gitmirror 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 56a7b198b063662d7315b5e052c1722e093c0439
-  data.tar.gz: 40ce918e36328a676545284b02dea5caf22e1add
+SHA256:
+  metadata.gz: 8ab530356b5440830facb43192ec2bdf2badc5d4867331bc280813081082ed66
+  data.tar.gz: eaed552df232e6eac6377a2d57573204da8f05b2c63894b49d132de679dd60ef
 SHA512:
-  metadata.gz: 21667df289c4602cc895622e2a06801f30cb8be25865c14a946d117c631ea659929d0e9eba748ebb0da25c15909e0c8a06b52b37cc6ac9e21fd5ebc60183356e
-  data.tar.gz: b7543fa8237a0193bdd946ed30bead904eac8b418833469cfa89465ec7523cf814c1b4b4bdba447e0544130f71daacc6a17bff0de296f4fe1fc4cc50fc31f0a3
+  metadata.gz: b0acc9ed869cb2f0fe0e42bb8e5e19c451159e4394c9bdbb2416c733965ab03b206ca62cf9508bc34791d1b5c52745039c870d6504c536b10f6457c496093c47
+  data.tar.gz: 7a9ed819dabeceac569ad99f4174262372b21e200795a237ce9996f11fbe1a88c9088ac9c01f02515a503300285b0d5df77994ae237cd9116e8c120abc994749

data/gitmirror.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/gitmirror/backend/base.rb

@@ -0,0 +1,52 @@
+require 'tempfile'
+require 'shellwords'
+require 'fileutils'
+module Gitmirror
+  module Backend
+    class Base
+
+      def mirror url, local_repo_path, credential=nil
+
+        #init bare repository
+        unless File.exists? local_repo_path 
+          FileUtils.mkdir_p local_repo_path
+          git({}, "init", "--bare", local_repo_path) #idempotent, does not harm existing repos
+          git({}, "--git-dir", local_repo_path, "remote", "add", "origin", "--mirror=fetch", url) #raises an error
+        end
+        #fetch updates
+        if credential
+          case url
+          when /^https:\/\//
+            u = URI.parse(url)
+            if u.user
+              u.password = credential
+            else
+              u.user = credential
+            end
+            git({}, "--git-dir", local_repo_path, "remote", "set-url", "origin", u.to_s)
+            git({"GIT_ASKPASS"=> "/bin/echo"}, "--git-dir" ,local_repo_path, "fetch", "origin")
+          else
+            #assuming ssh protocol
+            Tempfile.open("ssh-key") do |file|
+              file.write(credential)
+              file.close
+              git({"GIT_SSH_COMMAND"=> "ssh -o BatchMode=yes -i #{file.path}"}, "--git-dir" ,local_repo_path, "fetch", "origin")
+            end
+          end
+        else
+          # no auth, no problems
+          git({}, "--git-dir" ,local_repo_path, "fetch", "origin")
+        end
+        local_repo_path
+      end
+
+      def checkout repo_path, workdir, rev
+        #checkout workdir
+        FileUtils.mkdir_p workdir
+        git({}, "--git-dir", repo_path, "--work-tree", workdir, "checkout", "-f", rev)
+        git({}, "--git-dir", repo_path, "rev-parse", rev).rstrip
+      end
+
+    end
+  end
+end

data/lib/gitmirror/backend/fork.rb

@@ -1,35 +1,17 @@
+require 'gitmirror/backend/base'
+require 'open3'
 module Gitmirror
   module Backend
-    class Fork
+    class Fork <Base
       include Gitmirror::Log
 
-      def mirror url, local_repo_path
-        #init bare repository
-        unless File.exists? local_repo_path 
-          FileUtils.mkdir_p local_repo_path
-          git "init --bare #{local_repo_path}" #idempotent, does not harm existing repos
-          git "--git-dir=#{local_repo_path} remote add origin --mirror=fetch #{url}" #raises an error
-        end
-        #fetch updates
-        git "--git-dir=#{local_repo_path} fetch origin"
-        local_repo_path
-      end
-
-      def checkout repo_path, workdir, rev
-        #checkout workdir
-        FileUtils.mkdir_p workdir
-        git "--git-dir=#{repo_path} --work-tree #{workdir} checkout -f #{rev}"
-        git("--git-dir=#{repo_path} rev-parse #{rev}").rstrip
-      end
-
       private
 
-      def git command 
-        command= "git #{command}"
-        log.debug "Executing #{command}"
-        #return true
-        out = `#{command} 2>&1`
-        raise GitError, "Executing [#{command}] failed: #{out}" if $?.exitstatus != 0
+      def git env, *args
+        command = ['git'].concat args
+        log.debug %{Executing #{env.map{|k,v| "#{k}=#{v}"}.join(" ")} #{command}}
+        out, status = Open3.capture2e(env, "git", *args)
+        raise GitError, "Executing [#{command}] failed: #{out}" if status.exitstatus != 0
         out
       end
 

data/lib/gitmirror/backend/posix_spawn.rb

@@ -1,10 +1,18 @@
-require 'gitmirror/backend/fork'
+require 'gitmirror/backend/base'
 require 'posix-spawn'
 module Gitmirror
   module Backend
-    class PosixSpawn <Fork 
-      #POSIX::Spawns overrides `` from Kernel
-      include POSIX::Spawn
+    class PosixSpawn < Base
+      include Gitmirror::Log
+      private
+
+      def git env, *args
+        command = ['git'].concat args
+        log.debug %{Executing #{env.map{|k,v| "#{k}=#{v}"}.join(" ")} #{command}}
+        child = POSIX::Spawn::Child.new(env, "git", *args)
+        raise GitError, "Executing [#{command.join(' ')}] failed: #{child.err} #{child.out}" if child.status.exitstatus != 0
+        child.err+child.out
+      end
     end
   end
 end

data/lib/gitmirror/repository.rb

@@ -7,8 +7,8 @@ module Gitmirror
       @path = path ? File.expand_path(path) : default_path 
     end
 
-    def mirror
-      backend.mirror(url, path)
+    def mirror credential=nil
+      backend.mirror(url, path, credential)
       path
     end
 

data/lib/gitmirror/version.rb

@@ -1,3 +1,3 @@
 module Gitmirror
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitmirror
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Fabian Ruff
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-02 00:00:00.000000000 Z
+date: 2020-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +72,7 @@ files:
 - exe/gitmirror
 - gitmirror.gemspec
 - lib/gitmirror.rb
+- lib/gitmirror/backend/base.rb
 - lib/gitmirror/backend/fork.rb
 - lib/gitmirror/backend/posix_spawn.rb
 - lib/gitmirror/log.rb
@@ -95,8 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: gitmirror maintains mirrors of git repositories on the local system using