gollum-lib 5.0.4 → 5.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e49c63e5f17326f8cd276fef19bfc1b789a6ea1eb84ab34254c437041f082965
-  data.tar.gz: 32c68ea6732fa95cce77de649ffe63af6a36783445c92151aabd7aaec8cd4ceb
+  metadata.gz: ccf06509c7be7d9ce30fec5185caf8160752806c978c4a9442a8a1761d6d9a86
+  data.tar.gz: e6caac594ae4a468637d2b7655cff942241315abbac3adfac1fc3992abb329d2
 SHA512:
-  metadata.gz: 84a069e897db4f494c01d7acf82c5818c29de323f7ba70c1824a9554be1521e94038836c889f27e3b04ea014c04c6916970f7a1a454c3793adfa14442b394bd9
-  data.tar.gz: 13818f84f30dd46bb983602e163e5a2ea1eeaa21bff10b4a835bfbbb014c200ccca4c84cbb24354d77ab015b50979d339c5ad4bc1496b9b57bedc2577325e71d
+  metadata.gz: eb43a84550c6be9cd60716ea97cf3f67f5c18b3e0f4ca59bda95dc639bef80285fc9d6eb5c376aedcdf7592a4c4c5a12df6a1345e9c4f2290960fefb9fffa3d0
+  data.tar.gz: 2dc8f219900b705c78dffa7226fd713d15fd4a8778c2eaa4145ea3a087e21365b878b3b933e4845b038aeafd52f3ba5b79b445907d68b7be1fdf746d3ff95f7d

data/HISTORY.md

@@ -1,6 +1,10 @@
+# v5.1.2
+
+* SECURITY UPDATE: sanitize HTML generated by Macros.
+
 # v5.0.1
 
-Bugfix release: fix emoji when using base path. Thanks to @heavywatal.
+* Bugfix release: fix emoji when using base path. Thanks to @heavywatal.
 
 # v5.0
 

data/README.md

