gitlab-gollum-lib 4.2.7.7 → 4.2.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3ad328bee9b70bba0418001e4a5503610a1a26d8
-  data.tar.gz: dd9b959261b0ec13b647941b3dd5df90f087913c
+SHA256:
+  metadata.gz: d3638f39cb5c30df11d89f6f49bc068a4bf9b730f665dd919118cc5c5b8ac140
+  data.tar.gz: 7c988399cbe9d428aa48bb7e665d35b260ce6aae362eddb6b799b262ea37ba8b
 SHA512:
-  metadata.gz: bd82f0009c1df043add484a9cdebdda584fde1bde3d5a548c5fc34e1a78ef7ad43fd3b3048878c07f477dce973d39c43b937e31541fcaaf0691d209e01f06298
-  data.tar.gz: 2b257ac9b7d4929cf64220131e7e35f73f3197a8cbb169b575e2e59fa58963807979ed5bd2b89906663cb10b8758662d2fd3eb74ac1fea7f762c142431568067
+  metadata.gz: afcc6138b7587b2b690c9316678f06447536ade1ff03f05d12fdbd1def2a23272fa834664004ecd10c0716700b9f31c88db097eabd9e7bda1f0d3f05ddcbfdaf
+  data.tar.gz: 7e2e37d9b457d12ff35d92f6798abd56496d95a469906646ce2e3c16b7fd5c2c9f905d919520705be07a0ee72dba219a3eaeb094ca4ad28982df742c34969309

data/README.md

@@ -1,6 +1,7 @@
 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)
 ========================================
 
+[![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)
@@ -21,7 +22,8 @@ Gollum-lib follows the rules of [Semantic Versioning](http://semver.org/) and us
 
 - Ruby 1.9.3+ (>2.0 recommended)
 - Unix like operating system (OS X, Ubuntu, Debian, and more)
-- Will not work on Windows with the default [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, 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!)
 
 ## INSTALLATION
 

data/gemspec.rb

@@ -39,7 +39,9 @@ def specification(version, default_adapter, platform = nil)
     s.add_development_dependency 'RedCloth', '~> 4.2.9'
     s.add_development_dependency 'mocha', '~> 1.1.0'
     s.add_development_dependency 'shoulda', '~> 3.5.0'
-    s.add_development_dependency 'wikicloth', '~> 0.8.3'
+    # 0.8.2 is incompatible with the latest twitter-text gem, this is fixed in master
+    # https://github.com/nricciar/wikicloth/commit/60e863239452924ea60c91ba1fe07d37f1e13801
+    s.add_development_dependency 'wikicloth', '0.8.1'
     s.add_development_dependency 'rake', '~> 10.4.0'
     s.add_development_dependency 'pry', '~> 0.10.1'
     # required by pry

data/gollum-lib.gemspec

@@ -2,7 +2,9 @@ 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']
-  else
+  elsif ENV['GOLLUM_ADAPTER'] == 'grit'
     default_adapter = ['gollum-grit_adapter', '~> 1.0']
+  else
+    default_adapter = ['gitlab-gollum-rugged_adapter', '~> 0.4.4.2']
   end
 Gem::Specification.new &specification(Gollum::Lib::VERSION, default_adapter)

data/lib/gollum-lib.rb

@@ -5,7 +5,13 @@ require 'digest/sha1'
 require 'ostruct'
 require 'pathname'
 
-DEFAULT_ADAPTER = RUBY_PLATFORM == 'java' ? 'rjgit_adapter' : 'grit_adapter'
+DEFAULT_ADAPTER = if RUBY_PLATFORM == 'java'
+  'rjgit_adapter'
+elsif 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/page.rb

@@ -115,14 +115,7 @@ module Gollum
       self.class.canonicalize_filename(filename)
     end
 
-    # Public: The title will be constructed from the
-    # filename by stripping the extension and replacing any dashes with
-    # spaces.
-    #
-    # Returns the fully sanitized String title.
-    def title
-      Sanitize.clean(name).strip
-    end
+    alias_method :title, :name
 
     # Public: Determines if this is a sub-page
     # Sub-pages have filenames beginning with an underscore

data/lib/gollum-lib/version.rb

@@ -1,5 +1,5 @@
 module Gollum
   module Lib
-    VERSION = '4.2.7.7'
+    VERSION = '4.2.7.8'
   end
 end

data/lib/gollum-lib/wiki.rb

@@ -345,13 +345,11 @@ module Gollum
       multi_commit = !!commit[:committer]
       committer    = multi_commit ? commit[:committer] : Committer.new(self, commit)
 
-      filename = Gollum::Page.cname(sanitized_name)
-
-      committer.add_to_index(sanitized_dir, filename, format, data)
+      committer.add_to_index(sanitized_dir, sanitized_name, format, data)
 
       committer.after_commit do |index, _sha|
         @access.refresh
-        index.update_working_dir(sanitized_dir, filename, format)
+        index.update_working_dir(sanitized_dir, sanitized_name, format)
       end
 
       multi_commit ? committer : committer.commit
@@ -444,7 +442,7 @@ module Gollum
       format ||= page.format
       dir      = ::File.dirname(page.path)
       dir      = '' if dir == '.'
-      filename = (rename = page.name != name) ? Gollum::Page.cname(name) : page.filename_stripped
+      filename = (rename = page.name != name) ? name.gsub(' ', '-') : page.filename_stripped
 
       multi_commit = !!commit[:committer]
       committer    = multi_commit ? commit[:committer] : Committer.new(self, commit)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-gollum-lib
 version: !ruby/object:Gem::Version
-  version: 4.2.7.7
+  version: 4.2.7.8
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2020-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: gollum-grit_adapter
+  name: gitlab-gollum-rugged_adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.4.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.4.4.2
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
@@ -189,16 +189,16 @@ dependencies:
   name: wikicloth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -440,8 +440,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 2
 summary: A simple, Git-powered wiki.