docs-commits February 2015

docs-commits@lists.fedoraproject.org

6 participants
123 discussions

[jenkinscat-docs] master: Exec function should be placed in its own namespace. (19eb13f)
by Pete Travis 05 Feb '15

05 Feb '15

Repository : http://git.fedorahosted.org/cgit/jenkinscat-docs.git On branch : master >--------------------------------------------------------------- commit 19eb13f1b95c3ec0d6f3ce94f8e1fc9914bd6288 Author: Pavel Tisnovsky <ptisnovs(a)redhat.com> Date: Tue Dec 2 11:32:35 2014 +0100 Exec function should be placed in its own namespace. >--------------------------------------------------------------- ChangeLog | 5 +++ src/jenkinscat/{config.clj => exec.clj} | 52 +++++++++++++++++------------- 2 files changed, 34 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index cf58944..9a644ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2014-12-02 Pavel Tisnovsky <ptisnovs(a)redhat.com> + * src/jenkinscat/exec.clj: + Exec function should be placed in its own namespace. + +2014-12-02 Pavel Tisnovsky <ptisnovs(a)redhat.com> + * test/jenkinscat/test_exec.clj: Added new test: test_exec.clj. diff --git a/src/jenkinscat/config.clj b/src/jenkinscat/exec.clj similarity index 55% copy from src/jenkinscat/config.clj copy to src/jenkinscat/exec.clj index 8ad5fda..f0c279f 100644 --- a/src/jenkinscat/config.clj +++ b/src/jenkinscat/exec.clj @@ -1,3 +1,6 @@ +;;; +;;; Jenkinscat HTTP server that handles all requests send from clients/browsers. +;;; ;;; Copyright (c) 2014 Pavel Tisnovsky, Red Hat ;;; All rights reserved. ;;; @@ -22,30 +25,33 @@ ;;; ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ;;; (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.config) - -(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 json-url - "URL prefix for all requests based on JSON." - (str "http://" hostname ":8080/")) -(def test-results-url-prefix - "URL prefix for all tests (ie.test jobs)." - (str "http://" hostname "/tests/")) -(def test-results-prefix - "Path where test results will be stored." - "/var/www/html/tests/") +(ns jenkinscat.exec) + +(defn exec + "Execute external command." + ; command without parameters + ([command] + (.waitFor (. (Runtime/getRuntime) exec command))) + ; command with one parameter + ([command param1] + (.waitFor (. (Runtime/getRuntime) exec (str command " " param1)))) + ; command with two parameters + ([command param1 param2] + (.waitFor (. (Runtime/getRuntime) exec (str command " " param1 " " param2)))) + ; command with three parameters + ([command param1 param2 param3] + (.waitFor (. (Runtime/getRuntime) exec (str command " " param1 " " param2 " " param3)))) + ; command with four parameters + ([command param1 param2 param3 param4] + (.waitFor (. (Runtime/getRuntime) exec (str command " " param1 " " param2 " " param3 " " param4)))) + ; command with five parameters + ([command param1 param2 param3 param4 param5] + (.waitFor (. (Runtime/getRuntime) exec (str command " " param1 " " param2 " " param3 " " param4 " " param5)))) + ; command with six parameters + ([command param1 param2 param3 param4 param5 param6] + (.waitFor (. (Runtime/getRuntime) exec (str command " " param1 " " param2 " " param3 " " param4 " " param5 " " param6)))))

1 0

[jenkinscat-docs] master: Added new test: test_exec.clj. (e7b7bb5)
by Pete Travis 05 Feb '15

05 Feb '15

