jekyll 0.11.0 → 0.11.2

data/History.txt

@@ -1,3 +1,12 @@
+== 0.11.2 / 2011-12-27
+  * Bug Fixes
+    * Fix gemspec
+
+== 0.11.1 / 2011-12-27
+  * Bug Fixes
+    * Fix extra blank line in highlight blocks (#409)
+    * Update dependencies
+
 == 0.11.0 / 2011-07-10
   * Major Enhancements
     * Add command line importer functionality (#253)

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'rake'
+require 'rdoc'
 require 'date'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), *%w[lib]))
@@ -49,6 +50,10 @@ task :default => [:test, :features]
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
+  if `which pygmentize` == ''
+    puts "You must have Pygments installed to run the tests."
+    exit 1
+  end
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
@@ -62,7 +67,7 @@ task :coverage do
   sh "open coverage/index.html"
 end
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "#{name} #{version}"
@@ -119,7 +124,7 @@ task :release => :build do
     puts "You must be on the master branch to release!"
     exit!
   end
-  sh "git commit --allow-empty -a -m 'Release #{version}'"
+  sh "git commit --allow-empty -m 'Release #{version}'"
   sh "git tag v#{version}"
   sh "git push origin master"
   sh "git push origin v#{version}"

data/jekyll.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'jekyll'
-  s.version           = '0.11.0'
-  s.date              = '2011-07-10'
+  s.version           = '0.11.2'
+  s.date              = '2011-12-27'
   s.rubyforge_project = 'jekyll'
 
   s.summary     = "A simple, blog aware, static site generator."
@@ -22,20 +22,22 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.textile LICENSE]
 
-  s.add_runtime_dependency('liquid', ">= 1.9.0")
-  s.add_runtime_dependency('classifier', ">= 1.3.1")
-  s.add_runtime_dependency('directory_watcher', ">= 1.1.1")
-  s.add_runtime_dependency('maruku', ">= 0.5.9")
-  s.add_runtime_dependency('kramdown', ">= 0.13.2")
-  s.add_runtime_dependency('albino', ">= 1.3.2")
+  s.add_runtime_dependency('liquid', "~> 2.3")
+  s.add_runtime_dependency('classifier', "~> 1.3")
+  s.add_runtime_dependency('directory_watcher', "~> 1.1")
+  s.add_runtime_dependency('maruku', "~> 0.5")
+  s.add_runtime_dependency('kramdown', "~> 0.13")
+  s.add_runtime_dependency('albino', "~> 1.3")
 
