gollum-rugged_adapter 0.99.2 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae443605ad0dd343310fee4b9bac502bc21654108468f91002a1686be978a587
-  data.tar.gz: 957d8466bed97f5287131cde9aa63a7f88629ace4363680c8c0d1b90e30775b7
+  metadata.gz: 37cb3c6ab907f0e07284c8e86a4846fbc50835b1077ec78317ec8c6fe1338b8a
+  data.tar.gz: 4d55049d3ef2801916730be8544843a301f692cd077795cce15048c605a4ea3b
 SHA512:
-  metadata.gz: d4f70708545e36a1b0695ee0ea02860ca60187439e1c23d506ba3b11cb7d902666c943d6f0abcce4ccb0c7c0c3374bb3b4dda444200bf3e57ca0ad32ec23b1ee
-  data.tar.gz: 7a1b3a517bf612f7dd019b68b31ee4e0cb0eae6a8dd282e14b6a09e511957239663ddd1e3a0075dfd97d0492c8967d1f3d11186574937e6836a50cea737e3674
+  metadata.gz: 1564a85095a897ed8b4acb0fa5ccbdbd502ddde945945687edea68ddabfae008e0a566b0198ade261da1d49d1f7c763f2842018a1751b857a0a823773c15cbd7
+  data.tar.gz: 95a38d72f09c71de0145084f8afeb7ef97ee204967794fe97c30b0528f6c7a8a207ea6271f3e92f35c883226c02d6b901cddbeb8ef968bb9947dad29c66c68de

data/README.md

@@ -4,9 +4,7 @@
 
 ## DESCRIPTION
 
-Adapter for [gollum](https://github.com/gollum/gollum) to use [Rugged](https://github.com/libgit2/rugged) (libgit2) at the backend. See the [gollum wiki](https://github.com/gollum/gollum/wiki/Git-adapters) for more information on adapters. Currently gollum uses grit as a backend by default, but since that is abandonware, the plan is to make this adapter the default in the future.
-
-**Please note that this adapter is currently in beta. It passes the unit tests for gollum and [gollum-lib](https://github.com/gollum/gollum-lib), but it needs more comprehensive testing. Please [report any issues](https://github.com/gollum/rugged_adapter/issues) that you encounter.**
+Adapter for [gollum](https://github.com/gollum/gollum) to use [Rugged](https://github.com/libgit2/rugged) (libgit2) at the backend. See the [gollum wiki](https://github.com/gollum/gollum/wiki/Git-adapters) for more information on adapters. Currently this is the default adapter for gollum.
 
 ## USAGE
 

data/lib/rugged_adapter/git_layer_rugged.rb

@@ -19,15 +19,16 @@ module Gollum
 
     class Actor
 
-      attr_accessor :name, :email
+      attr_accessor :name, :email, :time
 
       def self.default_actor
         self.new("Gollum", "Gollum@wiki")
       end
 
-      def initialize(name, email)
+      def initialize(name, email, time = nil)
         @name = name
         @email = email
+        @time = time
       end
 
       def output(time)
@@ -42,7 +43,7 @@ module Gollum
       end
 
       def to_h
-        {:name => @name, :email => @email}
+        {:name => @name, :email => @email, :time => @time}
       end
 
     end
@@ -126,6 +127,10 @@ module Gollum
         @stats ||= build_stats
       end
 
+      def parent
+        @commit.parents.empty? ? nil : Gollum::Git::Commit.new(@commit.parents.first)
+      end
+
       private
 
       def build_stats
@@ -227,10 +232,10 @@ module Gollum
         path = path.nil? ? path : [path]
         options = options.merge({:paths => path, :strategy => :force})
         if ref == 'HEAD'
-          @repo.checkout_head(options)
+          @repo.checkout_head(**options)
         else
           ref = "refs/heads/#{ref}" unless ref =~ /^refs\/heads\//
-          @repo.checkout_tree(sha_from_ref(ref), options)
+          @repo.checkout_tree(sha_from_ref(ref), **options)
         end
       end
 
@@ -305,13 +310,13 @@ module Gollum
 
       def push(remote, branches = nil, options = {})
         branches = [branches].flatten.map {|branch| "refs/heads/#{branch}" unless branch =~ /^refs\/heads\//}
-        @repo.push(remote, branches, options)
+        @repo.push(remote, branches, **options)
       end
 
       def pull(remote, branches = nil, options = {})
         branches = [branches].flatten.map {|branch| "refs/heads/#{branch}" unless branch =~ /^refs\/heads\//}
         r = @repo.remotes[remote]
-        r.fetch(branches, options)
+        r.fetch(branches, **options)
         branches.each do |branch|
           branch_name = branch.match(/^refs\/heads\/(.*)/)[1]
           remote_name = remote.match(/^(refs\/heads\/)?(.*)/)[2]
@@ -346,6 +351,7 @@ module Gollum
         skipped = 0
         current_path = options[:path].dup if options[:path]
         current_path = nil if current_path == ''
+        renamed_path = current_path.nil? ? nil : current_path.dup
         track_pathnames = true if current_path && options[:follow]
         limit = options[:limit].to_i
         offset = options[:offset].to_i
@@ -358,12 +364,13 @@ module Gollum
                 # Skip merge commits
                 next if c.parents.length > 1
               end
-
               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, track_pathnames ? current_path.dup : nil)) if skipped > offset
+
+                commits.push(Gollum::Git::Commit.new(c, track_pathnames ? renamed_path : nil)) if skipped > offset
+                renamed_path = current_path.nil? ? nil : current_path.dup
               end
           end
         walker.reset
@@ -483,7 +490,7 @@ module Gollum
         commit_options[:message] = message.to_s
         commit_options[:parents] = parents
         commit_options[:update_ref] = head
-        Rugged::Commit.create(@rugged_repo, commit_options)
+        Rugged::Commit.create(@rugged_repo, **commit_options)
       end
 
       def tree
@@ -557,7 +564,7 @@ module Gollum
     class Repo
 
       def initialize(path, options)
-        @repo = Rugged::Repository.new(path, options)
+        @repo = Rugged::Repository.new(path, **options)
       end
 
       def self.init(path)
@@ -612,7 +619,7 @@ module Gollum
       end
 
       def log(commit = 'refs/heads/master', path = nil, options = {})
-        git.log(commit, path, options)
+        git.log(commit, path, **options)
       end
 
       def lstree(sha, options = {})

data/lib/rugged_adapter/version.rb

@@ -1,7 +1,7 @@
 module Gollum
   module Lib
     module Git
-    VERSION = '0.99.2'
+    VERSION = '1.1'
     end
   end
 end

data/rugged_adapter.gemspec

@@ -13,8 +13,8 @@ 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.99'
-  s.add_runtime_dependency 'mime-types', '>= 1.15'
+  s.add_runtime_dependency 'rugged', '~> 1.1.0'
+  s.add_runtime_dependency 'mime-types', '~> 1.15'
   s.add_development_dependency 'rspec', "3.4.0"
 
   s.files         = Dir['lib/**/*.rb'] + ["README.md", "Gemfile"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gollum-rugged_adapter
 version: !ruby/object:Gem::Version
-  version: 0.99.2
+  version: '1.1'
 platform: ruby
 authors:
 - Bart Kamphorst, Dawa Ometto
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-15 00:00:00.000000000 Z
+date: 2021-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -16,26 +16,26 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.99'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.99'
+        version: 1.1.0
 - !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
@@ -71,7 +71,7 @@ homepage: https://github.com/gollum/rugged_adapter
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -86,8 +86,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Adapter for Gollum to use Rugged (libgit2) at the backend.
 test_files: []