Repository : http://git.fedorahosted.org/cgit/jenkinscat-docs.git On branch : master >--------------------------------------------------------------- commit e7b7bb53dd1256a26b6e926563d5f692f3f5a21b Author: Pavel Tisnovsky <ptisnovs(a)redhat.com> Date: Tue Dec 2 11:30:32 2014 +0100 Added new test: test_exec.clj. >--------------------------------------------------------------- ChangeLog | 5 + test/jenkinscat/test_exec.clj | 277 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 282 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index c064481..cf58944 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-12-02 Pavel Tisnovsky <ptisnovs(a)redhat.com> + + * test/jenkinscat/test_exec.clj: + Added new test: test_exec.clj. + 2014-12-01 Pavel Tisnovsky <ptisnovs(a)redhat.com> * test/jenkinscat/test_config.clj: diff --git a/test/jenkinscat/test_exec.clj b/test/jenkinscat/test_exec.clj new file mode 100644 index 0000000..5ddcfcb --- /dev/null +++ b/test/jenkinscat/test_exec.clj @@ -0,0 +1,277 @@ +;;; +;;; Jenkinscat HTTP server that handles all requests send from clients/browsers. +;;; +;;; Copyright (c) 2014 Pavel Tisnovsky, Red Hat +;;; All rights reserved. +;;; +;;; Redistribution and use in source and binary forms, with or without +;;; modification, are permitted provided that the following conditions are met: +;;; * Redistributions of source code must retain the above copyright +;;; notice, this list of conditions and the following disclaimer. +;;; * Redistributions in binary form must reproduce the above copyright +;;; notice, this list of conditions and the following disclaimer in the +;;; documentation and/or other materials provided with the distribution. +;;; * Neither the name of the Red Hat nor the +;;; names of its contributors may be used to endorse or promote products +;;; derived from this software without specific prior written permission. +;;; +;;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +;;; ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +;;; WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +;;; DISCLAIMED. IN NO EVENT SHALL Pavel Tisnovsky BE LIABLE FOR ANY +;;; DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +;;; (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +;;; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +;;; ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +;;; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +;;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +;;; + +; Tests for defs and functions defined in the following namespace: jenkinscat.exec +(ns jenkinscat.test-exec + (:require [clojure.test :refer :all] + [clojure.java.io] + [jenkinscat.exec :refer :all])) + + + +; +; Common functions used by tests +; + +(defn callable? + "Test if given function-name is bound to the real function." + [function-name] + (clojure.test/function? function-name)) + +(defn call-exec-without-args + "Check if exec could/could not be called without arguments." + [] + ; we assume that exception would be thrown, so we catch it + ; and return true if and only if exception is caught + (try + ; run exec without args + (exec) + ; we are here? it's an error + nil + (catch Exception e + ; (any) exception is expected in this case + true))) + +(defn call-exec-with-empty-arg + "Check if exec could/could not be called with one empty argument." + [] + ; we assume that exception would be thrown, so we catch it + ; and return true if and only if exception is caught + (try + ; run exec with empty + (exec "") + ; we are here? it's an error + nil + (catch Exception e + ; (any) exception is expected in this case + true))) + +(defn call-exec-with-two-empty-args + "Check if exec could/could not be called with two empty arguments." + [] + ; we assume that exception would be thrown, so we catch it + ; and return true if and only if exception is caught + (try + ; run exec with two empty arguments + (exec "" "") + ; we are here? it's an error + nil + (catch Exception e + ; (any) exception is expected in this case + true))) + +(defn call-exec-with-three-empty-args + "Check if exec could/could not be called with three empty arguments." + [] + ; we assume that exception would be thrown, so we catch it + ; and return true if and only if exception is caught + (try + ; run exec with three empty arguments + (exec "" "" "") + ; we are here? it's an error + nil + (catch Exception e + ; (any) exception is expected in this case + true))) + +(defn call-exec-with-four-empty-args + "Check if exec could/could not be called with four empty arguments." + [] + ; we assume that exception would be thrown, so we catch it + ; and return true if and only if exception is caught + (try + ; run exec with four empty arguments + (exec "" "" "" "") + ; we are here? it's an error + nil + (catch Exception e + ; (any) exception is expected in this case + true))) + +(defn call-exec-with-five-empty-args + "Check if exec could/could not be called with five empty arguments." + [] + ; we assume that exception would be thrown, so we catch it + ; and return true if and only if exception is caught + (try + ; run exec with five empty arguments + (exec "" "" "" "" "") + ; we are here? it's an error + nil + (catch Exception e + ; (any) exception is expected in this case + true))) + +(defn call-exec-with-six-empty-args + "Check if exec could/could not be called with six empty arguments." + [] + ; we assume that exception would be thrown, so we catch it + ; and return true if and only if exception is caught + (try + ; run exec with six empty arguments + (exec "" "" "" "" "" "") + ; we are here? it's an error + nil + (catch Exception e + ; (any) exception is expected in this case + true))) + +(defn call-exec-with-improper-command + "Check if exec could/could not be called with improper command." + [command] + ; we assume that exception would be thrown, so we catch it + ; and return true if and only if exception is caught + (try + ; run exec with improper command + (exec command) + ; we are here? it's an error + nil + (catch Exception e + ; (any) exception is expected in this case + true))) + +(defn call-exec-with-improper-command-arg + "Check if exec could/could not be called with improper command." + [command arg] + ; we assume that exception would be thrown, so we catch it + ; and return true if and only if exception is caught + (try + ; run exec with improper command + (exec command arg) + ; we are here? it's an error + nil + (catch Exception e + ; (any) exception is expected in this case + true))) + + + +; +; Tests for the (defn exec) +; + +(deftest test-exec-existence + "Check that the jenkinscat.exec/exec definition exists." + (testing "if the jenkinscat.exec/exec def exists" + (is (callable? 'jenkinscat.exec/exec)))) + +(deftest test-exec-function-without-args + "Test exec function behaviour" + (testing "exec function behaviour" + ; call (exec) + (is (call-exec-without-args)))) + +(deftest test-exec-function-with-empty-arg + "Test exec function behaviour" + (testing "exec function behaviour" + ; call (exec "") + (is (call-exec-with-empty-arg)))) + +(deftest test-exec-function-with-empty-args + "Test exec function behaviour" + (testing "exec function behaviour" + ; call (exec "" "") + (is (call-exec-with-two-empty-args)) + ; call (exec "" "" "") + (is (call-exec-with-three-empty-args)) + ; call (exec "" "" "" "") + (is (call-exec-with-four-empty-args)) + ; call (exec "" "" "" "" "") + (is (call-exec-with-five-empty-args)) + ; call (exec "" "" "" "" "" "") + (is (call-exec-with-six-empty-args)))) + +(deftest test-exec-function-with-real-commands + "Test exec function with real commands (ls etc.)" + (testing "exec function behaviour" + ; call (exec "date") + (is (exec "date")) + ; call (exec "ls") + (is (exec "ls")) + ; call (exec "ls -1") + (is (exec "ls -1")) + ; call (exec "ls -1 -c") + (is (exec "ls -1 -c")) + ; call (exec "ls -a -1 -c") + (is (exec "ls -a -1 -c")) + ; call (exec "ls -a -1 -c -C") + (is (exec "ls -a -1 -c -C")) + ; call (exec "ls -a -1 -c -C -d") + (is (exec "ls -a -1 -c -C -d")) + ; call (exec "ls -a -1 -c -C -d -g") + (is (exec "ls -a -1 -c -C -d -g")) + ; call (exec "ls" "-1") + (is (exec "ls" "-1")) + ; call (exec "ls" "-1" "-c") + (is (exec "ls" "-1" "-c")) + ; call (exec "ls" "-a" "-1" "-c") + (is (exec "ls" "-a" "-1 -c")) + ; call (exec "ls" "-a" "-1" "-c" "-C") + (is (exec "ls" "-a" "-1" "-c" "-C")) + ; call (exec "ls" "-a" "-1" "-c" "-C" "-d") + (is (exec "ls" "-a" "-1" "-c" "-C" "-d")) + ; call (exec "ls" "-a" "-1" "-c" "-C" "-d" "-g") + (is (exec "ls" "-a" "-1" "-c" "-C" "-d" "-g")))) + +(deftest test-exec-function-with-improper-commands + "Test exec function with improper commands." + (testing "exec function behaviour" + ; call (exec "-") + (is (call-exec-with-improper-command "-")) + ; call (exec "---") + (is (call-exec-with-improper-command "---")) + ; call (exec "/") + (is (call-exec-with-improper-command "/")) + ; call (exec "//") + (is (call-exec-with-improper-command "//")) + ; call (exec "?") + (is (call-exec-with-improper-command "?")) + ; call (exec "??") + (is (call-exec-with-improper-command "??")) + ; call (exec "xyzzy") + (is (call-exec-with-improper-command "xyzzy")))) + +(deftest test-exec-function-with-improper-commands-arg + "Test exec function with improper commands." + (testing "exec function behaviour" + ; call (exec "-" "x") + (is (call-exec-with-improper-command-arg "-" "x")) + ; call (exec "---" "x") + (is (call-exec-with-improper-command-arg "---" "x")) + ; call (exec "/" "x") + (is (call-exec-with-improper-command-arg "/" "x")) + ; call (exec "//" "x") + (is (call-exec-with-improper-command-arg "//" "x")) + ; call (exec "?" "x") + (is (call-exec-with-improper-command-arg "?" "x")) + ; call (exec "??" "x") + (is (call-exec-with-improper-command-arg "??" "x")) + ; call (exec "xyzzy" "x") + (is (call-exec-with-improper-command-arg "xyzzy" "x")))) +

