Write initial tests and update dependencies

PositiveTechnologies · Feb 15, 2019 · f69de91 · f69de91
1 parent aa22e68
commit f69de91
Show file tree

Hide file tree

Showing 27 changed files with 206 additions and 77 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ pom.xml.asc
 .lein-*
 .nrepl-port
 .idea
+.eastwood
diff --git a/flower-common/project.clj b/flower-common/project.clj
@@ -4,18 +4,18 @@
   :scm {:dir ".."}
   :license {:name "MIT License"
             :url "https://opensource.org/licenses/MIT"}
-  :plugins [[jonase/eastwood "0.2.5"]
+  :plugins [[jonase/eastwood "0.3.5"]
             [lein-cljfmt "0.5.7"]
             [lein-bump-version "0.1.6"]]
   :cljfmt {:remove-consecutive-blank-lines? false}
   :aliases {"lint" ["do" ["cljfmt" "check"] ["eastwood"]]
-            "test-all" ["with-profile" "default:+1.7:+1.8" "test"]
+            "test-all" ["with-profile" "default:+1.9:+1.8" "test"]
             "lint-and-test-all" ["do" ["lint"] ["test-all"]]}
-  :dependencies [[org.clojure/clojure "1.9.0"]
+  :dependencies [[org.clojure/clojure "1.10.0"]
                  [org.clojure/core.memoize "0.7.1"]
                  [com.cemerick/pomegranate "1.1.0"]
                  [lambdaisland/uri "1.1.0"]
                  [cprop "0.1.13"]
                  [trptcolin/versioneer "0.2.0"]]
-  :profiles {:1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
+  :profiles {:1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}
              :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}})
diff --git a/flower-common/src/flower/credentials.clj b/flower-common/src/flower/credentials.clj
@@ -1,5 +1,6 @@
 (ns flower.credentials
   (:require [clojure.java.io :as io]
+            [clojure.string :as string]
             [cprop.core :as cprop]
             [cprop.source]))
 
@@ -9,8 +10,8 @@
 ;;
 
 (def ^:dynamic *credentials-file*
-  (clojure.string/join "/" [(System/getProperty "user.home")
-                            ".credentials.edn"]))
+  (string/join "/" [(System/getProperty "user.home")
+                    ".credentials.edn"]))
 
 
 ;;

diff --git a/flower-integration-default/project.clj b/flower-integration-default/project.clj
@@ -4,16 +4,16 @@
   :scm {:dir ".."}
   :license {:name "MIT License"
             :url "https://opensource.org/licenses/MIT"}
-  :plugins [[jonase/eastwood "0.2.5"]
+  :plugins [[jonase/eastwood "0.3.5"]
             [lein-cljfmt "0.5.7"]
             [lein-bump-version "0.1.6"]]
   :cljfmt {:remove-consecutive-blank-lines? false}
   :aliases {"lint" ["do" ["cljfmt" "check"] ["eastwood"]]
-            "test-all" ["with-profile" "default:+1.7:+1.8" "test"]
+            "test-all" ["with-profile" "default:+1.9:+1.8" "test"]
             "lint-and-test-all" ["do" ["lint"] ["test-all"]]}
-  :dependencies [[org.clojure/clojure "1.9.0"]
+  :dependencies [[org.clojure/clojure "1.10.0"]
                  [org.clojure/core.async "0.4.490"]
                  [flower/flower-common "0.4.6-SNAPSHOT"]
                  [flower/flower-proto "0.4.6-SNAPSHOT"]]
-  :profiles {:1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
+  :profiles {:1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}
              :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}})
diff --git a/flower-integration-exchange/project.clj b/flower-integration-exchange/project.clj
@@ -4,20 +4,20 @@
   :scm {:dir ".."}
   :license {:name "MIT License"
             :url "https://opensource.org/licenses/MIT"}
