replace version compare stuff with version-clj impl

Author: martinklepsch

project.clj

@@ -9,6 +9,7 @@
   :dependencies [[org.clojure/clojure "1.9.0"]
                  [me.arrdem/guten-tag "0.1.6"
                   :exclusions [org.clojure/clojure]]
+                 [version-clj "0.1.2"]
                  [org.clojure/core.match "0.3.0-alpha4"
                   :exclusions [org.clojure/clojure]]
                  [com.cemerick/url "0.1.1"

src/grimoire/api/fs/read.clj

@@ -10,7 +10,8 @@
             [grimoire.api.fs.impl :as impl]
             [clojure.java.io :as io]
             [clojure.string :as string]
-            [cemerick.url :as url])
+            [cemerick.url :as url]
+            [version-clj.core :as v])
   (:import [java.io File]))
 
 (defn- f->name [^File f]
@@ -52,7 +53,7 @@
       (->> (for [d     (reverse (sort (.listFiles handle)))
                  :when (.isDirectory d)]
              (t/->Version artifact (f->name d)))
-           (sort-by (comp util/clojure-version->cmp-key t/thing->name))
+           (sort-by t/thing->name v/version-compare)
            reverse
            succeed)
       (fail (str "No such artifact "

src/grimoire/util.clj

@@ -93,37 +93,6 @@
         #(.toLowerCase %)
         name))
 
-(defn clojure-version->cmp-key
-  "Create a comparison key from a Clojure version string, as returned
-  from function clojure.core/clojure-version.  The key is a vector of
-  integers and strings, and two such keys may be compared via
-  clojure.core/compare to get the correct relative order of the two
-  Clojure versions.
-
-  Makes simplifying assumption that:
-  x.y.z-alpha<n> < x.y.z-beta<m> < x.y.z-RC<p> < x.y.z.
-
-  Note that this was not the time order of release for some 1.5.0-beta
-  and 1.5.0-RC releases, historically, as they switched from 1.5.0-RC
-  releases back to 1.5.0-beta, and then back to 1.5.0-RC again.
-  Hopefully that will not happen again.
-
-  Stolen from AndyF with thanks."
-  [version-str]
-  (let [to-long (fn [^String s] (Long/parseLong s))
-      [v q] (str/split version-str #"-" 2)
-      [major minor incremental] (mapv to-long (str/split v #"\."))]
-  [major
-   (or minor 0)
-   (or incremental 0)
-   ;; qual1 will be one of "alpha" "beta" "rc", or "zfinal" if
-   ;; version-str is of the form "x.y.z".  It will always be
-   ;; lower case so that normal alphabetic order comparison is
-   ;; used, without weirdness of upper case letters being sorted
-   ;; earlier than lower case letters.
-   (if q (str/lower-case (re-find #"[^\d]+" q)) "zfinal")
-   (some->> q (re-find #"\d+$") to-long)]))
-
 (defn edn-read-string-with-readers
   "Read a string with clojure.edn/read-string and additional reader functions
   installed.