gitlab-gollum-lib 4.2.7.9 → 4.2.7.10.gitlab.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3740cc515ddd0fb237bd1601a56cc270c3006796d30dbbab427c98c63dd4768b
-  data.tar.gz: 9bb6911800778235cda3f750b9e453b75c9cbb0242da0b3e32ae060dbf205bb6
+  metadata.gz: 290dc5f811afde615e6e474cc94ce18ceda9894027a1398c903589838d6be1e9
+  data.tar.gz: 7cd7090ce4112e31c49257f41a7b7aa716c961d6c0dbe361e66b11cca70fa9da
 SHA512:
-  metadata.gz: 278c9c92777b62ba843772e352dc9cc49eb5c10c72227492e3118c58bcfcddd12715f54ffe392188f975edb06a743275b09e75cc51b86446fec0cd1b4004b7be
-  data.tar.gz: 655c25d15ed359668570a39b814a3ef4c1a7ba491eda6401af5bbe7c629f05b79d81ef2020cebb9fd929495b2b8ead8c67f7683cef1f91f28ad3bd36130ec442
+  metadata.gz: 0dc9f0e93e93ba8ce81db6cb055b32fc966d4f5ecb51da075a4e7049d9b5b625a71a0afe816e455c6253ea61d09367449ed3c98d025a3289ad1feb483d4daeaf
+  data.tar.gz: f11a51d68701ad24b04042fa2eb5a1eefa31bf49a1967597c32be0eccb68ed7562bbb69b880d8773a0062b023a061027d8b17aafe8c90051063039241ea3fb1c

data/CHANGELOG

@@ -0,0 +1,14 @@
+v4.2.7.10.gitlab.1
+  - Drop JRuby support
+  - Upgrade gitlab-gollum-rugged_adapter to support Rugged 1.x
+  - Don't expand filesystem paths (backport from https://github.com/gollum/gollum-lib/pull/385)
+
+v4.2.7.9
+  - Add adoc file support
+
+v4.2.7.8
+  - Use rugged adapter
+  - Don't sanitize page titles
+
+v1.1.0
+  - Removed pygments.rb dependency

data/README.md

