Merge pull request #19 from mcorbin/jgit

Add JGit to manage the crate index

Author: mcorbin

dev/resources/config.yaml

@@ -14,7 +14,9 @@ logging:
     com.zaxxer.hikari.pool.HikariPool: info
     org.apache.http: error
     io.netty.buffer.PoolThreadCache: error
+    org.eclipse.jgit.internal.storage.file.FileSnapshot: info
 metadata:
+  type: "shell"
   path: "/home/mathieu/prog/rust/testregistry"
   target: "origin/master"
   url: "https://github.com/mcorbin/testregistry"

project.clj

@@ -32,6 +32,7 @@
                  [org.clojure/java.jdbc "0.7.11"]
                  [seancorfield/next.jdbc "1.0.409"]
                  [org.clojure/tools.logging "1.0.0"]
+                 [org.eclipse.jgit/org.eclipse.jgit "5.7.0.202003110725-r"]
                  [org.postgresql/postgresql "42.2.11"]
                  [ragtime "0.8.0"]
                  [ring/ring-core "1.8.0"]

src/meuse/git.clj

@@ -1,14 +1,20 @@
 (ns meuse.git
   "Interacts with a git repository"
-  (:require [meuse.config :refer [config]]
+  (:require [meuse.config :as config]
             [meuse.log :as log]
             [meuse.metric :as metric]
             [exoscale.ex :as ex]
             [mount.core :refer [defstate]]
+            [clojure.java.io :as io]
             [clojure.java.shell :as shell]
-            [clojure.string :as string]))
+            [clojure.string :as string])
+  (:import (org.eclipse.jgit.api Git)
+           (org.eclipse.jgit.storage.file FileRepositoryBuilder)
+           (org.eclipse.jgit.transport CredentialsProvider
+                                       RefSpec
+                                       UsernamePasswordCredentialsProvider)))
 
-(defprotocol Git
+(defprotocol IGit
   (add [this])
   (commit [this msg-header msg-body])
   (get-lock [this])
@@ -31,7 +37,7 @@
                              :command args}))))))
 
 (defrecord LocalRepository [path target lock]
-  Git
+  IGit
   (add [this]
     (git-cmd path ["add" "."]))
   (commit [this msg-header msg-body]
@@ -43,6 +49,56 @@
   (pull [this]
     (git-cmd path ["pull" target])))
 
+(defrecord JGitFileRepository [target
+                               lock
+                               ^Git git
+                               ^CredentialsProvider credentials]
+  IGit
+  (add [this]
+    (doto (.add git)
+      (.addFilepattern ".")
+      (.call)))
+  (commit [this msg-header msg-body]
+    (doto (.commit git)
+      (.setMessage (str msg-header "\n\n" msg-body))
+      (.call)))
+  (get-lock [this]
+    lock)
+  (pull [this]
+    (let [[remote branch] (string/split target #"/")]
+      (doto (.pull git)
+        (.setCredentialsProvider credentials)
+        (.setRemote remote)
+        (.setRemoteBranchName branch)
+        (.call))))
+  (push [this]
+    (let [[remote branch] (string/split target #"/")
+          ref-spec (RefSpec. branch)]
+      (doto (.push git)
+        (.setCredentialsProvider credentials)
+        (.setRemote remote)
+        (.setRefSpecs (into-array [ref-spec]))
+        (.call)))))
+
+(defn build-jgit
+  [config]
+  (map->JGitFileRepository
+   {:credentials (UsernamePasswordCredentialsProvider.
+                  (:username config)
+                  (:password config))
+    :git (Git/open (io/file (:path config)))
+    :lock (java.lang.Object.)
+    :target (:target config)}))
+
+(defn build-local-git
+  [config]
+  (map->LocalRepository
+   {:path (:path config)
+    :lock (java.lang.Object.)
+    :target (:target config)}))
+
 (defstate git
-  :start (map->LocalRepository (merge (:metadata config)
-                                      {:lock (java.lang.Object.)})))
+  :start (condp = (get-in config/config [:metadata :type])
+           "jgit" (build-jgit (:metadata config/config))
+           "shell" (build-local-git (:metadata config/config))
+           (build-local-git (:metadata config/config))))

src/meuse/spec.clj

@@ -98,12 +98,36 @@
                                    :http/cert
                                    :http/cacert]))
 
+(defmulti metadata :type)
+
 (s/def :metadata/path ::directory)
 (s/def :metadata/target ::non-empty-string)
 (s/def :metadata/url ::non-empty-string)
-(s/def :metadata/metadata (s/keys :req-un [:metadata/path
-                                           :metadata/target
-                                           :metadata/url]))
+
+(defmethod metadata "shell"
+  [_]
+  (s/keys :req-un [:metadata/path
+                   :metadata/target
+                   :metadata/url]))
+
+(s/def :metadata/username ::non-empty-string)
+(s/def :metadata/password ::non-empty-string)
+
+(defmethod metadata "jgit"
+  [_]
+  (s/keys :req-un [:metadata/path
+                   :metadata/target
+                   :metadata/url
+                   :metadata/username
+                   :metadata/password]))
+
+(defmethod metadata :default
+  [_]
+  (s/keys :req-un [:metadata/path
+                   :metadata/target
+                   :metadata/url]))
+
+(s/def :metadata/metadata (s/multi-spec metadata :type))
 
 (s/def :crate/path ::directory)
 

test/meuse/helpers/git.clj

@@ -1,8 +1,8 @@
 (ns meuse.helpers.git
-  (:require [meuse.git :refer [Git]]))
+  (:require [meuse.git :refer [IGit]]))
 
 (defrecord GitMock [state lock]
-  Git
+  IGit
   (add [this]
     (swap! state conj {:cmd "add"}))
   (commit [this msg-header msg-body]