-  s.add_development_dependency('redgreen', ">= 1.2.2")
-  s.add_development_dependency('shoulda', ">= 2.11.3")
-  s.add_development_dependency('rr', ">= 1.0.2")
-  s.add_development_dependency('cucumber', ">= 0.10.3")
-  s.add_development_dependency('RedCloth', ">= 4.2.1")
-  s.add_development_dependency('rdiscount', ">= 1.6.5")
-  s.add_development_dependency('redcarpet', ">= 1.9.0")
+  s.add_development_dependency('rake', "~> 0.9")
+  s.add_development_dependency('rdoc', "~> 3.11")
+  s.add_development_dependency('redgreen', "~> 1.2")
+  s.add_development_dependency('shoulda', "~> 2.11")
+  s.add_development_dependency('rr', "~> 1.0")
+  s.add_development_dependency('cucumber', "1.1")
+  s.add_development_dependency('RedCloth', "~> 4.2")
+  s.add_development_dependency('rdiscount', "~> 1.6")
+  s.add_development_dependency('redcarpet', "~> 1.9")
   
   # = MANIFEST =
   s.files = %w[
@@ -46,14 +48,6 @@ Gem::Specification.new do |s|
     Rakefile
     bin/jekyll
     cucumber.yml
-    doc/output/book.html
-    doc/output/ch00-preface.asc
-    doc/output/ch01-quick-start.asc
-    doc/output/ch02-directory-layout.asc
-    doc/output/stylesheets/handbookish-quirks.css
-    doc/output/stylesheets/handbookish.css
-    doc/output/stylesheets/scribe-quirks.css
-    doc/output/stylesheets/scribe.css
     features/create_sites.feature
     features/embed_filters.feature
     features/markdown.feature
@@ -64,7 +58,6 @@ Gem::Specification.new do |s|
     features/site_data.feature
     features/step_definitions/jekyll_steps.rb
     features/support/env.rb
-    g.pl
     jekyll.gemspec
     lib/jekyll.rb
     lib/jekyll/converter.rb
@@ -97,8 +90,6 @@ Gem::Specification.new do |s|
     lib/jekyll/static_file.rb
     lib/jekyll/tags/highlight.rb
     lib/jekyll/tags/include.rb
-    output/stylesheets/scribe-quirks.css
-    output/stylesheets/scribe.css
     test/helper.rb
     test/source/.htaccess
     test/source/_includes/sig.markdown

data/lib/jekyll.rb

@@ -46,7 +46,7 @@ require_all 'jekyll/generators'
 require_all 'jekyll/tags'
 
 module Jekyll
-  VERSION = '0.11.0'
+  VERSION = '0.11.2'
 
   # Default options. Overriden by values in _config.yml or command-line opts.
   # (Strings rather symbols used for compatability with YAML).

data/lib/jekyll/tags/highlight.rb

@@ -36,9 +36,9 @@ module Jekyll
 
     def render(context)
       if context.registers[:site].pygments
-        render_pygments(context, super.join)
+        render_pygments(context, super)
       else
-        render_codehighlighter(context, super.join)
+        render_codehighlighter(context, super)
       end
     end
 
@@ -53,9 +53,7 @@ module Jekyll
       #The div is required because RDiscount blows ass
       <<-HTML
 <div>
-  <pre>
-    <code class='#{@lang}'>#{h(code).strip}</code>
-  </pre>
+  <pre><code class='#{@lang}'>#{h(code).strip}</code></pre>
 </div>
       HTML
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jekyll
 version: !ruby/object:Gem::Version 
-  hash: 51
-  prerelease: false
+  hash: 55
+  prerelease: 
   segments: 
   - 0
   - 11
-  - 0
-  version: 0.11.0
+  - 2
+  version: 0.11.2
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -15,217 +15,234 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-10 00:00:00 -07:00
+date: 2011-12-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: liquid
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 5
         segments: 
-        - 1
-        - 9
-        - 0
-        version: 1.9.0
+        - 2
+        - 3
+        version: "2.3"
   type: :runtime
+  name: liquid
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: classifier
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 9
         segments: 
         - 1
         - 3
-        - 1
-        version: 1.3.1
+        version: "1.3"
   type: :runtime
+  name: classifier
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: directory_watcher
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 13
         segments: 
         - 1
         - 1
-        - 1
-        version: 1.1.1
+        version: "1.1"
   type: :runtime
+  name: directory_watcher
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: maruku
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 1
         segments: 
         - 0
         - 5
-        - 9
-        version: 0.5.9
+        version: "0.5"
   type: :runtime
+  name: maruku
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: kramdown
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 17
         segments: 
         - 0
         - 13
-        - 2
-        version: 0.13.2
+        version: "0.13"
   type: :runtime
+  name: kramdown
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: albino
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 9
         segments: 
         - 1
         - 3
-        - 2
-        version: 1.3.2
+        version: "1.3"
   type: :runtime
+  name: albino
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: redgreen
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 25
         segments: 
-        - 1
-        - 2
-        - 2
-        version: 1.2.2
+        - 0
+        - 9
+        version: "0.9"
   type: :development
+  name: rake
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 37
+        hash: 17
         segments: 
-        - 2
-        - 11
         - 3
-        version: 2.11.3
+        - 11
+        version: "3.11"
   type: :development
+  name: rdoc
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 11
         segments: 
         - 1
-        - 0
         - 2
-        version: 1.0.2
+        version: "1.2"
   type: :development
+  name: redgreen
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 21
         segments: 
-        - 0
-        - 10
-        - 3
-        version: 0.10.3
+        - 2
+        - 11
+        version: "2.11"
   type: :development
+  name: shoulda
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: RedCloth
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 53
+        hash: 15
         segments: 
-        - 4
-        - 2
         - 1
-        version: 4.2.1
+        - 0
+        version: "1.0"
   type: :development
+  name: rr
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: rdiscount
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 13
         segments: 
         - 1
-        - 6
-        - 5
-        version: 1.6.5
+        - 1
+        version: "1.1"
   type: :development
+  name: cucumber
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: redcarpet
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 4
+        - 2
+        version: "4.2"
+  type: :development
+  name: RedCloth
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 6
+        version: "1.6"
+  type: :development
+  name: rdiscount
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 29
         segments: 
         - 1
         - 9
-        - 0
-        version: 1.9.0
+        version: "1.9"
   type: :development
-  version_requirements: *id013
+  name: redcarpet
+  version_requirements: *id015
 description: Jekyll is a simple, blog aware, static site generator.
 email: tom@mojombo.com
 executables: 
@@ -243,14 +260,6 @@ files:
 - Rakefile
 - bin/jekyll
 - cucumber.yml
-- doc/output/book.html
-- doc/output/ch00-preface.asc
-- doc/output/ch01-quick-start.asc
-- doc/output/ch02-directory-layout.asc
-- doc/output/stylesheets/handbookish-quirks.css
-- doc/output/stylesheets/handbookish.css
-- doc/output/stylesheets/scribe-quirks.css
-- doc/output/stylesheets/scribe.css
 - features/create_sites.feature
 - features/embed_filters.feature
 - features/markdown.feature
@@ -261,7 +270,6 @@ files:
 - features/site_data.feature
 - features/step_definitions/jekyll_steps.rb
 - features/support/env.rb
-- g.pl
 - jekyll.gemspec
 - lib/jekyll.rb
 - lib/jekyll/converter.rb
@@ -294,8 +302,6 @@ files:
 - lib/jekyll/static_file.rb
 - lib/jekyll/tags/highlight.rb
 - lib/jekyll/tags/include.rb
-- output/stylesheets/scribe-quirks.css
-- output/stylesheets/scribe.css
 - test/helper.rb
 - test/source/.htaccess
 - test/source/_includes/sig.markdown
@@ -379,7 +385,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: jekyll
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 2
 summary: A simple, blog aware, static site generator.