[jenkinscat-docs] master: Configuration settings should be stored in separate file. (c589180)

[immanetize at fedoraproject.org]

Repository : http://git.fedorahosted.org/cgit/jenkinscat-docs.git

On branch  : master

>---------------------------------------------------------------

commit c5891809b45f0f78acf0c7716d46a32475cf75cd
Author: Pavel Tisnovsky <ptisnovs at redhat.com>
Date:   Wed Nov 26 11:00:09 2014 +0100

    Configuration settings should be stored in separate file.


>---------------------------------------------------------------

 ChangeLog                                |    6 ++++++
 src/jenkinscat/{books.clj => config.clj} |   25 +++++++++++++++++--------
 src/jenkinscat/server.clj                |   19 +------------------
 3 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f862d86..7d2c741 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-26  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/jenkinscat/config.clj:
+	* src/jenkinscat/server.clj:
+	Configuration settings should be stored in separate file.
+
 2014-11-25  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/jenkinscat/server.clj:
diff --git a/src/jenkinscat/books.clj b/src/jenkinscat/config.clj
similarity index 77%
copy from src/jenkinscat/books.clj
copy to src/jenkinscat/config.clj
index f0405d8..3985886 100644
--- a/src/jenkinscat/books.clj
+++ b/src/jenkinscat/config.clj
@@ -23,14 +23,23 @@
 ;;; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 ;;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-(ns jenkinscat.books)
+(ns jenkinscat.config)
 
-(require '[clojure.edn :as edn])
+(def hostname
+    "Hostname of this computer"
+    (.getHostName (java.net.InetAddress/getLocalHost)))
 
-(defn read-books
-    []
-    (println "*** Reading all books... ***")
-    (def books
-        (edn/read-string (slurp "books.clj")))
-    (println "Read " (count books) " books"))
+(def jobs-dir-prefix
+    "Path to the directory where are stored all Jenkins jobs."
+    "/var/lib/jenkins/jobs/")
+
+(def jobs-href-prefix
+    "URL prefix for all Jenkins jobs."
+    (str "http://" hostname ":8080/job/"))
+
+(def json-url
+    (str "http://" hostname ":8080/"))
+
+(def test-results-url-prefix
+    (str "http://" hostname "/tests/"))
 
diff --git a/src/jenkinscat/server.clj b/src/jenkinscat/server.clj
index 00e9329..61b06f7 100644
--- a/src/jenkinscat/server.clj
+++ b/src/jenkinscat/server.clj
@@ -40,30 +40,13 @@
 (require '[ring.util.response :as http-response])
 (require '[clojure.data.json  :as json])
 (require '[jenkinscat.books   :as books])
+(require '[jenkinscat.config    :as config])
 
 (require '[clojure.xml        :as xml])
 
-(def hostname
-    "Hostname of this computer"
-    (.getHostName (java.net.InetAddress/getLocalHost)))
-
-(def jobs-dir-prefix
-    "Path to the directory where are stored all Jenkins jobs."
-    "/var/lib/jenkins/jobs/")
-
-(def jobs-href-prefix
-    "URL prefix for all Jenkins jobs."
-    (str "http://" hostname ":8080/job/"))
-
 (def test-results-prefix
     "/var/www/html/tests/")
 
-(def json-url
-    (str "http://" hostname ":8080/"))
-
-(def test-results-url-prefix
-    (str "http://" hostname "/tests/"))
-
 (def not-available-message
     "<span style='color:red'>N/A</span>")