inc_gollum 4.1.2d → 5.0.1b.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '082fa7931f47d2f6cea976b445cd42bf6738a6e7c1d6a69e100a8e086b956c53'
-  data.tar.gz: 49f01f009e581001538a89c8fec40a891a7d4602337c7b00d704d4de29fbccc1
+  metadata.gz: c08876c0be4003d0719117d3a903645a72c6acea05986126344edbe2788f2110
+  data.tar.gz: ab1a5db2660b4cc0ccc173c574ae218fc1d8f2c3017b0937c8946d4ff94fcbb0
 SHA512:
-  metadata.gz: 861a6bbd3ea0f3b90c4115a47e78d1a46f191be995f9b7188952ba6fa288c640dd17da19710e7d0197ebed5b06dbd3349a67ed8dc661635158a53ee3099fb2e3
-  data.tar.gz: 34fa663255e984ab963e4a7d95e8ff451733d90fd692b603c3c64fba89dc37896765b75f4bc2197c73649e695546d10f8a9db70c046a63af3de8b521bce4023a
+  metadata.gz: c3c7eb65d3688b72c38cd704d884adae9c850bd4255b7a348896183c2203c381da5e50de020b5019384992c90db1bb69e51a1212ebb656670832ace7e2c9c76f
+  data.tar.gz: e0379e049c8f270a77a2d98898a7b2af7314f1f9b43f8702266c03fbc344972fd4dc9cf067193cad3d25544c033dc89c44e53648bf93ab30dd6cfa528a43a119

data/Gemfile

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

data/HISTORY.md

@@ -1,7 +1,3 @@
-# 4.1.2 /2017-08-07
-
-* Lock to a newer version of gollum-lib to avoid installing an outdated and vulnerable dependency (nokogiri) on ruby 2.0. See https://github.com/gollum/gollum-lib/pull/279. Note: this breaks semantic versioning so those using outdated rubies will discover the problem on update.
-
 # 4.1.0 /2017-03-09
 
 * Added file deletion functionality to file view

data/README.md

@@ -146,7 +146,7 @@ Gollum comes with the following command line options:
 | --page-file-dir   | [PATH]    | Specify the subdirectory for all pages. If set, Gollum will only serve pages from this directory and its subdirectories. Default: repository root. |
 | --css             | none      | Tell Gollum to inject custom CSS into each page. Uses `custom.css` from repository root.<sup>3,5</sup> |
 | --js              | none      | Tell Gollum to inject custom JS into each page. Uses `custom.js` from repository root.<sup>3,5</sup> |
-| --emoji           | none      | Parse and interpret emoji tags (e.g. :heart:). |
+| --emoji           | none      | Parse and interpret emoji tags (e.g. `:heart:`) except when the leading colon is backslashed (e.g. `\:heart:`). |
 | --no-edit         | none      | Disable the feature of editing pages. |
 | --live-preview    | none      | Enable the live preview feature in page editor. |
 | --no-live-preview | none      | Disable the live preview feature in page editor. |
