gollum 5.3.2 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e32bf82f8d67475d5020511da99bba187af879ee90f1f0212e020c5ce493c10
-  data.tar.gz: '00926b86ae1c5dba815f764425e52a9f169ea60e16f193308849923fef3499b7'
+  metadata.gz: 5ba1dc19c4f9b1968a0800d5b70a50ca712cd3ef330ceeb7d937af5394169b56
+  data.tar.gz: 714ecd6e8e2511ebb40339230edde002082dd90e17a3b5681753d459ade46898
 SHA512:
-  metadata.gz: d2ff3f2cf5ca016567ee989c491aa96d52fc1e7f0e896e59140e708531bc00d178ac46e2841dec085a63ff2c189427a4dbd53f5272a95bad7e395d7ea35c1920
-  data.tar.gz: 507581ce324fedc14a6b64914f3d50a3ae072690302873193f98c7e51b08aac7501dd8be2e01de5759c31b13b33d17b21e30f440f3bf3d0c3671e441071afdda
+  metadata.gz: 969605876f29c7997fc98ddd11c95346d126fa96168425337e00aba7327b557c945a781bb9fabfb97120b81b846f7e444bbcc8a98fc8b3d997be5675517551aa
+  data.tar.gz: cd4192d8eb0857bc92aae1e4ac2cb1ee2d24ea6eee05cbe3cfb064a262616a9995ed464da45188737e0ad22bed82521be913639141c068bbc0bebd0b3a0eaa33

data/CONTRIBUTING.md

@@ -21,7 +21,7 @@ Before submitting an issue, **please carefully look through the following places
 
 Security vulnerabilities can be reported directly to the maintainers using these GPG keys:
 