1 0

[jenkinscat-docs] master: Added new test: test_config.clj. (0a2a540)
by Pete Travis 05 Feb '15

05 Feb '15

Repository : http://git.fedorahosted.org/cgit/jenkinscat-docs.git On branch : master >--------------------------------------------------------------- commit 0a2a5403c64508e378003c10b0d06be76ebf39af Author: Pavel Tisnovsky <ptisnovs(a)redhat.com> Date: Mon Dec 1 11:18:10 2014 +0100 Added new test: test_config.clj. >--------------------------------------------------------------- ChangeLog | 5 + test/jenkinscat/test_config.clj | 261 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 266 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9bbb9e3..c064481 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2014-12-01 Pavel Tisnovsky <ptisnovs(a)redhat.com> + * test/jenkinscat/test_config.clj: + Added new test: test_config.clj. + +2014-12-01 Pavel Tisnovsky <ptisnovs(a)redhat.com> + * src/jenkinscat/config.clj: Updated, new configuration options added. diff --git a/test/jenkinscat/test_config.clj b/test/jenkinscat/test_config.clj new file mode 100644 index 0000000..96e5ecd --- /dev/null +++ b/test/jenkinscat/test_config.clj @@ -0,0 +1,261 @@ +;;; Copyright (c) 2014 Pavel Tisnovsky, Red Hat +;;; All rights reserved. +;;; +;;; Redistribution and use in source and binary forms, with or without +;;; modification, are permitted provided that the following conditions are met: +;;; * Redistributions of source code must retain the above copyright +;;; notice, this list of conditions and the following disclaimer. +;;; * Redistributions in binary form must reproduce the above copyright +;;; notice, this list of conditions and the following disclaimer in the +;;; documentation and/or other materials provided with the distribution. +;;; * Neither the name of the Red Hat nor the +;;; names of its contributors may be used to endorse or promote products +;;; derived from this software without specific prior written permission. +;;; +;;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +;;; ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +;;; WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +;;; DISCLAIMED. IN NO EVENT SHALL Pavel Tisnovsky BE LIABLE FOR ANY +;;; DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +;;; (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +;;; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +;;; ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +;;; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +;;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + + +; Tests for defs and functions defined in the following namespace: jenkinscat.config +(ns jenkinscat.test-config + (:require [clojure.test :refer :all] + [clojure.java.io] + [jenkinscat.config :refer :all])) + + + +; +; Common functions used by tests +; + +(defn get-hostname + "Hostname of this computer" + [] + ; read the real hostname + (.getHostName (java.net.InetAddress/getLocalHost))) + +(defn proper-jobs-href-prefix? + "Returns true if jobs-href-prefix starts with 'http://' or 'https://'." + [] + ; the URL should start with 'http://' or 'https://' + (or (.startsWith jobs-href-prefix "http://") + (.startsWith jobs-href-prefix "https://"))) + +(defn proper-json-url-prefix? + "Returns true if json-url starts with 'http://' or 'https://'." + [] + ; the URL should start with 'http://' or 'https://' + (or (.startsWith json-url "http://") + (.startsWith json-url "https://"))) + +(defn proper-test-results-dir-prefix? + "Returns true if test-results-url-prefix starts with 'http://' or 'https://'." + [] + ; the URL should start with 'http://' or 'https://' + (or (.startsWith test-results-url-prefix "http://") + (.startsWith test-results-url-prefix "https://"))) + +(defn proper-url? + "Check if the given URL is properly formed." + [url] + (try + ; try to constructs new URL and check if any exception will occurs + ; (MalformedException etc. etc.) + (new java.net.URL url) + ; we are here -> URL is correct + true + (catch Exception e + ; we are here -> there's malformed URL or other problems + ; (but it's still test failure) + nil))) + + + +; +; Tests for the (def hostname) +; + +(deftest test-hostname-def-existence + "Check that the jenkinscat.config/hostname definition exists." + (testing "if the hostname def exists" + ; check if variable exists and it's bounded + (is (bound? (find-var 'jenkinscat.config/hostname))))) + +(deftest test-hostname-def-type + "Check that the jenkinscat.config/hostname has the correct type." + (testing "the hostname def type" + ; check if variable is of type java.lang.String + ; because Clojure strings are of this type + (is (= (type hostname) java.lang.String)))) + +(deftest test-hostname-def-value + "Check that the jenkinscat.config/hostname has the correct value." + (testing "the hostname def value" + ; hostname can't be empty + (is (not (empty hostname))) + ; hostname must be the same as host computer hostname + (is (= hostname (get-hostname))))) + + + +; +; Tests for the (def jobs-dir-prefix) +; + +(deftest test-jobs-dir-prefix-existence + "Check that the jenkinscat.config/jobs-dir-prefix definition exists." + (testing "if the jobs-dir-prefix def exists" + ; check if variable exists and it's bounded + (is (bound? (find-var 'jenkinscat.config/jobs-dir-prefix))))) + +(deftest test-jobs-dir-prefix-type + "Check that the jenkinscat.config/jobs-dir-prefix has the correct type." + (testing "the jobs-dir-prefix def type" + ; check if variable is of type java.lang.String + ; because Clojure strings are of this type + (is (= (type jobs-dir-prefix) java.lang.String)))) + +(deftest test-jobs-dir-prefix-value + "Check that the jenkinscat.config/jobs-dir-prefix has the correct value." + (testing "the jobs-dir-prefix def value" + ; value can't be empty + (is (not (empty jobs-dir-prefix))) + (is (.startsWith jobs-dir-prefix "/")) + (is (.endsWith jobs-dir-prefix "/")) + ; jobs-dir-prefix should be proper directory name + (is (.isDirectory (clojure.java.io/file jobs-dir-prefix ))))) + + + +; +; Tests for the (def jobs-href-prefix) +; + +(deftest test-jobs-href-prefix-existence + "Check that the jenkinscat.config/jobs-href-prefix definition exists." + (testing "if the jobs-href-prefix def exists" + ; check if variable exists and it's bounded + (is (bound? (find-var 'jenkinscat.config/jobs-href-prefix))))) + +(deftest test-jobs-href-prefix-type + "Check that the jenkinscat.config/jobs-href-prefix has the correct type." + (testing "the jobs-href-prefix def type" + ; check if variable is of type java.lang.String + ; because Clojure strings are of this type + (is (= (type jobs-href-prefix) java.lang.String)))) + +(deftest test-jobs-href-prefix-value + "Check that the jenkinscat.config/jobs-href-prefix has the correct value." + (testing "the jobs-href-prefix def value" + ; value can't be empty + (is (not (empty jobs-href-prefix))) + (is (proper-jobs-href-prefix?)) + (is (.endsWith jobs-href-prefix "/")))) + +(deftest test-jobs-href-prefix-url + "Check that the jenkinscat.config/jobs-href-prefix is the proper URL." + (testing "the jobs-href-prefix def URL" + (is (proper-url? jobs-href-prefix)))) + + + +; +; Tests for the (def json-url) +; + +(deftest test-json-url-existence + "Check that the jenkinscat.config/json-url definition exists." + (testing "if the json-url def exists" + ; check if variable exists and it's bounded + (is (bound? (find-var 'jenkinscat.config/json-url))))) + +(deftest test-json-url-type + "Check that the jenkinscat.config/json-url has the correct type." + (testing "the json-url def type" + ; check if variable is of type java.lang.String + ; because Clojure strings are of this type + (is (= (type json-url) java.lang.String)))) + +(deftest test-json-url-value + "Check that the jenkinscat.config/json-url has the correct value." + (testing "the json-url def value" + ; value can't be empty + (is (not (empty json-url))) + (is (proper-json-url-prefix?)) + (is (.endsWith json-url "/")))) + +(deftest test-json-url-url + "Check that the jenkinscat.config/json-url is the proper URL." + (testing "the jobs-href-prefix def URL" + (is (proper-url? json-url)))) + + + +; +; Tests for the (def test-results-url-prefix) +; + +(deftest test-test-results-url-prefix-existence + "Check that the jenkinscat.config/test-results-url-prefix definition exists." + (testing "if the test-results-url-prefix def exists" + ; check if variable exists and it's bounded + (is (bound? (find-var 'jenkinscat.config/test-results-url-prefix))))) + +(deftest test-test-results-url-prefix-type + "Check that the jenkinscat.config/test-results-url-prefix has the correct type." + (testing "the test-results-url-prefix def type" + ; check if variable is of type java.lang.String + ; because Clojure strings are of this type + (is (= (type test-results-url-prefix) java.lang.String)))) + +(deftest test-test-results-url-prefix-value + "Check that the jenkinscat.config/test-results-url-prefix has the correct value." + (testing "the test-results-url-prefix def value" + ; value can't be empty + (is (not (empty test-results-url-prefix))) + (is (proper-test-results-dir-prefix?)) + (is (.endsWith test-results-url-prefix "/")))) + +(deftest test-test-results-url-prefix-url + "Check that the jenkinscat.config/test-results-url-prefix is the proper URL." + (testing "the test-results-url-prefix def URL" + (is (proper-url? test-results-url-prefix)))) + + + +; +; Tests for the (def test-results-prefix) +; + +(deftest test-test-results-prefix-existence + "Check that the jenkinscat.config/test-results-prefix definition exists." + (testing "if the test-results-prefix def exists" + ; check if variable exists and it's bounded + (is (bound? (find-var 'jenkinscat.config/test-results-prefix))))) + +(deftest test-test-results-prefix-type + "Check that the jenkinscat.config/test-results-prefix has the correct type." + (testing "the test-results-prefix def type" + ; check if variable is of type java.lang.String + ; because Clojure strings are of this type + (is (= (type test-results-prefix) java.lang.String)))) + +(deftest test-test-results-prefix-value + "Check that the jenkinscat.config/test-results-prefix has the correct value." + (testing "the test-results-prefix def value" + ; value can't be empty + (is (not (empty test-results-prefix))) + (is (.startsWith test-results-prefix "/")) + (is (.endsWith test-results-prefix "/")) + ; test-results-prefix should be proper directory name + (is (.isDirectory (clojure.java.io/file test-results-prefix ))))) +