-  :plugins [[jonase/eastwood "0.2.5"]
+  :plugins [[jonase/eastwood "0.3.5"]
             [lein-cljfmt "0.5.7"]
             [lein-bump-version "0.1.6"]]
   :cljfmt {:remove-consecutive-blank-lines? false}
   :eastwood {:exclude-namespaces [flower.messaging.exchange.async]}
   :aliases {"lint" ["do" ["cljfmt" "check"] ["eastwood"]]
-            "test-all" ["with-profile" "default:+1.7:+1.8" "test"]
+            "test-all" ["with-profile" "default:+1.9:+1.8" "test"]
             "lint-and-test-all" ["do" ["lint"] ["test-all"]]}
   :repositories {"atlassian-public" "https://maven.atlassian.com/content/repositories/atlassian-public/"
                  "sonatype" "https://oss.sonatype.org/content/repositories/releases"}
-  :dependencies [[org.clojure/clojure "1.9.0"]
+  :dependencies [[org.clojure/clojure "1.10.0"]
                  [org.clojure/core.async "0.4.490"]
                  [com.microsoft.ews-java-api/ews-java-api "2.0"]
                  [flower/flower-common "0.4.6-SNAPSHOT"]
                  [flower/flower-proto "0.4.6-SNAPSHOT"]]
-  :profiles {:1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
+  :profiles {:1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}
              :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}})
diff --git a/flower-integration-github/project.clj b/flower-integration-github/project.clj
@@ -4,19 +4,19 @@
   :scm {:dir ".."}
   :license {:name "MIT License"
             :url "https://opensource.org/licenses/MIT"}
-  :plugins [[jonase/eastwood "0.2.5"]
+  :plugins [[jonase/eastwood "0.3.5"]
             [lein-cljfmt "0.5.7"]
             [lein-bump-version "0.1.6"]]
   :cljfmt {:remove-consecutive-blank-lines? false}
   :aliases {"lint" ["do" ["cljfmt" "check"] ["eastwood"]]
-            "test-all" ["with-profile" "default:+1.7:+1.8" "test"]
+            "test-all" ["with-profile" "default:+1.9:+1.8" "test"]
             "lint-and-test-all" ["do" ["lint"] ["test-all"]]}
   :repositories {"eclipse-releases" "https://repo.eclipse.org/content/groups/releases/"}
-  :dependencies [[org.clojure/clojure "1.9.0"]
+  :dependencies [[org.clojure/clojure "1.10.0"]
                  [com.google.code.gson/gson "2.8.5"]
                  [org.eclipse.mylyn.github/org.eclipse.egit.github.core "4.9.0.201710071750-r"]
                  [clj-time "0.15.1"]
                  [flower/flower-common "0.4.6-SNAPSHOT"]
                  [flower/flower-proto "0.4.6-SNAPSHOT"]]
-  :profiles {:1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
+  :profiles {:1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}
              :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}})
diff --git a/flower-integration-gitlab/project.clj b/flower-integration-gitlab/project.clj
@@ -4,19 +4,19 @@
   :scm {:dir ".."}
   :license {:name "MIT License"
             :url "https://opensource.org/licenses/MIT"}
-  :plugins [[jonase/eastwood "0.2.5"]
+  :plugins [[jonase/eastwood "0.3.5"]
             [lein-cljfmt "0.5.7"]
             [lein-bump-version "0.1.6"]]
   :cljfmt {:remove-consecutive-blank-lines? false}
   :aliases {"lint" ["do" ["cljfmt" "check"] ["eastwood"]]
-            "test-all" ["with-profile" "default:+1.7:+1.8" "test"]
+            "test-all" ["with-profile" "default:+1.9:+1.8" "test"]
             "lint-and-test-all" ["do" ["lint"] ["test-all"]]}
   :repositories {"sonatype" "https://oss.sonatype.org/content/repositories/releases"}
-  :dependencies [[org.clojure/clojure "1.9.0"]
+  :dependencies [[org.clojure/clojure "1.10.0"]
                  [joda-time/joda-time "2.10.1"]
                  [org.gitlab/java-gitlab-api "4.1.0"]
                  [clj-time "0.15.1"]
                  [flower/flower-common "0.4.6-SNAPSHOT"]
                  [flower/flower-proto "0.4.6-SNAPSHOT"]]
-  :profiles {:1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
+  :profiles {:1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}
              :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}})
