gollum-rugged_adapter 2.0.0 → 3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff65dc7719f5202705485b44d61a70c6a46451393aeeb7243c820c468da85e69
-  data.tar.gz: 336e98811d5cb8c19638f6dd8a85d1c5f17d772f2828cea3230ba109e5aaf695
+  metadata.gz: 5a7a4dc762df0ff1cb91195f8be624c1516945b5ed1d37271aa9791b609158cf
+  data.tar.gz: e167a14946f31bd07d751ae9dfb7bd5bf210beebb0cc69bf27d2179694c407bf
 SHA512:
-  metadata.gz: 67f5126eea74217c669854445059f74b7363e3473950b7cf34632b8652f61ad9b0efff8a2fa5ad9e05ee66c6a09144139a8a56d0e3b44b2f1511948cd11508ba
-  data.tar.gz: ab629d342c8346f067b485450a9d898c9238bdff88d60c96c4dab900da01757d4db0bded4f3fdb28522073e5f340757de6d92320d0a26cac71728d9c98d8c2c1
+  metadata.gz: c32be19c86ab9f0480ebf4786fcefa8ccf6b83af86a02127feaa130595203bc616ec08980bf8ea77d91d948300e2021942b5777cb5b4b627f00a51eb932d18f7
+  data.tar.gz: 737583e56222388d0a4657190636c2d37fb6a42ee2caa147c45b743949e27ebf45468671f9f99cd611360efb1624dcc883630248105619b8498ca83386e3ebff

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,9 +87,10 @@ 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}"
+  sh "git tag v#{version} -m 'Release v#{version}'"
   sh "git push origin master"
   sh "git push origin v#{version}"
   sh "gem push pkg/#{gem_file}"
@@ -123,4 +139,44 @@ task :validate do
     puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir."
     exit!
   end
-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

@@ -143,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
@@ -638,11 +654,7 @@ module Gollum
       def lstree(sha, options = {})
         results = []
         @repo.lookup(sha).tree.walk(:postorder) do |root, entry|
-          entry[:sha] = entry[:oid]
-          entry[:mode] = entry[:filemode].to_s(8)
-          entry[:type] = entry[:type].to_s
-          entry[:path] = "#{root}#{entry[:name]}"
-          results << entry
+          results << ::Gollum::Git::Tree.tree_entry_from_rugged_hash(entry, root)
         end
         results
       end
@@ -673,6 +685,16 @@ module Gollum
 
     class Tree
 
+      def self.tree_entry_from_rugged_hash(entry, root = '')
+        {
+          sha:  entry[:oid],
+          mode: entry[:filemode],
+          type: entry[:type].to_s,
+          name: entry[:name],
+          path: "#{root}#{entry[:name]}"
+        }
+      end
+
       def initialize(tree)
         @tree = tree
       end
@@ -703,10 +725,22 @@ module Gollum
 
       def blobs
         blobs = []
-        @tree.each_blob {|blob| blobs << Gollum::Git::Blob.new(@tree.owner.lookup(blob[:oid]), blob) }
+        @tree.each_blob {|blob| blobs << blob_for_tree_entry(blob) }
         blobs
       end
 
+      def find_blob(&block)
+        return nil unless block_given?
+        blob = @tree.each_blob.find {|blob| yield blob[:name] }
+        blob ? blob_for_tree_entry(blob) : nil
+      end
+
+      private
+
+      def blob_for_tree_entry(blob)
+        Gollum::Git::Blob.new(@tree.owner.lookup(blob[:oid]), self.class.tree_entry_from_rugged_hash(blob))
+      end
+      
     end
 
   end

data/lib/rugged_adapter/version.rb

@@ -1,7 +1,7 @@
 module Gollum
   module Lib
     module Git
-      VERSION = '2.0.0'
+      VERSION = '3.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: 2.0.0
+  version: '3.0'
 platform: ruby
 authors:
 - Bart Kamphorst, Dawa Ometto
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-07 00:00:00.000000000 Z
+date: 2023-05-24 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.2.3
 signing_key:
 specification_version: 4
 summary: Adapter for Gollum to use Rugged (libgit2) at the backend.