1 0

[jenkinscat-docs] master: Updated, new configuration options added. (852a929)
by Pete Travis 05 Feb '15

05 Feb '15

Repository : http://git.fedorahosted.org/cgit/jenkinscat-docs.git On branch : master >--------------------------------------------------------------- commit 852a929388e8b32fbf029116547aeb94446a72e4 Author: Pavel Tisnovsky <ptisnovs(a)redhat.com> Date: Mon Dec 1 11:13:18 2014 +0100 Updated, new configuration options added. >--------------------------------------------------------------- ChangeLog | 5 +++++ src/jenkinscat/config.clj | 6 ++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d2c741..9bbb9e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-12-01 Pavel Tisnovsky <ptisnovs(a)redhat.com> + + * src/jenkinscat/config.clj: + Updated, new configuration options added. + 2014-11-26 Pavel Tisnovsky <ptisnovs(a)redhat.com> * src/jenkinscat/config.clj: diff --git a/src/jenkinscat/config.clj b/src/jenkinscat/config.clj index 3985886..8ad5fda 100644 --- a/src/jenkinscat/config.clj +++ b/src/jenkinscat/config.clj @@ -38,8 +38,14 @@ (str "http://" hostname ":8080/job/")) (def json-url + "URL prefix for all requests based on JSON." (str "http://" hostname ":8080/")) (def test-results-url-prefix + "URL prefix for all tests (ie.test jobs)." (str "http://" hostname "/tests/")) +(def test-results-prefix + "Path where test results will be stored." + "/var/www/html/tests/") +

