From c3313d868e92f5906ec21e020c35f08c74dda090 Mon Sep 17 00:00:00 2001
From: DirtyF <frank.taillandier@gmail.com>
Date: Wed, 15 Jun 2016 22:22:57 +0200
Subject: [PATCH 1/3] fix rubocop offenses in exe/jekyll

---
 .rubocop.yml |  1 -
 exe/jekyll   | 28 ++++++++++++++++------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 431b08ff..ac0ce379 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,7 +4,6 @@ AllCops:
   Include:
   - lib/**/*.rb
   Exclude:
-  - exe/jekyll
   - lib/jekyll/collection.rb
   - lib/jekyll/command.rb
   - lib/jekyll/configuration.rb
diff --git a/exe/jekyll b/exe/jekyll
index 43364b99..c5e03111 100755
--- a/exe/jekyll
+++ b/exe/jekyll
@@ -3,8 +3,8 @@ STDOUT.sync = true
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w( .. lib ))
 
-require 'jekyll'
-require 'mercenary'
+require "jekyll"
+require "mercenary"
 
 Jekyll::PluginManager.require_from_bundler
 
@@ -12,22 +12,26 @@ Jekyll::Deprecator.process(ARGV)
 
 Mercenary.program(:jekyll) do |p|
   p.version Jekyll::VERSION
-  p.description 'Jekyll is a blog-aware, static site generator in Ruby'
-  p.syntax 'jekyll <subcommand> [options]'
+  p.description "Jekyll is a blog-aware, static site generator in Ruby"
+  p.syntax "jekyll <subcommand> [options]"
 
-  p.option 'source', '-s', '--source [DIR]', 'Source directory (defaults to ./)'
-  p.option 'destination', '-d', '--destination [DIR]', 'Destination directory (defaults to ./_site)'
-  p.option 'safe', '--safe', 'Safe mode (defaults to false)'
-  p.option 'plugins_dir', '-p', '--plugins PLUGINS_DIR1[,PLUGINS_DIR2[,...]]', Array, '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'
+  p.option "source", "-s", "--source [DIR]", "Source directory (defaults to ./)"
+  p.option "destination", "-d", "--destination [DIR]", \
+    "Destination directory (defaults to ./_site)"
+  p.option "safe", "--safe", "Safe mode (defaults to false)"
+  p.option "plugins_dir", "-p", "--plugins PLUGINS_DIR1[,PLUGINS_DIR2[,...]]", Array, \
+    "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|
-    cmd = g.split('-').last
+    cmd = g.split("-").last
     p.command(cmd.to_sym) do |c|
       c.syntax cmd
       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

From b972daa54db1f282e978919e0728999316fa549e Mon Sep 17 00:00:00 2001
From: DirtyF <frank.taillandier@gmail.com>
Date: Wed, 15 Jun 2016 22:31:08 +0200
Subject: [PATCH 2/3] apply @envygeeks recommandation

---
 exe/jekyll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exe/jekyll b/exe/jekyll
index c5e03111..2244e274 100755
--- a/exe/jekyll
+++ b/exe/jekyll
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 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 "mercenary"

From 20910976c4c6d04d88c33e2bda08d635cd602fc9 Mon Sep 17 00:00:00 2001
From: DirtyF <frank.taillandier@gmail.com>
Date: Wed, 15 Jun 2016 23:00:16 +0200
Subject: [PATCH 3/3] remove unecessary slashes

---
 exe/jekyll | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/exe/jekyll b/exe/jekyll
index 2244e274..997c64b0 100755
--- a/exe/jekyll
+++ b/exe/jekyll
@@ -16,12 +16,12 @@ Mercenary.program(:jekyll) do |p|
   p.syntax "jekyll <subcommand> [options]"
 
   p.option "source", "-s", "--source [DIR]", "Source directory (defaults to ./)"
-  p.option "destination", "-d", "--destination [DIR]", \
+  p.option "destination", "-d", "--destination [DIR]",
     "Destination directory (defaults to ./_site)"
   p.option "safe", "--safe", "Safe mode (defaults to false)"
-  p.option "plugins_dir", "-p", "--plugins PLUGINS_DIR1[,PLUGINS_DIR2[,...]]", Array, \
+  p.option "plugins_dir", "-p", "--plugins PLUGINS_DIR1[,PLUGINS_DIR2[,...]]", Array,
     "Plugins directory (defaults to ./_plugins)"
-  p.option "layouts_dir", "--layouts DIR", String, \
+  p.option "layouts_dir", "--layouts DIR", String,
     "Layouts directory (defaults to ./_layouts)"
   p.option "profile", "--profile", "Generate a Liquid rendering profile"