gitlab-gollum-rugged_adapter 0.4.4.2 → 0.4.4.3.gitlab.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 415639f73ca1446976691bb097576d53e077e1b7
-  data.tar.gz: 9fca45257ca9a9349a347bad320f1319d58ab994
+SHA256:
+  metadata.gz: 6b1303d0b8d7932f85d730fe280edff577c0d1dc3fe54699778e7db553a34dc3
+  data.tar.gz: c291c4ed819401f11eeddc7af37a332e7b429133f79fea6c4814ecbcbf43e108
 SHA512:
-  metadata.gz: 6ad11281e0d2166427d87cb343958021c6ee34aaf8a40a562c3f7c26cf9de0413b4aa178324c74b2f293937c55741c2933e1f97585cb8b845a8d7246494f731d
-  data.tar.gz: 29f6a3603a7fef2a6e8f813f4c39a5368c551c70e611914158326dbc3e0dba59200c82cd47eb62d08b4509defe1cb4f5b615da47a8cb46e023eb0be37c723396
+  metadata.gz: 8b33ca987b9006c581659b6ccf674c8819202de3b065bab35eee125b58a2d921894be1b7b391460caea74e7d488216fc5fed34945668c24ab1d149c00bec7734
+  data.tar.gz: 843bf6be50e90c77c5da6bd93d67ccd7671c73314cf58a0e0f400d32e645bcf497194fccde8cccec3ff1ef1bd1e196fbea9d7a38f1e018a306dbe369da8c5dd8

data/README.md