1 0

[jenkinscat-docs] master: Configuration settings should be stored in separate file. (c589180)
by Pete Travis 05 Feb '15

05 Feb '15

Repository : http://git.fedorahosted.org/cgit/jenkinscat-docs.git On branch : master >--------------------------------------------------------------- commit c5891809b45f0f78acf0c7716d46a32475cf75cd Author: Pavel Tisnovsky <ptisnovs(a)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(a)redhat.com> + + * src/jenkinscat/config.clj: + * src/jenkinscat/server.clj: + Configuration settings should be stored in separate file. + 2014-11-25 Pavel Tisnovsky <ptisnovs(a)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>")

1 0

[jenkinscat-docs] master: Added support for app-infra books. (012304b)
by Pete Travis 05 Feb '15

05 Feb '15

Repository : http://git.fedorahosted.org/cgit/jenkinscat-docs.git On branch : master >--------------------------------------------------------------- commit 012304b6124517168aacd8ccb6cba1218f9a50b7 Author: Pavel Tisnovsky <ptisnovs(a)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(a)redhat.com> + + * src/jenkinscat/server.clj: + Added support for app-infra books. + 2014-11-21 Pavel Tisnovsky <ptisnovs(a)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/artif… @@ -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]

1 0

[jenkinscat-docs] master: Updated front page design. (d19295a)
by Pete Travis 05 Feb '15

05 Feb '15

