rjgit 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9245b5d9f4861f6b4235bc629312460693b18a17
-  data.tar.gz: 3aeafdf12b1f9c362317663d3a736daadb51dbc0
+  metadata.gz: 5f8f94f2128a3ee824c892fc4c2c6d9be1ba6de0
+  data.tar.gz: 2a9f7160306fbae9ab4995d9d5216906c35f070a
 SHA512:
-  metadata.gz: db938a041e535a18e7a0aede4f017174c897e9809673f7777df5778df91bc6ff10fc72eb4014632220fedf5c1f91c5c5048deb5485a2905f297bef0b1a056237
-  data.tar.gz: 02508bddd55f4d13bd51702abe64d9840f517f56b101b3c2b6aab9490d52e6117d4cad96a093208e5b947da3df51c8854b1638acfcdc67615f040528cf3f3452
+  metadata.gz: a3d13231efffbec59d78cb0225dfea6a8e4d03f18a526949f503192075acc80a978317bb8803cc20b771de0c72e74f131550aaf862674f422b0f555d8e6f80a5
+  data.tar.gz: ea070846441ec20a6c9eb3cdde196886c5f3ea6f34b7b5c4412ca657fbb76f3d9b3f2184778c18f6b71edc49ae8b9d8c1fb465e94b596801635d65e687b39ee7

data/lib/git.rb

@@ -9,6 +9,8 @@ module RJGit
   import 'org.eclipse.jgit.api.RmCommand'
   import 'org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider'
   import 'org.eclipse.jgit.transport.RefSpec'
+  import 'org.eclipse.jgit.diff.RenameDetector'
+  import 'org.eclipse.jgit.diff.DiffEntry'
 
   class RubyGit
 
@@ -31,13 +33,45 @@ module RJGit
       logs.addPath(path) if path
       logs.setMaxCount(options[:max_count]) if options[:max_count]
       logs.setSkip(options[:skip]) if options[:skip]
+      jcommits = logs.call
       commits = Array.new
-      logs.call.each do |jcommit|
+      jcommits.each do |jcommit|
         commits << Commit.new(jrepo, jcommit)
       end
+      
+      if path && options[:follow]
+        jcommits = @jgit.log.add(ref).addPath(path).call
+        commits += follow_renames(jcommits, path)
+      end
+
       commits
     end
 
+    def follow_renames(jcommits, path)
+      renames = Array.new
+      jcommits.each do |jcommit|
+        all_commits = @jgit.log.add(jcommit).call
+        all_commits.each do |jcommit_prev|
+          tree_start = jcommit.getTree
+          tree_prev  = jcommit_prev.getTree
+          treewalk = TreeWalk.new(jrepo)
+          treewalk.addTree(tree_prev)
+          treewalk.addTree(tree_start)
+          treewalk.setRecursive(true)
+          rename_detector = RenameDetector.new(jrepo)
+          rename_detector.addAll(DiffEntry.scan(treewalk))
+          diff_entries = rename_detector.compute
+          diff_entries.each do |entry|
+            if ((entry.getChangeType == DiffEntry::ChangeType::RENAME || entry.getChangeType == DiffEntry::ChangeType::COPY) && entry.getNewPath.match(path))
+              renames << Commit.new(jrepo, jcommit_prev)
+            end
+          end
+        end
+      end
+      renames
+    end
+
+
     def branch_list
       branch = @jgit.branch_list
       array = Array.new

data/lib/version.rb

@@ -1,3 +1,3 @@
 module RJGit
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rjgit
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Maarten Engelen
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types