@@ -3,7 +3,7 @@ gollum lib -- A wiki built on top of Git
 
 [![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)
+[![Cutting Edge Dependency Status](https://dometto-cuttingedge.herokuapp.com/github/gollum/gollum-lib/svg 'Cutting Edge Dependency Status')](https://dometto-cuttingedge.herokuapp.com/github/gollum/gollum-lib/info)
 
 ## DESCRIPTION
 
@@ -91,7 +91,7 @@ Note that `base_path` just modifies the links.
 Get the latest version of the given human or canonical page name:
 
 ```ruby
-page = wiki.page('/page name') # Finds pages in the root directory of the wiki that are named 'page name' with a valid extension. 
+page = wiki.page('/page name') # Finds pages in the root directory of the wiki that are named 'page name' with a valid extension.
 # => <Gollum::Page>
 
 page = wiki.page('page name') # For convenience, you can leave out the '/' in front. Paths are assumed to be relative to '/'.
@@ -217,6 +217,21 @@ end
 Gollum::Hook.unregister(:post_commit, :hook_id)
 ```
 
+Register or unregister a hook to be called after the wiki is initialized:
+
+```ruby
+Gollum::Hook.register(:post_wiki_initialize, :hook_id) do |wiki|
+  # Your code here
+end
+
+Gollum::Hook.unregister(:post_wiki_initialize, :hook_id)
+```
+
+A combination of both hooks can be used to pull from a remote after
+`:post_wiki_initialize` and push to a remote after `:post_commit` which in
+effect keeps the remote in sync both ways. Keep in mind that it may not be
+possible to resolve all conflicts automatically.
+
 ## WINDOWS FILENAME VALIDATION
 
 Note that filenames on windows must not contain any of the following characters `\ / : * ? " < > |`. See [this support article](http://support.microsoft.com/kb/177506) for details.

data/Rakefile

@@ -75,6 +75,7 @@ Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test' << '.'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
+  test.warning = false
 end
 
 desc "Generate RCov test coverage and open in your browser"

data/gemspec.rb

@@ -8,7 +8,7 @@ def specification(version, default_adapter, platform = nil)
     s.name              = 'gollum-lib'
     s.version           = version
     s.platform          = platform if platform
-    s.date              = '2020-04-29'
+    s.date              = '2021-07-10'
     s.date              = '2017-04-13'
     s.rubyforge_project = 'gollum-lib'
     s.license           = 'MIT'
@@ -29,36 +29,33 @@ def specification(version, default_adapter, platform = nil)
     s.add_dependency 'rouge', '~> 3.1'
     s.add_dependency 'nokogiri', '~> 1.8'
     s.add_dependency 'loofah', '~> 2.3'
-    s.add_dependency 'github-markup', '~> 3.0'
+    s.add_dependency 'github-markup', '~> 4.0'
     s.add_dependency 'gemojione', '~> 4.1'
-    s.add_dependency 'octicons', '~> 8.5'
+    s.add_dependency 'octicons', '~> 12.0'
     s.add_dependency 'twitter-text', '1.14.7'
 
     s.add_development_dependency 'org-ruby', '~> 0.9.9'
-    s.add_development_dependency 'kramdown', '~> 2.1.0'
+    s.add_development_dependency 'kramdown', '~> 2.3.0'
     s.add_development_dependency 'kramdown-parser-gfm', '~> 1.1.0'
     s.add_development_dependency 'RedCloth', '~> 4.2.9'
-    s.add_development_dependency 'mocha', '~> 1.2.0'
-    s.add_development_dependency 'shoulda', '~> 3.5.0'
+    s.add_development_dependency 'mocha', '~> 1.11'
+    s.add_development_dependency 'shoulda', '~> 4.0'
     s.add_development_dependency 'wikicloth', '~> 0.8.3'
-    s.add_development_dependency 'bibtex-ruby', '~> 4.3'
+    s.add_development_dependency 'bibtex-ruby', '~> 6.0'
     s.add_development_dependency 'citeproc-ruby', '~> 1.1'
     s.add_development_dependency 'unicode_utils', '~> 1.4.0' # required by citeproc-ruby on ruby < 2.4
-    s.add_development_dependency 'rake', '~> 12.3', '>= 12.3.3'
-    s.add_development_dependency 'pry', '~> 0.10.1'
+    s.add_development_dependency 'rake', '~> 13.0'
+    s.add_development_dependency 'pry', '~> 0.13'
     # required by pry
     s.add_development_dependency 'rb-readline', '~> 0.5.1'
     # updating minitest-reporters requires a new minitest which fails with gollum's tests.
-    s.add_development_dependency 'test-unit', '~> 3.1.5'
+    s.add_development_dependency 'test-unit', '~> 3.3'
     s.add_development_dependency 'minitest-reporters', '~> 1.4'
     s.add_development_dependency 'nokogiri-diff', '~> 0.2.0'
-    # required by guard
-    s.add_development_dependency 'guard', '~> 2.8.2'
-    s.add_development_dependency 'guard-minitest', '~> 2.3.2'
-    s.add_development_dependency 'rb-inotify', '~> 0.9.3'
-    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'
+    s.add_development_dependency 'guard', '~> 2.16'
+    s.add_development_dependency 'guard-minitest', '~> 2.4'
+    s.add_development_dependency 'twitter_cldr', '~> 6.4'
+    
     # = MANIFEST =
   s.files = %w(
     Gemfile

data/lib/gollum-lib/blob_entry.rb

@@ -78,12 +78,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

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

data/lib/gollum-lib/filter/macro.rb

@@ -55,6 +55,6 @@ class Gollum::Filter::Macro < Gollum::Filter
       end
     end
 
-    data
+    sanitize(data)
   end
 end

data/lib/gollum-lib/filter/pandoc_bib.rb

@@ -14,16 +14,15 @@ class Gollum::Filter::PandocBib < Gollum::Filter
 
   def extract(data)
     return data unless supported_format? && bibliography_metadata_present?
-    bib_metadata = {}
-    bib_metadata.merge!(@markup.metadata.select {|key, _value| BIB_KEYS.include?(key)})
+    @bib_metadata.select! {|key, _value| BIB_KEYS.include?(key)}
 
     BIB_PATH_KEYS.each do |bibliography_key|
       if path = @markup.metadata[bibliography_key]
         next unless file = @markup.wiki.file(path)
-        bib_metadata[bibliography_key] = path_for_bibfile(file)
+        @bib_metadata[bibliography_key] = path_for_bibfile(file)
       end
     end
-    bib_metadata.empty? ? data : "#{bib_metadata.to_yaml}---\n#{data}"
+    @bib_metadata.empty? ? data : "#{@bib_metadata.to_yaml}---\n#{data}"
   end
 
   private
@@ -47,6 +46,8 @@ class Gollum::Filter::PandocBib < Gollum::Filter
   end
 
   def bibliography_metadata_present?
-     @markup.metadata && @markup.metadata.keys.any? {|key| ALL_BIB_KEYS.include?(key)}
+      return false unless @markup.metadata
+      @bib_metadata = @markup.wiki.metadata.merge(@markup.metadata)
+      @bib_metadata.keys.any? {|key| ALL_BIB_KEYS.include?(key)}
   end
 end

data/lib/gollum-lib/filter/tags.rb

@@ -230,6 +230,7 @@ class Gollum::Filter::Tags < Gollum::Filter
     else
       name = page ? path_to_link_text(link) : link
     end
+
     link = page ? page.escaped_url_path : ERB::Util.url_encode(link).force_encoding('utf-8')
     generate_link(link, name, extra, presence)
   end

data/lib/gollum-lib/filter/toc.rb

@@ -1,5 +1,8 @@
 # Inserts header anchors and creates TOC
 class Gollum::Filter::TOC < Gollum::Filter
+
+  HEADERS = (1..6).to_a
+
   def extract(data)
     data
   end
@@ -10,12 +13,15 @@ class Gollum::Filter::TOC < Gollum::Filter
     @toc_doc           = nil
     @anchor_names      = {}
     @current_ancestors = []
-
+    @headers_levels    = {}
     toc_str            = ''
     if @markup.sub_page && @markup.parent_page
       toc_str = @markup.parent_page.toc_data
     else
-      @doc.css('h1,h2,h3,h4,h5,h6').each_with_index do |header, i|
+      @headers = @doc.css(headers_selector)
+      get_toc_levels()
+
+      @headers.each_with_index do |header, i|
         next if header.content.empty?
         # omit the first H1 (the page title) from the TOC if so configured
         next if (i == 0 && header.name =~ /[Hh]1/) && @markup.wiki && @markup.wiki.h1_title
@@ -59,6 +65,39 @@ class Gollum::Filter::TOC < Gollum::Filter
 
   private
 
+  def headers_selector
+    HEADERS.map { |n| make_header_tag(n) } .join(',')
+  end
+
+  def get_header_level(header)
+    header.name.match(/[Hh]([1-6])/)[1].to_i
+  end
+
+  # Find level as it should be viewed in TOC for each header
+  # and save hash to @header_levels
+  def get_toc_levels
+    stack = []
+
+    @headers.each do |header|
+      cur_level = get_header_level(header)
+
+      loop do
+        prev_level = stack[-1]
+        break if prev_level.nil? || prev_level < cur_level
+        stack.pop
+      end
+
+      stack.push cur_level
+      @headers_levels[header] = stack.size
+    end
+  end
+
+  # Generates header in format "h<level>"
+  def make_header_tag(level)
+    raise "Header should be from 1 to 6" unless level.between?(1, 6)
+    "h#{level}"
+  end
+
   # Generates the anchor name from the given header element
   # removing all non alphanumeric characters, replacing them
   # with single dashes.
@@ -100,7 +139,7 @@ class Gollum::Filter::TOC < Gollum::Filter
     @tail ||= @toc_doc.child
     @tail_level ||= 0
 
-    level = header.name.gsub(/[hH]/, '').to_i
+    level = @headers_levels[header]
 
     if @tail_level < level
       while @tail_level < level

data/lib/gollum-lib/filter/yaml.rb

@@ -14,7 +14,7 @@ class Gollum::Filter::YAML < Gollum::Filter
         @markup.metadata.merge!(frontmatter) if frontmatter.respond_to?(:keys) && frontmatter.respond_to?(:values)
       rescue ::Psych::SyntaxError, ::Psych::DisallowedClass, ::Psych::BadAlias => error
         @markup.metadata['errors'] ||= []
-        @markup.metadata['errors'] << "Failed to load YAML frontmater: #{error.message}"
+        @markup.metadata['errors'] << "Failed to load YAML frontmatter: #{error.message}"
       end
       ''
     end

data/lib/gollum-lib/helpers.rb

@@ -16,7 +16,7 @@ module Gollum
     # '/opt/local/bin/ruby.ext' -> 'ruby'
     def path_to_link_text(str)
       return nil unless str
-      ::File.basename(str, ::File.extname(str))
+      ::File.basename(str, Page.valid_extension?(str) ? ::File.extname(str) : '')
     end
 
   end

data/lib/gollum-lib/macro.rb

@@ -25,6 +25,10 @@ module Gollum
       "<p class=\"gollum-error\">#{s}</p>"
     end
 
+    def active_page
+      return @page.parent_page || @page
+    end
+
     # The special class we reserve for only the finest of screwups.  The
     # underscore is to make sure nobody can define a real, callable macro
     # with the same name, because that would be... exciting.

data/lib/gollum-lib/macro/all_pages.rb

@@ -3,7 +3,7 @@ module Gollum
     class AllPages < Gollum::Macro
       def render
         if @wiki.pages.size > 0
-          '<ul id="pages">' + @wiki.pages.map { |p| "<li>#{p.name}</li>" }.join + '</ul>'
+          '<ul id="pages">' + @wiki.pages.map { |p| "<li>#{CGI::escapeHTML(p.name)}</li>" }.join + '</ul>'
         end
       end
     end

data/lib/gollum-lib/macro/audio.rb

@@ -2,7 +2,7 @@ module Gollum
   class Macro
     class Audio < Gollum::Macro
       def render (fname)
-        "<audio width=\"100%\" height=\"100%\" src=\"#{fname}\" controls=\"\"> HTML5 audio is not supported on this Browser.</audio>"
+        "<audio width=\"100%\" height=\"100%\" src=\"#{CGI::escapeHTML(fname)}\" controls=\"\"> HTML5 audio is not supported on this Browser.</audio>"
       end
     end
   end

data/lib/gollum-lib/macro/global_toc.rb

@@ -4,9 +4,9 @@ module Gollum
       def render(title = "Global Table of Contents")
         if @wiki.pages.size > 0
           prepath = @wiki.base_path.sub(/\/$/, '')
-          result  = '<ul>' + @wiki.pages.map { |p| "<li><a href=\"#{prepath}/#{p.escaped_url_path}\">#{p.url_path}</a></li>" }.join + '</ul>'
+          result  = '<ul>' + @wiki.pages.map { |p| "<li><a href=\"#{CGI::escapeHTML(prepath + "/" + p.escaped_url_path)}\">#{CGI::escapeHTML(p.url_path)}</a></li>" }.join + '</ul>'
         end
-        "<div class=\"toc\"><div class=\"toc-title\">#{title}</div>#{result}</div>"
+        "<div class=\"toc\"><div class=\"toc-title\">#{CGI::escapeHTML(title)}</div>#{result}</div>"
       end
     end
   end

data/lib/gollum-lib/macro/navigation.rb

@@ -9,12 +9,12 @@ module Gollum
           list_items = pages.map do |page|
             if toc_root_path == '.' || page.url_path =~ /^#{toc_root_path}\//
               path_display = (full_path || toc_root_path == '.') ? page.url_path  : page.url_path.sub(/^#{toc_root_path}\//,"").sub(/^\//,'')
-              "<li><a href=\"#{prepath}/#{page.escaped_url_path}\">#{path_display}</a></li>"
+              "<li><a href=\"#{CGI::escapeHTML(prepath + "/" + page.escaped_url_path)}\">#{CGI::escapeHTML(path_display)}</a></li>"
             end
           end
           result = "<ul>#{list_items.join}</ul>"
         end
-        "<div class=\"toc\"><div class=\"toc-title\">#{title}</div>#{result}</div>"
+        "<div class=\"toc\"><div class=\"toc-title\">#{CGI::escapeHTML(title)}</div>#{result}</div>"
       end
 
     end

data/lib/gollum-lib/macro/note.rb

@@ -12,7 +12,7 @@ module Gollum
           icon.options[:class] << ' mr-2'
           icon = icon.to_svg
         end
-        "<div class='flash'>#{icon}#{notice}</div>"
+        "<div class='flash'>#{icon}#{CGI::escapeHTML(notice)}</div>"
       end
     end
   end

data/lib/gollum-lib/macro/series.rb

@@ -3,13 +3,13 @@ module Gollum
 
     class Series < Gollum::Macro
       def render(series_prefix = "")
-      	raise "This page's name does not match the prefix '#{series_prefix}'" unless @page.name =~ /^#{series_prefix}/
+      	raise "This page's name does not match the prefix '#{series_prefix}'" unless active_page.name =~ /^#{series_prefix}/
       	render_links(*find_series(series_prefix))
       end
 
       def render_links(previous_page, next_page)
-      	result = "Previous: <a href=\"#{::File.join(@wiki.base_path,previous_page.escaped_url_path)}\">#{previous_page.name}</a>" if previous_page
-      	result = "#{result}#{result ? ' | ' : ''}Next: <a href=\"#{::File.join(@wiki.base_path,next_page.escaped_url_path)}\">#{next_page.name}</a>" if next_page
+      	result = "Previous: <a href=\"#{CGI::escapeHTML(::File.join(@wiki.base_path,previous_page.escaped_url_path))}\">#{CGI::escapeHTML(previous_page.name)}</a>" if previous_page
+      	result = "#{result}#{result ? ' | ' : ''}Next: <a href=\"#{CGI::escapeHTML(::File.join(@wiki.base_path,next_page.escaped_url_path))}\">#{CGI::escapeHTML(next_page.name)}</a>" if next_page
       	wrap_result(result)
       end
 
@@ -21,7 +21,7 @@ module Gollum
       	dir = @wiki.pages.select {|page| ::File.dirname(page.path) == ::File.dirname(@page.path)}
       	dir.select! {|page| page.name =~ /\A#{series_prefix}/ } unless series_prefix.empty?
       	dir.sort_by! {|page| page.name}
-      	self_index = dir.find_index {|page| page.name == @page.name}
+      	self_index = dir.find_index {|page| page.name == active_page.name}
       	if self_index > 0
           return dir[self_index-1], dir[self_index+1]
       	else
@@ -32,14 +32,14 @@ module Gollum
 
     class SeriesStart < Gollum::Macro::Series
       def render_links(previous_page, next_page)
-        result = "Next: <a href=\"#{::File.join(@wiki.base_path,next_page.escaped_url_path)}\">#{next_page.name}</a>" if next_page
+        result = "Next: <a href=\"#{CGI::escapeHTML(::File.join(@wiki.base_path,next_page.escaped_url_path))}\">#{CGI::escapeHTML(next_page.name)}</a>" if next_page
         wrap_result(result)
       end
     end
 
     class SeriesEnd < Gollum::Macro::Series
       def render_links(previous_page, next_page)
-        result = "Previous: <a href=\"#{::File.join(@wiki.base_path,previous_page.escaped_url_path)}\">#{previous_page.name}</a>" if previous_page
+        result = "Previous: <a href=\"#{CGI::escapeHTML(::File.join(@wiki.base_path,previous_page.escaped_url_path))}\">#{CGI::escapeHTML(previous_page.name)}</a>" if previous_page
         wrap_result(result)
       end
     end

data/lib/gollum-lib/macro/video.rb

@@ -2,7 +2,7 @@ module Gollum
   class Macro
     class Video < Gollum::Macro
       def render (fname)
-        "<video width=\"100%\" height=\"100%\" src=\"#{fname}\" controls=\"\"> HTML5 video is not supported on this Browser.</video>"
+        "<video width=\"100%\" height=\"100%\" src=\"#{CGI::escapeHTML(fname)}\" controls=\"\"> HTML5 video is not supported on this Browser.</video>"
       end
     end
   end

data/lib/gollum-lib/macro/warn.rb

@@ -4,7 +4,7 @@ module Gollum
       def render(warning)
         icon = Octicons::Octicon.new('alert', {width: 24, height: 24})
         icon.options[:class] << ' mr-2'
-        "<div class='flash flash-warn'>#{icon.to_svg}#{warning}</div>"
+        "<div class='flash flash-warn'>#{icon.to_svg}#{CGI::escapeHTML(warning)}</div>"
       end
     end
   end

data/lib/gollum-lib/markups.rb

@@ -56,9 +56,9 @@ end
 module Gollum
   class Markup
     if gem_exists?('pandoc-ruby')
-      GitHub::Markup::Markdown::MARKDOWN_GEMS.delete('kramdown')
+      GitHub::Markup::Markdown::MARKDOWN_GEMS.clear
       GitHub::Markup::Markdown::MARKDOWN_GEMS['pandoc-ruby'] = proc { |content|
-          PandocRuby.convert(content, :from => :markdown, :to => :html, :filter => 'pandoc-citeproc')
+          PandocRuby.convert(content, '--citeproc', :from => 'markdown-tex_math_dollars-raw_tex', :to => :html)
       }
     else
       GitHub::Markup::Markdown::MARKDOWN_GEMS['kramdown'] = proc { |content|
@@ -85,7 +85,8 @@ module Gollum
              :extensions => ['rest', 'rst'])
     register(:asciidoc, "AsciiDoc",
              :skip_filters => [:Tags],
-             :enabled => MarkupRegisterUtils::gem_exists?("asciidoctor"))
+             :enabled => MarkupRegisterUtils::gem_exists?("asciidoctor"),
+             :extensions => ['adoc','asciidoc'])
     register(:mediawiki, "MediaWiki",
              :enabled => MarkupRegisterUtils::gem_exists?("wikicloth"),
              :extensions => ['mediawiki','wiki'], :reverse_links => true)

data/lib/gollum-lib/page.rb

@@ -277,7 +277,7 @@ module Gollum
     #
     # Returns the String extension (no leading period).
     def self.format_to_ext(format)
-      format == :markdown ? "md" : format.to_s
+      Gollum::Markup.formats[format] ? Gollum::Markup.formats[format][:extensions].first : nil
     end
 
     # The underlying wiki repo.
@@ -360,7 +360,7 @@ module Gollum
     def initialize(wiki, name, data, version, parent_page = nil)
       @wiki           = wiki 
       @path           = name
-      @blob           = OpenStruct.new(:name => name, :data => data, :is_symlink => false)
+      @blob           = OpenStruct.new(:name => name, :data => wiki.normalize(data), :is_symlink => false)
       @version        = version
       @formatted_data = nil
       @doc            = nil
@@ -368,5 +368,6 @@ module Gollum
       @historical     = false
     end
   end
+  
 
 end

data/lib/gollum-lib/redirects.rb

@@ -28,9 +28,10 @@ module Gollum
       self.clear
       self.merge!(redirects)
     end
-    
-    def dump
-      @wiki.overwrite_file(REDIRECTS_FILE, self.to_yaml, {})
+
+    def dump(commit=nil)
+      commit = {} if commit.nil?
+      @wiki.overwrite_file(REDIRECTS_FILE, self.to_yaml, commit)
     end
     
     def get_head_sha

data/lib/gollum-lib/version.rb

@@ -1,5 +1,5 @@
 module Gollum
   module Lib
-    VERSION = '5.0.4'
+    VERSION = '5.1.2'
   end
 end

data/lib/gollum-lib/wiki.rb

@@ -150,6 +150,8 @@ module Gollum
       @filter_chain.delete(:Emoji) unless options.fetch :emoji, false
       @filter_chain.delete(:PandocBib) unless ::Gollum::MarkupRegisterUtils.using_pandoc?
       @filter_chain.delete(:CriticMarkup) unless options.fetch :critic_markup, false
+
+      Hook.execute(:post_wiki_initialize, self)
     end
 
     # Public: check whether the wiki's git repo exists on the filesystem.
@@ -551,14 +553,14 @@ module Gollum
       @redirects
     end
 
-    def add_redirect(old_path, new_path)
+    def add_redirect(old_path, new_path, commit=nil)
       redirects[old_path] = new_path
-      redirects.dump
+      redirects.dump(commit)
     end
 
-    def remove_redirect(path)
+    def remove_redirect(path, commit=nil)
       redirects.tap{|k| k.delete(path)}
-      redirects.dump
+      redirects.dump(commit)
     end
 
     #########################################################################

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: gollum-lib
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.1.2
 platform: ruby
 authors:
 - Tom Preston-Werner
 - Rick Olson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2017-04-13 00:00:00.000000000 Z
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: gemojione
   requirement: !ruby/object:Gem::Requirement
@@ -101,14 +101,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.5'
+        version: '12.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.5'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: twitter-text
   requirement: !ruby/object:Gem::Requirement
@@ -143,14 +143,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: kramdown-parser-gfm
   requirement: !ruby/object:Gem::Requirement
@@ -185,28 +185,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: wikicloth
   requirement: !ruby/object:Gem::Requirement
@@ -227,14 +227,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: citeproc-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -269,34 +269,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: rb-readline
   requirement: !ruby/object:Gem::Requirement
@@ -317,14 +311,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.5
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.5
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
@@ -359,84 +353,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.2
+        version: '2.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.2
+        version: '2.16'
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.2
-- !ruby/object:Gem::Dependency
-  name: rb-inotify
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.3
-- !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.4
-- !ruby/object:Gem::Dependency
-  name: rb-fchange
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '6.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '6.4'
 description: A simple, Git-powered wiki with a sweet API and local frontend.
 email: tom@github.com
 executables: []
@@ -500,7 +452,7 @@ homepage: http://github.com/gollum/gollum-lib
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -517,7 +469,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 2
 summary: A simple, Git-powered wiki.
 test_files: []