rjgit 4.2.0.0 → 4.2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d56351d6b926d22b1eebd8c8c958b638cb1aef80
-  data.tar.gz: 6c5a3308f8fb57d5be9e80617835ab60f84a5ca6
+  metadata.gz: 738fc495773f62915e0f17f7266abd3de241ae7f
+  data.tar.gz: 9c7edfdc17e0439e98ecd254a184292ea0cde524
 SHA512:
-  metadata.gz: 07703d7678e79653a27b6d6e605c056b45eb9181fbee56bfe098d889802af1e52a64611786f7c1c43da9e45fb9a2a722344d84aaaf7dd2860164ec2065345fe5
-  data.tar.gz: 16fb0eab317a868eb2239e3194d93a8727ead62d8be8e34b7bb0381e9bf66197d37afb4806804f2357e8e83efd0e5eae6b75c93f7354070fd051e8a943ff81eb
+  metadata.gz: 3a6e9c6bc9db3594325b28eca28fd9f9ba00b3a0ee9f9932e8a50b3e45addb77df14418bdd15b56138c44d9e621fc6fa5c7361de54e25328f19422063ffbd304
+  data.tar.gz: f91fcfcd0749fa320bc736c480a1fef73e8daf68ab4dc421349fedca2a00cf72706143cbf9fa2858e00fce4356c47199cc5e6dde3208827235365ca5880d914b

data/lib/git.rb

@@ -12,6 +12,9 @@ module RJGit
   import 'org.eclipse.jgit.diff.RenameDetector'
   import 'org.eclipse.jgit.diff.DiffEntry'
   import 'org.eclipse.jgit.treewalk.filter.PathFilter'
+  import 'org.eclipse.jgit.api.TransportConfigCallback'
+  import 'org.eclipse.jgit.transport.JschConfigSessionFactory'
+  import 'org.eclipse.jgit.transport.SshTransport'
 
   class RubyGit
 
@@ -19,6 +22,10 @@ module RJGit
     attr_accessor :jrepo
 
     RESET_MODES = ["HARD", "SOFT", "KEEP", "MERGE", "MIXED"]
+    SSH_TRANSPORTS = ["ssh"]
+    HTTP_TRANSPORTS = ["http", "https"]
+    FILE_TRANSPORTS = ["file"]
+    VALID_TRANSPORTS = SSH_TRANSPORTS + HTTP_TRANSPORTS + FILE_TRANSPORTS
 
     RJGit.delegate_to(Git, :@jgit)
 
@@ -34,14 +41,14 @@ module RJGit
       end
       logs
     end
-    
+
     def log(path = nil, revstring = Constants::HEAD, options = {})
       ref = jrepo.resolve(revstring)
       return [] unless ref
       jcommits = Array.new
-      
+
       if path && options[:follow]
-        current_path = path    
+        current_path = path
         start = nil
         loop do
           logs = @jgit.log.add(ref).addPath(current_path).call
@@ -53,8 +60,8 @@ module RJGit
           current_path = follow_renames(start, current_path) if start
           break if current_path.nil?
         end
-        
-      else      
+
+      else
         logs = @jgit.log
         logs.add(ref)
         logs.addPath(path) if path
@@ -65,7 +72,7 @@ module RJGit
           revwalk = RevWalk.new(jrepo)
           since_commit = revwalk.parseCommit(jrepo.resolve(options[:since]))
           until_commit = revwalk.parseCommit(jrepo.resolve(options[:until]))
-          logs.addRange(since_commit, until_commit) 
+          logs.addRange(since_commit, until_commit)
         end
         if options[:not]
           revwalk = RevWalk.new(jrepo)
@@ -75,7 +82,7 @@ module RJGit
         end
         jcommits = logs.call
       end
-      
+
       jcommits.map{ |jcommit| Commit.new(jrepo, jcommit) }
     end
 
@@ -127,6 +134,66 @@ module RJGit
       RubyGit.clone(remote, local, options)
     end
 
+    class RJGitSSHConfigCallback
+      include TransportConfigCallback
+      def initialize(options = {})
+        @sshSessionFactory = Class.new(JschConfigSessionFactory) {
+          def initialize(options)
+            super()
+            @private_key_file = options[:private_key_file]
+            @private_key_passphrase = options[:private_key_passphrase]
+            @username = options[:username]
+            @password = options[:password]
+            @known_hosts_file = options[:known_hosts_file]
+          end
+
+          def configure(host, session)
+            session.setUserName(@username) if @username
+            session.setPassword(@password) if @password
+          end
+
+          def createDefaultJSch(fs)
+            default_j_sch = super(fs)
+            if @private_key_file
+              default_j_sch.removeAllIdentity()
+              if @private_key_passphrase
+                default_j_sch.addIdentity(@private_key_file, @private_key_passphrase)
+              else
+                default_j_sch.addIdentity(@private_key_file)
+              end
+            end
+            if @known_hosts_file
+              default_j_sch.setKnownHosts(@known_hosts_file)
+            end
+
+            return default_j_sch
+          end
+        }.new(options)
+      end
+
+      def configure(ssh_transport)
+        ssh_transport.setSshSessionFactory(@sshSessionFactory)
+      end
+    end
+
+    def self.set_command_transport(command, remote, options = {})
+      uri = nil
+      begin
+        uri = URI.parse(remote) if remote
+      rescue URI::InvalidURIError
+      end
+
+      if uri && (VALID_TRANSPORTS.include? uri.scheme)
+        transport_protocol = uri.scheme
+      end
+
+      if (SSH_TRANSPORTS.include? transport_protocol.to_s) || (options[:transport_protocol] == :ssh) || options[:private_key_file]
+        command.set_transport_config_callback(RJGitSSHConfigCallback.new(options))
+      elsif (HTTP_TRANSPORTS.include? transport_protocol.to_s) || options[:username]
+        command.set_credentials_provider(UsernamePasswordCredentialsProvider.new(options[:username], options[:password]))
+      end
+    end
+
     def self.clone(remote, local, options = {})
       clone_command = Git.clone_repository
       clone_command.setURI(remote)
