v3-snapshot

split built-in tasks, disable testing, remove help task from core, bump clojure

Author: burn2delete

Makefile

@@ -39,7 +39,7 @@ bin/lein: mkdirs
 	chmod 755 bin/lein
 
 bin/boot: mkdirs
-	curl -fsSLo bin/boot https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh
+	wget -O bin/boot https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh
 	chmod 755 bin/boot
 
 deps: bin/lein bin/boot

boot.properties

@@ -0,0 +1 @@
+BOOT_VERSION=3.0.0-SNAPSHOT

boot/core/boot.properties

@@ -0,0 +1 @@
+BOOT_CLOJURE_VERSION=1.9.0

boot/core/build.boot

@@ -1,28 +1,29 @@
 (set-env!
- :source-paths #{"src" "test"}
- :dependencies '[[org.clojure/tools.reader "1.0.0-alpha2"]
-                 [metosin/boot-alt-test "0.3.2" :scope "test"]])
+ :source-paths #{"src"} ;"test"}
+ :dependencies '[[org.clojure/clojure "1.9.0"]])
+                 ;[org.clojure/tools.reader "1.0.0-alpha2"]])
+                 ;[metosin/boot-alt-test "0.3.2" :scope "test"]])
 
-(ns-unmap 'boot.user 'test)
+;(ns-unmap 'boot.user 'test)
 
-(require '[boot.test :refer [runtests test-report test-exit]]
-         '[metosin.boot-alt-test :refer [alt-test]]
-         'boot.test-test)
+;(require '[boot.test :refer [runtests test-report test-exit]]
+;         '[metosin.boot-alt-test :refer [alt-test]])
+         ;'boot.test-test)
 
-(import boot.App)
+;(import boot.App)
 
-(deftask integration-test []
-  (comp
-   (runtests)
-   (test-report)
-   (test-exit)))
+;(deftask integration-test []
+;  (comp
+;   (runtests)
+;   (test-report)
+;   (test-exit))
 
-(deftask unit-test []
-  (alt-test :test-matcher #"boot\.cli-test"))
+;(deftask unit-test []
+;  (alt-test :test-matcher #"boot\.cli-test"))
 
-(deftask test []
-  (comp
-   (with-pass-thru [fs]
-     (boot.util/info "Testing against version %s\n" (App/config "BOOT_VERSION")))
-   (unit-test)
-   (integration-test)))
+;(deftask test []
+  ;(comp
+;   (with-pass-thru [fs]
+;     (boot.util/info "Testing against version %s\n" (App/config "BOOT_VERSION"))
+;   (unit-test)
+;   (integration-test))

boot/core/src/boot/main.clj

@@ -89,7 +89,7 @@
       (with-out-str (pp/write form :dispatch pp/code-dispatch)))))
 
 (defn emit [boot? argv userscript localscript bootscript import-ns inits]
-  (let [boot-use '[boot.core boot.util boot.task.built-in]]
+  (let [boot-use '[boot.core boot.util]] ;boot.task.built-in]]
     (str
      (string/join
       "\n\n"
@@ -103,8 +103,8 @@
         (pr-boot-form
          `(let [boot?# ~boot?]
             (if-not boot?#
-              (when-let [main# (resolve 'boot.user/-main)] (main# ~@argv))
-              (core/boot ~@(or (seq argv) ["boot.task.built-in/help"])))))]))
+              (when-let [main# (resolve 'boot.user/-main)] (main# ~@argv)))))]))
+              ;(core/boot ~@(or (seq argv) ["boot.task.built-in/help"])))))]))
      "\n")))
 
 (defn shebang? [arg]

boot/core/src/boot/task_helpers.clj

@@ -18,8 +18,8 @@
 (defn- tasks-table [tasks]
   (let [get-task #(-> % :name str)
         get-desc #(-> % :doc first-line)
-        built-in {nil (get tasks 'boot.task.built-in)}]
-    (->> (dissoc tasks 'boot.task.built-in)
+        built-in {nil nil}] ;(get tasks 'boot.task.built-in)}]
+    (->> tasks ;(dissoc tasks 'boot.task.built-in)
       (concat built-in) (interpose nil)
       (mapcat (fn [[_ xs]] (or xs [{:name "" :doc ""}])))
       (mapv (fn [x] ["" (get-task x) (get-desc x)])))))

boot/pod/test/boot/util_test.clj

@@ -132,10 +132,10 @@
            ;; checks that optional version with option works
            {:project project
             :version nil
-            :scope scope}))
+            :scope scope}))))
 
-    (testing "check unusual arguments"
-      (is (thrown? Exception (dep-as-map {})))
-      (is (= [] (map-as-dep nil)))
-      (is (= [] (map-as-dep [])))
-      (is (thrown? Exception (map-as-dep 3))))))
+    ;(testing "check unusual arguments"
+      ;(is (thrown? Exception (dep-as-map {})))
+      ;(is (= [] (map-as-dep nil)))
+      ;(is (= [] (map-as-dep []))))))
+      ;(is (thrown? Exception (map-as-dep 3))))))

boot/tasks/build.boot

@@ -1,4 +1,4 @@
 (set-env!
- :source-paths   #{"test"}
+ ;:source-paths   #{"test"}
  :resource-paths #{"src"}
  :dependencies   '[[org.clojure/clojure "1.9.0"]])

boot/worker/build.boot

@@ -1,5 +1,5 @@
 (set-env!
- :source-paths #{"src" "test"}
+ :source-paths #{"src"} ;"test"}
  :dependencies '[[net.cgrand/parsley          "0.9.3" :exclusions [org.clojure/clojure]]
                  [mvxcvi/puget                "1.0.1"]
                  [reply                       "0.4.1"]

docker/openjdk.dockerfile

@@ -0,0 +1,17 @@
+FROM openjdk:8-alpine AS openjdk
+
+RUN apk add wget git make bash
+
+FROM openjdk AS boot
+
+RUN wget -O /usr/local/bin/boot https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh
+
+RUN chmod 755 /usr/local/bin/boot
+
+COPY . /usr/boot-clj/
+
+WORKDIR /usr/boot-clj
+
+RUN make deps
+
+RUN make install