From b830a8e005844d784259b1448345223d7261c8de Mon Sep 17 00:00:00 2001 From: Denis Defreyne Date: Fri, 8 Jun 2012 19:38:32 +0200 Subject: [PATCH 1/2] updated to latest nanoc version --- Gemfile | 2 +- Gemfile.lock | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index d2ad58d840..1315bfbf3d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "http://rubygems.org" gem 'rake', '~> 0.9.2' -gem 'nanoc', '~> 3.1.6' +gem 'nanoc', '~> 3.3.7' gem 'kramdown', '~> 0.13.2' gem 'nokogiri', '~> 1.4.4' gem 'yajl-ruby', '~> 0.8.2' diff --git a/Gemfile.lock b/Gemfile.lock index 6cd448fe9a..ec8ce4c5b0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,21 +1,21 @@ GEM remote: http://rubygems.org/ specs: - adsf (1.0.1) + adsf (1.1.1) rack (>= 1.0.0) - coderay (1.0.5) - cri (1.0.1) - kramdown (0.13.2) - mime-types (1.16) - nanoc (3.1.6) - nanoc3 (>= 3.1.6) - nanoc3 (3.1.6) - cri (>= 1.0.0) - nokogiri (1.4.4) + coderay (1.0.6) + colored (1.2) + cri (2.3.0) + colored (>= 1.2) + kramdown (0.13.7) + mime-types (1.18) + nanoc (3.3.7) + cri (~> 2.2) + nokogiri (1.4.7) pygmentize (0.0.3) - rack (1.2.2) + rack (1.4.1) rake (0.9.2.2) - yajl-ruby (0.8.2) + yajl-ruby (0.8.3) PLATFORMS ruby @@ -25,7 +25,7 @@ DEPENDENCIES coderay kramdown (~> 0.13.2) mime-types (~> 1.16) - nanoc (~> 3.1.6) + nanoc (~> 3.3.7) nokogiri (~> 1.4.4) pygmentize (~> 0.0.3) rake (~> 0.9.2) From b35c70631207ad183480076cd47c1046bca40144 Mon Sep 17 00:00:00 2001 From: Denis Defreyne Date: Fri, 8 Jun 2012 19:39:24 +0200 Subject: [PATCH 2/2] replaced pygmentize by pygments.rb --- Gemfile | 2 +- Gemfile.lock | 10 ++++++++-- Rules | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 1315bfbf3d..7fbcc9ed33 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ gem 'nanoc', '~> 3.3.7' gem 'kramdown', '~> 0.13.2' gem 'nokogiri', '~> 1.4.4' gem 'yajl-ruby', '~> 0.8.2' -gem 'pygmentize', '~> 0.0.3' +gem 'pygments.rb' gem 'mime-types', '~> 1.16' gem 'coderay' diff --git a/Gemfile.lock b/Gemfile.lock index ec8ce4c5b0..857d181cc9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,18 +3,24 @@ GEM specs: adsf (1.1.1) rack (>= 1.0.0) + blankslate (2.1.2.4) coderay (1.0.6) colored (1.2) cri (2.3.0) colored (>= 1.2) + ffi (1.0.11) kramdown (0.13.7) mime-types (1.18) nanoc (3.3.7) cri (~> 2.2) nokogiri (1.4.7) - pygmentize (0.0.3) + pygments.rb (0.2.12) + rubypython (~> 0.5.3) rack (1.4.1) rake (0.9.2.2) + rubypython (0.5.3) + blankslate (>= 2.1.2.3) + ffi (~> 1.0.7) yajl-ruby (0.8.3) PLATFORMS @@ -27,6 +33,6 @@ DEPENDENCIES mime-types (~> 1.16) nanoc (~> 3.3.7) nokogiri (~> 1.4.4) - pygmentize (~> 0.0.3) + pygments.rb rake (~> 0.9.2) yajl-ruby (~> 0.8.2) diff --git a/Rules b/Rules index 0a872ff7f4..c56a0eb86c 100644 --- a/Rules +++ b/Rules @@ -17,7 +17,7 @@ compile '*' do filter :erb filter :kramdown filter :colorize_syntax, - :colorizers => {:javascript => :pygmentize} + :colorizers => {:javascript => :pygmentsrb} layout 'default' end