gollum-rugged_adapter 0.99.4 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e26a1062990e5dae1e42c6f0b55b964b5bc39246fc45ba091556cf3638e35fa6
-  data.tar.gz: 6b7163ae78eb0fd4db16a185994116532da4887bd3d8c5da023f6f27e5d1406c
+  metadata.gz: e30b044f09b8b22f7616816d30ae2ad30397e45537df0c256fdd5e85f4f186ab
+  data.tar.gz: 2ec6f1bddc5d186160dde25cfc03a45182d779bed3bf026eeb414008255c4ea5
 SHA512:
-  metadata.gz: 184dcbda389bd30dd6548f1d66927c6805cea668b50bf545eff349ea474823f0b6408703005c1748a885049bf0e1d3c49686711913817dbd1044b6fcec931929
-  data.tar.gz: fa41ab8888be111f340362fb7c4bc09d3cfb8f270cc84f967570d0557fc6e1f2a605ebe9801d019c6ac6a93d4e39bc2c167d2909497b45ef13d5c80354120100
+  metadata.gz: 75c2a499064d67e007d0e970831fe317c457e9b25d6cfc1958a984faf13ff19ce8bee9292830e65395d183d91fdd09dbfb680c63b00ec688a0a011baeb489acb
+  data.tar.gz: 7d74de8e8eae9b1f606c73330324fdd5026d34cc4be7ab12cf1da34defaabbfa2b09ed8a666c9a35708366a4e09eb05325b37689fd5726c02926944fed910644

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]
@@ -363,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
@@ -485,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
@@ -559,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)
@@ -610,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.4'
+    VERSION = '1.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.4
+  version: 1.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-08-28 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: []