gollum-rugged_adapter 0.99.6 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b52a878c106ae3c5aee6eb2871ddf060117c6eaaff0a33a101b29704be75e9b9
-  data.tar.gz: f652fe0afa40f2e2bd93f823d813afe5d4dc218b5f52754c09d3899d715966bd
+  metadata.gz: 3b4b572fd56e0608c76ab7b3536ed18a54211571ded4f37dbfe77e296df17bfe
+  data.tar.gz: e3f2ab7a9ae0ebe06eaa1983426a9f89f78796e8535cb6373d21499d45914c72
 SHA512:
-  metadata.gz: 43e6d20d1c1959208331dd36643e6f2384b72e530fdfc09d13bdffee5ef69734924bd12244f04b2588fc66ab80f33b8aaebe87a039b3001a2e93c6dca3d35d9c
-  data.tar.gz: 43cb1739e0b909fae184a5857dd7971d0582e9b3a883df7b6fbf49d00edcbca0bc458399f73e94a8984767ea6651abfbaa2e18460a505b33675e979487f73503
+  metadata.gz: 4c481c8741c577b5cf0e0af292745c04fea0a32d96f89ed77ddb54db726c510517e35e134ca80ab3ddba8966618814fb1590c590c89e2f453fdab2447a62acba
+  data.tar.gz: 8b7cbcc97c857862a2e60ddb9beb7f625d5eb184ca7800189d95400cbe38400511075083f0dbd50bef91bbe21c9f38f1ba1599675d83dbb31fe5e72d2b903545

data/README.md

@@ -1,12 +1,10 @@
 [![Gem Version](https://badge.fury.io/rb/gollum-rugged_adapter.svg)](http://badge.fury.io/rb/gollum-rugged_adapter)
-[![Build Status](https://travis-ci.org/gollum/rugged_adapter.svg?branch=master)](https://travis-ci.org/gollum/rugged_adapter)
+![Build Status](https://github.com/gollum/rugged_adapter/actions/workflows/test.yaml/badge.svg)
 [![Dependency Status](https://gemnasium.com/gollum/rugged_adapter.svg)](https://gemnasium.com/gollum/rugged_adapter)
 
 ## 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
@@ -173,7 +174,7 @@ module Gollum
       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]
+        tree  = @repo.lookup(tree.path(options[:path])[:oid]) if options[:path]
         enc   = options.fetch(:encoding, 'utf-8')
         results = []
         tree.walk_blobs(:postorder) do |root, entry|
@@ -234,7 +235,7 @@ module Gollum
           @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
 
@@ -309,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]
@@ -367,7 +368,7 @@ module Gollum
                 # 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 ? renamed_path : nil)) if skipped > offset
                 renamed_path = current_path.nil? ? nil : current_path.dup
               end
@@ -489,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
@@ -614,11 +615,11 @@ module Gollum
 
       def diff(sha1, sha2, *paths)
         opts = paths.nil? ? {} : {:paths => paths}
-        @repo.diff(sha1, sha2, opts).patch
+        @repo.diff(sha1, sha2, opts).patch.force_encoding('utf-8')
       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.6'
+    VERSION = '1.1.2'
     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.6
+  version: 1.1.2
 platform: ruby
 authors:
 - Bart Kamphorst, Dawa Ometto
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2021-11-22 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
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Adapter for Gollum to use Rugged (libgit2) at the backend.
 test_files: []