Fix lint and tests (#102)

Author: rads

bbin

@@ -267,7 +267,7 @@ WARNING: (We won't make any changes without asking you first.)
         lib-opts->template-deps-fn))
 
 (defn- invalid-lib-opts-error [provided-lib-opts]
-  (ex-info (str "Provided invalid combination of CLI options")
+  (ex-info "Provided invalid combination of CLI options"
            {:provided-opts (set (keys provided-lib-opts))
             :valid-combinations valid-lib-opts}))
 
@@ -383,8 +383,9 @@ WARNING: (We won't make any changes without asking you first.)
         (and (#{:http} procurer) (re-seq #"\.git$" (:script/lib cli-opts))))
     :dir
 
-    (or (and (#{:local} procurer) (and (:script/lib cli-opts)
-                                       (regular-file? (:script/lib cli-opts))))
+    (or (and (#{:local} procurer)
+             (:script/lib cli-opts)
+             (regular-file? (:script/lib cli-opts)))
         (and (#{:http} procurer) (re-seq #"\.(cljc?|bb)$" (:script/lib cli-opts))))
     :file
 

src/babashka/bbin/deps.clj

@@ -72,7 +72,7 @@
         lib-opts->template-deps-fn))
 
 (defn- invalid-lib-opts-error [provided-lib-opts]
-  (ex-info (str "Provided invalid combination of CLI options")
+  (ex-info "Provided invalid combination of CLI options"
            {:provided-opts (set (keys provided-lib-opts))
             :valid-combinations valid-lib-opts}))
 
@@ -188,8 +188,9 @@
         (and (#{:http} procurer) (re-seq #"\.git$" (:script/lib cli-opts))))
     :dir
 
-    (or (and (#{:local} procurer) (and (:script/lib cli-opts)
-                                       (regular-file? (:script/lib cli-opts))))
+    (or (and (#{:local} procurer)
+             (:script/lib cli-opts)
+             (regular-file? (:script/lib cli-opts)))
         (and (#{:http} procurer) (re-seq #"\.(cljc?|bb)$" (:script/lib cli-opts))))
     :file
 

test/babashka/bbin/migrate_test.clj

@@ -76,9 +76,9 @@
                                       [:copying {:src (str (fs/file (dirs/legacy-bin-dir) "hello.bat"))
                                                  :dest (str (fs/file (dirs/xdg-bin-dir nil) "hello.bat"))}])
                                     [:moving {:src (str (dirs/legacy-bin-dir))
-                                              :dest (str (migrate/src-backup-path
-                                                          (dirs/legacy-bin-dir)
-                                                          (inst-ms (util/now))))}]
+                                              :dest (migrate/src-backup-path
+                                                     (dirs/legacy-bin-dir)
+                                                     (inst-ms (util/now)))}]
                                     [:done]])
                 commands-2 [[:up-to-date]]]
             (is (= commands-1
@@ -113,9 +113,9 @@
                             [:migrating]
                             [:skipping {:src (str (fs/file (dirs/legacy-bin-dir) "hello"))}]
                             [:moving {:src (str (dirs/legacy-bin-dir))
-                                      :dest (str (migrate/src-backup-path
-                                                  (dirs/legacy-bin-dir)
-                                                  (inst-ms (util/now))))}]
+                                      :dest (migrate/src-backup-path
+                                             (dirs/legacy-bin-dir)
+                                             (inst-ms (util/now)))}]
                             [:done]]
                 commands-2 [[:up-to-date]]]
             (is (= commands-1
@@ -161,13 +161,13 @@
                                     [:copying {:src (str (fs/file (dirs/legacy-jars-dir) "hello.jar"))
                                                :dest (str (fs/file (dirs/xdg-jars-dir nil) "hello.jar"))}]
                                     [:moving {:src (str (dirs/legacy-bin-dir))
-                                              :dest (str (migrate/src-backup-path
-                                                          (dirs/legacy-bin-dir)
-                                                          (inst-ms (util/now))))}]
+                                              :dest (migrate/src-backup-path
+                                                     (dirs/legacy-bin-dir)
+                                                     (inst-ms (util/now)))}]
                                     [:moving {:src (str (dirs/legacy-jars-dir))
-                                              :dest (str (migrate/src-backup-path
-                                                          (dirs/legacy-jars-dir)
-                                                          (inst-ms (util/now))))}]
+                                              :dest (migrate/src-backup-path
+                                                     (dirs/legacy-jars-dir)
+                                                     (inst-ms (util/now)))}]
                                     [:done]])
                 commands-2 [[:up-to-date]]]
             (is (= commands-1

test/babashka/bbin/scripts/maven_jar_test.clj

@@ -28,7 +28,7 @@
       (is (= `{~'http-server ~maven-lib} (tu/run-ls))))))
 
 (def upgraded-lib
-  (assoc-in maven-lib [:coords :mvn/version] "0.1.13"))
+  (assoc-in maven-lib [:coords :mvn/version] "0.1.14"))
 
 (deftest upgrade-maven-jar-test
   (testing "upgrade (maven jar)"