gollum-rugged_adapter 1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37cb3c6ab907f0e07284c8e86a4846fbc50835b1077ec78317ec8c6fe1338b8a
-  data.tar.gz: 4d55049d3ef2801916730be8544843a301f692cd077795cce15048c605a4ea3b
+  metadata.gz: ff65dc7719f5202705485b44d61a70c6a46451393aeeb7243c820c468da85e69
+  data.tar.gz: 336e98811d5cb8c19638f6dd8a85d1c5f17d772f2828cea3230ba109e5aaf695
 SHA512:
-  metadata.gz: 1564a85095a897ed8b4acb0fa5ccbdbd502ddde945945687edea68ddabfae008e0a566b0198ade261da1d49d1f7c763f2842018a1751b857a0a823773c15cbd7
-  data.tar.gz: 95a38d72f09c71de0145084f8afeb7ef97ee204967794fe97c30b0528f6c7a8a207ea6271f3e92f35c883226c02d6b901cddbeb8ef968bb9947dad29c66c68de
+  metadata.gz: 67f5126eea74217c669854445059f74b7363e3473950b7cf34632b8652f61ad9b0efff8a2fa5ad9e05ee66c6a09144139a8a56d0e3b44b2f1511948cd11508ba
+  data.tar.gz: ab629d342c8346f067b485450a9d898c9238bdff88d60c96c4dab900da01757d4db0bded4f3fdb28522073e5f340757de6d92320d0a26cac71728d9c98d8c2c1

data/README.md

@@ -1,5 +1,5 @@
 [![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

data/lib/rugged_adapter/git_layer_rugged.rb

@@ -17,6 +17,18 @@ module Gollum
     DEFAULT_MIME_TYPE = "text/plain"
     class NoSuchShaFound < StandardError; end
 
+    def self.global_default_branch
+      Rugged::Config.global['init.defaultBranch']
+    end
+
+    def self.default_ref_for_repo(repo)
+      begin
+        repo.head.name
+      rescue Rugged::ReferenceError
+        self.global_default_branch || 'refs/heads/master'
+      end
+    end
+    
     class Actor
 
       attr_accessor :name, :email, :time
@@ -168,13 +180,13 @@ module Gollum
       end
 
       def exist?
-        ::File.exists?(@repo.path)
+        ::File.exist?(@repo.path)
       end
 
       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|
@@ -239,7 +251,7 @@ module Gollum
         end
       end
 
-      def log(ref = 'refs/heads/master', path = nil, options = {})
+      def log(ref = Gollum::Git.default_ref_for_repo(@repo), path = nil, options = {})
         default_options = {
           :limit => options[:max_count] ? options[:max_count] : 10,
           :offset => options[:skip] ? options[:skip] : 0,
@@ -265,7 +277,7 @@ module Gollum
       end
 
       def ls_files(query, options = {})
-        ref = options[:ref] || "refs/heads/master"
+        ref = options[:ref] || Gollum::Git.default_ref_for_repo(@repo)
         tree = @repo.lookup(sha_from_ref(ref)).tree
         tree = @repo.lookup(tree[options[:path]][:oid]) if options[:path]
         results = []
@@ -459,6 +471,7 @@ module Gollum
       def initialize(index, repo)
         @index = index
         @rugged_repo = repo
+        @default_ref = Gollum::Git.default_ref_for_repo(@rugged_repo)
         @treemap = {}
       end
 
@@ -479,7 +492,7 @@ module Gollum
         @index
       end
 
-      def commit(message, parents = nil, actor = nil, last_tree = nil, head = 'refs/heads/master')
+      def commit(message, parents = nil, actor = nil, last_tree = nil, head = @default_ref)
         commit_options = {}
         head = "refs/heads/#{head}" unless head =~ /^refs\/heads\//
         parents = get_parents(parents, head) || []
@@ -597,7 +610,7 @@ module Gollum
         end
       end
 
-      def commits(start = 'refs/heads/master', max_count = 10, skip = 0)
+      def commits(start = Gollum::Git.default_ref_for_repo(@repo), max_count = 10, skip = 0)
         git.log(start, nil, :max_count => max_count, :skip => skip)
       end
 
@@ -615,10 +628,10 @@ 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 = {})
+      def log(commit = Gollum::Git.default_ref_for_repo(@repo), path = nil, options = {})
         git.log(commit, path, **options)
       end
 
@@ -648,6 +661,14 @@ module Gollum
           @repo.checkout(ref, :strategy => :force) unless @repo.bare?
         end
       end
+
+      # Find the first existing branch in an Array of branch names of the form ['main', ...] and return its String name.
+      def find_branch(search_list)
+       all_branches = @repo.branches.to_a.map {|b| b.name}
+        search_list.find do |branch_name|
+          all_branches.include?(branch_name)
+        end
+      end
     end
 
     class Tree

data/lib/rugged_adapter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gollum-rugged_adapter
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: 2.0.0
 platform: ruby
 authors:
 - Bart Kamphorst, Dawa Ometto
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-27 00:00:00.000000000 Z
+date: 2022-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Adapter for Gollum to use Rugged (libgit2) at the backend.