Pin version of jekyll and fix rake docs.

assaf · Mar 27, 2016 · 136ebbc · 136ebbc
1 parent f3224a8
commit 136ebbc
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 16 deletions.
diff --git a/Gemfile b/Gemfile
@@ -34,7 +34,7 @@ end
 group :development do
   gem "appraisal", "~> 1.0.2" # For setting up test Gemfiles
 
-  gem "jekyll", platform: :ruby
+  gem "jekyll", "~> 2.5.3", platform: :ruby
   gem "rake"
   gem "RedCloth"
   gem "yard"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -120,7 +120,7 @@ DEPENDENCIES
   garb (< 0.9.2)
   integration (<= 0.1.0)
   jdbc-sqlite3
-  jekyll
+  jekyll (~> 2.5.3)
   minitest (>= 4.2)
   mongo (~> 2.1)
   rack

diff --git a/Rakefile b/Rakefile
@@ -80,7 +80,7 @@ task(:clobber) { rm_rf "tmp" }
 # -- Documenting stuff -- #TODO make sure works under 1.9/2.0
 
 desc "Jekyll generates the main documentation (sans API)"
-task(:jekyll) { sh "jekyll", "doc", "html" }
+task(:jekyll) { sh "jekyll build -s doc -d html" }
 
 desc "Create documentation in docs directory"
 task :docs=>[:jekyll]

diff --git a/gemfiles/rails32.gemfile b/gemfiles/rails32.gemfile
@@ -22,7 +22,7 @@ gem "test-unit", "~> 3.0"
 
 group :development do
   gem "appraisal", "~> 1.0.2"
-  gem "jekyll", :platform => :ruby
+  gem "jekyll", "~> 2.5.3", :platform => :ruby
   gem "rake"
   gem "RedCloth"
   gem "yard"

diff --git a/gemfiles/rails32.gemfile.lock b/gemfiles/rails32.gemfile.lock
@@ -208,7 +208,7 @@ DEPENDENCIES
   garb (< 0.9.2)
   integration (<= 0.1.0)
   jdbc-sqlite3
-  jekyll
+  jekyll (~> 2.5.3)
   minitest (~> 4.2.0)
   minitest_tu_shim (~> 1.3.3)
   mocha (~> 1.0)

diff --git a/gemfiles/rails41.gemfile b/gemfiles/rails41.gemfile
@@ -19,7 +19,7 @@ gem "passenger", "~>3.0"
 
 group :development do
   gem "appraisal", "~> 1.0.2"
-  gem "jekyll", :platform => :ruby
+  gem "jekyll", "~> 2.5.3", :platform => :ruby
   gem "rake"
   gem "RedCloth"
   gem "yard"

diff --git a/gemfiles/rails41.gemfile.lock b/gemfiles/rails41.gemfile.lock
@@ -200,7 +200,7 @@ DEPENDENCIES
   garb (< 0.9.2)
   integration (<= 0.1.0)
   jdbc-sqlite3
-  jekyll
+  jekyll (~> 2.5.3)
   minitest (>= 4.2)
   mocha (~> 1.0)
   mongo (~> 2.1)

diff --git a/gemfiles/rails42.gemfile b/gemfiles/rails42.gemfile
@@ -19,7 +19,7 @@ gem "passenger", "~>3.0"
 
 group :development do
   gem "appraisal", "~> 1.0.2"
-  gem "jekyll", :platform => :ruby
+  gem "jekyll", "~> 2.5.3", :platform => :ruby
   gem "rake"
   gem "RedCloth"
   gem "yard"

diff --git a/gemfiles/rails42.gemfile.lock b/gemfiles/rails42.gemfile.lock
@@ -226,7 +226,7 @@ DEPENDENCIES
   garb (< 0.9.2)
   integration (<= 0.1.0)
   jdbc-sqlite3
-  jekyll
+  jekyll (~> 2.5.3)
   minitest (>= 4.2)
   mocha (~> 1.0)
   mongo (~> 2.1)