@@ -154,6 +154,7 @@ Gollum comes with the following command line options:
 | --mathjax         | none      | Enables MathJax (renders mathematical equations). By default, uses the `TeX-AMS-MML_HTMLorMML` config with the `autoload-all` extension.<sup>5</sup> |
 | --irb             | none      | Launch Gollum in "console mode", with a [predefined API](https://github.com/gollum/gollum-lib/). |
 | --h1-title        | none      | Tell Gollum to use the first `<h1>` as page title. |
+| --no-display-metadata | none  | Do not render metadata tables in pages. |
 | --show-all        | none      | Tell Gollum to also show files in the file view. By default, only valid pages are shown. |
 | --collapse-tree   | none      | Tell Gollum to collapse the file tree, when the file view is opened. By default, the tree is expanded. |
 | --user-icons      | [MODE]    | Tell Gollum to use specific user icons for history view. Can be set to `gravatar`, `identicon` or `none`. Default: `none`. |
@@ -161,6 +162,7 @@ Gollum comes with the following command line options:
 | --template-dir    | [PATH]    | Specify custom mustache template directory. |
 | --help            | none      | Display the list of options on the command line. |
 | --version         | none      | Display the current version of Gollum. |
+| --template-page   | none      | Tell Gollum to use /_Template as the default content for new pages. _Template must be git committed. |
 
 **Notes:**
 

data/bin/inc_gollum

@@ -6,6 +6,7 @@ require 'optparse'
 require 'rubygems'
 require 'gollum'
 require 'cgi'
+require 'sprockets'
 
 exec         = {}
 options      = {
@@ -21,28 +22,28 @@ wiki_options = {
 opts = OptionParser.new do |opts|
   # define program name (although this defaults to the name of the file, just in case...)
   opts.program_name = "gollum"
-    
+
   # set basic info for the "--help" command (options will be appended automatically from the below definitions)
   opts.banner = '
   Gollum is a multi-format Wiki Engine/API/Frontend.
-    
+
   Usage:
       gollum [options] [git-repo]
-    
+
   Arguments:
       [git-repo]                     Path to the git repository being served. If not specified, current working directory is used.
-  
+
   Notes:
       Paths for all options are relative to <git-repo> unless absolute.
       This message is only a basic description. For more information, please visit:
           https://github.com/gollum/gollum
-  
+
   OPTIONS'
-  
-  # define gollum options  
+
+  # define gollum options
   opts.separator ""
   opts.separator "  Major:"
-  
+
   opts.on("-h", "--host [HOST]", "Specify the hostname or IP address to listen on. Default: '0.0.0.0'.") do |host|
     options[:bind] = host
   end
@@ -69,14 +70,14 @@ opts = OptionParser.new do |opts|
   end
   opts.on("-b", "--base-path [PATH]", "Specify the leading portion of all Gollum URLs (path info). Default: '/'.",
     "Example: setting this to '/wiki' will make the wiki accessible under 'http://localhost:4567/wiki/'.") do |base_path|
-      
+
     # first trim a leading slash, if any
     base_path.sub!(/^\/+/, '')
 
     # make a backup of the option and sanitize it
     base_path_original = base_path.dup
     base_path = CGI.escape(base_path)
-    
+
     # then let the user know if we changed the URL
     unless base_path_original == base_path
       puts <<MSG
@@ -85,31 +86,43 @@ Warning: your base-path has been sanitized:
   - sanitized: '#{base_path}'
 MSG
     end
-      
+
     # and finally, let others enjoy our hard work:
     wiki_options[:base_path] = base_path
   end
-  opts.on("--page-file-dir [PATH]", "Specify the subdirectory for all pages. Default: repository root.", 
+  opts.on("--page-file-dir [PATH]", "Specify the subdirectory for all pages. Default: repository root.",
     "Example: setting this to 'pages' will make Gollum serve only pages at '<git-repo>/pages/*'.") do |path|
     wiki_options[:page_file_dir] = path
   end
+  opts.on("--static", "Use static assets. Defaults to false in development/test, defaults to true in production/staging.") do
+    wiki_options[:static] = true
+  end
+  opts.on("--no-static", "Do not use static assets (even when in production/staging).") do
+    wiki_options[:static] = false
+  end
+  opts.on("--assets [PATH]", "Set the path to look for static assets. Only used if --static is set to true, or environment is production/staging. Default: ./public/assets") do |path|
+    wiki_options[:static_assets_path] = path
+  end
+  opts.on("--precompile-assets [PATH]", "Precompile static assets to PATH.") do |path|
+    options[:precompile] = path || './public/assets'
+  end
   opts.on("--css", "Inject custom CSS into each page. The '<git-repo>/custom.css' file is used (must be committed).") do
     wiki_options[:css] = true
   end
   opts.on("--js", "Inject custom JavaScript into each page. The '<git-repo>/custom.js' file is used (must be committed).") do
     wiki_options[:js] = true
   end
-  opts.on("--emoji", "Parse and interpret emoji tags (e.g. :heart:).") do
+  opts.on("--emoji", "Parse and interpret emoji tags (e.g. :heart:) except when the leading colon is backslashed (e.g. \\:heart:).") do
     wiki_options[:emoji] = true
   end
   opts.on("--no-edit", "Disable the feature of editing pages.")  do
     wiki_options[:allow_editing] = false
   end
-  opts.on("--live-preview", "Enable the live preview feature in page editor.") do
-    wiki_options[:live_preview] = true
+  opts.on("--follow-renames", "Follow pages across renames in the History view. Default except on jruby.") do
+    wiki_options[:follow_renames] = true
   end
-  opts.on("--no-live-preview", "Disable the live preview feature in page editor.") do
-    wiki_options[:live_preview] = false
+  opts.on("--no-follow-renames", "Do not follow pages across renames in the History view.") do
+    wiki_options[:follow_renames] = false
   end
   opts.on("--allow-uploads [MODE]", [:dir, :page, :dirpage], "Enable file uploads.",
     "If set to 'dir', Gollum will store all uploads in the '<git-repo>/uploads/' directory.",
@@ -126,13 +139,16 @@ MSG
   opts.on("--irb", "Launch Gollum in 'console mode', with a predefined API.") do
     options[:irb] = true
   end
-  
+
   opts.separator ""
   opts.separator "  Minor:"
-  
+
   opts.on("--h1-title", "Use the first '<h1>' as page title.") do
     wiki_options[:h1_title] = true
   end
+  opts.on("--no-display-metadata", "Do not render metadata tables in pages.") do
+    wiki_options[:display_metadata] = false
+  end
   opts.on("--show-all", "Also show files in the file view. By default, only valid pages are shown.") do
     wiki_options[:show_all] = true
   end
@@ -147,16 +163,15 @@ MSG
     "If not specified, uses the '<git-repo>/mathjax.config.js' file.") do |file|
     wiki_options[:mathjax_config] = file || 'mathjax.config.js'
   end
-  opts.on("--plantuml-url [URL]", "Sets the PlantUML server endpoint.") do |url|
-    wiki_options[:plantuml_url] = url
-  end
   opts.on("--template-dir [PATH]", "Specify custom mustache template directory.") do |path|
     wiki_options[:template_dir] = path
   end
-  
+  opts.on("--template-page", "Use _Template in root as a template for new pages.") do
+    wiki_options[:template_page] = true
+  end
   opts.separator ""
   opts.separator "  Common:"
-  
+
   opts.on("--help", "Display this message.") do
     puts opts
     exit 0
@@ -165,7 +180,7 @@ MSG
     puts "Inc Gollum " + Gollum::VERSION
     exit 0
   end
-  
+
   opts.separator ""
 end
 
@@ -212,12 +227,7 @@ if options[:irb]
     if !wiki.exist? then
       raise Gollum::InvalidGitRepositoryError
     end
-    if wiki_options[:plantuml_url]
-      Gollum::Filter::PlantUML.configure do |config|
-        puts "Using #{wiki_options[:plantuml_url]} as PlantUML endpoint"
-        config.url = wiki_options[:plantuml_url]
-      end
-    end
+
     puts
     puts "Loaded Gollum wiki at:"
     puts "#{File.expand_path(gollum_path).inspect}"
@@ -240,6 +250,19 @@ if options[:irb]
     puts "Invalid Gollum wiki at #{File.expand_path(gollum_path).inspect}"
     exit 0
   end
+elsif options[:precompile]
+  require 'gollum/app'
+  env = Precious::Assets.sprockets
+  manifest = Sprockets::Manifest.new(env, options[:precompile])
+    Sprockets::Helpers.configure do |config|
+      config.environment = env
+      config.prefix      = "#{wiki_options[:base_path]}/#{Precious::Assets::ASSET_URL}"
+      config.digest      = true
+      config.public_path = options[:precompile]
+      config.manifest    = manifest
+    end
+  puts "Precompiling assets to #{::File.expand_path(options[:precompile])}..."
+  manifest.compile(Precious::Assets::MANIFEST)
 else
   require 'gollum/app'
   Precious::App.set(:gollum_path, gollum_path)
@@ -253,13 +276,6 @@ else
     require cfg
   end
 
-  if wiki_options[:plantuml_url]
-    Gollum::Filter::PlantUML.configure do |config|
-      puts "Using #{wiki_options[:plantuml_url]} as PlantUML endpoint"
-      config.url = wiki_options[:plantuml_url]
-    end
-  end
-
   base_path = wiki_options[:base_path]
 
   if base_path.nil?
@@ -270,7 +286,7 @@ else
     class MapGollum
       def initialize(base_path)
         @mg = Rack::Builder.new do
-          
+
           map "/#{base_path}" do
             run Precious::App
           end
@@ -280,7 +296,7 @@ else
           map '/*' do
             run Proc.new { [302, { 'Location' => "/#{base_path}" }, []] }
           end
-          
+
         end
       end
 
@@ -288,7 +304,7 @@ else
         @mg.call(env)
       end
     end
-    
+
     # 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