gollum 2.7.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfff52d8969895eec3a33d0af52d563f551e2dac
-  data.tar.gz: de29e6aac5aba83a16f867d318e15f96620ef675
+  metadata.gz: ae63e46f52e80b39d9876f199ecf4adc35cb4ed3
+  data.tar.gz: 2e899d40a26492fb28fa9719fd07fb28cfe114be
 SHA512:
-  metadata.gz: ecfb6ba982e9f881ede96b39efe47a852ab4f118fa8db1dfa1a5f3d2bb7801151519bb18c87231f25982b24b774ec87da4fb1695e7b076818e3ec18bfc0d410d
-  data.tar.gz: 1638d6809a62ad4c56b63117b2d15bd0703d4b8eeaaf4ae8d123a249501ff32ae32aaf66f72534e8ed7c70f7513bb248d1accf93502ccfc32a1cb29f5c2b6c34
+  metadata.gz: 5a239050238237bc42b2a3b0dd7a74c1b5a2f618945eb4dede46794cd20f150ecbbc1475743bfc765a5007e137fe57b5adac727fb776caafc2a7570b3fb9d2f1
+  data.tar.gz: 8a033dc8543467eba6a508c6a01e035d05d02aa5a804a668787437f923d6eb1c055a990e7b0282554f673fff51079a8b6dde20b913993b5c959a112a2b4a64fe

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 gemspec
-gem 'rake', '~> 10.0.3'
+gem 'rake', '~> 10.2.2'

data/README.md

@@ -1,9 +1,9 @@
 gollum -- A wiki built on top of Git
 ====================================
 
