gollum-rjgit_adapter 0.3.4-java → 0.4.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eca3d197750d25056e1be20903a959c2c48443e46827469405ddab50d46f2307
-  data.tar.gz: 8336a3385dfcf3a58adf55c2d4e978014186ddb568179ea26e7f281408c90309
+  metadata.gz: 48f627d36cd5376254399d252034e79505e0e21dc125d04c77b3cabec3b4843c
+  data.tar.gz: de5904a088ff15a2509b3330594b2d6b9651b08541a1b8410eed820be929acd8
 SHA512:
-  metadata.gz: 505678250b9d281a6880da42be1efab65bc339943d094a7d3efd75f73503da6384ad43b2c77dcb66ac8fb1bf8b19080b15f031ca0c99a2a92c4474d0e7275810
-  data.tar.gz: 9afb266e98ac7261be17ade511bc99983d849f8fcc683c945e2a1a0e08b9e8823177d5489888735ab11c8720a6e9cfa4736e845e734be5b41e1782aee86a2ea5
+  metadata.gz: 4af0a30d70c46566ec318cfed08de9821097a91ed2e795988c461b3a8afa89aec61f48312ef2918adf5aa16744df4509145df6e2f322620491a0807fa6890cc9
+  data.tar.gz: 70cce95a94456a21952d22e2c9f3dbbaef7cd644d848eb9b5b80f31676f92c855557e2464eece5400a471946205ea27a46e76670a02b7daf9a3f2fca6e0c8e93

data/Gemfile

@@ -1,8 +1,7 @@
 source 'https://rubygems.org'
 
 gemspec
-gem 'rake', '~> 10.4.2'
-
+gem 'rake', '>= 12.3.3'
 gem 'adapter_specs', :git => 'https://github.com/gollum/adapter_specs.git'
 
 group :test do

data/README.md

