[jenkinscat-docs] master: Added support for app-infra books. (012304b)

[immanetize at fedoraproject.org]

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

On branch  : master

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

commit 012304b6124517168aacd8ccb6cba1218f9a50b7
Author: Pavel Tisnovsky <ptisnovs at redhat.com>
Date:   Tue Nov 25 10:55:57 2014 +0100

    Added support for app-infra books.


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

 ChangeLog                 |    5 +++++
 src/jenkinscat/server.clj |   31 +++++++++++++++++++++++++------
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3fba5cc..f862d86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-25  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/jenkinscat/server.clj:
+	Added support for app-infra books.
+
 2014-11-21  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/jenkinscat/server.clj:
diff --git a/src/jenkinscat/server.clj b/src/jenkinscat/server.clj
index 7cb84a7..00e9329 100644
--- a/src/jenkinscat/server.clj
+++ b/src/jenkinscat/server.clj
@@ -107,6 +107,10 @@
     [job-name]
     (.contains job-name "/"))
 
+(defn appinfra-job?
+    [job-name]
+    (.startsWith job-name "doc-Appinfra-"))
+
 (defn get-job-name-prefix
     "Middleware documentation uses the following form: 'job-name/book-name'"
     [job-name]
@@ -126,8 +130,9 @@
 (defn href-to-single-html
     "Return a proper href to a single-html page generated by Jenkins job."
     [job-name]
-    (cond (gnome-job? job-name) (str jobs-href-prefix job-name "%20(html)/lastStableBuild/artifact/gnome-help/C/index.html")
-          :else                 (str jobs-href-prefix job-name "%20(html-single)/lastStableBuild/artifact/tmp/en-US/html-single/index.html")))
+    (cond (gnome-job? job-name)    (str jobs-href-prefix job-name "%20(html)/lastStableBuild/artifact/gnome-help/C/index.html")
+          (appinfra-job? job-name) (str jobs-href-prefix job-name "%20(html-single)/lastStableBuild/artifact/index.html")
+          :else                    (str jobs-href-prefix job-name "%20(html-single)/lastStableBuild/artifact/tmp/en-US/html-single/index.html")))
     ;(str "<a href='" jobs-href-prefix job-name "%20(html-single)/lastStableBuild/artifact/tmp/en-US/html-single/index.html'>link</a>"))
 
 (defn href-to-file-middleware
@@ -266,12 +271,18 @@
           file (new-file path-to-html)]
         (.isFile file)))
 
+(defn html-exists-appinfra-job?
+    [job-name]
+    (let [file (new-file (str jobs-dir-prefix job-name " (html-single)/lastStable/archive/index.html"))]
+        (.isFile file)))
+
 (defn html-exists?
     "Test for existence of single-HTML file generated by Jenkins."
     [job-name]
-    (cond (gnome-job? job-name)      (html-exists-gnome-job? job-name)
+    (cond (gnome-job?      job-name) (html-exists-gnome-job?      job-name)
           (middleware-job? job-name) (html-exists-middleware-job? job-name)
-          :else                      (html-exists-publican-job? job-name)))
+          (appinfra-job?   job-name) (html-exists-appinfra-job?   job-name)
+          :else                      (html-exists-publican-job?   job-name)))
 
 (defn get-path-to-html-publican-book
     [job-name]
@@ -280,6 +291,13 @@
             (href-to-single-html job-name)
             nil)))
 
+(defn get-path-to-html-appinfra-book
+    [job-name]
+    (let [file (new-file (str jobs-dir-prefix job-name " (html-single)/lastStable/archive/index.html"))]
+        (if (.isFile file)
+            (href-to-single-html job-name)
+            nil)))
+
 (defn get-path-to-html-gnome-book
     [job-name]
     ;example http://localhost:8080/job/doc-FuseSource-ActiveMQDocs/lastStableBuild/artifact/output/admin_guide/admin_guide.html
@@ -299,9 +317,10 @@
 (defn get-path-to-html
     "Get path to HTML generated by given Jenkins job."
     [job-name]
-    (cond (gnome-job? job-name)      (get-path-to-html-gnome-book job-name)
+    (cond (gnome-job?      job-name) (get-path-to-html-gnome-book      job-name)
           (middleware-job? job-name) (get-path-to-html-middleware-book job-name)
-          :else                      (get-path-to-html-publican-book job-name)))
+          (appinfra-job?   job-name) (get-path-to-html-appinfra-book   job-name)
+          :else                      (get-path-to-html-publican-book   job-name)))
 
 (defn get-path-to-log-publican-book
     [job-name]