@@ -1,14 +1,19 @@
-[![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)
-[![Dependency Status](https://gemnasium.com/gollum/rugged_adapter.svg)](https://gemnasium.com/gollum/rugged_adapter)
+GitLab gollum rugged adapter
 
-## DESCRIPTION
+## This is a fork
+
+This is a GitLab fork
+
+[![Gem Version](https://badge.fury.io/rb/gitlab-gollum-rugged_adapter.svg)](http://badge.fury.io/rb/gitlab-gollum-rugged_adapter)
+[![pipeline status](https://gitlab.com/gitlab-org/gitlab-gollum-rugged_adapter/badges/master/pipeline.svg)](https://gitlab.com/gitlab-org/gitlab-gollum-rugged_adapter/-/commits/master)
+
+## 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.**
 
-## USAGE
+## Usage
 
 Install the gem:
 
@@ -22,7 +27,7 @@ Now run gollum as follows:
 gollum --adapter rugged
 ```
 
-## CONTRIBUTING
+## Contributing
 
 1. Start by cloning the repo [on GitHub](http://github.com/gollum/rugged_adapter).
 2. From inside the repo's directory, install the (development) dependencies with `bundle install`
@@ -39,6 +44,14 @@ gollum --adapter rugged
 1. Push the branch up to GitHub.
 1. Send a pull request to the gollum/rugged_adapter project.
 
-## RELEASING
+## Releasing a new GitLab fork version
 
 This gem uses [Semantic Versioning](http://semver.org/).
+
+1. Check the upstream gem at https://github.com/gollum/rugged_adapter and merge any needed changes.
+1. Bump version in `lib/rugged_adapter/version.rb`.
+   - Use the version of the upstream gem and add `.gitlab.$VERSION`, e.g. for the `1.0` version use `1.0.gitlab.1`.
+1. Run `bundle install` to make sure `Gemfile.lock` is up-to-date.
+1. Commit all changes.
+1. Tag release and publish gem with `rake release`.
+   - Use a personal work account for this.

data/lib/rugged_adapter.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'rugged_adapter/git_layer_rugged.rb'

data/lib/rugged_adapter/git_layer_rugged.rb

@@ -1,4 +1,4 @@
-# ~*~ encoding: utf-8 ~*~
+# frozen_string_literal: true
 
 require 'rugged'
 require 'ostruct'
@@ -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
@@ -93,8 +94,9 @@ module Gollum
 
     class Commit
 
-      def initialize(commit)
+      def initialize(commit, tracked_pathname = nil)
         @commit = commit
+        @tracked_pathname = tracked_pathname
       end
 
       def id
@@ -103,7 +105,7 @@ module Gollum
       alias_method :sha, :id
       alias_method :to_s, :id
 
-      attr_reader :commit
+      attr_reader :commit, :tracked_pathname
 
       def author
         @author ||= Gollum::Git::Actor.new(@commit.author[:name], @commit.author[:email])
@@ -125,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
@@ -135,12 +141,12 @@ module Gollum
         parent = @commit.parents.first
         diff = Rugged::Tree.diff(@commit.tree.repo, parent ? parent.tree : nil, @commit.tree)
         diff = diff.each_patch do |patch|
-          new_additions = patch.stat[1]
-          new_deletions = patch.stat[0]
+          new_additions = patch.additions
+          new_deletions = patch.deletions
           additions += new_additions
           deletions += new_deletions
           total += patch.changes
-          files << [patch.delta.new_file[:path].force_encoding("UTF-8"), new_deletions, new_additions, patch.changes] # Rugged seems to generate the stat diffs in the other direciton than grit does by default, so switch the order of additions and deletions.
+          files << [patch.delta.new_file[:path].force_encoding("UTF-8"), new_additions, new_deletions, patch.changes]
         end
         OpenStruct.new(:additions => additions, :deletions => deletions, :files => files, :id => id, :total => total)
       end
@@ -162,12 +168,14 @@ module Gollum
         ref = options[:ref] ? options[:ref] : "HEAD"
         tree = @repo.lookup(sha_from_ref(ref)).tree
         tree = @repo.lookup(tree[options[:path]][:oid]) if options[:path]
+        enc = options.fetch(:encoding, 'utf-8')
         results = []
         tree.walk_blobs(:postorder) do |root, entry|
           blob = @repo.lookup(entry[:oid])
           count = 0
-          blob.content.each_line do |line|
-            next unless line.force_encoding("UTF-8").match(/#{Regexp.escape(query)}/i)
+          next if blob.binary?
+          blob.content.force_encoding(enc).each_line do |line|
+            next unless line.match(/#{query}/i)
             count += 1
           end
           path = options[:path] ? ::File.join(options[:path], root, entry[:name]) : "#{root}#{entry[:name]}"
@@ -199,7 +207,7 @@ 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)
@@ -308,7 +316,7 @@ module Gollum
         !!(str =~ /^[0-9a-f]{40}$/)
       end
 
-      # Return an array of log commits, given an SHA hash and a hash of
+      # Return an array of log commits, given a SHA hash and a hash of
       # options. From Gitlab::Git
       def build_log(sha, options)
         # Instantiate a Walker and add the SHA hash
@@ -316,8 +324,10 @@ module Gollum
         walker.push(sha)
         commits = []
         skipped = 0
-        current_path = options[:path]
+        current_path = options[:path].dup if options[:path]
         current_path = nil if current_path == ''
+        renamed_path = current_path.nil? ? nil : current_path.dup
+        track_pathnames = true if current_path && options[:follow]
         limit = options[:limit].to_i
         offset = options[:offset].to_i
         skip_merges = options[:skip_merges]
@@ -329,13 +339,13 @@ module Gollum
                 # Skip merge commits
                 next if c.parents.length > 1
               end
-
-              if !current_path ||
-                commit_touches_path?(c, current_path, options[:follow], walker)
+              if !current_path || commit_touches_path?(c, current_path, options[:follow], walker)
                 # This is a commit we care about, unless we haven't skipped enough
                 # yet
                 skipped += 1
-                commits.push(Gollum::Git::Commit.new(c)) if skipped > offset
+
+                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
           end
         walker.reset
@@ -363,7 +373,7 @@ module Gollum
 
           # Only follow the first TREESAME parent for merge commits
           if num_treesame > 0
-            walker.hide(parent)
+            walker.hide(parent.oid)
             next
           end
 
@@ -388,12 +398,7 @@ module Gollum
         tmp_entry = nil
 
         pathname.each_filename do |dir|
-          tmp_entry = if tmp_entry.nil?
-                        commit.tree[dir]
-                      else
-                        @repo.lookup(tmp_entry[:oid])[dir]
-                      end
-
+          tmp_entry = tmp_entry ? @repo.lookup(tmp_entry[:oid])[dir] : commit.tree[dir]
           return nil unless tmp_entry
         end
         tmp_entry
@@ -479,9 +484,13 @@ module Gollum
       def read_tree(id)
         id = Gollum::Git::Git.new(@rugged_repo).ref_to_sha(id)
         return nil if id.nil?
-        current_tree = @rugged_repo.lookup(id)
-        current_tree = current_tree.tree unless current_tree.is_a?(Rugged::Tree)
-        @index.read_tree(current_tree)
+        begin
+          current_tree = @rugged_repo.lookup(id)
+          current_tree = current_tree.tree unless current_tree.is_a?(Rugged::Tree)
+          @index.read_tree(current_tree)
+        rescue
+          raise Gollum::Git::NoSuchShaFound
+        end
         @current_tree = Gollum::Git::Tree.new(current_tree)
       end
 
@@ -539,13 +548,7 @@ module Gollum
     class Repo
 
       def initialize(path, options)
-        begin
-          @repo = Rugged::Repository.new(path, options)
-        #rescue Grit::InvalidGitRepositoryError
-         # raise Gollum::InvalidGitRepositoryError
-        #rescue Grit::NoSuchPathError
-         # raise Gollum::NoSuchPathError
-        end
+        @repo = Rugged::Repository.new(path, **options)
       end
 
       def self.init(path)
@@ -571,7 +574,11 @@ module Gollum
       end
 
       def commit(id)
-        git.commit_from_ref(id)
+        begin
+          git.commit_from_ref(id)
+        rescue
+          raise Gollum::Git::NoSuchShaFound
+        end
       end
 
       def commits(start = 'refs/heads/master', max_count = 10, skip = 0)
@@ -579,7 +586,11 @@ module Gollum
       end
 
       def head
-        Gollum::Git::Ref.new(@repo.head)
+        begin
+          return Gollum::Git::Ref.new(@repo.head)
+        rescue Rugged::ReferenceError
+          return nil
+        end
       end
 
       def index
@@ -587,12 +598,8 @@ module Gollum
       end
 
       def diff(sha1, sha2, *paths)
-        opts = path == nil ? {} : {:path => path}
-        patches = @repo.diff(sha1, sha2, opts).patches
-        if not paths.empty?
-          patches.keep_if { |p| paths.include? p.delta.new_file[:path] }
-        end
-        patches.map  {|patch| OpenStruct.new(:diff => patch.to_s.split("\n")[2..-1].join("\n").force_encoding("UTF-8"))}.reverse # First remove two superfluous lines. Rugged seems to order the diffs differently than Grit, so reverse.
+        opts = paths.nil? ? {} : {:paths => paths}
+        @repo.diff(sha1, sha2, opts).patch
       end
 
       def log(commit = 'refs/heads/master', path = nil, options = {})

data/lib/rugged_adapter/version.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Gollum
   module Lib
     module Git
-    VERSION = '0.4.4.2'
+      VERSION = '0.4.4.3.gitlab.1'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-gollum-rugged_adapter
 version: !ruby/object:Gem::Version
-  version: 0.4.4.2
+  version: 0.4.4.3.gitlab.1
 platform: ruby
 authors:
 - Bart Kamphorst, Dawa Ometto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2020-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.25'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.25'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -59,14 +59,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - lib/rugged_adapter.rb
 - lib/rugged_adapter/git_layer_rugged.rb
 - lib/rugged_adapter/version.rb
-- rugged_adapter.gemspec
 homepage: https://gitlab.com/gitlab-org/gitlab-gollum-rugged_adapter
 licenses:
 - MIT
@@ -82,12 +79,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Adapter for Gollum to use Rugged (libgit2) at the backend.

data/Gemfile

@@ -1,9 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-gem 'rake', '~> 10.4.2'
-gem 'adapter_specs', git: 'https://github.com/gollum/adapter_specs.git'
-
-group :test do
-  gem "simplecov"
-end

data/Rakefile

@@ -1,126 +0,0 @@
-require 'rubygems'
- 
-task :default => :rspec
-
-require 'rspec/core/rake_task'
-
-def name
-  "rugged_adapter"
-end
-
-def version
-  line = File.read("lib/rugged_adapter/version.rb")[/^\s*VERSION\s*=\s*.*/]
-  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
-end
-
-# assumes x.y.z all digit version
-def next_version
-  # x.y.z
-  v = version.split '.'
-  # bump z
-  v[-1] = v[-1].to_i + 1
-  v.join '.'
-end
-
-def bump_version
-  old_file = File.read("lib/#{name}/version.rb")
-  old_version_line = old_file[/^\s*VERSION\s*=\s*.*/]
-  new_version = next_version
-  # replace first match of old version with new version
-  old_file.sub!(old_version_line, "    VERSION = '#{new_version}'")
-
-  File.write("lib/#{name}/version.rb", old_file)
-
-  new_version
-end
-
-def date
-  Date.today.to_s
-end
-
-def gemspec
-  "#{name}.gemspec"
-end
-
-def gem_file
-  "gollum-#{name}-#{version}.gem"
-end
-
-def replace_header(head, header_name)
-  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
-end
-
-desc "Run specs."
-RSpec::Core::RakeTask.new(:rspec) do |spec|
-  ruby_opts = "-w"
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rspec_opts = ['--backtrace --color']
-end
-
-desc "Update version number and gemspec"
-task :bump do
-  puts "Updated version to #{bump_version}"
-  # Execute does not invoke dependencies.
-  # Manually invoke gemspec then validate.
-  Rake::Task[:gemspec].execute
-  Rake::Task[:validate].execute
-end
-
-desc 'Create a release build'
-task :release => :build do
-  unless `git branch` =~ /^\* master$/
-    puts "You must be on the master branch to release!"
-    exit!
-  end
-  sh "git commit --allow-empty -a -m 'Release #{version}'"
-  sh "git pull --rebase origin master"
-  sh "git tag v#{version}"
-  sh "git push origin master"
-  sh "git push origin v#{version}"
-  sh "gem push pkg/#{gem_file}"
-end
-
-desc 'Publish to rubygems. Same as release'
-task :publish => :release
-
-desc 'Build gem'
-task :build => :gemspec do
-  sh "mkdir -p pkg"
-   sh "gem build #{gemspec}"
-   sh "mv #{gem_file} pkg"
-end
-
-desc 'Update gemspec'
-task :gemspec => :validate do
-  # read spec file and split out manifest section
-  spec = File.read(gemspec)
-  head, manifest, tail = spec.split("  # = MANIFEST =\n")
-
-  # replace name version and date
-  replace_header(head, :name)
-  replace_header(head, :date)
-
-  # determine file list from git ls-files
-  files = `git ls-files`.
-    split("\n").
-    sort.
-    reject { |file| file =~ /^\./ }.
-    reject { |file| file =~ /^(rdoc|pkg|spec|\.gitattributes|Guardfile)/ }.
-    map { |file| "    #{file}" }.
-    join("\n")
-
-  # piece file back together and write
-  manifest = "  s.files = %w(\n#{files}\n  )\n"
-  spec = [head, manifest, tail].join("  # = MANIFEST =\n")
-  File.open(gemspec, 'w') { |io| io.write(spec) }
-  puts "Updated #{gemspec}"
-end
-
-desc 'Validate lib files and version file'
-task :validate do
-  libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}"]
-  unless libfiles.empty?
-    puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir."
-    exit!
-  end
-end

data/rugged_adapter.gemspec

@@ -1,36 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "rugged_adapter/version"
-
-Gem::Specification.new do |s|
-  s.name        = "gitlab-gollum-rugged_adapter"
-  s.version     = Gollum::Lib::Git::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Bart Kamphorst, Dawa Ometto"]
-  s.email       = ["fjlopez@gitlab.com"]
-  s.homepage    = "https://gitlab.com/gitlab-org/gitlab-gollum-rugged_adapter"
-  s.summary     = %q{Adapter for Gollum to use Rugged (libgit2) at the backend.}
-  s.description = %q{Adapter for Gollum to use Rugged (libgit2) at the backend.}
-  s.license	= "MIT"
-
-  s.add_runtime_dependency 'rugged', '~> 0.25'
-  s.add_runtime_dependency 'mime-types', '>= 1.15'
-  s.add_development_dependency "rspec", "3.4.0"
-
-  s.files         = Dir['lib/**/*.rb'] + ["README.md", "Gemfile"]
-  s.require_paths = ["lib"]
-
-  # = MANIFEST =
-  s.files = %w(
-    Gemfile
-    LICENSE
-    README.md
-    Rakefile
-    lib/rugged_adapter.rb
-    lib/rugged_adapter/git_layer_rugged.rb
-    lib/rugged_adapter/version.rb
-    rugged_adapter.gemspec
-  )
-  # = MANIFEST =
-
-end