adjust valid?

minhtuannguyen · Jul 9, 2016 · 938fcad · 938fcad
1 parent 1c11ef6
commit 938fcad
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/project.clj b/project.clj
@@ -9,10 +9,12 @@
                    :unit    :unit
                    :focused :focused
                    :all     (constantly true)}
+  :aliases {"test"         ["do" ["cljfmt" "fix"] "test"]
+            "test-refresh" ["do" ["cljfmt" "fix"] "test-refresh"]}
   :profiles {:uberjar {:aot :all}
              :test    {:resource-paths ["test-resources"]}
              :dev     {:dependencies [[pjstadig/humane-test-output "0.8.0"]]
                        :plugins      [[lein-cljfmt "0.5.3"]
                                       [lein-cloverage "1.0.6"]
                                       [jonase/eastwood "0.2.3"]
-                                      [lein-kibit "0.1.2"]]}})
+                                      [lein-kibit "0.1.2"]]}})
diff --git a/src/cljocker/hh/dsl/docker.clj b/src/cljocker/hh/dsl/docker.clj
@@ -36,10 +36,11 @@
       m
       (conj m result))))
 
-(defn valid? [definition]
+(defn valid? [[first & rest :as definition]]
   (and (not (nil? definition))
        (even? (count definition))
-       (= :from (first definition))
+       (= :from first)
+       (= 0 (count (filter empty? (take-nth 2 rest))))
        (subset? (set (take-nth 2 definition))
                 DOCKER-INSTRUCTION)))
 

diff --git a/test/cljocker/hh/dsl/docker_test.clj b/test/cljocker/hh/dsl/docker_test.clj
@@ -7,16 +7,18 @@
 
 (deftest ^:unit valid?
   (is (true? (d/valid? [:from "image"])))
+  (is (false? (d/valid? [:from ""])))
   (is (false? (d/valid? [:from "image" :cmd])))
+  (is (false? (d/valid? [:from "image" :cmd ""])))
   (is (false? (d/valid? [:from "image" :bla "blub"])))
   (is (false? (d/valid? [:cmd "echo"]))))
 
 (deftest ^:unit test-docker-dsl
-  (testing "edgecase"
+  (testing "edge case"
     (is (= [] (d/docker [:from])))
     (is (= [] (d/docker []))))
 
-  (testing "happy-case"
+  (testing "happy case"
     (is (= ["FROM java:8"
             "RUN mkdir -p /var/opt/folder"
             "USER nobody"
@@ -30,7 +32,7 @@
                       :workdir "/var/opt/folder"
                       :cmd (java-cmd-with-heap-size 512)])))))
 
-(deftest ^:unit write-file
+(deftest ^:unit write-docker-file-to-disk
   (let [definition [:from "java:8"
                     :cmd (java-cmd-with-heap-size 512)]
         path "target"