gollum-rugged_adapter 0.4.4 → 0.99

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7dd22e68aefae79b87ce19c5b29b257b73c387fa
-  data.tar.gz: 32752e14dc82dd6f7931ef59e6f60748573603f0
+SHA256:
+  metadata.gz: f9b5e759dc0448a68c2ef5b03a5da78f81ca2af18e5faa82280b2f707a83e7d4
+  data.tar.gz: bcc46ceaab4b1bf5b5dd1d5e05ce9856a9cd6ee63219eaf85dbff7f90c87f9d4
 SHA512:
-  metadata.gz: 57bbce0adb29b1e09c63be2072d9919aa47b86ca4c11754cb82d64c28a7048477a9fecf9555cd10b477a84253bd45e9155eb1714518318650572c9f75a075f8d
-  data.tar.gz: 657feaeaf50d11af8f296bf49f72a693f0534eadb2c422bcc35411b149e7f284a38339192ba44a365394b7beabcab4ac29214a41b8d572dc85f1217cf1e93c86
+  metadata.gz: 0abff79a7bdb6ea9ea54a7d6483cb7a8e2daf34d0d28f44a2a7702efe12a2d6bdaed8e59fd3969bd7aa57b5b62b281880f998c2d740cd91dc2f0ab5a9ae370c7
+  data.tar.gz: 0b2e7ac0435588fc46a2f4777e5295a26caa370f24a1ec5a0083c5470c4668c3a64596d27112c645c39d4949acabf3cbd45e610405e93c048d5b3438b1cfa69b

data/lib/rugged_adapter/git_layer_rugged.rb

@@ -16,20 +16,20 @@ module Gollum
 
     DEFAULT_MIME_TYPE = "text/plain"
     class NoSuchShaFound < StandardError; end
-    
+
     class Actor
-      
+
       attr_accessor :name, :email
 
       def self.default_actor
         self.new("Gollum", "Gollum@wiki")
       end
-      
+
       def initialize(name, email)
         @name = name
         @email = email
       end
-      
+
       def output(time)
         # implementation from grit
         offset = time.utc_offset / 60
@@ -44,9 +44,9 @@ module Gollum
       def to_h
         {:name => @name, :email => @email}
       end
-      
+
     end
-    
+
     class Blob
 
       attr_reader :mode
@@ -57,7 +57,7 @@ module Gollum
         blob = repo.git.lookup(options[:id])
         self.new(blob, options)
       end
-      
+
       def initialize(blob, options = {})
         @blob = blob
         @mode = options[:mode]
@@ -65,11 +65,11 @@ module Gollum
         @size = options[:size]
         @id = blob.oid
       end
-      
+
       def data
         @content ||= @blob.content
       end
-      
+
       def is_symlink
         @mode == 0120000
       end
@@ -90,33 +90,34 @@ module Gollum
         nil
       end
     end
-    
+
     class Commit
-      
-      def initialize(commit)
+
+      def initialize(commit, tracked_pathname = nil)
         @commit = commit
+        @tracked_pathname = tracked_pathname
       end
-      
+
       def id
         @commit.oid
       end
       alias_method :sha, :id
       alias_method :to_s, :id
 
-      attr_reader :commit
+      attr_reader :commit, :tracked_pathname
 
       def author
         @author ||= Gollum::Git::Actor.new(@commit.author[:name], @commit.author[:email])
       end
-      
+
       def authored_date
         @commit.author[:time]
       end
-      
+
       def message
         @commit.message
       end
-      
+
       def tree
         Gollum::Git::Tree.new(@commit.tree)
       end
@@ -134,65 +135,92 @@ module Gollum
         files = []
         parent = @commit.parents.first
         diff = Rugged::Tree.diff(@commit.tree.repo, parent ? parent.tree : nil, @commit.tree)
+        diff.find_similar!
         diff = diff.each_patch do |patch|
-          new_additions = patch.stat[1]
-          new_deletions = patch.stat[0]
+          new_additions = patch.additions
+          new_deletions = patch.deletions
           additions += new_additions
           deletions += new_deletions
           total += patch.changes
-          files << [patch.delta.new_file[:path].force_encoding("UTF-8"), new_deletions, new_additions, patch.changes] # Rugged seems to generate the stat diffs in the other direciton than grit does by default, so switch the order of additions and deletions.
+          files << {
+            new_file: patch.delta.new_file[:path].force_encoding("UTF-8"),
+            old_file: patch.delta.renamed? ? patch.delta.old_file[:path].force_encoding("UTF-8") : nil,
+            new_deletions: new_deletions,
+            new_additions: new_additions,
+            changes: patch.changes
+          }
         end
         OpenStruct.new(:additions => additions, :deletions => deletions, :files => files, :id => id, :total => total)
       end