@@ -1,7 +1,6 @@
 gollum-lib_rjgit_adapter
 ========================
 [![Gem Version](https://badge.fury.io/rb/gollum-rjgit_adapter.svg)](http://badge.fury.io/rb/gollum-rjgit_adapter)
+[![Build Status](https://travis-ci.org/gollum/rjgit_adapter.svg?branch=master)](https://travis-ci.org/gollum/rjgit_adapter)
 
-Adapter for Gollum to use [RJGit](https://github.com/repotag/rjgit) at the backend. This adapter is the default when your platform is JRuby, so you need only to `gem install gollum` and then use gollum normally.
-
-Note: this adapter is new. Although it passes the full test suite for gollum (and gollum-lib), it might well still contain bugs. Please let us know if you encouter any!
+Adapter for Gollum to use [RJGit](https://github.com/repotag/rjgit) at the backend. The adapter requires using [JRuby](https://www.jruby.org/). This adapter is the default when your platform is JRuby, so you need only to `gem install gollum` and then use gollum normally.

data/gollum-rjgit_adapter.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary     = %q{Adapter for Gollum to use RJGit at the backend.}
   s.description = %q{Adapter for Gollum to use RJGit at the backend.}
 
-  s.add_runtime_dependency "rjgit", "~> 5.0"
+  s.add_runtime_dependency "rjgit", "> 5.6.0", "~> 5.6.0"
   s.add_development_dependency "rspec", "3.4.0"
 
   s.files         = Dir['lib/**/*.rb'] + ["README.md", "Gemfile"]

data/lib/rjgit_adapter/git_layer_rjgit.rb

@@ -19,7 +19,7 @@ module Gollum
     # Convert HEAD refspec to jgit canonical form
     def self.canonicalize(ref)
       return ref if sha?(ref)
-      return "refs/heads/master" if ref.nil? || ref.to_s.upcase == "HEAD"
+      return 'refs/heads/master' if ref.nil? || ref.to_s.upcase == 'HEAD'
       result = ref.is_a?(Gollum::Git::Ref) ? ref.name : ref
       result = "refs/heads/#{result}" unless result =~ /^refs\/heads\//
       result
@@ -135,9 +135,28 @@ module Gollum
       def stats
         return @stats unless @stats.nil?
         rjgit_stats = @commit.stats
-        additions = rjgit_stats[0]
-        deletions = rjgit_stats[1]
-        @stats = OpenStruct.new(:additions => additions, :deletions => deletions, :files => rjgit_stats[2].to_a.map {|a| a.flatten}, :id => id, :total => additions + deletions)
+
+        files = rjgit_stats[:files].map do |file|
+          file[:new_file] == file[:old_file] if file[:new_file] == '/dev/null' # File is deleted, display only the original, deleted path.
+          file.delete(:old_file) if (file[:old_file] == '/dev/null') || (file[:old_file] == file[:new_file]) # Don't include an old path when the file is new, or it's a regular update
+          file
+        end
+        
+        @stats = OpenStruct.new(
+          :additions => rjgit_stats[:total_additions],
+          :deletions => rjgit_stats[:total_deletions],
+          :total => rjgit_stats[:total_additions] + rjgit_stats[:total_deletions],
+          :files => files,
+          :id => id
+        )
+      end
+      
+      def tracked_pathname
+        begin
+          @commit.tracked_pathname
+        rescue NoMethodError
+          nil
+        end
       end
       
     end
@@ -152,19 +171,17 @@ module Gollum
         ::File.exists?(@git.jrepo.getDirectory.to_s)
       end
       
-      def grep(query, options={})
+      def grep(query, options={}, &block)
         ref = Gollum::Git.canonicalize(options[:ref])
-        blobs = []
+        results = []
+        walk = RevWalk.new(@git.jrepo)
         RJGit::Porcelain.ls_tree(@git.jrepo, options[:path], ref, {:recursive => true}).each do |item|
-          walk = RevWalk.new(@git.jrepo)
-          blobs << RJGit::Blob.new(@git.jrepo, item[:mode], item[:path], walk.lookup_blob(ObjectId.from_string(item[:id]))) if item[:type] == 'blob'
-        end
-        result = []
-        blobs.each do |blob|
-          count = blob.data.downcase.scan(/#{query}/i).length
-          result << {:name => blob.path, :count => count} if count > 0
+          if item[:type] == 'blob'
+            blob = RJGit::Blob.new(@git.jrepo, item[:mode], item[:path], walk.lookup_blob(ObjectId.from_string(item[:id])))
+            results << yield(blob.path, blob.binary? ? nil : blob.data)
+          end
         end
-        result
+        results.compact
       end
       
       def rm(path, options={})
@@ -181,34 +198,45 @@ module Gollum
       
       # rev_list({:max_count=>1}, ref)
       def rev_list(options, *refs)
-        raise "Not implemented"
+        raise 'Not implemented'
       end
       
       def ls_files(query, options = {})
         ref = Gollum::Git.canonicalize(options[:ref])
-        result = RJGit::Porcelain.ls_tree(@git.jrepo, options[:path], ref, {:recursive => true}).select {|object| object[:type] == "blob" && !!(::File.basename(object[:path]) =~ /#{query}/i) }
+        result = RJGit::Porcelain.ls_tree(@git.jrepo, options[:path], ref, {:recursive => true}).select {|object| object[:type] == 'blob' && !!(::File.basename(object[:path]) =~ /#{query}/i) }
         result.map do |r|
           r[:path]
         end
       end
       
-      def apply_patch(sha, patch = nil, options = {})
-        return false if patch.nil?
+      def revert_path(path, sha1, sha2, ref = 'HEAD^{commit}')
+        result, _paths = revert(path, sha1, sha2, ref)
+        result
+      end
+      
+      def revert_commit(sha1, sha2, ref = 'HEAD^{commit}')
+        revert(nil, sha1, sha2, ref)
+      end
+      
+      def revert(path, sha1, sha2, ref)
+        patch = generate_patch(sha1, sha2, path)
+        return false unless patch
         begin
-          @git.apply_patch(patch)
-        rescue Java::OrgEclipseJgitApiErrors::PatchApplyException
+          applier = RJGit::Plumbing::ApplyPatchToIndex.new(@git.jrepo, patch, ref)
+          applier.new_tree
+        rescue ::RJGit::PatchApplyException
           false
         end
-        Tree.new(RJGit::Tree.new(@git.jrepo, nil, nil, RevWalk.new(@git.jrepo).lookup_tree(@git.jrepo.resolve("HEAD^{tree}"))))
       end
-      
+            
       # @repo.git.cat_file({:p => true}, sha)
       def cat_file(options, sha)
         @git.cat_file(options, sha)
       end
       
-      def log(path = nil, ref = nil, options = {})
+      def log(ref = 'refs/heads/master', path = nil, options = {})
         ref = Gollum::Git.canonicalize(ref)
+        options[:list_renames] = true if path && options[:follow]
         @git.log(path, ref, options).map {|commit| Gollum::Git::Commit.new(commit)}
       end
       alias_method :versions_for_path, :log
@@ -225,6 +253,12 @@ module Gollum
         @git.pull(remote, branch, options)
       end
       
+      private
+            
+      def generate_patch(sha1, sha2, path = nil)
+        RJGit::Plumbing::ApplyPatchToIndex.diffs_to_patch(RJGit::Porcelain.diff(@git.jrepo, patch: true, new_rev: sha1, old_rev: sha2, file_path: path))
+      end
+      
     end
     
     class Index
@@ -242,9 +276,9 @@ module Gollum
         @index.add(path, data)
       end
       
-      def commit(message, parents = nil, actor = nil, last_tree = nil, ref = "refs/heads/master")
+      def commit(message, parents = nil, actor = nil, last_tree = nil, ref = 'refs/heads/master')
         ref = Gollum::Git.canonicalize(ref)
-        actor = actor ? actor.actor : RJGit::Actor.new("Gollum", "gollum@wiki")
+        actor = actor ? actor.actor : RJGit::Actor.new('Gollum', 'gollum@wiki')
         parents = parents.map{|parent| parent.commit} if parents
         commit_data = @index.commit(message, actor, parents, ref)
         return false if !commit_data
@@ -349,16 +383,17 @@ module Gollum
       
       # @wiki.repo.head.commit.sha
       def head
-        Gollum::Git::Ref.new("refs/heads/master", @repo.head)
+        return nil unless @repo.head
+        Gollum::Git::Ref.new('refs/heads/master', @repo.head)
       end
       
       def index
         @index ||= Gollum::Git::Index.new(RJGit::Plumbing::Index.new(@repo))
       end
       
-      def log(commit = 'refs/heads/master', path = nil, options = {})
+      def log(ref = 'refs/heads/master', path = nil, options = {})
         commit = Gollum::Git.canonicalize(commit)
-        git.log(path, commit, options)
+        git.log(ref, path, options)
       end
       
       def lstree(sha, options={})
@@ -374,7 +409,7 @@ module Gollum
         @repo.path
       end
       
-      def update_ref(ref = "refs/heads/master", commit_sha)
+      def update_ref(ref = 'refs/heads/master', commit_sha)
         ref = Gollum::Git.canonicalize(head)
         cm = self.commit(commit_sha)
         @repo.update_ref(cm.commit, true, ref)

data/lib/rjgit_adapter/version.rb

@@ -1,7 +1,7 @@
 module Gollum
   module Lib
     module Git
-    VERSION = '0.3.4'
+    VERSION = '0.4.0'
     end
   end
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: gollum-rjgit_adapter
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: java
 authors:
 - Bart Kamphorst, Dawa Ometto
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-17 00:00:00.000000000 Z
+date: 2020-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 5.6.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.6.0
   name: rjgit
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 5.6.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.6.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -72,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key:
 specification_version: 4
 summary: Adapter for Gollum to use RJGit at the backend.