Repository : http://git.fedorahosted.org/cgit/jenkinscat-docs.git On branch : master >--------------------------------------------------------------- commit d19295a23f31f1b295196bd60be75a3a2e3fec4e Author: Pavel Tisnovsky <ptisnovs(a)redhat.com> Date: Fri Nov 21 15:14:31 2014 +0100 Updated front page design. >--------------------------------------------------------------- ChangeLog | 5 ++++ src/jenkinscat/server.clj | 54 ++++++++++++++++++++++++++++++--------------- 2 files changed, 41 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 534ba73..3fba5cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-11-21 Pavel Tisnovsky <ptisnovs(a)redhat.com> + + * src/jenkinscat/server.clj: + Updated front page design. + 2014-11-20 Pavel Tisnovsky <ptisnovs(a)redhat.com> * tools/create_books_clj_file.lua: diff --git a/src/jenkinscat/server.clj b/src/jenkinscat/server.clj index 81e3a8d..7cb84a7 100644 --- a/src/jenkinscat/server.clj +++ b/src/jenkinscat/server.clj @@ -55,13 +55,23 @@ "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>") +(defn third + [coll] + (nth coll 2)) + (defn exec "Execute external command." ([command] @@ -381,17 +391,27 @@ [title] [:nav {:class "navbar navbar-inverse navbar-fixed-top" :role "navigation"} [:div {:class "container-fluid"} - [:div {:class "row"} - [:div {:class "col-md-2"} - [:div {:class "navbar-header"} - [:img {:class "navbar-brand-" :style "float:left" :src "jenkinscat.png"}] - [:a {:href "/" :class "navbar-brand"} "  Jenkinscat"] - ] ; ./navbar-header + [:div {:class "navbar-header"} + [:button {:type "button" :class "navbar-toggle" :data-toggle "collapse"} + [:span {:class "sr-only"} "Toggle navigation"] + [:span {:class "icon-bar"}] + [:span {:class "icon-bar"}] + [:span {:class "icon-bar"}] + ] + [:img {:class "navbar-brand-" :style "float:left" :src "jenkinscat.png"}] + [:a {:href "/" :class "navbar-brand"} "  Jenkinscat"] + ] ; ./navbar-header + [:div {:class "col-md-4"} + [:form {:class "navbar-form navbar-left"} + [:div {:class "form-group"} + "<input disabled='disabled' autofocus='autofocus' size='40' type='text' class='form-control' ng-model='search' placeholder='' id='searchinput'>" + ] + ] ] ; col ends - [:div {:class "col-md-2"} + [:div {:class "col-md"} [:a {:href "/job-configurations" :class "navbar-brand"} "Job configurations"] ] ; col ends - [:div {:class "col-md-2"} + [:div {:class "col-md"} [:a {:href "/statistics" :class "navbar-brand"} "Statistics"] ] ; col ends ] ; row ends @@ -513,7 +533,6 @@ [:td [:a {:href "/reload-book-list"} "Reload book list"]] ] ] - ])) (defn generate-response-html @@ -782,10 +801,6 @@ [xmlstructure tag] (first (for [x xmlstructure :when (= tag (:tag x))] x))) -(defn third - [coll] - (nth coll 2)) - (defn read-git-repo-from-xml [scm-node] (->> scm-node :content second :content first :content first :content first)) @@ -1063,11 +1078,14 @@ (def action-handlers "Map of action handlers, ie. pages generated dynamically by this tool." - {"/data.json" json-data-handler - "/start-build" start-build-handler - "/statistics" statistics-handler - "/job-configurations" job-configurations-handler - "/reload-book-list" reload-books-list-handler + {"/data.json" json-data-handler + "/start-build" start-build-handler + "/statistics" statistics-handler + "/job-configurations" job-configurations-handler + "/reload-book-list" reload-books-list-handler + "/add-book-step-1" add-book-step-1-handler + "/add-book-step-2" add-book-step-2-handler + "/build-configuration-help" build-configuration-help-handler }) (defn get-file-handler

1 0

[jenkinscat-docs] master: Work directory should not be hardwired in internal functions. (63dcb8f)
by Pete Travis 05 Feb '15

05 Feb '15