-      
+
     end
-    
+
     class Git
-    
+
       # Rugged does not have a Git class, but the Repository class should allows us to do what's necessary.
       def initialize(repo)
         @repo = repo
       end
-      
+
       def exist?
         ::File.exists?(@repo.path)
       end
-      
-      def grep(query, options={})
-        ref = options[:ref] ? options[:ref] : "HEAD"
-        tree = @repo.lookup(sha_from_ref(ref)).tree
-        tree = @repo.lookup(tree[options[:path]][:oid]) if options[:path]
+
+      def grep(search_terms, options={}, &block)
+        ref   = options[:ref] ? options[:ref] : "HEAD"
+        tree  = @repo.lookup(sha_from_ref(ref)).tree
+        tree  = @repo.lookup(tree[options[:path]][:oid]) if options[:path]
+        enc   = options.fetch(:encoding, 'utf-8')
         results = []
         tree.walk_blobs(:postorder) do |root, entry|
-          blob = @repo.lookup(entry[:oid])
-          count = 0
-          blob.content.each_line do |line|
-            next unless line.force_encoding("UTF-8").match(/#{Regexp.escape(query)}/i)
-            count += 1
-          end
-          path = options[:path] ? ::File.join(options[:path], root, entry[:name]) : "#{root}#{entry[:name]}"
-          results << {:name => path, :count => count} unless count == 0
+          blob  = @repo.lookup(entry[:oid])
+          path  = options[:path] ? ::File.join(options[:path], root, entry[:name]) : "#{root}#{entry[:name]}"
+          data  = blob.binary? ? nil : blob.content.force_encoding(enc)
+          results << yield(path, data)
         end
-        results
+        results.compact
       end
-      
+
       def rm(path, options = {})
         index = @repo.index
         index.write
-        ::File.unlink ::File.join(@repo.workdir, path)
+        to_delete = ::File.join(@repo.workdir, path)
+        ::File.unlink to_delete if ::File.exist?(to_delete)
       end
 
       def cat_file(options, sha)
         @repo.lookup(sha).read_raw
       end
 
-      def apply_patch(head_sha = 'HEAD', patch=nil)
-        false # Rewrite gollum-lib's revert so that it doesn't require a direct equivalent of Grit's apply_patch
+      def revert_path(path, sha1, sha2)
+        diff = @repo.diff(sha2, sha1, {:paths => [path]}).first.diff
+        begin
+          result = @repo.apply(diff, {:location => :index, :path => path})
+        rescue RuntimeError
+          return false
+        end
+        begin
+          return @repo.index.write_tree
+        rescue Rugged::IndexError
+          return false
+        end
       end
 
-      def revert(path, sha1, sha2, ref)
-        # FIXME: See https://github.com/gollum/grit_adapter/pull/14
-        fail NotImplementedError
+      def revert_commit(sha1, sha2)
+        diff = @repo.diff(sha2, sha1)
+        index = @repo.revert_commit(sha2, sha1)
+        return false unless index
+        paths = []
+        diff.each_delta do |delta|
+          paths << delta.new_file[:path]
+          paths << delta.old_file[:path]
+        end
+        paths.uniq!
+        begin
+          return index.write_tree(@repo), paths
+        rescue Rugged::IndexError
+          return false
+        end
       end
 
       def checkout(path, ref = 'HEAD', options = {})
@@ -230,7 +258,7 @@ module Gollum
       def versions_for_path(path = nil, ref = nil, options = {})
         log(ref, path, options)
       end
-      
+
       def ls_files(query, options = {})
         ref = options[:ref] || "refs/heads/master"
         tree = @repo.lookup(sha_from_ref(ref)).tree
@@ -270,7 +298,7 @@ module Gollum
         end
       end
       alias_method :sha_from_ref, :sha_or_commit_from_ref
-      
+
       def commit_from_ref(ref)
         sha_or_commit_from_ref(ref, :commit)
       end
@@ -308,7 +336,7 @@ module Gollum
         !!(str =~ /^[0-9a-f]{40}$/)
       end
 
-      # Return an array of log commits, given an SHA hash and a hash of
+      # Return an array of log commits, given a SHA hash and a hash of
       # options. From Gitlab::Git
       def build_log(sha, options)
         # Instantiate a Walker and add the SHA hash
@@ -316,8 +344,9 @@ module Gollum
         walker.push(sha)
         commits = []
         skipped = 0
-        current_path = options[:path]
+        current_path = options[:path].dup if options[:path]
         current_path = nil if current_path == ''
+        track_pathnames = true if current_path && options[:follow]
         limit = options[:limit].to_i
         offset = options[:offset].to_i
         skip_merges = options[:skip_merges]
@@ -330,12 +359,11 @@ module Gollum
                 next if c.parents.length > 1
               end
 
-              if !current_path ||
-                commit_touches_path?(c, current_path, options[:follow], walker)
+              if !current_path || commit_touches_path?(c, current_path, options[:follow], walker)
                 # This is a commit we care about, unless we haven't skipped enough
                 # yet
                 skipped += 1
-                commits.push(Gollum::Git::Commit.new(c)) if skipped > offset
+                commits.push(Gollum::Git::Commit.new(c, track_pathnames ? current_path.dup : nil)) if skipped > offset
               end
           end
         walker.reset
@@ -363,7 +391,7 @@ module Gollum
 
           # Only follow the first TREESAME parent for merge commits
           if num_treesame > 0
-            walker.hide(parent)
+            walker.hide(parent.oid)
             next
           end
 
@@ -388,11 +416,8 @@ module Gollum
         tmp_entry = nil
 
         pathname.each_filename do |dir|
-          if tmp_entry.nil?
-            tmp_entry = commit.tree[dir]
-          else
-            tmp_entry = @repo.lookup(tmp_entry[:oid])[dir]
-          end
+          tmp_entry = tmp_entry ? @repo.lookup(tmp_entry[:oid])[dir] : commit.tree[dir]
+          return nil unless tmp_entry
         end
         tmp_entry
       end
@@ -405,7 +430,7 @@ module Gollum
         # If +path+ is a filename, not a directory, then we should only have
         # one delta. We don't need to follow renames for directories.
         return nil if diff.each_delta.count > 1
-        
+
         delta = diff.each_delta.first
         if delta.added?
           full_diff = parent.diff(commit)
@@ -419,23 +444,23 @@ module Gollum
           end
         end
       end
- 
+
     end
-    
+
     class Index
-      
+
       def initialize(index, repo)
         @index = index
         @rugged_repo = repo
         @treemap = {}
       end
-      
+
       def delete(path)
         @index.remove_all(path)
         update_treemap(path, false)
         false
       end
-      
+
       def add(path, data)
         blob = @rugged_repo.write(data, :blob)
         @index.add(:path => path, :oid => blob, :mode => 0100644)
@@ -446,7 +471,7 @@ module Gollum
       def index
         @index
       end
-      
+
       def commit(message, parents = nil, actor = nil, last_tree = nil, head = 'refs/heads/master')
         commit_options = {}
         head = "refs/heads/#{head}" unless head =~ /^refs\/heads\//
@@ -460,11 +485,11 @@ module Gollum
         commit_options[:update_ref] = head
         Rugged::Commit.create(@rugged_repo, commit_options)
       end
-      
+
       def tree
         @treemap
       end
-      
+
       def read_tree(id)
         id = Gollum::Git::Git.new(@rugged_repo).ref_to_sha(id)
         return nil if id.nil?
@@ -473,7 +498,7 @@ module Gollum
         @index.read_tree(current_tree)
         @current_tree = Gollum::Git::Tree.new(current_tree)
       end
-      
+
       def current_tree
         @current_tree
       end
@@ -495,115 +520,111 @@ module Gollum
         path = path[1..-1] if path[0] == ::File::SEPARATOR
         path = path.split(::File::SEPARATOR)
         last = path.pop
-    
+
         current = @treemap
-    
+
         path.each do |dir|
           current[dir] ||= {}
           node = current[dir]
           current = node
         end
-    
+
         current[last] = data
         @treemap
       end
 
     end
-    
+
     class Ref
       def initialize(ref)
         @ref = ref
       end
-      
+
       def name
         @ref.name
       end
-      
+
       def commit
         Gollum::Git::Commit.new(@ref.target)
       end
-            
+
     end
-    
+
     class Repo
-      
+
       def initialize(path, options)
-        begin
-          @repo = Rugged::Repository.new(path, options)
-        #rescue Grit::InvalidGitRepositoryError
-         # raise Gollum::InvalidGitRepositoryError
-        #rescue Grit::NoSuchPathError
-         # raise Gollum::NoSuchPathError
-        end
+        @repo = Rugged::Repository.new(path, options)
       end
-      
+
       def self.init(path)
         Rugged::Repository.init_at(path, false)
         self.new(path, :is_bare => false)
       end
-      
+
       def self.init_bare(path)
         Rugged::Repository.init_at(path, true)
         self.new(path, :is_bare => true)
       end
-      
+
       def bare
         @repo.bare?
       end
-      
+
       def config
         @repo.config
       end
-      
+
       def git
         @git ||= Gollum::Git::Git.new(@repo)
       end
-      
+
       def commit(id)
         git.commit_from_ref(id)
       end
-      
+
       def commits(start = 'refs/heads/master', max_count = 10, skip = 0)
         git.log(start, nil, :max_count => max_count, :skip => skip)
       end
-      
+
       def head
-        Gollum::Git::Ref.new(@repo.head)
+        begin
+          return Gollum::Git::Ref.new(@repo.head)
+        rescue Rugged::ReferenceError
+          return nil
+        end
       end
-      
+
       def index
         @index ||= Gollum::Git::Index.new(@repo.index, @repo)
       end
 
       def diff(sha1, sha2, *paths)
-        opts = path == nil ? {} : {:path => path}
-        patches = @repo.diff(sha1, sha2, opts).patches
-        if not paths.empty?
-          patches.keep_if { |p| paths.include? p.delta.new_file[:path] }
-        end
-        patches.map  {|patch| OpenStruct.new(:diff => patch.to_s.split("\n")[2..-1].join("\n").force_encoding("UTF-8"))}.reverse # First remove two superfluous lines. Rugged seems to order the diffs differently than Grit, so reverse.
+        opts = paths.nil? ? {} : {:paths => paths}
+        @repo.diff(sha1, sha2, opts).diff.patches.map do |patch|
+          OpenStruct.new(:diff => patch.to_s.split("\n")[2..-1].join("\n").force_encoding("UTF-8")) # First remove two superfluous lines.
+        end.reverse # Rugged seems to order the diffs differently than Grit, so reverse.
       end
-      
+
       def log(commit = 'refs/heads/master', path = nil, options = {})
         git.log(commit, path, options)
       end
-      
+
       def lstree(sha, options = {})
         results = []
         @repo.lookup(sha).tree.walk(:postorder) do |root, entry|
           entry[:sha] = entry[:oid]
           entry[:mode] = entry[:filemode].to_s(8)
           entry[:type] = entry[:type].to_s
-          entry[:path] = "#{root}#{entry[:name]}" 
+          entry[:path] = "#{root}#{entry[:name]}"
           results << entry
         end
         results
       end
-      
+
       def path
         @repo.path
       end
-      
+
       # Checkout branch and if necessary first create it. Currently used only in gollum-lib's tests.
       def update_ref(ref, commit_sha)
         ref = "refs/heads/#{ref}" unless ref =~ /^refs\/heads\//
@@ -617,23 +638,23 @@ module Gollum
     end
 
     class Tree
-      
+
       def initialize(tree)
         @tree = tree
       end
-      
+
       def keys
         @tree.map{|entry| entry[:name]}
       end
-      
+
       def [](i)
         @tree[i]
       end
-      
+
       def id
         @tree.oid
       end
-      
+
       def /(file)
         return self if file == '/'
         begin
@@ -645,7 +666,7 @@ module Gollum
         obj = @tree.owner.lookup(obj[:oid])
         obj.is_a?(Rugged::Tree) ? Gollum::Git::Tree.new(obj) : Gollum::Git::Blob.new(obj)
       end
-      
+
       def blobs
         blobs = []
         @tree.each_blob {|blob| blobs << Gollum::Git::Blob.new(@tree.owner.lookup(blob[:oid]), blob) }
@@ -653,6 +674,6 @@ module Gollum
       end
 
     end
-    
+
   end
 end

data/lib/rugged_adapter/version.rb

@@ -1,7 +1,7 @@
 module Gollum
   module Lib
     module Git
-    VERSION = '0.4.4'
+    VERSION = '0.99'
     end
   end
 end

data/rugged_adapter.gemspec

@@ -13,9 +13,9 @@ Gem::Specification.new do |s|
   s.description = %q{Adapter for Gollum to use Rugged (libgit2) at the backend.}
   s.license	= "MIT"
 
-  s.add_runtime_dependency 'rugged', '~> 0.25'
+  s.add_runtime_dependency 'rugged', '~> 0.99'
   s.add_runtime_dependency 'mime-types', '>= 1.15'
-  s.add_development_dependency "rspec", "3.4.0"  
+  s.add_development_dependency 'rspec', "3.4.0"
 
   s.files         = Dir['lib/**/*.rb'] + ["README.md", "Gemfile"]
   s.require_paths = ["lib"]

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: gollum-rugged_adapter
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: '0.99'
 platform: ruby
 authors:
 - Bart Kamphorst, Dawa Ometto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-26 00:00:00.000000000 Z
+date: 2020-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.25'
+        version: '0.99'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.25'
+        version: '0.99'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.15'
 - !ruby/object:Gem::Dependency
@@ -77,17 +77,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Adapter for Gollum to use Rugged (libgit2) at the backend.