@@ -1,10 +1,14 @@
-gollum lib -- A wiki built on top of Git [![build status](https://ci.gitlab.org/projects/7/status.png?ref=master)](https://ci.gitlab.org/projects/7?ref=master)
+gollum lib -- A wiki built on top of Git. 
+
 ========================================
 
 [![pipeline status](https://gitlab.com/gitlab-org/gollum-lib/badges/master/pipeline.svg)](https://gitlab.com/gitlab-org/gollum-lib/-/commits/master)
-[![Gem Version](https://badge.fury.io/rb/gollum-lib.svg)](http://badge.fury.io/rb/gollum-lib)
-[![Build Status](https://travis-ci.org/gollum/gollum-lib.svg?branch=master)](https://travis-ci.org/gollum/gollum-lib)
-[![Dependency Status](https://gemnasium.com/gollum/gollum-lib.svg)](https://gemnasium.com/gollum/gollum-lib)
+[![Gem Version](https://badge.fury.io/rb/gitlab-gollum-lib.svg)](http://badge.fury.io/rb/gitlab-gollum-lib)
+
+## This is a fork
+
+It is made for the GitLab application and used in the [Gitaly](https://gitlab.com/gitlab-org/gitaly) project.
+For use outside of GitLab, refer to the upstream [`gollum-lib`](https://github.com/gollum/gollum-lib) gem.
 
 ## DESCRIPTION
 
@@ -20,17 +24,17 @@ Gollum-lib follows the rules of [Semantic Versioning](http://semver.org/) and us
 
 ## SYSTEM REQUIREMENTS
 
-- Ruby 1.9.3+ (>2.0 recommended)
+- Ruby 2.4+
 - Unix like operating system (OS X, Ubuntu, Debian, and more)
-- By default the [Rugged adapter](https://gitlab.com/gitlab-org/gitlab-gollum-rugged_adapter) is used for MRI, and [RJGit](https://github.com/gollum/rjgit_adapter) for JRuby.
-- Will not work on Windows with the [grit](https://github.com/github/grit) adapter, but might work via JRuby (please let us know!)
+- By default the [Rugged adapter](https://gitlab.com/gitlab-org/gitlab-gollum-rugged_adapter) is used for MRI.
+- Will not work on Windows.
 
 ## INSTALLATION
 
 The best way to install Gollum-lib is with RubyGems:
 
 ```bash
-$ [sudo] gem install gollum-lib
+$ [sudo] gem install gitlab-gollum-lib
 ```
 
 If you're installing from source, you can use [Bundler][bundler] to pick up all the

data/Rakefile

@@ -51,11 +51,11 @@ def gemspec_file
 end
 
 def gemspecs
-  ["#{name}.gemspec", "#{name}_java.gemspec"]
+  ["#{name}.gemspec"]
 end
 
 def gem_files
-  ["#{name}-#{version}.gem", "#{name}-#{version}-java.gem"]
+  ["#{name}-#{version}.gem"]
 end
 
 def replace_header(head, header_name)
@@ -128,7 +128,6 @@ task :release => :build do
   sh "git push origin master"
   sh "git push origin v#{version}"
   sh "gem push pkg/#{name}-#{version}.gem"
-  sh "gem push pkg/#{name}-#{version}-java.gem"
 end
 
 desc 'Publish to rubygems. Same as release'

data/gemspec.rb

@@ -57,55 +57,54 @@ def specification(version, default_adapter, platform = nil)
     s.add_development_dependency 'rb-fsevent', '~> 0.9.4'
     s.add_development_dependency 'rb-fchange', '~> 0.0.6'
     s.add_development_dependency 'twitter_cldr', '~> 3.1.0'
-    # = MANIFEST =
-  s.files = %w(
-    Gemfile
-    HISTORY.md
-    LICENSE
-    README.md
-    Rakefile
-    docs/sanitization.md
-    gemspec.rb
-    gollum-lib.gemspec
-    gollum-lib_java.gemspec
-    lib/gollum-lib.rb
-    lib/gollum-lib/blob_entry.rb
-    lib/gollum-lib/committer.rb
-    lib/gollum-lib/file.rb
-    lib/gollum-lib/file_view.rb
-    lib/gollum-lib/filter.rb
-    lib/gollum-lib/filter/code.rb
-    lib/gollum-lib/filter/emoji.rb
-    lib/gollum-lib/filter/macro.rb
-    lib/gollum-lib/filter/metadata.rb
-    lib/gollum-lib/filter/plain_text.rb
-    lib/gollum-lib/filter/plantuml.rb
-    lib/gollum-lib/filter/remote_code.rb
-    lib/gollum-lib/filter/render.rb
-    lib/gollum-lib/filter/sanitize.rb
-    lib/gollum-lib/filter/tags.rb
-    lib/gollum-lib/filter/toc.rb
-    lib/gollum-lib/filter/wsd.rb
-    lib/gollum-lib/sorters/wiki_sorter.rb
-    lib/gollum-lib/git_access.rb
-    lib/gollum-lib/gitcode.rb
-    lib/gollum-lib/helpers.rb
-    lib/gollum-lib/hook.rb
-    lib/gollum-lib/macro.rb
-    lib/gollum-lib/macro/all_pages.rb
-    lib/gollum-lib/macro/global_toc.rb
-    lib/gollum-lib/macro/navigation.rb
-    lib/gollum-lib/macro/series.rb
-    lib/gollum-lib/markup.rb
-    lib/gollum-lib/markups.rb
-    lib/gollum-lib/page.rb
-    lib/gollum-lib/pagination.rb
-    lib/gollum-lib/sanitization.rb
-    lib/gollum-lib/version.rb
-    lib/gollum-lib/wiki.rb
-    licenses/licenses.txt
-  )
-  # = MANIFEST =
+
+    s.files = %w(
+      Gemfile
+      HISTORY.md
+      CHANGELOG
+      LICENSE
+      README.md
+      Rakefile
+      docs/sanitization.md
+      gemspec.rb
+      gollum-lib.gemspec
+      lib/gollum-lib.rb
+      lib/gollum-lib/blob_entry.rb
+      lib/gollum-lib/committer.rb
+      lib/gollum-lib/file.rb
+      lib/gollum-lib/file_view.rb
+      lib/gollum-lib/filter.rb
+      lib/gollum-lib/filter/code.rb
+      lib/gollum-lib/filter/emoji.rb
+      lib/gollum-lib/filter/macro.rb
+      lib/gollum-lib/filter/metadata.rb
+      lib/gollum-lib/filter/plain_text.rb
+      lib/gollum-lib/filter/plantuml.rb
+      lib/gollum-lib/filter/remote_code.rb
+      lib/gollum-lib/filter/render.rb
+      lib/gollum-lib/filter/sanitize.rb
+      lib/gollum-lib/filter/tags.rb
+      lib/gollum-lib/filter/toc.rb
+      lib/gollum-lib/filter/wsd.rb
+      lib/gollum-lib/sorters/wiki_sorter.rb
+      lib/gollum-lib/git_access.rb
+      lib/gollum-lib/gitcode.rb
+      lib/gollum-lib/helpers.rb
+      lib/gollum-lib/hook.rb
+      lib/gollum-lib/macro.rb
+      lib/gollum-lib/macro/all_pages.rb
+      lib/gollum-lib/macro/global_toc.rb
+      lib/gollum-lib/macro/navigation.rb
+      lib/gollum-lib/macro/series.rb
+      lib/gollum-lib/markup.rb
+      lib/gollum-lib/markups.rb
+      lib/gollum-lib/page.rb
+      lib/gollum-lib/pagination.rb
+      lib/gollum-lib/sanitization.rb
+      lib/gollum-lib/version.rb
+      lib/gollum-lib/wiki.rb
+      licenses/licenses.txt
+    )
 
     s.test_files = s.files.select { |path| path =~ /^test\/test_.*\.rb/ }
   end

data/gollum-lib.gemspec

@@ -1,10 +1,10 @@
 require File.join(File.dirname(__FILE__), 'gemspec.rb')
 require File.join(File.dirname(__FILE__), 'lib', 'gollum-lib', 'version.rb')
-  if RUBY_PLATFORM == 'java' then
-    default_adapter = ['gollum-rjgit_adapter', '~> 0.3']
-  elsif ENV['GOLLUM_ADAPTER'] == 'grit'
-    default_adapter = ['gollum-grit_adapter', '~> 1.0']
-  else
-    default_adapter = ['gitlab-gollum-rugged_adapter', '~> 0.4.4.2']
-  end
+
+if ENV['GOLLUM_ADAPTER'] == 'grit'
+  default_adapter = ['gollum-grit_adapter', '~> 1.0']
+else
+  default_adapter = ['gitlab-gollum-rugged_adapter', '~> 0.4.4.3.gitlab.1']
+end
+
 Gem::Specification.new &specification(Gollum::Lib::VERSION, default_adapter)

data/lib/gollum-lib.rb

@@ -5,13 +5,11 @@ require 'digest/sha1'
 require 'ostruct'
 require 'pathname'
 
-DEFAULT_ADAPTER = if RUBY_PLATFORM == 'java'
-  'rjgit_adapter'
-elsif ENV['GOLLUM_ADAPTER'] == 'grit'
-  'grit_adapter'
-else
-  'rugged_adapter'
-end
+DEFAULT_ADAPTER = if ENV['GOLLUM_ADAPTER'] == 'grit'
+                    'grit_adapter'
+                  else
+                    'rugged_adapter'
+                  end
 
 if defined?(Gollum::GIT_ADAPTER)
   require "#{Gollum::GIT_ADAPTER.downcase}_adapter"

data/lib/gollum-lib/blob_entry.rb

@@ -84,12 +84,22 @@ module Gollum
     # Returns a normalized String directory name, or nil if no directory
     # is given.
     def self.normalize_dir(dir)
-      return '' if dir =~ /^.:\/$/
-      if dir
-        dir = ::File.expand_path(dir, '/')
-        dir = dir[2..-1] if dir =~ /^[a-zA-Z]:\// # expand_path may add d:/ on windows
-        dir = '' if dir == '/'
-      end
+      return unless dir
+
+      dir = dir.dup
+
+      # Remove '.' and '..' path segments
+      dir.gsub!(%r{(\A|/)\.{1,2}(/|\z)}, '/')
+
+      # Remove repeated slashes
+      dir.gsub!(%r{//+}, '/')
+
+      # Remove Windows drive letters, trailing slashes, and keep one leading slash
+      dir.sub!(%r{\A([a-z]:)?/*(.*?)/*\z}i, '/\2')
+
+      # Return empty string for paths that point to the toplevel
+      return '' if dir == '/'
+
       dir
     end
   end

data/lib/gollum-lib/file.rb

@@ -113,7 +113,7 @@ module Gollum
       return false if commit.sha != @wiki.repo.head.commit.sha
 
       # This will try to resolve symbolic links, as well
-      pathname = Pathname.new(::File.expand_path(::File.join(@wiki.repo.path, '..', name)))
+      pathname = Pathname.new(::File.join(@wiki.repo.path, '..', BlobEntry.normalize_dir(name)))
       if pathname.symlink?
         source   = ::File.readlink(pathname.to_path)
         realpath = ::File.join(::File.dirname(pathname.to_path), source)

data/lib/gollum-lib/version.rb

@@ -1,5 +1,5 @@
 module Gollum
   module Lib
-    VERSION = '4.2.7.9'
+    VERSION = '4.2.7.10.gitlab.1'
   end
 end

data/lib/gollum-lib/wiki.rb

@@ -534,81 +534,6 @@ module Gollum
       multi_commit ? committer : committer.commit
     end
 
-    # Public: Applies a reverse diff for a given page.  If only 1 SHA is given,
-    # the reverse diff will be taken from its parent (^SHA...SHA).  If two SHAs
-    # are given, the reverse diff is taken from SHA1...SHA2.
-    #
-    # page   - The Gollum::Page to delete.
-    # sha1   - String SHA1 of the earlier parent if two SHAs are given,
-    #          or the child.
-    # sha2   - Optional String SHA1 of the child.
-    # commit - The commit Hash details:
-    #          :message - The String commit message.
-    #          :name    - The String author full name.
-    #          :email   - The String email address.
-    #          :parent  - Optional Gollum::Git::Commit parent to this update.
-    #
-    # Returns a String SHA1 of the new commit, or nil if the reverse diff does
-    # not apply.
-    def revert_page(page, sha1, sha2 = nil, commit = {})
-      if sha2.is_a?(Hash)
-        commit = sha2
-        sha2   = nil
-      end
-
-      patch     = full_reverse_diff_for(page, sha1, sha2)
-      committer = Committer.new(self, commit)
-      parent    = committer.parents[0]
-      committer.options[:tree] = @repo.git.apply_patch(parent.sha, patch)
-      return false unless committer.options[:tree]
-      committer.after_commit do |index, _sha|
-        @access.refresh
-
-        files = []
-        if page
-          files << [page.path, page.filename_stripped, page.format]
-        else
-          # Grit::Diff can't parse reverse diffs.... yet
-          patch.each_line do |line|
-            if line =~ %r(^diff --git b/.+? a/(.+)$)
-              path = Regexp.last_match[1]
-              ext  = ::File.extname(path)
-              name = ::File.basename(path, ext)
-              if (format = ::Gollum::Page.format_for(ext))
-                files << [path, name, format]
-              end
-            end
-          end
-        end
-
-        files.each do |(path, name, format)|
-          dir = ::File.dirname(path)
-          dir = '' if dir == '.'
-          index.update_working_dir(dir, name, format)
-        end
-      end
-
-      committer.commit
-    end
-
-    # Public: Applies a reverse diff to the repo.  If only 1 SHA is given,
-    # the reverse diff will be taken from its parent (^SHA...SHA).  If two SHAs
-    # are given, the reverse diff is taken from SHA1...SHA2.
-    #
-    # sha1   - String SHA1 of the earlier parent if two SHAs are given,
-    #          or the child.
-    # sha2   - Optional String SHA1 of the child.
-    # commit - The commit Hash details:
-    #          :message - The String commit message.
-    #          :name    - The String author full name.
-    #          :email   - The String email address.
-    #
-    # Returns a String SHA1 of the new commit, or nil if the reverse diff does
-    # not apply.
-    def revert_commit(sha1, sha2 = nil, commit = {})
-      revert_page(nil, sha1, sha2, commit)
-    end
-
     # Public: Lists all pages for this wiki.
     #
     # treeish - The String commit ID or ref to find  (default:  @ref)
@@ -905,34 +830,6 @@ module Gollum
       end
     end
 
-    # Creates a reverse diff for the given SHAs on the given Gollum::Page.
-    #
-    # page   - The Gollum::Page to scope the patch to, or a String Path.
-    # sha1   - String SHA1 of the earlier parent if two SHAs are given,
-    #          or the child.
-    # sha2   - Optional String SHA1 of the child.
-    #
-    # Returns a String of the reverse Diff to apply.
-    def full_reverse_diff_for(page, sha1, sha2 = nil)
-      sha1, sha2 = "#{sha1}^", sha1 if sha2.nil?
-      if page
-        path = (page.respond_to?(:path) ? page.path : page.to_s)
-        return repo.diff(sha2, sha1, path).first.diff
-      end
-      repo.diff(sha2, sha1).map { |d| d.diff }.join("\n")
-    end
-
-    # Creates a reverse diff for the given SHAs.
-    #
-    # sha1   - String SHA1 of the earlier parent if two SHAs are given,
-    #          or the child.
-    # sha2   - Optional String SHA1 of the child.
-    #
-    # Returns a String of the reverse Diff to apply.
-    def full_reverse_diff(sha1, sha2 = nil)
-      full_reverse_diff_for(nil, sha1, sha2)
-    end
-
     # Gets the default name for commits.
     #
     # Returns the String name.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-gollum-lib
 version: !ruby/object:Gem::Version
-  version: 4.2.7.9
+  version: 4.2.7.10.gitlab.1
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab-gollum-rugged_adapter
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.4.2
+        version: 0.4.4.3.gitlab.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.4.2
+        version: 0.4.4.3.gitlab.1
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
@@ -375,6 +375,7 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
+- CHANGELOG
 - Gemfile
 - HISTORY.md
 - LICENSE
@@ -383,7 +384,6 @@ files:
 - docs/sanitization.md
 - gemspec.rb
 - gollum-lib.gemspec
-- gollum-lib_java.gemspec
 - lib/gollum-lib.rb
 - lib/gollum-lib/blob_entry.rb
 - lib/gollum-lib/committer.rb
@@ -436,11 +436,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 2
 summary: A simple, Git-powered wiki.

data/gollum-lib_java.gemspec

@@ -1,4 +0,0 @@
-require File.join(File.dirname(__FILE__), 'gemspec.rb')
-require File.join(File.dirname(__FILE__), 'lib', 'gollum-lib', 'version.rb')
-default_adapter = ['gollum-rjgit_adapter', '~> 0.3']
-Gem::Specification.new &specification(Gollum::Lib::VERSION, default_adapter, "java")