Sync changes from upstream repository

Hubot · Hubot · commit 9fb4f829dad8 · 2014-06-08T21:53:34.000Z
diff --git a/Gemfile b/Gemfile
@@ -6,9 +6,9 @@ gem 'builder'
 gem 'coderay'
 gem 'kramdown', '~> 0.13.2'
 gem 'mime-types', '~> 1.16'
-gem 'nanoc', '~> 3.4.3'
+gem 'nanoc', '~> 3.7'
 gem 'nokogiri', '~> 1.6.0'
-gem 'pygments.rb'
+gem 'rouge', '~> 1.4'
 gem 'rake', '~> 0.9.2'
 gem 'thin'
 gem 'yajl-ruby', '~> 0.8.2'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -3,45 +3,42 @@ GEM
   specs:
     adsf (1.2.0)
       rack (>= 1.0.0)
-    blankslate (3.1.2)
     builder (3.2.2)
     coderay (1.1.0)
     colored (1.2)
-    cri (2.4.1)
-      colored (>= 1.2)
+    cri (2.6.1)
+      colored (~> 1.2)
     daemons (1.1.9)
     ethon (0.7.0)
       ffi (>= 1.3.0)
     eventmachine (1.0.3)
     ffi (1.9.3)
     fssm (0.2.10)
-    html-proofer (0.6.1)
+    html-proofer (0.6.8)
       colored (~> 1.2)
-      mercenary (~> 0.2.0)
+      mercenary (~> 0.3.2)
       nokogiri (~> 1.6.0)
       typhoeus (~> 0.6.7)
+      yell (~> 2.0)
     kramdown (0.13.8)
-    mercenary (0.2.1)
+    mercenary (0.3.3)
     mime-types (1.25.1)
-    mini_portile (0.5.2)
-    nanoc (3.4.3)
-      cri (~> 2.2)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    pygments.rb (0.2.3)
-      rubypython (>= 0.5.1)
+    mini_portile (0.6.0)
+    nanoc (3.7.0)
+      cri (~> 2.3)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
     rack (1.5.2)
     rake (0.9.6)
-    rubypython (0.6.3)
-      blankslate (>= 2.1.2.3)
-      ffi (>= 1.0.7)
-    thin (1.6.1)
+    rouge (1.4.0)
+    thin (1.6.2)
       daemons (>= 1.0.9)
       eventmachine (>= 1.0.0)
       rack (>= 1.0.0)
     typhoeus (0.6.8)
       ethon (>= 0.7.0)
     yajl-ruby (0.8.3)
+    yell (2.0.4)
 
 PLATFORMS
   ruby
@@ -54,9 +51,9 @@ DEPENDENCIES
   html-proofer (~> 0.6.1)
   kramdown (~> 0.13.2)
   mime-types (~> 1.16)
-  nanoc (~> 3.4.3)
+  nanoc (~> 3.7)
   nokogiri (~> 1.6.0)
-  pygments.rb
   rake (~> 0.9.2)
+  rouge (~> 1.4)
   thin
   yajl-ruby (~> 0.8.2)
diff --git a/Rules b/Rules
@@ -31,7 +31,7 @@ compile '/v3/*' do
   filter :erb
   filter :kramdown, :toc_levels => [2]
   filter :colorize_syntax,
-    :colorizers => {:javascript => :pygmentsrb}
+    :colorizers => {:javascript => :rouge}
   layout item[:layout] || 'api'
 end
 
@@ -40,7 +40,7 @@ end
     filter :erb
     filter :kramdown, :toc_levels => [2]
     filter :colorize_syntax,
-      :colorizers => {:javascript => :pygmentsrb}
+      :colorizers => {:javascript => :rouge}
     layout 'changes' if version[0] == '*'
     layout item[:layout] || 'blog'
   end
@@ -49,22 +49,22 @@ end
 compile '/guides/*' do
   filter :kramdown, :toc_levels => [2]
   filter :erb
-  filter :colorize_syntax, :default_colorizer => :pygmentsrb
+  filter :colorize_syntax, :default_colorizer => :rouge
   layout item[:layout] || 'guides'
 end
 
 compile '/webhooks/*' do
   filter :kramdown, :toc_levels => [2]
   filter :erb
-  filter :colorize_syntax, :default_colorizer => :pygmentsrb
+  filter :colorize_syntax, :default_colorizer => :rouge
   layout item[:layout] || 'webhooks'
 end
 
 compile '*' do
   filter :erb
   filter :kramdown, :toc_levels => [2]
   filter :colorize_syntax,
-    :colorizers => {:javascript => :pygmentsrb}
+    :colorizers => {:javascript => :rouge}
   layout item[:layout] || 'default'
 end
 