diff --git a/flower-integration-gitlab/src/flower/repository/gitlab/pr.clj b/flower-integration-gitlab/src/flower/repository/gitlab/pr.clj
@@ -1,5 +1,6 @@
 (ns flower.repository.gitlab.pr
-  (:require [flower.macros :as macros]
+  (:require [clojure.string :as string]
+            [flower.macros :as macros]
             [flower.repository.proto :as proto]
             [flower.repository.gitlab.common :as common])
   (:import (java.io FileNotFoundException)
@@ -162,7 +163,7 @@
         project-id (.getId project-inner)
         changes (common/get-gitlab-changes-inner repository pull-request)
         flat-list (map (fn [diff]
-                         (let [splitted (clojure.string/split (.getDiff diff) #"\n")
+                         (let [splitted (string/split (.getDiff diff) #"\n")
                                grouped (group-by first splitted)
                                added (count (get grouped \+ []))
                                deleted (count (get grouped \- []))]

diff --git a/flower-integration-jira/project.clj b/flower-integration-jira/project.clj
@@ -4,16 +4,16 @@
   :scm {:dir ".."}
   :license {:name "MIT License"
             :url "https://opensource.org/licenses/MIT"}
-  :plugins [[jonase/eastwood "0.2.5"]
+  :plugins [[jonase/eastwood "0.3.5"]
             [lein-cljfmt "0.5.7"]
             [lein-bump-version "0.1.6"]]
   :cljfmt {:remove-consecutive-blank-lines? false}
   :aliases {"lint" ["do" ["cljfmt" "check"] ["eastwood"]]
-            "test-all" ["with-profile" "default:+1.7:+1.8" "test"]
+            "test-all" ["with-profile" "default:+1.9:+1.8" "test"]
             "lint-and-test-all" ["do" ["lint"] ["test-all"]]}
   :repositories {"atlassian-public" "https://maven.atlassian.com/content/repositories/atlassian-public/"
                  "eclipse-releases" "https://repo.eclipse.org/content/groups/releases/"}
-  :dependencies [[org.clojure/clojure "1.9.0"]
+  :dependencies [[org.clojure/clojure "1.10.0"]
                  [org.clojure/core.memoize "0.7.1"]
                  [joda-time/joda-time "2.10.1"]
                  [org.slf4j/slf4j-api "1.7.25"]
@@ -23,5 +23,5 @@
                  [clj-time "0.15.1"]
                  [flower/flower-common "0.4.6-SNAPSHOT"]
                  [flower/flower-proto "0.4.6-SNAPSHOT"]]
-  :profiles {:1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
+  :profiles {:1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}
              :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}})
diff --git a/flower-integration-slack/project.clj b/flower-integration-slack/project.clj
@@ -4,19 +4,19 @@
   :scm {:dir ".."}
   :license {:name "MIT License"
             :url "https://opensource.org/licenses/MIT"}
-  :plugins [[jonase/eastwood "0.2.5"]
+  :plugins [[jonase/eastwood "0.3.5"]
             [lein-cljfmt "0.5.7"]
             [lein-bump-version "0.1.6"]]
   :cljfmt {:remove-consecutive-blank-lines? false}
   :aliases {"lint" ["do" ["cljfmt" "check"] ["eastwood"]]
-            "test-all" ["with-profile" "default:+1.7:+1.8" "test"]
+            "test-all" ["with-profile" "default:+1.9:+1.8" "test"]
             "lint-and-test-all" ["do" ["lint"] ["test-all"]]}
-  :dependencies [[org.clojure/clojure "1.9.0"]
+  :dependencies [[org.clojure/clojure "1.10.0"]
                  [org.clojure/core.async "0.4.490"]
                  [org.clojure/data.json "0.2.6"]
                  [org.julienxx/clj-slack "0.6.2"]
                  [stylefruits/gniazdo "1.1.1"]
                  [flower/flower-common "0.4.6-SNAPSHOT"]
                  [flower/flower-proto "0.4.6-SNAPSHOT"]]
-  :profiles {:1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
+  :profiles {:1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}
              :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}})
diff --git a/flower-integration-tfs/project.clj b/flower-integration-tfs/project.clj
@@ -4,19 +4,19 @@
   :scm {:dir ".."}
   :license {:name "MIT License"
             :url "https://opensource.org/licenses/MIT"}
-  :plugins [[jonase/eastwood "0.2.5"]
+  :plugins [[jonase/eastwood "0.3.5"]
             [lein-cljfmt "0.5.7"]
             [lein-bump-version "0.1.6"]]
   :cljfmt {:remove-consecutive-blank-lines? false}
   :aliases {"lint" ["do" ["cljfmt" "check"] ["eastwood"]]
-            "test-all" ["with-profile" "default:+1.7:+1.8" "test"]
+            "test-all" ["with-profile" "default:+1.9:+1.8" "test"]
             "lint-and-test-all" ["do" ["lint"] ["test-all"]]}
-  :dependencies [[org.clojure/clojure "1.9.0"]
+  :dependencies [[org.clojure/clojure "1.10.0"]
                  [org.clojure/data.json "0.2.6"]
                  [joda-time/joda-time "2.10.1"]
                  [clj-http "3.9.1"]
                  [clj-time "0.15.1"]
                  [flower/flower-common "0.4.6-SNAPSHOT"]
                  [flower/flower-proto "0.4.6-SNAPSHOT"]]
-  :profiles {:1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
+  :profiles {:1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}
              :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}})
diff --git a/flower-integration-tfs/src/flower/tracker/tfs/common.clj b/flower-integration-tfs/src/flower/tracker/tfs/common.clj
@@ -1,5 +1,6 @@
 (ns flower.tracker.tfs.common
   (:require [clj-http.client :as client]
+            [clojure.string :as string]
             [clojure.data.json :as json]
             [flower.macros :as macros]
             [flower.tracker.proto :as proto]))
@@ -60,7 +61,7 @@
 
 (defn- private-get-tfs-workitems-inner [tracker task-ids]
   (if-not (empty? (filter identity task-ids))
-    (let [query-string {:ids (clojure.string/join "," task-ids)
+    (let [query-string {:ids (string/join "," task-ids)
                         :$expand "relations"}]
       (with-tfs-function tracker false ("/_apis/wit/workitems") query-string :value
         result))))

diff --git a/flower-integration-tfs/src/flower/tracker/tfs/task.clj b/flower-integration-tfs/src/flower/tracker/tfs/task.clj
@@ -74,7 +74,7 @@
               (let [{task-url :url
                      relation-type :rel} relation]
                 (if task-url
-                  (let [task-id (last (clojure.string/split task-url #"/"))]
+                  (let [task-id (last (string/split task-url #"/"))]
                     (update acc relation-type (fn [acc workitem]
                                                 (if workitem
                                                   (conj acc workitem)
@@ -107,7 +107,7 @@
   (into {}
         (map (fn [[key value]]
                [key (if (= key :task-tags)
-                      (clojure.string/join "; " (sort value))
+                      (string/join "; " (sort value))
                       value)])
              tags)))
 

diff --git a/flower-messaging/project.clj b/flower-messaging/project.clj
@@ -4,16 +4,16 @@
   :scm {:dir ".."}
   :license {:name "MIT License"
             :url "https://opensource.org/licenses/MIT"}
-  :plugins [[jonase/eastwood "0.2.5"]
+  :plugins [[jonase/eastwood "0.3.5"]
             [lein-cljfmt "0.5.7"]
             [lein-bump-version "0.1.6"]]
   :cljfmt {:remove-consecutive-blank-lines? false}
   :aliases {"lint" ["do" ["cljfmt" "check"] ["eastwood"]]
-            "test-all" ["with-profile" "default:+1.7:+1.8" "test"]
+            "test-all" ["with-profile" "default:+1.9:+1.8" "test"]
             "lint-and-test-all" ["do" ["lint"] ["test-all"]]}
-  :dependencies [[org.clojure/clojure "1.9.0"]
+  :dependencies [[org.clojure/clojure "1.10.0"]
                  [com.stuartsierra/component "0.4.0"]
                  [flower/flower-common "0.4.6-SNAPSHOT"]
                  [flower/flower-proto "0.4.6-SNAPSHOT"]]
-  :profiles {:1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
+  :profiles {:1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}
              :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}})
diff --git a/flower-proto/project.clj b/flower-proto/project.clj
@@ -4,13 +4,13 @@
   :scm {:dir ".."}
   :license {:name "MIT License"
             :url "https://opensource.org/licenses/MIT"}
-  :plugins [[jonase/eastwood "0.2.5"]
+  :plugins [[jonase/eastwood "0.3.5"]
             [lein-cljfmt "0.5.7"]
             [lein-bump-version "0.1.6"]]
   :cljfmt {:remove-consecutive-blank-lines? false}
   :aliases {"lint" ["do" ["cljfmt" "check"] ["eastwood"]]
-            "test-all" ["with-profile" "default:+1.7:+1.8" "test"]
+            "test-all" ["with-profile" "default:+1.9:+1.8" "test"]
             "lint-and-test-all" ["do" ["lint"] ["test-all"]]}
-  :dependencies [[org.clojure/clojure "1.9.0"]]
-  :profiles {:1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
+  :dependencies [[org.clojure/clojure "1.10.0"]]
+  :profiles {:1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}
              :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}})
diff --git a/flower-repository/project.clj b/flower-repository/project.clj
@@ -4,17 +4,17 @@
   :scm {:dir ".."}
   :license {:name "MIT License"
             :url "https://opensource.org/licenses/MIT"}
-  :plugins [[jonase/eastwood "0.2.5"]
+  :plugins [[jonase/eastwood "0.3.5"]
             [lein-cljfmt "0.5.7"]
             [lein-bump-version "0.1.6"]]
   :cljfmt {:remove-consecutive-blank-lines? false}
   :aliases {"lint" ["do" ["cljfmt" "check"] ["eastwood"]]
-            "test-all" ["with-profile" "default:+1.7:+1.8" "test"]
+            "test-all" ["with-profile" "default:+1.9:+1.8" "test"]
             "lint-and-test-all" ["do" ["lint"] ["test-all"]]}
-  :dependencies [[org.clojure/clojure "1.9.0"]
+  :dependencies [[org.clojure/clojure "1.10.0"]
                  [com.stuartsierra/component "0.4.0"]
                  [tesser.core "1.0.3"]
                  [flower/flower-common "0.4.6-SNAPSHOT"]
                  [flower/flower-proto "0.4.6-SNAPSHOT"]]
-  :profiles {:1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
+  :profiles {:1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}
              :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}})
diff --git a/flower-repository/src/flower/repository/core.clj b/flower-repository/src/flower/repository/core.clj
@@ -36,12 +36,12 @@
                (let [repo-projects-list (or repo-projects (list nil))]
                  [repo-name (map #((resolver/resolve-implementation repo-type :repository)
                                    (let [[repo-project & repo-reversed-ns] (-> %
-                                                                               (clojure.string/split #"/")
+                                                                               (string/split #"/")
                                                                                reverse)
                                          repo-ns (if repo-reversed-ns
                                                    (->> repo-reversed-ns
                                                         reverse
-                                                        (clojure.string/join #"/"))
+                                                        (string/join #"/"))
                                                    repo-ns)]
                                      {:repository-component repository-component
                                       :repo-name repo-name

diff --git a/flower-repository/test/flower/repository/core_test.clj b/flower-repository/test/flower/repository/core_test.clj
@@ -0,0 +1,47 @@
+(ns flower.repository.core-test
+  (:require [clojure.test :as test]
+            [flower.repository.core :as repository.core]))
+
+
+(test/deftest test-repository-info
+  (test/testing "Getting repository info"
+    (test/testing "for GitHub"
+      (test/is (= (repository.core/get-repository-info "https://github.com/PositiveTechnologies/flower")
+                  {:repo-type :github
+                   :repo-url "https://github.com/PositiveTechnologies"
+                   :repository-ns nil
+                   :repo-projects ["PositiveTechnologies/flower"]
+                   :repo-name :github-github.com-flower}))
+      (test/is (= (repository.core/get-repository-info "https://github.com/example/test")
+                  {:repo-type :github
+                   :repo-url "https://github.com/example"
+                   :repository-ns nil
+                   :repo-projects ["example/test"]
+                   :repo-name :github-github.com-test})))
+
+    (test/testing "for GitLab"
+      (test/is (= (repository.core/get-repository-info "https://gitlab.com/example/test")
+                  {:repo-type :gitlab
+                   :repo-url "https://gitlab.com"
+                   :repository-ns nil
+                   :repo-projects ["example/test"]
+                   :repo-name :gitlab-gitlab.com-test}))
+      (test/is (= (repository.core/get-repository-info "https://gitlab.example.com/example/test")
+                  {:repo-type :gitlab
+                   :repo-url "https://gitlab.example.com"
+                   :repository-ns nil
+                   :repo-projects ["example/test"]
+                   :repo-name :gitlab-gitlab.example.com-test}))
+      (test/is (= (repository.core/with-repository-type :gitlab
+                    (repository.core/get-repository-info "https://hello.example.com/example/test"))
+                  {:repo-type :gitlab
+                   :repo-url "https://hello.example.com"
+                   :repository-ns nil
+                   :repo-projects ["example/test"]
+                   :repo-name :gitlab-hello.example.com-test})))
+
+    (test/testing "unrecognized"
+      (test/is (= (repository.core/get-repository-info "https://hello.example.com/example/test")
+                  {:repo-type :default
+                   :repo-name :default-hello.example.com
+                   :repo-url "https://hello.example.com"})))))
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,3 +8,4 @@ pom.xml.asc @@
     .lein-*
     .nrepl-port
     .idea
+    .eastwood