-* [@dometto](https://keys.openpgp.org/vks/v1/by-fingerprint/02354CC9F820B52CC2791979BB8CCC95FD83B795)
+* [@dometto](https://keys.openpgp.org/vks/v1/by-fingerprint/16E08F9EF05BAA7E16165C4750D1BBE8362E93F1)
 
 Lastly, please **consider helping out** by opening a Pull Request!
 
@@ -29,14 +29,102 @@ Lastly, please **consider helping out** by opening a Pull Request!
 
 You can triage issues which may include reproducing bug reports or asking for vital information, such as version numbers or reproduction instructions. If you would like to start triaging issues, one easy way to get started is to [subscribe to gollum on CodeTriage](https://www.codetriage.com/gollum/gollum).
 
+## Set up your development environment
+
+If you want to hack on Gollum, you'll need to set up a development
+environment.
+
+To get started, you'll need:
+
+  - A recent version of [Git][git]
+  - A recent version of [Ruby][rubylang].
+  - A recent version of [Node JS][nodejs].
+
+Refer to their installation instructions. Installation methods differ depending
+on your operating system.
+
+Once you have those:
+
+  - Install Bundler, the Ruby package manager. In a terminal:
+    ```sh
+    gem install bundler
+    ```
+  - Install Yarn, a JavaScript package manager. [See Yarn's install
+    guide][yarn-install].
+
+Now, you can start setting up Gollum to run locally:
+
+  1. Clone the git repository. In a terminal:
+
+     ```sh
+     git clone https://github.com/gollum/gollum.git
+     ```
+  2. Change directory into the cloned project:
+     ```sh
+     cd gollum
+     ```
+  3. Bundle the project's Ruby dependencies using Bundler:
+     ```sh
+     [sudo] bundle install
+     ```
+  4. Install the project's JavaScript dependencies using Yarn:
+     ```sh
+     yarn install
+     ```
+  5. Configure the local git repository to use `master` as the default branch
+     when initializing new git repositories:
+     ```sh
+     git config --local init.defaultbranch=master
+     ```
+
+     This is currently required make the test suite pass when running it
+     locally.[^1]
+
+If all went well, you should now be able to run the test suite using the
+following command:
+
+```sh
+bundle exec rake
+```
+
+If you already have a Gollum wiki, you can also browse it via your local version
+of Gollum:
+
+```sh
+bundle exec gollum <path/to/my/wiki/root>
+```
+
+Or you can clone an example wiki and browse that:
+
+```sh
+git clone test/examples/lotr.git ~/lotr-wiki
+bundle exec gollum ~/lotr-wiki
+```
+
+With this, you're ready to start contributing and open your first [pull
+request](#opening-a-pull-request).
+
+[git]: https://git-scm.com/downloads
+[nodejs]: https://nodejs.org
+[rubylang]: https://www.ruby-lang.org
+[yarn-install]: https://yarnpkg.com/getting-started/install
+
+[^1]: Gollum's test suite will clone and initialize test git repositories using
+      your system's `git` executable. These test git repositories are
+      committed to the codebase, and all of them use `master` as the `HEAD`. If
+      `init.defaultbranch` is set to `main` or something else in your global git
+      configuration file, this will cause many tests to erroneously fail. It's
+      on our to-do list to move these committed git repos to using a `main`
+      branch.
 
 ## Opening a Pull Request
 
 Pull Requests fixing bugs, implementing new features, or updating documentation and dependencies are all very welcome! If you would like to help out with the project, you can pick an open issue from the issue tracker. We're more than happy to help you get started! Here's how you can proceed:
 
-1. Fork and clone Gollum.
+1. Fork and clone Gollum. See [Set up your development
+   environment](#set-up-your-development-environment).
 2. Create a thoughtfully named topic branch to contain your changes.
-3. If you haven't installed dependencies yet, navigate to your clone and execute:  
+3. If you haven't installed dependencies yet, navigate to your clone and execute:
 	```
 	[sudo] bundle install
 	```
@@ -47,23 +135,32 @@ Pull Requests fixing bugs, implementing new features, or updating documentation
 8. Push the branch to your fork on GitHub.
 9. Create a pull request for Gollum.
 
-**Notes:**
-* Do not change Gollum's version numbers, we will do that on our own.
+Do not change Gollum's version number, we will do that on our own.
 
 ### Running tests
 
 1. Install [Bundler](http://bundler.io/).
 2. Navigate to the cloned source of Gollum.
-3. Install dependencies:  
+3. Install dependencies:
 	```
 	[sudo] bundle install
 	```
-4. Run the tests:  
+4. Run the tests:
 	```
 	bundle exec rake test
 	```
-	
-To profile slow tests, you can use `bundle exec rake test TESTOPTS="--verbose"`.
+
+To profile slow tests, you can use the `--verbose` flag:
+
+```sh
+bundle exec rake test TESTOPTS="--verbose"
+```
+
+You can also run a single test file with the following command:
+
+```sh
+bundle exec ruby <test/test_the_file_i_want_to_run.rb>
+```
 
 ### Working with test repositories
 
@@ -80,9 +177,20 @@ git commit -am "Add test"
 git push ../lotr.git/ master
 ```
 
+## Assets
+
+Gollum uses [yarn](https://yarnpkg.com/) and [sprockets](https://github.com/rails/sprockets) to manage assets. By default, Gollum uses the precompiled static assets that are packaged with the gem (under `lib/gollum/public/assets`). If you're making changes to Gollum's JavaScript or (S)CSS assets, you might want to develop by calling `gollum` with the `--development-assets` flag. This will cause the application to use the unpackaged assets that you are editing (under `lib/gollum/public/gollum/` and in your local `node_modules` directory), so you can test and tweak. Once you are satisfied with your changes, it's time to [update the static assets](#updating-static-assets)!
+
+For convenience, Gollum also allows developers to set a custom location for `node_modules` (by default expected to be in the root of the project) when using `--development-assets`. Set the `GOLLUM_DEV_ASSETS` environment variable to do this, e.g.: `GOLLUM_DEV_ASSETS=/path/to/my/node_modules gollum --development-assets`
+
 ## Updating static assets
 
-This is necessary whenever changes have been made to the assets in `lib/gollum/public/gollum/javascript` (mostly SASS, CSS, and JS files), to ensure the changes are also present in the [released](#releasing-the-gem) version of the gem. Steps:
+This is necessary whenever changes have been made to the assets in
+`lib/gollum/public/gollum/javascript` (mostly SASS, CSS, and JS files), to
+ensure the changes are also present in the [released](#releasing-the-gem)
+version of the gem.
+
+Steps:
 
 1. `git rm -r lib/gollum/public/assets`
 1. `bundle exec rake precompile`

data/Dockerfile

@@ -1,11 +1,14 @@
-FROM ruby:2.7-alpine AS builder
-
-RUN apk add \
-    build-base \
-    cmake \
-    git \
-    icu-dev \
-    openssl-dev
+FROM ruby:3.1-alpine AS builder
+
+RUN apk add --update \
+            --no-cache \
+            build-base \
+            cmake \
+            git \
+            icu-dev \
+            openssl-dev \
+            yaml-dev \
+    && rm -rf /var/cache/apk/*
 
 COPY Gemfile* /tmp/
 COPY gollum.gemspec* /tmp/
@@ -25,17 +28,30 @@ WORKDIR /app
 COPY . /app
 RUN bundle exec rake install
 
+FROM ruby:3.1-alpine
 
-FROM ruby:2.7-alpine
+ARG UID=${UID:-1000}
+ARG GID=${GID:-1000}
 
 COPY --from=builder /usr/local/bundle/ /usr/local/bundle/
 
-RUN apk add \
-    bash \
-    git \
-    libc6-compat
-
-VOLUME /wiki
 WORKDIR /wiki
+RUN apk add --update \
+            --no-cache \
+            bash \
+            git \
+            libc6-compat \
+            openssh \
+            shadow \
+    && rm -rf /var/cache/apk/* \
+    && groupmod -g $GID www-data \
+    && adduser -u $UID -S www-data -G www-data \
+    && git config --file /home/www-data/.gitconfig --add safe.directory /wiki \
+    && chown www-data:www-data /home/www-data/.gitconfig
+
 COPY docker-run.sh /docker-run.sh
+RUN chmod +x /docker-run.sh
+USER www-data
+VOLUME /wiki
+
 ENTRYPOINT ["/docker-run.sh"]

data/Gemfile

@@ -1,22 +1,18 @@
 source 'https://rubygems.org'
 
-gem 'warbler', platforms: :jruby
+gem 'warbler', git: 'https://github.com/jruby/warbler' if RUBY_PLATFORM == 'java'
 
-# FIXME:
-#
-# There's an issue in 1.12.5 that causes XHTML elements to be generated badly,
-# causing Gollum's test suite to fail.[1] The issue has been fixed upstream,
-# but we're still waiting for a new Nokogiri point release.
-#
-# However, 1.12.5 is a security patch, so we don't want end users to use an
-# older version of Nokogiri. But this is safe to do in our CI environment.
-#
-# Once there's a new Nokogiri release, we can remove this dependency and JRuby
-# CI should pass normally again.
-#
-# Note that Nokogiri 1.11+ does not support Ruby v2.4.x anymore. So to make our
-# current CI workflows pass, we should only try to install this version of
-# Nokogiri for newer Ruby versions.
+group :test do
+  gem 'selenium-webdriver', require: false
+  gem 'capybara', require: false
+end
+
+group :development do
+  unless RUBY_PLATFORM.match(/linux-musl$/)
+    gem 'sassc',  '~> 2.4'
+    gem 'sassc-embedded', '~> 1.54'
+  end
+end
 
 gemspec
 

data/HISTORY.md

@@ -1,7 +1,3 @@
-# 5.3.1 / 2023-03-20
-
-* Backport fixes from the `master` branch for Ruby 3.2 compatibility.
-
 # 5.3.0 / 2022-05-25
 
 * Feature: allow for overriding only specific Mustache templates/partials (@beporter)
@@ -38,7 +34,7 @@
 
 * Bugfixes
 * Add autosave feature (#1576)
-* Add Add quick access to diff of each commit in the history
+* Add quick access to diff of each commit in the history
 
 # 5.0 / 2020-03-17
 
@@ -86,7 +82,7 @@ Many of these changes have been made possible by removing the default grit adapt
 * Major enhancements
   * Made the Gollum theme responsive [@rtrvrtg](https://github.com/rtrvrtg) (#831)
   * Depends on new [gollum-lib](https://github.com/gollum/gollum-lib) `4.0.0`
-    * Allows specifiying [git adapter](https://github.com/gollum/gollum/wiki/Git-adapters) with `--adapter` [@bartkamphorst](https://github.com/bartkamphorst), [@dometto](https://github.com/dometto)
+    * Allows specifying [git adapter](https://github.com/gollum/gollum/wiki/Git-adapters) with `--adapter` [@bartkamphorst](https://github.com/bartkamphorst), [@dometto](https://github.com/dometto)
 * Numerous bugfixes
   * **NB**: please pass `--h1-title` if you do not want page titles to default to the page's filepath. See [here](https://github.com/gollum/gollum/wiki/Page-titles).
 

data/LATEST_CHANGES.md

@@ -1,3 +1,19 @@
-# 5.3.2
+# 6.0.0
 
-* Guard against [CVE-2020-11022](https://github.com/advisories/GHSA-gxr4-xjj5-5px2) (@bartkamphorst)
+# Breaking Changes
+
+* Docker image: removed deprecated automatic activation of --mathjax. Pass '--math mathjax' to continue using mathjax, or '--math' to use KaTeX (see below).
+* RACK_ENV is ignored, please use APP_ENV instead (@svoop).
+
+## New features
+
+* Add support for Mermaid diagrams (@dometto).
+* Add support for downloading page sources with ?raw (@tstein).
+* Add openssh client to docker images for ssh: repo support. (@jagerkin).
+* Add support for mathematical typesetting using KaTeX (@dometto). Users can now choose between MathJax and KaTeX with the --math flag.
+* Add support for more languages (Chinese).
+
+## Fixes & Improvements
+
+* Fix (Docker image): add git configuration for `/wiki` as safe directory. #2006
+* Fix: use `base_path` as set in config file.

data/README.md

@@ -4,7 +4,7 @@ gollum -- A git-based Wiki
 [![Gem Version](https://badge.fury.io/rb/gollum.svg)](http://badge.fury.io/rb/gollum)
 ![Build Status](https://github.com/gollum/gollum/actions/workflows/test.yaml/badge.svg)
 [![Open Source Helpers](https://www.codetriage.com/gollum/gollum/badges/users.svg)](https://www.codetriage.com/gollum/gollum)
-[![Cutting Edge Dependency Status](https://dometto-cuttingedge.herokuapp.com/github/gollum/gollum/svg 'Cutting Edge Dependency Status')](https://dometto-cuttingedge.herokuapp.com/github/gollum/gollum/info)
+[![Cutting Edge Dependency Status](https://cuttingedge.onrender.com/github/gollum/gollum/svg 'Cutting Edge Dependency Status')](https://cuttingedge.onrender.com/github/gollum/gollum/info)
 [![Docker Pulls](https://img.shields.io/docker/pulls/gollumwiki/gollum)](https://hub.docker.com/r/gollumwiki/gollum)
 
 See the [wiki](https://github.com/gollum/gollum/wiki) for extensive documentation, along with [screenshots](https://github.com/gollum/gollum/wiki/Screenshots) of Gollum's features.
@@ -22,12 +22,12 @@ Gollum is a simple wiki system built on top of Git. A Gollum Wiki is simply a gi
 	* Can be displayed in all versions, reverted, etc.
 * Gollum strives to be [compatible](https://github.com/gollum/gollum/wiki/5.0-release-notes#compatibility-option) with [GitHub](https://docs.github.com/en/communities/documenting-your-project-with-wikis/about-wikis) and [GitLab](https://docs.gitlab.com/ee/user/project/wiki/#create-or-edit-wiki-pages-locally) wikis.
   * Just clone your GitHub/GitLab wiki and view and edit it locally!
-	
+
 * Gollum supports advanced functionality like:
-  * [UML diagrams](https://github.com/gollum/gollum/wiki#plantuml-diagrams)
+  * Diagrams using [Mermaid](https://github.com/gollum/gollum/wiki#mermaid-diagrams) or [PlantUML](https://github.com/gollum/gollum/wiki#plantuml-diagrams)
   * [BibTeX and Citation support](https://github.com/gollum/gollum/wiki/BibTeX-and-Citations)
   * Annotations using [CriticMarkup](https://github.com/gollum/gollum/wiki#criticmarkup-annotations)
-  * Mathematics via [MathJax](https://github.com/gollum/gollum/wiki#mathematics)
+  * [Mathematics](https://github.com/gollum/gollum/wiki#mathematics) via KaTeX or MathJax
   * [Macros](https://github.com/gollum/gollum/wiki/Standard-Macros)
   * [Redirects](https://github.com/gollum/gollum/wiki#redirects)
   * [RSS Feed](https://github.com/gollum/gollum/wiki/5.0-release-notes#rss-feed) of latest changes
@@ -35,7 +35,11 @@ Gollum is a simple wiki system built on top of Git. A Gollum Wiki is simply a gi
 
 ### SYSTEM REQUIREMENTS
 
-Gollum runs on Unix-like systems using its default [adapter](https://github.com/gollum/rugged_adapter) for [rugged](https://github.com/libgit2/rugged). You can also run Gollum on [JRuby](https://github.com/jruby/jruby) via its [adapter](https://github.com/repotag/gollum-lib_rjgit_adapter) for [RJGit](https://github.com/repotag/rjgit/). On Windows, Gollum runs only on JRuby.
+Gollum runs both on Unix-like systems and on Windows.
+
+Gollum runs either using 'normal' Ruby (MRI) or [JRuby](https://github.com/jruby/jruby) (Ruby on the Java Virtual Machine). On Windows, Gollum runs only using JRuby (either from source, or [prebuilt](#as-a-web-application-resource-java)).
+
+On MRI, Gollum uses the [rugged](https://github.com/libgit2/rugged) git library, while on JRuby/Java it utilizes the [rjgit](https://github.com/repotag/rjgit) and [JGit](https://eclipse.dev/jgit/) libraries. See [here](https://github.com/gollum/gollum/wiki/Git-adapters) for more info.
 
 ## INSTALLATION
 
@@ -45,7 +49,7 @@ Ruby is best installed either via [RVM](https://rvm.io/) or a package manager of
 	```
 	gem install gollum
 	```
-	
+
 Installation examples for individual systems can be seen [here](https://github.com/gollum/gollum/wiki/Installation).
 
 To run, simply:
@@ -57,6 +61,12 @@ To run, simply:
 
 See [here](https://github.com/gollum/gollum/wiki/Gollum-via-Docker) for instructions on how to run Gollum via Docker.
 
+### As a web application resource (Java)
+
+The [latest Release](https://github.com/gollum/gollum/releases/) of Gollum will always contain a downloadable `gollum.war` file that can be directly executed on any system with a working Java installation:
+
+`java -jar gollum.war -S gollum <your-gollum-arguments-here>`
+
 ### Misc
 
 See [below](#running-from-source) for information on running Gollum from source, as a Rack app, and more.
@@ -104,9 +114,16 @@ Gollum can also be run alongside a CAS (Central Authentication Service) SSO (sin
 
 Gollum can also be run as a service. More on that [over here](https://github.com/gollum/gollum/wiki/Gollum-as-a-service).
 
+## ENVIRONMENT
+
+Gollum uses the environment variable `APP_ENV` primarily to control how the underlying Sinatra app behaves:
+
+* `development` – reload the app on every request
+* `production` – load the app only once
+
 ## CONFIGURATION
 
-Gollum comes with the following command line options:
+Gollum comes with the command line options listed below. Note that there are some additional 'minor' options to tweak Gollum's behaviour that do not have commandline options, but can be configured in [config.rb](#config-file).
 
 | Option            | Arguments | Description |
 | ----------------- | --------- | ----------- |
@@ -123,16 +140,13 @@ Gollum comes with the following command line options:
 | --css             | none      | Tell Gollum to inject custom CSS into each page. Uses `custom.css` from wiki root.<sup>3</sup> |
 | --js              | none      | Tell Gollum to inject custom JS into each page. Uses `custom.js` from wiki root.<sup>3</sup> |
 | --no-edit         | none      | Disable the feature of editing pages. |
-| --local-time | none      | Use the browser's local timezone instead of the server's for displaying dates. Default: false.
-| --follow-renames, --no-follow-renames  | none      | Follow pages across renames in the History view. Default: true.
 | --allow-uploads   | [MODE]    | Enable file uploads. If set to `dir`, Gollum will store all uploads in the `/uploads/` directory in repository root. If set to `page`, Gollum will store each upload at the currently edited page.<sup>4</sup> |
-| --mathjax         | none      | Enables MathJax (renders mathematical equations). By default, uses the `TeX-AMS-MML_HTMLorMML` config with the `autoload-all` extension.<sup>5</sup> |
+| --math         | [RENDERER]      | Enable rendering of mathematical equations. Valid renderers: mathjax, katex. Default: katex. Add custom configuration for the renderer to math.config.js and commit it to the repo. |
 | --critic-markup   | none      | Enable support for annotations using [CriticMarkup](http://criticmarkup.com/). |
 | --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. |
 | --user-icons      | [MODE]    | Tell Gollum to use specific user icons for history view. Can be set to `gravatar`, `identicon` or `none`. Default: `none`. |
-| --mathjax-config  | [FILE]    | Specify path to a custom MathJax configuration. If not specified, uses the `mathjax.config.js` file from repository root. |
 | --template-dir    | [PATH]    | Specify custom mustache template directory. Only overrides templates that exist in this directory. |
 | --template-page   | none      | Use _Template in root as a template for new pages. Must be committed. |
 | --emoji           | none      | Parse and interpret emoji tags (e.g. `:heart:`) except when the leading colon is backslashed (e.g. `\:heart:`). |
@@ -150,14 +164,12 @@ Gollum comes with the following command line options:
 
 ### Config file
 
-When `--config` option is used, certain inner parts of Gollum can be customized. This is used throughout our wiki for certain user-level alterations, among which [customizing supported markups](https://github.com/gollum/gollum/wiki/Formats-and-extensions) will probably stand out.
+When `--config` option is used, certain inner parts of Gollum can be customized. This is used throughout our wiki for certain user-level alterations, among which [customizing supported markups](https://github.com/gollum/gollum/wiki/Formats-and-extensions) will probably stand out. 
 
-**All of the mentioned alterations work both for Gollum's config file (`config.rb`) and Rack's config file (`config.ru`).**
+See [here](https://github.com/gollum/gollum/wiki/Sample-config.rb) for documentation about settings configurable in `config.rb`.
+
+**All of the mentioned alterations and options work both for Gollum's config file (`config.rb`) and Rack's config file (`config.ru`).**
 
 ## CONTRIBUTING
 
 Please consider helping out! See [CONTRIBUTING](CONTRIBUTING.md) for information on how to submit issues, and how to start hacking on gollum.
-
-## THANKS TO
-
-[![Testing Powered By SauceLabs](https://opensource.saucelabs.com/images/opensauce/powered-by-saucelabs-badge-gray.png?sanitize=true "Testing Powered By SauceLabs")](https://saucelabs.com)

data/Rakefile

@@ -3,12 +3,18 @@ require 'rake'
 require 'date'
 require 'tempfile'
 
+NODE_MODULES = File.join(File.dirname(__FILE__), 'node_modules')
+
 #############################################################################
 #
 # Helper functions
 #
 #############################################################################
 
+def release_branch
+  ENV.fetch('RELEASE_BRANCH', 'master')
+end
+
 def date
    Time.now.strftime("%Y-%m-%d")
 end
@@ -43,7 +49,7 @@ def bump_version
   old_file = File.read("lib/#{name}.rb")
   old_version_line = old_file[/^\s*VERSION\s*=\s*.*/]
   new_version = next_version
-  # replace first match of old vesion with new version
+  # replace first match of old version with new version
   old_file.sub!(old_version_line, "  VERSION = '#{new_version}'")
 
   File.write("lib/#{name}.rb", old_file)
@@ -63,6 +69,16 @@ def replace_header(head, header_name)
   head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
 end
 
+def bundle_katex_fonts(assets_path)
+  fonts_subpath = File.join('katex', 'dist', 'fonts')
+  fonts_source = File.join(NODE_MODULES, fonts_subpath)
+  fonts_target = File.join(assets_path, fonts_subpath)
+  puts "\n  Copying KaTeX fonts from #{fonts_source} to #{fonts_target}..."
+  `mkdir "#{fonts_target}"`
+  `cp "#{fonts_source}"/*.woff2 "#{fonts_target}"/`
+  puts "... Done."
+end
+
 #############################################################################
 #
 # Standard tasks
@@ -72,9 +88,21 @@ end
 task :default => :test
 
 require 'rake/testtask'
+
+namespace :test do
+  Rake::TestTask.new('capybara') do |test|
+    test.libs << 'lib' << 'test' << '.'
+    test.pattern = 'test/integration/**/test_*.rb'
+    test.verbose = true
+    test.warning = false
+  end
+end
+
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test' << '.'
-  test.pattern = 'test/**/test_*.rb'
+  test.test_files = FileList.new('test/**/test_*.rb') do |fl|
+    fl.exclude('test/integration/**/test_*.rb')
+  end
   test.verbose = true
   test.warning = false
 end
@@ -115,15 +143,16 @@ end
 
 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!"
+  branch = release_branch
+  unless `git branch` =~ /^\* #{branch}$/
+    puts "You must be on the #{branch} branch to release!"
     exit!
   end
   Rake::Task[:changelog].execute
   sh "git commit --allow-empty -a -m 'Release #{version}'"
-  sh "git pull --rebase origin master"
+  sh "git pull --rebase origin #{branch}"
   sh "git tag v#{version}"
-  sh "git push origin master"
+  sh "git push origin #{branch}"
   sh "git push origin v#{version}"
   sh "gem push pkg/#{name}-#{version}.gem"
 end
@@ -182,7 +211,7 @@ task :validate do
   end
 end
 
-desc 'Build changlog'
+desc 'Build changelog'
 task :changelog do
   [latest_changes_file, history_file].each do |f|
     unless File.exists?(f)
@@ -190,10 +219,10 @@ task :changelog do
       exit!
     end
   end
-  
+
   latest_changes = File.open(latest_changes_file)
   version_pattern = "# #{version}"
-  
+
   if !`grep "#{version_pattern}" #{history_file}`.empty?
     puts "#{version} is already described in #{history_file}"
     exit!
@@ -208,13 +237,13 @@ task :changelog do
     puts "#{latest_changes_file} is empty!"
     exit!
   end
-  
+
   body = latest_changes.read
   body.scan(/\s*#\s+\d\.\d.*/) do |match|
     puts "#{latest_changes_file} may not contain multiple markdown headers!"
     exit!
   end
-  
+
   temp = Tempfile.new
   temp.puts("#{version_pattern} / #{date}\n#{body}\n")
   temp.close
@@ -224,11 +253,36 @@ end
 
 desc 'Precompile assets'
 task :precompile do
+  # Attempt to install JavaScript dependencies managed by Yarn via the
+  # `package.json` file in Gollum's project root. If it fails, raise an error
+  # and exit the task early.
+  puts "\n  Installing `yarn`-managed JavaScript dependencies...  \n\n"
+  system "yarn install"
+    unless $?.success?
+    raise "This task tried to run `yarn install` to get up-to-date "          \
+      "JavaScript dependencies before precompilation. But it failed. Please " \
+      "run `yarn install` manually from your shell and resolve any issues. "  \
+      "It's possible that you just need to install `yarn` on your system."
+  end
+
+  require 'terser'
+  module Precious
+    module Assets
+      JS_COMPRESSOR = ::Terser.new
+    end
+  end
+  
   require './lib/gollum/app.rb'
+
+  # Next, configure the Sprockets asset pipeline and precompile production-
+  # ready assets.
   Precious::App.set(:environment, :production)
+
   env = Precious::Assets.sprockets
-  path = ENV.fetch('GOLLUM_ASSETS_PATH', ::File.join(File.dirname(__FILE__), 'lib/gollum/public/assets'))
+  path = ENV.fetch 'GOLLUM_ASSETS_PATH',
+    File.join(File.dirname(__FILE__), 'lib/gollum/public/assets')
   manifest = Sprockets::Manifest.new(env, path)
+
   Sprockets::Helpers.configure do |config|
     config.environment = env
     config.prefix      = Precious::Assets::ASSET_URL
@@ -236,6 +290,8 @@ task :precompile do
     config.public_path = path
     config.manifest    = manifest
   end
-  puts "Precompiling assets to #{path}..."
+
+  puts "\n  Precompiling assets to #{path}...  \n\n"
   manifest.compile(Precious::Assets::MANIFEST)
+  bundle_katex_fonts(path)
 end