mirror of
https://github.com/seigler/dash-docs
synced 2025-07-27 09:46:12 +00:00
Backend: Upgrade To Jekyll 1.3.0 & Remove Workarounds
* Require in Makefile that everyone use bundle to remove inconsistencies * Require in Gemfile that everyone use Jekyll 1.3.* * Require in Gemfile that everyone use Ruby 2.0.0 (already used by Travis and most developers) * Remove workaround _plugin/svg.rb which showed SVG files in `jekyll serve` (fixed in Jekyll 1.0.0) * Remove inconsistent file path workarounds in _plugins/autocrossref.rb and _plugins/inline-template.rb
This commit is contained in:
parent
a6d5b863bf
commit
ca7b97134d
6 changed files with 11 additions and 28 deletions
9
Gemfile
9
Gemfile
|
@ -1,10 +1,15 @@
|
||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
|
|
||||||
#ruby '2.0.0'
|
## If you update the version here, also update it in .travis.yml and
|
||||||
|
## README.md. Then push your branch and make sure Travis supports that
|
||||||
|
## version. Then remind one of the site maintainers that they need to
|
||||||
|
## run `rvm install <VERSION>` on the build server(s) before they commit
|
||||||
|
## to master
|
||||||
|
ruby '2.0.0'
|
||||||
|
|
||||||
group :development do
|
group :development do
|
||||||
gem 'ffi-icu'
|
gem 'ffi-icu'
|
||||||
gem 'jekyll'
|
gem 'jekyll', '~>1.3.0'
|
||||||
gem 'json'
|
gem 'json'
|
||||||
gem 'less'
|
gem 'less'
|
||||||
gem 'kramdown'
|
gem 'kramdown'
|
||||||
|
|
|
@ -80,7 +80,7 @@ DEPENDENCIES
|
||||||
RedCloth
|
RedCloth
|
||||||
ffi-icu
|
ffi-icu
|
||||||
html-proofer
|
html-proofer
|
||||||
jekyll
|
jekyll (~> 1.3.0)
|
||||||
json
|
json
|
||||||
kramdown
|
kramdown
|
||||||
less
|
less
|
||||||
|
|
9
Makefile
9
Makefile
|
@ -4,13 +4,6 @@
|
||||||
S=@ ## Silent: only print errors by default;
|
S=@ ## Silent: only print errors by default;
|
||||||
## run `make S='' [other args]` to print commands as they're run
|
## run `make S='' [other args]` to print commands as they're run
|
||||||
|
|
||||||
## Old versions of jekyll must not call "build". If you have one of
|
|
||||||
## these versions, either run make like this: make JEKYLL_COMMAND=jekyll
|
|
||||||
## or create the JEKYLL_COMMAND environmental variable:
|
|
||||||
# echo 'export JEKYLL_COMMAND=jekyll' >> ~/.bashrc
|
|
||||||
# exec bash
|
|
||||||
# make
|
|
||||||
JEKYLL_COMMAND ?= "bundle exec jekyll build"
|
|
||||||
SITEDIR=_site
|
SITEDIR=_site
|
||||||
JEKYLL_LOG=._jekyll.log
|
JEKYLL_LOG=._jekyll.log
|
||||||
|
|
||||||
|
@ -74,7 +67,7 @@ ERROR_ON_OUTPUT="sed '1s/^/ERROR:\n/' | if grep . ; then sed 1iERROR ; false ; e
|
||||||
## Always build using the default locale so log messages can be grepped.
|
## Always build using the default locale so log messages can be grepped.
|
||||||
## This should not affect webpage output.
|
## This should not affect webpage output.
|
||||||
build:
|
build:
|
||||||
$S export LANG=C.UTF-8 ; eval $(JEKYLL_COMMAND) 2>&1 | tee $(JEKYLL_LOG)
|
$S export LANG=C.UTF-8 ; bundle exec jekyll build 2>&1 | tee $(JEKYLL_LOG)
|
||||||
$S grep -r -L 'Note: this file is built non-deterministically' _site/ \
|
$S grep -r -L 'Note: this file is built non-deterministically' _site/ \
|
||||||
| egrep -v 'sha256sums.txt' \
|
| egrep -v 'sha256sums.txt' \
|
||||||
| xargs sha256sum > _site/sha256sums.txt
|
| xargs sha256sum > _site/sha256sums.txt
|
||||||
|
|
|
@ -33,12 +33,10 @@ require 'yaml'
|
||||||
def render(context)
|
def render(context)
|
||||||
output = super
|
output = super
|
||||||
|
|
||||||
## Workaround for inconsistent relative directory
|
|
||||||
path = File.expand_path(File.dirname(__FILE__)) + "/.."
|
|
||||||
## Load terms from file
|
## Load terms from file
|
||||||
site = context.registers[:site].config
|
site = context.registers[:site].config
|
||||||
if !site.has_key?("crossref")
|
if !site.has_key?("crossref")
|
||||||
site['crossref'] = YAML.load_file(path + "/_autocrossref.yaml")
|
site['crossref'] = YAML.load_file("_autocrossref.yaml")
|
||||||
end
|
end
|
||||||
|
|
||||||
## Sort terms by reverse length, so longest matches get linked
|
## Sort terms by reverse length, so longest matches get linked
|
||||||
|
|
|
@ -23,11 +23,8 @@ require 'yaml'
|
||||||
def render(context)
|
def render(context)
|
||||||
output = super
|
output = super
|
||||||
|
|
||||||
## Workaround for inconsistent relative directory
|
|
||||||
path = File.expand_path(File.dirname(__FILE__)) + "/../"
|
|
||||||
|
|
||||||
data = YAML.load(output)
|
data = YAML.load(output)
|
||||||
template = File.open(path + @template_name, mode="r")
|
template = File.open(@template_name, mode="r")
|
||||||
@mytemplate = Liquid::Template.parse(template.read())
|
@mytemplate = Liquid::Template.parse(template.read())
|
||||||
@mytemplate.render('entry' => data)
|
@mytemplate.render('entry' => data)
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
# This file is licensed under the MIT License (MIT) available on
|
|
||||||
# http://opensource.org/licenses/MIT.
|
|
||||||
|
|
||||||
#svg.rb is a workaround to allow built-in jekyll server
|
|
||||||
#to serve svg files with jekyll --server.
|
|
||||||
|
|
||||||
require 'webrick'
|
|
||||||
include WEBrick
|
|
||||||
|
|
||||||
WEBrick::HTTPUtils::DefaultMimeTypes.store 'svg', 'image/svg+xml'
|
|
Loading…
Add table
Add a link
Reference in a new issue