Repository : http://git.fedorahosted.org/cgit/jenkinscat-docs.git On branch : master >--------------------------------------------------------------- commit 63dcb8f3e5faf7c809c45fb5c9ee5ca3b6e5eb98 Author: Pavel Tisnovsky <ptisnovs(a)redhat.com> Date: Thu Nov 20 10:13:36 2014 +0100 Work directory should not be hardwired in internal functions. >--------------------------------------------------------------- ChangeLog | 5 +++++ tools/create_books_clj_file.lua | 31 +++++++++++++++++++------------ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 19eb8b5..534ba73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-11-20 Pavel Tisnovsky <ptisnovs(a)redhat.com> + + * tools/create_books_clj_file.lua: + Work directory should not be hardwired in internal functions. + 2014-11-19 Pavel Tisnovsky <ptisnovs(a)redhat.com> * tools/create_books_clj_file.lua: diff --git a/tools/create_books_clj_file.lua b/tools/create_books_clj_file.lua index 239e42d..031e26e 100644 --- a/tools/create_books_clj_file.lua +++ b/tools/create_books_clj_file.lua @@ -253,7 +253,7 @@ end -- -- function fetchDocumentTitleFromXML(jobDirectory, docname) - local workspace = jobDirectory .. "/workspace/en-US" + local workspace = jobDirectory .. "/en-US" local command = "cd \"" .. workspace .. "\"; xmllint --xinclude --postvalid \"" .. docname .. ".xml\" 2>/dev/null | xmlstarlet sel -t -v \"//bookinfo/title|//articleinfo/title\" 2>/dev/null" print(command) local handle = io.popen(command) @@ -266,7 +266,7 @@ end -- -- function fetchProductNameFromXML(jobDirectory, docname) - local workspace = jobDirectory .. "/workspace/en-US" + local workspace = jobDirectory .. "/en-US" local command = "cd \"" .. workspace .. "\"; xmllint --xinclude --postvalid \"" .. docname .. ".xml\" 2>/dev/null | xmlstarlet sel -t -v \"//bookinfo/productname|//articleinfo/productname\" 2>/dev/null" local handle = io.popen(command) local result = handle:read("*a") @@ -278,7 +278,7 @@ end -- -- function fetchProductVersionFromXML(jobDirectory, docname, condition) - local workspace = jobDirectory .. "/workspace/en-US" + local workspace = jobDirectory .. "/en-US" local command = nil @@ -345,7 +345,7 @@ end -- -- -- -function getJobTitleTypeAndProduct(jobDirectory) +function getJobTitleTypeAndProduct(jobDirectory, jobWorkDirectory) local documentType local productName local productVersion @@ -353,7 +353,7 @@ function getJobTitleTypeAndProduct(jobDirectory) local condition print("Processing job " .. jobDirectory) - documentType, productName, productVersion, documentName, condition = readDocumentInfoFromPublicanCfg(jobDirectory) + documentType, productName, productVersion, documentName, condition = readDocumentInfoFromPublicanCfg(jobWorkDirectory) if documentName == nil then if documentType == "Book" then @@ -363,15 +363,15 @@ function getJobTitleTypeAndProduct(jobDirectory) end end - local documentTitle = fetchDocumentTitleFromXML(jobDirectory, documentName) + local documentTitle = fetchDocumentTitleFromXML(jobWorkDirectory, documentName) print(documentTitle) if productName == nil then - productName = fetchProductNameFromXML(jobDirectory, documentName) + productName = fetchProductNameFromXML(jobWorkDirectory, documentName) end if productVersion == nil then - productVersion = fetchProductVersionFromXML(jobDirectory, documentName, condition) + productVersion = fetchProductVersionFromXML(jobWorkDirectory, documentName, condition) end return documentTitle, documentType, productName, productVersion @@ -474,7 +474,7 @@ end -- function addJobGitRepo(allJobs) for i, job in ipairs(allJobs) do - job.git_repo = getJobBuildRepo(job.directory) + job.git_repo = getJobBuildRepo(job.workDirectory) end end @@ -483,7 +483,7 @@ end -- function addJobTitleTypeAndProduct(allJobs) for i, job in ipairs(allJobs) do - job.documentTitle, job.documentType, job.productName, job.productVersion = getJobTitleTypeAndProduct(job.directory) + job.documentTitle, job.documentType, job.productName, job.productVersion = getJobTitleTypeAndProduct(job.directory, job.workDirectory) end end @@ -591,6 +591,13 @@ end +function concatTables(table1, table2) + for i = 1,#table2 do + table1[#table1 + 1] = table2[i] + end + return table1 +end + function readBugDescription() local fin = io.open("bug_summary.txt", "r") bug_description = fin:read("*line") @@ -618,8 +625,8 @@ function main() performBasicCheck() createWorkDirectory() readBugDescriptionAndBugTemplate() - print(bug_description) - print(bug_template) + --print(bug_description) + --print(bug_template) local allJobs = fetchListOfAllJobs() addJobDirectories(allJobs)

1 0

[jenkinscat-docs] master: Added functions to fetch product, title etc. from generated HTML pages. (a0224cf)
by Pete Travis 05 Feb '15

05 Feb '15

Repository : http://git.fedorahosted.org/cgit/jenkinscat-docs.git On branch : master >--------------------------------------------------------------- commit a0224cfa032965f1664ab58fb0e8b5e04f7d4790 Author: Pavel Tisnovsky <ptisnovs(a)redhat.com> Date: Wed Nov 19 11:40:45 2014 +0100 Added functions to fetch product, title etc. from generated HTML pages. >--------------------------------------------------------------- ChangeLog | 6 ++++++ tools/create_books_clj_file.lua | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 016efea..19eb8b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-11-19 Pavel Tisnovsky <ptisnovs(a)redhat.com> + + * tools/create_books_clj_file.lua: + Added functions to fetch product, title etc. from generated HTML + pages. + 2014-11-18 Pavel Tisnovsky <ptisnovs(a)redhat.com> * tools/create_books_clj_file.lua: diff --git a/tools/create_books_clj_file.lua b/tools/create_books_clj_file.lua index bc247e1..239e42d 100644 --- a/tools/create_books_clj_file.lua +++ b/tools/create_books_clj_file.lua @@ -306,6 +306,45 @@ end -- -- -- +function fetchDocumentTitleFromHTML(docname) + -- <h1 xmlns="http://www.w3.org/1999/xhtml" class="title"><a id="FuseMBConnectivity"></a>Client Connectivity Guide</h1> + local command = "cat " .. docname .. " | xmlstarlet sel -t -v \"(//*[@class='title'])[1]\" 2>/dev/null" + local handle = io.popen(command) + local result = handle:read("*a") + handle:close() + return result +end + +-- +-- +-- +function fetchProductNameFromHTML(docname) + -- <span xmlns="http://www.w3.org/1999/xhtml" class="productname">Red Hat JBoss A-MQ<br /></span> + local command = "cat " .. docname .. " | xmlstarlet sel -t -v \"(//*[@class='productname'])[1]\" 2>/dev/null" + local handle = io.popen(command) + local result = handle:read("*a") + handle:close() + return result +end + +-- +-- +-- +function fetchProductVersionFromHTML(docname) + -- <p xmlns="http://www.w3.org/1999/xhtml" class="releaseinfo">Version 6.1</p> + local command = "cat " .. docname .. " | xmlstarlet sel -t -v \"(//*[@class='releaseinfo'])[1]\" 2>/dev/null" + local handle = io.popen(command) + local result = handle:read("*a") + handle:close() + if result:startsWith("Version ") then + result = result:sub(8):trim() + end + return result +end + +-- +-- +-- function getJobTitleTypeAndProduct(jobDirectory) local documentType local productName