@@ -139,9 +206,8 @@ module RJGit
           clone_command.set_branch(options[:branch])
         end
       end
-      if options[:username]
-        clone_command.set_credentials_provider(UsernamePasswordCredentialsProvider.new(options[:username], options[:password]))
-      end
+
+      set_command_transport(clone_command, remote, options)
       clone_command.call
       Repo.new(local)
     end
@@ -275,9 +341,8 @@ module RJGit
       push_command.set_remote(remote)
       push_command.set_push_all
       push_command.set_push_tags
-      if options[:username]
-        push_command.set_credentials_provider(UsernamePasswordCredentialsProvider.new(options[:username], options[:password]))
-      end
+
+      self.class.set_command_transport(push_command, remote, options)
       push_command.call
     end
 
@@ -289,9 +354,7 @@ module RJGit
         refs.map!{|ref| RefSpec.new(ref)}
         push_command.set_ref_specs(refs)
       end
-      if options[:username]
-        push_command.set_credentials_provider(UsernamePasswordCredentialsProvider.new(options[:username], options[:password]))
-      end
+      self.class.set_command_transport(push_command, remote, options)
       push_command.call
     end
 
@@ -301,11 +364,21 @@ module RJGit
       pull_command.set_rebase(options[:rebase]) if options[:rebase]
       pull_command.set_remote(remote) if remote
       pull_command.set_remote_branch_name(remote_ref) if remote_ref
-      if options[:username]
-        pull_command.set_credentials_provider(UsernamePasswordCredentialsProvider.new(options[:username], options[:password]))
-      end
+      self.class.set_command_transport(pull_command, remote, options)
       pull_command.call
     end
 
+    def fetch(remote = nil, options = {})
+      fetch_command = @jgit.fetch
+      fetch_command.set_dry_run(true) if options[:dryrun]
+      fetch_command.set_thin(true) if options[:thin]
+      fetch_command.set_check_fetched_objects(true) if options[:check_fetched_objects]
+      fetch_command.set_remove_deleted_refs(true) if options[:remove_deleted_refs]
+      fetch_command.set_ref_specs(RefSpec.new(options[:refspecs])) if options[:refspecs]
+      fetch_command.set_remote(remote) if remote
+      self.class.set_command_transport(fetch_command, remote, options)
+      fetch_command.call
+    end
+
   end
 end

data/lib/repo.rb

@@ -42,7 +42,15 @@ module RJGit
     
     def initialize(path, options = {})
       epath = File.expand_path(path)
-      gitpath = File.join(epath, '.git')
+      if options[:git_dir]
+        if (Pathname.new options[:git_dir]).absolute?
+          gitpath = options[:git_dir]
+        else
+          gitpath = File.expand_path(options[:git_dir])
+        end
+      else
+        gitpath = File.join(epath, '.git')
+      end
       
       # Default value for bare
       bare = false
@@ -61,7 +69,7 @@ module RJGit
       @path = bare ? epath : gitpath
       @config = RJGit::Configuration.new(File.join(@path, 'config'))
       repo_path = java.io.File.new(@path)
-      @jrepo = bare ? RepositoryBuilder.new().set_bare.set_git_dir(repo_path).build() : RepositoryBuilder.new().set_git_dir(repo_path).build()
+      @jrepo = bare ? RepositoryBuilder.new().set_bare.set_git_dir(repo_path).build() : RepositoryBuilder.new().set_git_dir(repo_path).set_work_tree(java.io.File.new(epath)).build()
       @jrepo.create(bare) if options[:create]
       @git = RubyGit.new(@jrepo)
     end

data/lib/tree.rb

@@ -60,7 +60,11 @@ module RJGit
     end
     
     def /(file)
-      treewalk = TreeWalk.forPath(@jrepo, file, @jtree)
+      begin
+        treewalk = TreeWalk.forPath(@jrepo, file, @jtree)
+      rescue Java::JavaLang::IllegalArgumentException
+        return self
+      end
       treewalk.nil? ? nil : 
         wrap_tree_or_blob(treewalk.get_file_mode(0), treewalk.get_path_string, treewalk.get_object_id(0))
     end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module RJGit
-  VERSION = "4.2.0.0"
+  VERSION = "4.2.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rjgit
 version: !ruby/object:Gem::Version
-  version: 4.2.0.0
+  version: 4.2.0.1
 platform: ruby
 authors:
 - Maarten Engelen
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2016-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types