-[![Gem Version](https://badge.fury.io/rb/gollum.png)](http://rubygems.org/gems/gollum)
-[![Build Status](https://secure.travis-ci.org/gollum/gollum.png?branch=master)](http://travis-ci.org/gollum/gollum)
-[![Dependency Status](https://gemnasium.com/gollum/gollum.png)](https://gemnasium.com/gollum/gollum)
+[![Gem Version](https://badge.fury.io/rb/gollum.svg)](http://badge.fury.io/rb/gollum)
+[![Build Status](https://travis-ci.org/gollum/gollum.svg?branch=master)](https://travis-ci.org/gollum/gollum)
+[![Dependency Status](https://gemnasium.com/gollum/gollum.svg)](https://gemnasium.com/gollum/gollum)
 
 ## DESCRIPTION
 

data/Rakefile

@@ -107,20 +107,23 @@ end
 #
 #############################################################################
 
-desc 'Create a release build'
+desc 'Create a release build and push to rubygems'
 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"
+  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/#{name}-#{version}.gem"
 end
 
+desc 'Publish to rubygems. Same as release'
+task :publish => :release
+
 desc 'Build gem'
 task :build => :gemspec do
   sh "mkdir -p pkg"
@@ -128,6 +131,11 @@ task :build => :gemspec do
   sh "mv #{gem_file} pkg"
 end
 
+desc "Build and install"
+task :install => :build do
+  sh "gem install --local --no-ri --no-rdoc pkg/#{name}-#{version}.gem"
+end
+
 desc 'Update gemspec'
 task :gemspec => :validate do
   # read spec file and split out manifest section

data/bin/gollum

@@ -17,10 +17,10 @@ require 'optparse'
 require 'rubygems'
 require 'gollum'
 
-exec = {}
-options = { 'port' => 4567, 'bind' => '0.0.0.0' }
+exec         = {}
+options      = { 'port' => 4567, 'bind' => '0.0.0.0' }
 wiki_options = {
-    :live_preview => false,
+    :live_preview  => false,
     :allow_uploads => false,
 }
 
@@ -85,7 +85,7 @@ opts = OptionParser.new do |opts|
   end
 
   opts.on("--allow-uploads [MODE]", [:dir, :page], "Allows file uploads. Modes: dir (default, store all uploads in the same directory), page (store each upload at the same location as the page).") do |mode|
-    wiki_options[:allow_uploads] = true
+    wiki_options[:allow_uploads]    = true
     wiki_options[:per_page_uploads] = true if mode == :page
   end
 
@@ -120,8 +120,8 @@ end
 
 # --gollum-path wins over ARGV[0]
 gollum_path = wiki_options[:gollum_path] ?
-              wiki_options[:gollum_path] :
-              ARGV[0] || Dir.pwd
+    wiki_options[:gollum_path] :
+    ARGV[0] || Dir.pwd
 
 if options['irb']
   require 'irb'
@@ -151,7 +151,9 @@ if options['irb']
   begin
     require 'gollum-lib'
     wiki = Gollum::Wiki.new(gollum_path, wiki_options)
-    if !wiki.exist? then raise Gollum::InvalidGitRepositoryError end
+    if !wiki.exist? then
+      raise Gollum::InvalidGitRepositoryError
+    end
     puts "Loaded Gollum wiki at #{File.expand_path(gollum_path).inspect}."
     puts
     puts %(    page = wiki.page('page-name'))
@@ -193,7 +195,7 @@ else
       def initialize base_path
         @mg = Rack::Builder.new do
           map '/' do
-            run Proc.new { [ 302, {'Location'=> "/#{base_path}" }, [] ] }
+            run Proc.new { [302, { 'Location' => "/#{base_path}" }, []] }
           end
 
           map "/#{base_path}" do
@@ -209,4 +211,4 @@ else
     # Rack::Handler does not work with Ctrl + C. Use Rack::Server instead.
     Rack::Server.new(:app => MapGollum.new(base_path), :Port => options['port'], :Host => options['bind']).start
   end
-end
+end

data/gollum.gemspec

@@ -1,38 +1,40 @@
 Gem::Specification.new do |s|
   s.specification_version = 2 if s.respond_to? :specification_version=
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.rubygems_version = '1.3.5'
-  s.required_ruby_version = ">= 1.9"
+  s.required_ruby_version = '>= 1.9'
 
   s.name              = 'gollum'
-  s.version           = '2.7.0'
-  s.date              = '2014-02-20'
+  s.version           = '3.0.0'
+  s.date              = '2014-04-05'
   s.rubyforge_project = 'gollum'
   s.license           = 'MIT'
 
-  s.summary     = "A simple, Git-powered wiki."
-  s.description = "A simple, Git-powered wiki with a sweet API and local frontend."
+  s.summary     = 'A simple, Git-powered wiki.'
+  s.description = 'A simple, Git-powered wiki with a sweet API and local frontend.'
 
-  s.authors  = ["Tom Preston-Werner", "Rick Olson"]
+  s.authors  = ['Tom Preston-Werner', 'Rick Olson']
   s.email    = 'tom@github.com'
   s.homepage = 'http://github.com/gollum/gollum'
 
   s.require_paths = %w[lib]
 
-  s.executables = ["gollum"]
+  s.executables = ['gollum']
 
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = %w[README.md LICENSE]
 
-  s.add_dependency 'gollum-lib', '~> 2.0'
-  s.add_dependency 'github-markdown', '~> 0.5.5'
-  s.add_dependency 'sinatra', '~> 1.4', '>= 1.4.3'
-  s.add_dependency 'mustache', ['>= 0.99.4', '< 1.0.0']
-  s.add_dependency 'useragent', '~> 0.8.2'
+  s.add_dependency 'gollum-lib', '~> 3.0'
+  s.add_dependency 'github-markdown', '~> 0.6.5'
+  s.add_dependency 'sinatra', '~> 1.4', '>= 1.4.4'
+  s.add_dependency 'mustache', ['>= 0.99.5', '< 1.0.0']
+  s.add_dependency 'useragent', '~> 0.10.0'
 
   s.add_development_dependency 'rack-test', '~> 0.6.2'
-  s.add_development_dependency 'shoulda', '~> 3.4.0'
+  s.add_development_dependency 'shoulda', '~> 3.5.0'
   s.add_development_dependency 'minitest-reporters', '~> 0.14.16'
+  s.add_development_dependency 'twitter_cldr', '~> 2.4.2'
+  s.add_development_dependency 'mocha', '~> 1.0.0'
 
   # = MANIFEST =
   s.files = %w[
@@ -55,6 +57,11 @@ Gem::Specification.new do |s|
     lib/gollum/public/gollum/css/ie7.css
     lib/gollum/public/gollum/css/print.css
     lib/gollum/public/gollum/css/template.css
+    lib/gollum/public/gollum/fonts/FontAwesome.otf
+    lib/gollum/public/gollum/fonts/fontawesome-webfont.eot
+    lib/gollum/public/gollum/fonts/fontawesome-webfont.svg
+    lib/gollum/public/gollum/fonts/fontawesome-webfont.ttf
+    lib/gollum/public/gollum/fonts/fontawesome-webfont.woff
     lib/gollum/public/gollum/images/dirty-shade.png
     lib/gollum/public/gollum/images/fileview/document.png
     lib/gollum/public/gollum/images/fileview/folder-horizontal.png
@@ -533,8 +540,6 @@ Gem::Specification.new do |s|
     licenses/unity_asset_pool/COPYRIGHT
     openrc/conf.d/gollum
     openrc/init.d/gollum
-    templates/formatting.html
-    templates/helper_wiki.rb
   ]
   # = MANIFEST =
 

data/lib/gollum.rb

@@ -13,16 +13,17 @@ require File.expand_path('../gollum/uri_encode_component', __FILE__)
 
 # Set ruby to UTF-8 mode
 # This is required for Ruby 1.8.7 which gollum still supports.
-$KCODE = 'U' if RUBY_VERSION[0,3] == '1.8'
+$KCODE = 'U' if RUBY_VERSION[0, 3] == '1.8'
 
 module Gollum
-  VERSION = '2.7.0'
+  VERSION = '3.0.0'
 
   def self.assets_path
     ::File.expand_path('gollum/public', ::File.dirname(__FILE__))
   end
 
-  class Error < StandardError; end
+  class Error < StandardError;
+  end
 
   class DuplicatePageError < Error
     attr_accessor :dir

data/lib/gollum/app.rb

@@ -43,7 +43,7 @@ module Precious
     register Mustache::Sinatra
     include Precious::Helpers
 
-    dir = File.dirname(File.expand_path(__FILE__))
+    dir     = File.dirname(File.expand_path(__FILE__))
 
     # Detect unsupported browsers.
     Browser = Struct.new(:browser, :version)
@@ -56,23 +56,23 @@ module Precious
 
     def supported_useragent?(user_agent)
       ua = UserAgent.parse(user_agent)
-      @@min_ua.detect {|min| ua >= min }
+      @@min_ua.detect { |min| ua >= min }
     end
 
     # We want to serve public assets for now
     set :public_folder, "#{dir}/public/gollum"
-    set :static,         true
+    set :static, true
     set :default_markup, :markdown
 
     set :mustache, {
-      # Tell mustache where the Views constant lives
-      :namespace => Precious,
+        # Tell mustache where the Views constant lives
+        :namespace => Precious,
 
-      # Mustache templates live here
-      :templates => "#{dir}/templates",
+        # Mustache templates live here
+        :templates => "#{dir}/templates",
 
-      # Tell mustache where the views are
-      :views => "#{dir}/views"
+        # Tell mustache where the views are
+        :views     => "#{dir}/views"
     }
 
     # Sinatra error handling
@@ -90,7 +90,7 @@ module Precious
       # above will detect base_path when it's used with map in a config.ru
       settings.wiki_options.merge!({ :base_path => @base_url })
       @css = settings.wiki_options[:css]
-      @js = settings.wiki_options[:js]
+      @js  = settings.wiki_options[:js]
     end
 
     get '/' do
@@ -139,9 +139,9 @@ module Precious
           end
           redirect to(live_preview_url)
         else
-          @page = page
+          @page         = page
           @page.version = wiki.repo.log(wiki.ref, @page.path).first
-          @content = page.text_data
+          @content      = page.text_data
           mustache :edit
         end
       else
@@ -163,9 +163,9 @@ module Precious
         tempfile = params[:file][:tempfile]
       end
 
-      dir = wiki.per_page_uploads ? params[:upload_dest] : 'uploads'
-      ext = ::File.extname(fullname)
-      format = ext.split('.').last || 'txt'
+      dir      = wiki.per_page_uploads ? params[:upload_dest] : 'uploads'
+      ext      = ::File.extname(fullname)
+      format   = ext.split('.').last || 'txt'
       filename = ::File.basename(fullname, ext)
       contents = ::File.read(tempfile)
       reponame = filename + '.' + format
@@ -173,10 +173,10 @@ module Precious
       head = wiki.repo.head
 
       options = {
-        :message => "Uploaded file to #{dir}/#{reponame}",
-        :parent => wiki.repo.head.commit,
+          :message => "Uploaded file to #{dir}/#{reponame}",
+          :parent  => wiki.repo.head.commit,
       }
-      author = session['gollum.author']
+      author  = session['gollum.author']
       unless author.nil?
         options.merge! author
       end
@@ -197,37 +197,37 @@ module Precious
     end
 
     post '/rename/*' do
-      wikip     = wiki_page(params[:splat].first)
+      wikip = wiki_page(params[:splat].first)
       halt 500 if wikip.nil?
-      wiki      = wikip.wiki
-      page      = wiki.paged(wikip.name, wikip.path, exact = true)
-      rename    = params[:rename]
+      wiki   = wikip.wiki
+      page   = wiki.paged(wikip.name, wikip.path, exact = true)
+      rename = params[:rename]
       halt 500 if page.nil?
       halt 500 if rename.nil? or rename.empty?
 
       # Fixup the rename if it is a relative path
       # In 1.8.7 rename[0] != rename[0..0]
       if rename[0..0] != '/'
-        source_dir = ::File.dirname(page.path)
-        source_dir = '' if source_dir == '.'
+        source_dir                = ::File.dirname(page.path)
+        source_dir                = '' if source_dir == '.'
         (target_dir, target_name) = ::File.split(rename)
-        target_dir = target_dir == '' ? source_dir : "#{source_dir}/#{target_dir}"
-        rename = "#{target_dir}/#{target_name}"
+        target_dir                = target_dir == '' ? source_dir : "#{source_dir}/#{target_dir}"
+        rename                    = "#{target_dir}/#{target_name}"
       end
 
       committer = Gollum::Committer.new(wiki, commit_message)
-      commit    = {:committer => committer}
+      commit    = { :committer => committer }
 
       success = wiki.rename_page(page, rename, commit)
       if !success
-          # This occurs on NOOPs, for example renaming A => A
-          redirect to("/#{page.escaped_url_path}")
-          return
+        # This occurs on NOOPs, for example renaming A => A
+        redirect to("/#{page.escaped_url_path}")
+        return
       end
       committer.commit
 
       wikip = wiki_page(rename)
-      page = wiki.paged(wikip.name, wikip.path, exact = true)
+      page  = wiki.paged(wikip.name, wikip.path, exact = true)
       return if page.nil?
       redirect to("/#{page.escaped_url_path}")
     end
@@ -239,11 +239,11 @@ module Precious
       page      = wiki.paged(page_name, path, exact = true)
       return if page.nil?
       committer = Gollum::Committer.new(wiki, commit_message)
-      commit    = {:committer => committer}
+      commit    = { :committer => committer }
 
       update_wiki_page(wiki, page, params[:content], commit, page.name, params[:format])
-      update_wiki_page(wiki, page.header,  params[:header],  commit) if params[:header]
-      update_wiki_page(wiki, page.footer,  params[:footer],  commit) if params[:footer]
+      update_wiki_page(wiki, page.header, params[:header], commit) if params[:header]
+      update_wiki_page(wiki, page.footer, params[:footer], commit) if params[:footer]
       update_wiki_page(wiki, page.sidebar, params[:sidebar], commit) if params[:sidebar]
       committer.commit
 
@@ -252,9 +252,9 @@ module Precious
 
     get '/delete/*' do
       wikip = wiki_page(params[:splat].first)
-      name = wikip.name
-      wiki = wikip.wiki
-      page = wikip.page
+      name  = wikip.name
+      wiki  = wikip.wiki
+      page  = wikip.page
       unless page.nil?
         wiki.delete_page(page, { :message => "Destroyed #{name} (#{page.format})" })
       end
@@ -286,10 +286,10 @@ module Precious
     end
 
     post '/create' do
-      name         = params[:page].to_url
-      path         = sanitize_empty_params(params[:path]) || ''
-      format       = params[:format].intern
-      wiki = wiki_new
+      name   = params[:page].to_url
+      path   = sanitize_empty_params(params[:path]) || ''
+      format = params[:format].intern
+      wiki   = wiki_new
 
       path.gsub!(/^\//, '')
 
@@ -305,15 +305,15 @@ module Precious
     end
 
     post '/revert/*/:sha1/:sha2' do
-      wikip        = wiki_page(params[:splat].first)
-      @path        = wikip.path
-      @name        = wikip.name
-      wiki         = wikip.wiki
-      @page        = wiki.paged(@name,@path)
-      sha1         = params[:sha1]
-      sha2         = params[:sha2]
-
-      commit = commit_message
+      wikip = wiki_page(params[:splat].first)
+      @path = wikip.path
+      @name = wikip.name
+      wiki  = wikip.wiki
+      @page = wiki.paged(@name, @path)
+      sha1  = params[:sha1]
+      sha2  = params[:sha2]
+
+      commit           = commit_message
       commit[:message] = "Revert commit #{sha1.chars.take(7).join}"
       if wiki.revert_page(@page, sha1, sha2, commit)
         redirect to("/#{@page.escaped_url_path}")
@@ -328,23 +328,23 @@ module Precious
     end
 
     post '/preview' do
-      wiki     = wiki_new
-      @name    = params[:page] || "Preview"
-      @page    = wiki.preview_page(@name, params[:content], params[:format])
-      @content = @page.formatted_data
-      @toc_content = wiki.universal_toc ? @page.toc_data : nil
-      @mathjax = wiki.mathjax
-      @h1_title = wiki.h1_title
-      @editable = false
+      wiki           = wiki_new
+      @name          = params[:page] || "Preview"
+      @page          = wiki.preview_page(@name, params[:content], params[:format])
+      @content       = @page.formatted_data
+      @toc_content   = wiki.universal_toc ? @page.toc_data : nil
+      @mathjax       = wiki.mathjax
+      @h1_title      = wiki.h1_title
+      @editable      = false
       @allow_uploads = wiki.allow_uploads
       mustache :page
     end
 
     get '/history/*' do
-      @page        = wiki_page(params[:splat].first).page
-      @page_num    = [params[:page].to_i, 1].max
+      @page     = wiki_page(params[:splat].first).page
+      @page_num = [params[:page].to_i, 1].max
       unless @page.nil?
-        @versions    = @page.versions :page => @page_num
+        @versions = @page.versions :page => @page_num
         mustache :history
       else
         redirect to("/")
@@ -358,10 +358,10 @@ module Precious
         redirect to("/history/#{@file}")
       else
         redirect to("/compare/%s/%s...%s" % [
-          @file,
-          @versions.last,
-          @versions.first]
-        )
+            @file,
+            @versions.last,
+            @versions.first]
+                 )
       end
     end
 
@@ -373,14 +373,14 @@ module Precious
       \.{2,3}   # match .. or ...
       (.+)      # match the second SHA1
     }x do |path, start_version, end_version|
-      wikip        = wiki_page(path)
-      @path        = wikip.path
-      @name        = wikip.name
-      @versions    = [start_version, end_version]
-      wiki         = wikip.wiki
-      @page        = wikip.page
-      diffs        = wiki.repo.diff(@versions.first, @versions.last, @page.path)
-      @diff        = diffs.first
+      wikip     = wiki_page(path)
+      @path     = wikip.path
+      @name     = wikip.name
+      @versions = [start_version, end_version]
+      wiki      = wikip.wiki
+      @page     = wikip.page
+      diffs     = wiki.repo.diff(@versions.first, @versions.last, @page.path)
+      @diff     = diffs.first
       mustache :compare
     end
 
@@ -391,8 +391,8 @@ module Precious
       name      = wikip.name
       path      = wikip.path
       if page = wikip.page
-        @page = page
-        @name = name
+        @page    = page
+        @name    = name
         @content = page.formatted_data
         @version = version
         mustache :page
@@ -402,11 +402,11 @@ module Precious
     end
 
     get '/search' do
-      @query = params[:q]
-      wiki = wiki_new
+      @query   = params[:q]
+      wiki     = wiki_new
       # Sort wiki search results by count (desc) and then by name (asc)
-      @results = wiki.search(@query).sort{ |a, b| (a[:count] <=> b[:count]).nonzero? || b[:name] <=> a[:name] }.reverse
-      @name = @query
+      @results = wiki.search(@query).sort { |a, b| (a[:count] <=> b[:count]).nonzero? || b[:name] <=> a[:name] }.reverse
+      @name    = @query
       mustache :search
     end
 
@@ -426,16 +426,16 @@ module Precious
     end
 
     get '/fileview' do
-      wiki = wiki_new
-      options = settings.wiki_options
-      content = wiki.pages
+      wiki     = wiki_new
+      options  = settings.wiki_options
+      content  = wiki.pages
       # if showing all files include wiki.files
-      content += wiki.files if options[:show_all]
+      content  += wiki.files if options[:show_all]
 
       # must pass wiki_options to FileView
       # --show-all and --collapse-tree can be set.
       @results = Gollum::FileView.new(content, options).render_files
-      @ref = wiki.ref
+      @ref     = wiki.ref
       mustache :file_view, { :layout => false }
     end
 
@@ -450,21 +450,21 @@ module Precious
       path = extract_path(fullpath) || '/'
 
       if page = wiki.paged(name, path, exact = true)
-        @page = page
-        @name = name
-        @content  = page.formatted_data
-        @upload_dest = settings.wiki_options[:allow_uploads] ?
-                         (settings.wiki_options[:per_page_uploads] ?
-                            "#{path}/#{@name}".sub(/^\/\//, '') : 'uploads'
-                         ) : ''
+        @page          = page
+        @name          = name
+        @content       = page.formatted_data
+        @upload_dest   = settings.wiki_options[:allow_uploads] ?
+            (settings.wiki_options[:per_page_uploads] ?
+                "#{path}/#{@name}".sub(/^\/\//, '') : 'uploads'
+            ) : ''
 
         # Extensions and layout data
-        @editable = true
-        @page_exists = !page.versions.empty?
-        @toc_content = wiki.universal_toc ? @page.toc_data : nil
-        @mathjax  = wiki.mathjax
-        @h1_title = wiki.h1_title
-        @bar_side  = wiki.bar_side
+        @editable      = true
+        @page_exists   = !page.versions.empty?
+        @toc_content   = wiki.universal_toc ? @page.toc_data : nil
+        @mathjax       = wiki.mathjax
+        @h1_title      = wiki.h1_title
+        @bar_side      = wiki.bar_side
         @allow_uploads = wiki.allow_uploads
 
         mustache :page
@@ -483,9 +483,9 @@ module Precious
 
     def update_wiki_page(wiki, page, content, commit, name = nil, format = nil)
       return if !page ||
-        ((!content || page.raw_data == content) && page.format == format)
+          ((!content || page.raw_data == content) && page.format == format)
       name    ||= page.name
-      format    = (format || page.format).to_sym
+      format  = (format || page.format).to_sym
       content ||= page.raw_data
       wiki.update_page(page, name, format, content.to_s, commit)
     end
@@ -499,8 +499,8 @@ module Precious
     # message is sourced from the incoming request parameters
     # author details are sourced from the session, to be populated by rack middleware ahead of us
     def commit_message
-      msg = (params[:message].nil? or params[:message].empty?) ? "[no message]" : params[:message]
-      commit_message = { :message => msg }
+      msg               = (params[:message].nil? or params[:message].empty?) ? "[no message]" : params[:message]
+      commit_message    = { :message => msg }
       author_parameters = session['gollum.author']
       commit_message.merge! author_parameters unless author_parameters.nil?
       commit_message