1 0

[jenkinscat-docs] master: Updated, added comments, sync with devel version. (1ad3139)
by Pete Travis 05 Feb '15

05 Feb '15

Repository : http://git.fedorahosted.org/cgit/jenkinscat-docs.git On branch : master >--------------------------------------------------------------- commit 1ad3139bc280a0c1caee133a45fcf0840aa1f499 Author: Pavel Tisnovsky <ptisnovs(a)redhat.com> Date: Tue Nov 18 12:10:12 2014 +0100 Updated, added comments, sync with devel version. >--------------------------------------------------------------- ChangeLog | 5 +++++ tools/create_books_clj_file.lua | 32 ++++++++++++++++++++++++++------ 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index ef3a667..016efea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-11-18 Pavel Tisnovsky <ptisnovs(a)redhat.com> + + * tools/create_books_clj_file.lua: + Updated, added comments, sync with devel version. + 2014-11-13 Pavel Tisnovsky <ptisnovs(a)redhat.com> * src/jenkinscat/server.clj: diff --git a/tools/create_books_clj_file.lua b/tools/create_books_clj_file.lua index de48379..bc247e1 100644 --- a/tools/create_books_clj_file.lua +++ b/tools/create_books_clj_file.lua @@ -36,6 +36,16 @@ end -- +-- Tests if the given string ends with the specified suffix. +-- +function string.endsWith(str, suffix) + local substring = string.sub(str, -string.len(suffix)) + return suffix == "" or substring == suffix +end + + + +-- -- Read input file and return its content as a string. -- function readInputFile(inputFileName) @@ -201,6 +211,7 @@ function readDocumentInfoFromPublicanCfg(jobDirectory) local fin = io.open(publicanCfgFile, "r") if fin == nil then + print("Warning: can not read file " .. publicanCfgFile) return "", "", "", "", "" end fin:close() @@ -236,12 +247,15 @@ function readDocumentInfoFromPublicanCfg(jobDirectory) return documentType, productName, productVersion, documentName, condition end + + -- -- -- -function fetchDocumentTitle(jobDirectory, docname) +function fetchDocumentTitleFromXML(jobDirectory, docname) local workspace = jobDirectory .. "/workspace/en-US" local command = "cd \"" .. workspace .. "\"; xmllint --xinclude --postvalid \"" .. docname .. ".xml\" 2>/dev/null | xmlstarlet sel -t -v \"//bookinfo/title|//articleinfo/title\" 2>/dev/null" + print(command) local handle = io.popen(command) local result = handle:read("*a") handle:close() @@ -251,7 +265,7 @@ end -- -- -- -function fetchProductName(jobDirectory, docname) +function fetchProductNameFromXML(jobDirectory, docname) local workspace = jobDirectory .. "/workspace/en-US" local command = "cd \"" .. workspace .. "\"; xmllint --xinclude --postvalid \"" .. docname .. ".xml\" 2>/dev/null | xmlstarlet sel -t -v \"//bookinfo/productname|//articleinfo/productname\" 2>/dev/null" local handle = io.popen(command) @@ -263,7 +277,7 @@ end -- -- -- -function fetchProductVersion(jobDirectory, docname, condition) +function fetchProductVersionFromXML(jobDirectory, docname, condition) local workspace = jobDirectory .. "/workspace/en-US" local command = nil @@ -299,6 +313,7 @@ function getJobTitleTypeAndProduct(jobDirectory) local documentName local condition + print("Processing job " .. jobDirectory) documentType, productName, productVersion, documentName, condition = readDocumentInfoFromPublicanCfg(jobDirectory) if documentName == nil then @@ -309,14 +324,15 @@ function getJobTitleTypeAndProduct(jobDirectory) end end - local documentTitle = fetchDocumentTitle(jobDirectory, documentName) + local documentTitle = fetchDocumentTitleFromXML(jobDirectory, documentName) + print(documentTitle) if productName == nil then - productName = fetchProductName(jobDirectory, documentName) + productName = fetchProductNameFromXML(jobDirectory, documentName) end if productVersion == nil then - productVersion = fetchProductVersion(jobDirectory, documentName, condition) + productVersion = fetchProductVersionFromXML(jobDirectory, documentName, condition) end return documentTitle, documentType, productName, productVersion @@ -387,10 +403,12 @@ end -- +-- Add job directory and work directory information to each job. -- function addJobDirectories(allJobs) for i, job in ipairs(allJobs) do job.directory = jenkins_dir .. "jobs/" .. job.name + job.workDirectory = jenkins_dir .. "workspace/" .. job.name end end @@ -574,6 +592,8 @@ function main() addArtifactInfo(normalJobs) end + + -- -- Rule the world! --

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

docs-commits February 2015