Replaced include code with octopress-render-code

imathis · Jun 23, 2014 · ddf78cc · ddf78cc
1 parent 9854ee1
commit ddf78cc
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 129 deletions.
diff --git a/Gemfile b/Gemfile
@@ -7,8 +7,9 @@ group :development do
   gem 'jekyll-date-format', '~> 1.0'
   gem 'jekyll-sitemap'
   gem 'octopress-codefence', '~> 1.4.2'
-  gem 'octopress-codeblock', '~> 1.0.0'
-  gem 'octopress-gist', '~> 1.2.0'
+  gem 'octopress-codeblock', '~> 1.0.1'
+  gem 'octopress-gist', '~> 1.3.0'
+  gem 'octopress-render-code', '~> 1.0.0'
   gem 'rdiscount', '~> 2.0'
   gem 'RedCloth', '~> 4.2.9'
   gem 'haml', '~> 4.0'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -40,7 +40,7 @@ GEM
       coffee-script (~> 2.2)
     jekyll-date-format (1.0.0)
       jekyll (>= 1.0.0)
-    jekyll-page-hooks (1.2.0)
+    jekyll-page-hooks (1.3.0)
       jekyll (>= 2.0.0)
     jekyll-sass-converter (1.0.0)
       sass (~> 3.2)
@@ -53,15 +53,20 @@ GEM
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     mercenary (0.3.3)
-    octopress-code-highlighter (4.0.0)
+    octopress-code-highlighter (4.0.2)
       colorator (~> 0.1.0)
-    octopress-codeblock (1.0.0)
-      octopress-code-highlighter (~> 4.0.0)
+    octopress-codeblock (1.0.1)
+      jekyll (~> 2.0.3)
+      octopress-code-highlighter (~> 4.0.1)
     octopress-codefence (1.4.2)
       jekyll-page-hooks (>= 1.0.2)
       octopress-code-highlighter (~> 4.0.0)
-    octopress-gist (1.2.0)
-      octopress-code-highlighter (~> 4.0.0)
+    octopress-gist (1.3.0)
+      jekyll (~> 2.0.3)
+      octopress-code-highlighter (~> 4.0.2)
+    octopress-render-code (1.0.0)
+      jekyll (~> 2.0.3)
+      octopress-code-highlighter (~> 4.0.1)
     parslet (1.5.0)
       blankslate (~> 2.0)
     posix-spawn (0.3.8)
@@ -75,7 +80,7 @@ GEM
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rdiscount (2.0.7.3)
+    rdiscount (2.1.7.1)
     redcarpet (3.1.2)
     rubypants (0.2.0)
     safe_yaml (1.0.3)
@@ -104,9 +109,10 @@ DEPENDENCIES
   jekyll-date-format (~> 1.0)
   jekyll-page-hooks (~> 1.2)
   jekyll-sitemap
-  octopress-codeblock (~> 1.0.0)
+  octopress-codeblock (~> 1.0.1)
   octopress-codefence (~> 1.4.2)
-  octopress-gist (~> 1.2.0)
+  octopress-gist (~> 1.3.0)
+  octopress-render-code (~> 1.0.0)
   rake (~> 10.0)
   rb-fsevent (~> 0.9)
   rdiscount (~> 2.0)

diff --git a/plugins/include_code.rb b/plugins/include_code.rb
diff --git a/plugins/octopress_filters.rb b/plugins/octopress_filters.rb
@@ -2,6 +2,7 @@
 require 'octopress-codefence'
 require 'octopress-codeblock'
 require 'octopress-gist'
+require 'octopress-render-code'
 require 'jekyll-sitemap'
 require 'jekyll-date-format'
 require './plugins/raw'

diff --git a/plugins/pygments_code.rb b/plugins/pygments_code.rb