gollum-rugged_adapter 1.1.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b4b572fd56e0608c76ab7b3536ed18a54211571ded4f37dbfe77e296df17bfe
-  data.tar.gz: e3f2ab7a9ae0ebe06eaa1983426a9f89f78796e8535cb6373d21499d45914c72
+  metadata.gz: 18259a2992e32502c42836d608a0339a0e0f4e5555aca0a36cba02cc2894ffd5
+  data.tar.gz: a0f13307e539bfd3cddc2053fc569ac334feec99b86c58ce592569001632be05
 SHA512:
-  metadata.gz: 4c481c8741c577b5cf0e0af292745c04fea0a32d96f89ed77ddb54db726c510517e35e134ca80ab3ddba8966618814fb1590c590c89e2f453fdab2447a62acba
-  data.tar.gz: 8b7cbcc97c857862a2e60ddb9beb7f625d5eb184ca7800189d95400cbe38400511075083f0dbd50bef91bbe21c9f38f1ba1599675d83dbb31fe5e72d2b903545
+  metadata.gz: 5e09da620ba3f9cfdecdb85b00e68fef221209896d9a12a297f6d7e956e9d12bdf719ba88a1b2a2375f03ce1b291956fbf0f76e24f656706eaaaeec5f0bae34a
+  data.tar.gz: f8b75d0f80ed360fc6bd14a1e0eb2d9c2e258b0b83460caf73cc0ee039a2c7077b2be3c0919182f6c2ded4ccd105b33262943764aa7d953b5bcb9113d64f8f61

data/README.md

@@ -1,6 +1,6 @@
-[![Gem Version](https://badge.fury.io/rb/gollum-rugged_adapter.svg)](http://badge.fury.io/rb/gollum-rugged_adapter)
+[![Gem Version](https://badge.fury.io/rb/gollum-rugged_adapter.svg)](https://badge.fury.io/rb/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)
+[![Cutting Edge Dependency Status](https://cuttingedge.onrender.com/github/gollum/rugged_adapter/svg 'Cutting Edge Dependency Status')](https://cuttingedge.onrender.com/github/gollum/rugged_adapter/info)
 
 ## DESCRIPTION
 

data/Rakefile

@@ -1,4 +1,7 @@
 require 'rubygems'
+require 'rake'
+require 'date'
+require 'tempfile'
  
 task :default => :rspec
 
@@ -8,6 +11,18 @@ def name
   "rugged_adapter"
 end
 
+def date
+  Time.now.strftime("%Y-%m-%d")
+end
+
+def latest_changes_file
+  'LATEST_CHANGES.md'
+end
+
+def history_file
+  'HISTORY.md'
+end
+
 def version
   line = File.read("lib/rugged_adapter/version.rb")[/^\s*VERSION\s*=\s*.*/]
   line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
@@ -72,6 +87,7 @@ task :release => :build do
     puts "You must be on the master branch to release!"
     exit!
   end
+  Rake::Task[:changelog].execute
   sh "git commit --allow-empty -a -m 'Release #{version}'"
   sh "git pull --rebase origin master"
   sh "git tag v#{version}"
@@ -123,4 +139,44 @@ task :validate do
     puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir."
     exit!
   end
+end
+
+desc 'Build changlog'
+task :changelog do
+  [latest_changes_file, history_file].each do |f|
+    unless File.exist?(f)
+      puts "#{f} does not exist but is required to build a new release."
+      exit!
+    end
+  end
+  
+  latest_changes = File.open(latest_changes_file)
+  version_pattern = "# #{version}"
+  
+  if !`grep "#{version_pattern}" #{history_file}`.empty?
+    puts "#{version} is already described in #{history_file}"
+    exit!
+  end
+
+  begin
+    unless latest_changes.readline.chomp! =~ %r{#{version_pattern}}
+      puts "#{latest_changes_file} should begin with '#{version_pattern}'"
+      exit!
+    end
+  rescue EOFError
+    puts "#{latest_changes_file} is empty!"
+    exit!
+  end
+  
+  body = latest_changes.read
+  body.scan(/\s*#\s+\d\.\d.*/) do |match|
+    puts "#{latest_changes_file} may not contain multiple markdown headers!"
+    exit!
+  end
+  
+  temp = Tempfile.new
+  temp.puts("#{version_pattern} / #{date}\n#{body}\n\n")
+  temp.close
+  `cat #{history_file} >> #{temp.path}`
+  `cat #{temp.path} > #{history_file}`
 end

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
@@ -131,6 +143,22 @@ module Gollum
         @commit.parents.empty? ? nil : Gollum::Git::Commit.new(@commit.parents.first)
       end
 
+      def note(ref='refs/notes/commits')
+        result = @commit.notes(ref)
+        result ? result[:message] : nil
+      end
+
+      def note=(msg, actor = nil, ref='refs/notes/commits')
+        actor = Gollum::Git::Actor.default_actor if actor.nil?
+        @commit.create_note(
+            author: actor.to_h,
+            committer: actor.to_h,
+            message: msg,
+            ref: ref,
+            force: true
+        )
+      end
+
       private
 
       def build_stats
@@ -168,7 +196,7 @@ module Gollum
       end
 
       def exist?
-        ::File.exists?(@repo.path)
+        ::File.exist?(@repo.path)
       end
 
       def grep(search_terms, options={}, &block)
@@ -239,7 +267,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 +293,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 +487,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 +508,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 +626,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
 
@@ -618,7 +647,7 @@ module Gollum
         @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 +677,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.2'
+      VERSION = '2.1.0'
     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', '~> 1.1.0'
-  s.add_runtime_dependency 'mime-types', '~> 1.15'
+  s.add_runtime_dependency 'rugged', '~> 1.5'
+  s.add_runtime_dependency 'mime-types', '~> 3.4'
   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: 1.1.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Bart Kamphorst, Dawa Ometto
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-22 00:00:00.000000000 Z
+date: 2023-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Adapter for Gollum to use Rugged (libgit2) at the backend.