rjgit 4.2.0.1 → 4.3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 738fc495773f62915e0f17f7266abd3de241ae7f
-  data.tar.gz: 9c7edfdc17e0439e98ecd254a184292ea0cde524
+  metadata.gz: e0b9f90bf7c15110eccfc10400698258195b6cb4
+  data.tar.gz: 2fd362d8001a355f18dc160c481e4c63a740f639
 SHA512:
-  metadata.gz: 3a6e9c6bc9db3594325b28eca28fd9f9ba00b3a0ee9f9932e8a50b3e45addb77df14418bdd15b56138c44d9e621fc6fa5c7361de54e25328f19422063ffbd304
-  data.tar.gz: f91fcfcd0749fa320bc736c480a1fef73e8daf68ab4dc421349fedca2a00cf72706143cbf9fa2858e00fce4356c47199cc5e6dde3208827235365ca5880d914b
+  metadata.gz: d230bddcb3161791a276668ee700bf883d08c2467b40b21b77535dc14953e2031d302425e1f2560fc0ac1f6b39e0d455f8821a92b1c74f3f2a9bdffb6b618f8f
+  data.tar.gz: 32b7d90e6030489c7247b056cbaeb8d6330b18b1056103a9dc225b86da4d6e19c076d34af617c2c10f5693df72c9c3c1963db77f86c58bef073f6b0fd1515102

data/lib/rjgit.rb

@@ -132,17 +132,17 @@ module RJGit
     
     def self.diff(repository, options = {})
       options = {:namestatus => false, :patch => false}.merge(options)
-      git = repository.git.jgit
       repo = RJGit.repository_type(repository)
+      git = RubyGit.new(repo).jgit
       diff_command = git.diff
-        if options[:old_rev] then
+        if options[:old_rev]
           reader = repo.new_object_reader
           old_tree = repo.resolve("#{options[:old_rev]}^{tree}")
           old_tree_iter = CanonicalTreeParser.new
           old_tree_iter.reset(reader, old_tree)
           diff_command.set_old_tree(old_tree_iter)
         end
-        if options[:new_rev] then
+        if options[:new_rev]
           reader = repo.new_object_reader unless reader
           new_tree = repo.resolve("#{options[:new_rev]}^{tree}")
           new_tree_iter = CanonicalTreeParser.new
@@ -154,7 +154,7 @@ module RJGit
       diff_command.set_cached(true) if options[:cached]
       diff_entries = diff_command.call
       diff_entries = diff_entries.to_array.to_ary
-        if options[:patch] then
+        if options[:patch]
           result = []
           out_stream = ByteArrayOutputStream.new
           formatter = DiffFormatter.new(out_stream)
@@ -198,7 +198,7 @@ module RJGit
       
       def only_contains_deletions(hashmap)
         hashmap.each do |key, value|
-          if value.is_a?(Hash) then
+          if value.is_a?(Hash)
             return false unless only_contains_deletions(value)
           elsif value.is_a?(String)
             return false
@@ -313,7 +313,7 @@ module RJGit
         commit_builder.setAuthor(person)
         commit_builder.setMessage(message)
         commit_builder.setTreeId(RJGit.tree_type(new_tree))
-        if parents.is_a?(Array) then
+        if parents.is_a?(Array)
           parents.each {|parent| commit_builder.addParentId(RJGit.commit_type(parent)) }
         elsif parents
           commit_builder.addParentId(RJGit.commit_type(parents))

data/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rjgit
 version: !ruby/object:Gem::Version
-  version: 4.2.0.1
+  version: 4.3.1.0
 platform: ruby
 authors:
 - Maarten Engelen
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-02-21 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -45,7 +45,7 @@ files:
 - lib/constants.rb
 - lib/git.rb
 - lib/java/jars/jsch-0.1.49.jar
-- lib/java/jars/org.eclipse.jgit-4.2.0.201601211800-r.jar
+- lib/java/jars/org.eclipse.jgit-4.3.1.201605051710-r.jar
 - lib/java/jars/slf4j-api-1.7.2.jar
 - lib/java/jars/slf4j-simple-1.7.12.jar
 - lib/repo.rb