fix rubocop offenses in exe/jekyll

This commit is contained in:
DirtyF 2016-06-15 22:22:57 +02:00
parent a9666bf1c7
commit c3313d868e
No known key found for this signature in database
GPG Key ID: E73258E3F50AEB7E
2 changed files with 16 additions and 13 deletions

View File

@ -4,7 +4,6 @@ AllCops:
Include: Include:
- lib/**/*.rb - lib/**/*.rb
Exclude: Exclude:
- exe/jekyll
- lib/jekyll/collection.rb - lib/jekyll/collection.rb
- lib/jekyll/command.rb - lib/jekyll/command.rb
- lib/jekyll/configuration.rb - lib/jekyll/configuration.rb

View File

@ -3,8 +3,8 @@ STDOUT.sync = true
$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w( .. lib )) $LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w( .. lib ))
require 'jekyll' require "jekyll"
require 'mercenary' require "mercenary"
Jekyll::PluginManager.require_from_bundler Jekyll::PluginManager.require_from_bundler
@ -12,22 +12,26 @@ Jekyll::Deprecator.process(ARGV)
Mercenary.program(:jekyll) do |p| Mercenary.program(:jekyll) do |p|
p.version Jekyll::VERSION p.version Jekyll::VERSION
p.description 'Jekyll is a blog-aware, static site generator in Ruby' p.description "Jekyll is a blog-aware, static site generator in Ruby"
p.syntax 'jekyll <subcommand> [options]' p.syntax "jekyll <subcommand> [options]"
p.option 'source', '-s', '--source [DIR]', 'Source directory (defaults to ./)' p.option "source", "-s", "--source [DIR]", "Source directory (defaults to ./)"
p.option 'destination', '-d', '--destination [DIR]', 'Destination directory (defaults to ./_site)' p.option "destination", "-d", "--destination [DIR]", \
p.option 'safe', '--safe', 'Safe mode (defaults to false)' "Destination directory (defaults to ./_site)"
p.option 'plugins_dir', '-p', '--plugins PLUGINS_DIR1[,PLUGINS_DIR2[,...]]', Array, 'Plugins directory (defaults to ./_plugins)' p.option "safe", "--safe", "Safe mode (defaults to false)"
p.option 'layouts_dir', '--layouts DIR', String, 'Layouts directory (defaults to ./_layouts)' p.option "plugins_dir", "-p", "--plugins PLUGINS_DIR1[,PLUGINS_DIR2[,...]]", Array, \
p.option 'profile', '--profile', 'Generate a Liquid rendering profile' "Plugins directory (defaults to ./_plugins)"
p.option "layouts_dir", "--layouts DIR", String, \
"Layouts directory (defaults to ./_layouts)"
p.option "profile", "--profile", "Generate a Liquid rendering profile"
Jekyll::External.require_if_present(Jekyll::External.blessed_gems) do |g| Jekyll::External.require_if_present(Jekyll::External.blessed_gems) do |g|
cmd = g.split('-').last cmd = g.split("-").last
p.command(cmd.to_sym) do |c| p.command(cmd.to_sym) do |c|
c.syntax cmd c.syntax cmd
c.action do c.action do
Jekyll.logger.abort_with "You must install the '#{g}' gem to use the 'jekyll #{cmd}' command." Jekyll.logger.abort_with "You must install the '#{g}' gem" \
" to use the 'jekyll #{cmd}' command."
end end
end end
end end