diff --git a/gemfiles/rails42_protected_attributes.gemfile b/gemfiles/rails42_protected_attributes.gemfile
@@ -20,7 +20,7 @@ gem "passenger", "~>3.0"
 
 group :development do
   gem "appraisal", "~> 1.0.2"
-  gem "jekyll", :platform => :ruby
+  gem "jekyll", "~> 2.5.3", :platform => :ruby
   gem "rake"
   gem "RedCloth"
   gem "yard"

diff --git a/gemfiles/rails42_protected_attributes.gemfile.lock b/gemfiles/rails42_protected_attributes.gemfile.lock
@@ -55,15 +55,24 @@ GEM
       rake
       thor (>= 0.14.0)
     arel (6.0.3)
+    blankslate (2.1.2.4)
     bson (4.0.2)
     builder (3.2.2)
+    classifier-reborn (2.0.3)
+      fast-stemmer (~> 1.0)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.9.1)
     colorator (0.1)
     concurrent-ruby (1.0.0)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     daemon_controller (1.2.0)
     erubis (2.7.0)
+    execjs (2.5.2)
     fakefs (0.6.7)
+    fast-stemmer (1.0.2)
     ffi (1.9.10)
     garb (0.9.1)
       activesupport (>= 2.2.0)
@@ -73,22 +82,32 @@ GEM
     hashdiff (0.2.3)
     i18n (0.7.0)
     integration (0.1.0)
-    jekyll (3.0.1)
+    jekyll (2.5.3)
+      classifier-reborn (~> 2.0)
       colorator (~> 0.1)
+      jekyll-coffeescript (~> 1.0)
+      jekyll-gist (~> 1.0)
+      jekyll-paginate (~> 1.0)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
       kramdown (~> 1.3)
-      liquid (~> 3.0)
+      liquid (~> 2.6.1)
       mercenary (~> 0.3.3)
-      rouge (~> 1.7)
+      pygments.rb (~> 0.6.0)
+      redcarpet (~> 3.1)
       safe_yaml (~> 1.0)
+      toml (~> 0.1.0)
+    jekyll-coffeescript (1.0.1)
+      coffee-script (~> 2.2)
+    jekyll-gist (1.2.1)
+    jekyll-paginate (1.1.0)
     jekyll-sass-converter (1.4.0)
       sass (~> 3.4)
     jekyll-watch (1.3.0)
       listen (~> 3.0)
     json (1.8.3)
     kramdown (1.9.0)
-    liquid (3.0.6)
+    liquid (2.6.2)
     listen (3.0.5)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -107,13 +126,19 @@ GEM
       bson (~> 4.0)
     nokogiri (1.6.7.1)
       mini_portile2 (~> 2.0.0.rc2)
+    parslet (1.5.0)
+      blankslate (~> 2.0)
     passenger (3.0.21)
       daemon_controller (>= 1.0.0)
       fastthread (>= 1.0.1)
       rack
       rake (>= 0.8.1)
+    posix-spawn (0.3.11)
     protected_attributes (1.1.0)
       activemodel (>= 4.0.1, < 5.0)
+    pygments.rb (0.6.3)
+      posix-spawn (~> 0.3.6)
+      yajl-ruby (~> 1.2.0)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -145,10 +170,10 @@ GEM
     rb-fsevent (0.9.7)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
+    redcarpet (3.2.3)
     redis (3.2.2)
     redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
-    rouge (1.10.1)
     rubystats (0.2.4)
     safe_yaml (1.0.4)
     sass (3.4.20)
@@ -163,12 +188,15 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.5)
     timecop (0.8.0)
+    toml (0.1.2)
+      parslet (~> 1.5.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     webmock (1.22.5)
       addressable (< 2.4.0)
       crack (>= 0.3.2)
       hashdiff
+    yajl-ruby (1.2.1)
     yard (0.8.7.6)
 
 PLATFORMS
@@ -184,7 +212,7 @@ DEPENDENCIES
   garb (< 0.9.2)
   integration (<= 0.1.0)
   jdbc-sqlite3
-  jekyll
+  jekyll (~> 2.5.3)
   minitest (>= 4.2)
   mocha (~> 1.0)
   mongo (~> 2.1)