jekyll 1.5.1 → 2.0.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7774f515b69590f22a19d6d02f549f16176acfdc
-  data.tar.gz: a43d5a1e9ebd75da9f4d8445d6c738593ea11c9d
+  metadata.gz: 4e35c918f0934bb55de7b1591e07da3f0aec52aa
+  data.tar.gz: 3898da127bf6315ae05408642f5109286ab906d1
 SHA512:
-  metadata.gz: 70cc97ba0736a056ceef606efec097fd966b4dc414780e643bd8f72f5881a276f74824e3faadd9fac0c02e96008662048935693a776386cfcf1112fcd4e336ae
-  data.tar.gz: a9f7b7f9a267a81f8de02195e1dad705f1452dd0639ffb623872d6602cf2fdab3b3130a0a72c41f30e86baece917ffa9fd6447f05e7a75e2d1bad0d49a49d295
+  metadata.gz: 8c0eb8bcf642c692a0ee7ca5fbb8d4185c0abd27b052d6eae1da056929b6b38694cc662d8f8ad9a3fbd0c4cd45f535512c31fde81f9f008195e7c80f88fcd957
+  data.tar.gz: 528a7516fb6aa1919008e7d9a9310271b93e0e7cc7c87ce51dc963019b90adb27dcc9fcddb648b4f38610ad740b9bc857a7bac9ab9a95a16a31fa9895837a971

data/CONTRIBUTING.markdown

@@ -53,7 +53,7 @@ Here's the most direct way to get your work merged into the project:
 * Make sure everything still passes by running `rake`.
 * If necessary, rebase your commits into logical chunks, without errors.
 * Push the branch up ( `git push origin my_awesome_feature` ).
-* Create a pull request against mojombo/jekyll and describe what your change
+* Create a pull request against jekyll/jekyll and describe what your change
   does and the why you think it should be merged.
 
 Updating Documentation
@@ -63,14 +63,14 @@ We want the Jekyll documentation to be the best it can be. We've
 open-sourced our docs and we welcome any pull requests if you find it
 lacking.
 
-You can find the documentation for jekyllrb.com in the 
-[site](https://github.com/mojombo/jekyll/tree/master/site) directory of
+You can find the documentation for jekyllrb.com in the
+[site](https://github.com/jekyll/jekyll/tree/master/site) directory of
 Jekyll's repo on GitHub.com.
 
 All documentation pull requests should be directed at `master`.  Pull
-requests directed at another branch will not be accepted. 
+requests directed at another branch will not be accepted.
 
-The [Jekyll wiki](https://github.com/mojombo/jekyll/wiki) on GitHub 
+The [Jekyll wiki](https://github.com/jekyll/jekyll/wiki) on GitHub
 can be freely updated without a pull request as all GitHub users have access.
 
 Gotchas
@@ -78,7 +78,7 @@ Gotchas
 
 * If you want to bump the gem version, please put that in a separate commit.
   This way, the maintainers can control when the gem gets released.
-* Try to keep your patch(es) based from the latest commit on mojombo/jekyll.
+* Try to keep your patch(es) based from the latest commit on jekyll/jekyll.
   The easier it is to apply your work, the less work the maintainers have to do,
   which is always a good thing.
 * Please don't tag your GitHub issue with [fix], [feature], etc. The maintainers

data/History.markdown

@@ -1,41 +1,117 @@
 ## HEAD
 
 ### Major Enhancements
+  * Add gem-based plugin whitelist to safe mode (#1657)
+  * Replace the commander command line parser with a more robust
+    solution for our needs called `mercenary` (#1706)
+  * Remove support for Ruby 1.8.x (#1780)
+  * Move to jekyll/jekyll from mojombo/jekyll (#1817)
+  * Allow custom markdown processors (#1872)
+  * Provide support for the Rouge syntax highlighter (#1859)
+  * Provide support for Sass (#1932)
+  * Provide a 300% improvement when generating sites that use
+    `Post#next` or `Post#previous` (#1983)
+  * Provide support for CoffeeScript (#1991)
+  * Replace Maruku with Kramdown as Default Markdown Processor (#1988)
 
 ### Minor Enhancements
+  * Move the EntryFilter class into the Jekyll module to avoid polluting the
+    global namespace (#1800)
+  * Add `group_by` Liquid filter create lists of items grouped by a common
+    property's value (#1788)
+  * Add support for Maruku's `fenced_code_blocks` option (#1799)
+  * Update Redcarpet dependency to ~> 3.0 (#1815)
+  * Automatically sort all pages by name (#1848)
+  * Better error message when time is not parseable (#1847)
+  * Allow `include` tag variable arguments to use filters (#1841)
+  * `post_url` tag should raise `ArgumentError` for invalid name (#1825)
+  * Bump dependency `mercenary` to `~> 0.2.0` (#1879)
+  * Bump dependency `safe_yaml` to `~> 1.0` (#1886)
+  * Allow sorting of content by custom properties (#1849)
+  * Add `--quiet` flag to silence output during build and serve (#1898)
+  * Add a `where` filter to filter arrays based on a key/value pair
+    (#1875)
+  * Route 404 errors to a custom 404 page in development (#1899)
+  * Excludes are now relative to the site source (#1916)
+  * Bring MIME Types file for `jekyll serve` to complete parity with GH Pages
+    servers (#1993)
+  * Adding Breakpoint to make new site template more responsive (#2038)
+  * Default to using the UTF-8 encoding when reading files. (#2031)
 
 ### Bug Fixes
+  * Don't allow nil entries when loading posts (#1796)
+  * Remove the scrollbar that's always displayed in new sites generated
+    from the site template (#1805)
+  * Add `#path` to required methods in `Jekyll::Convertible` (#1866)
+  * Default Maruku fenced code blocks to ON for 2.0.0-dev (#1831)
+  * Change short opts for host and port for `jekyll docs` to be consistent with
+    other subcommands (#1877)
+  * Fix typos (#1910)
+  * Lock Maruku at 0.7.0 to prevent bugs caused by Maruku 0.7.1 (#1958)
+  * Fixes full path leak to source directory when using include tag (#1951)
+  * Don't generate pages that aren't being published (#1931)
+  * Use `SafeYAML.load` to avoid conflicts with other projects (#1982)
+  * Relative posts should never fail to build (#1976)
 
 ### Development Fixes
+  * Add a link to the site in the README.md file (#1795)
+  * Add in History and site changes from `v1-stable` branch (#1836)
+  * Testing additions on the Excerpt class (#1893)
+  * Update Kramdown to `~> 1.3` (#1894)
+  * Fix the `highlight` tag feature (#1859)
+  * Test Jekyll under Ruby 2.1.0 (#1900)
+  * Add script/cibuild for fun and profit (#1912)
+  * Use `Forwardable` for delegation between `Excerpt` and `Post`
+    (#1927)
+  * Rename `read_things` to `read_content` (#1928)
+  * Add `script/branding` script for ASCII art lovin' (#1936)
+  * Update the README to reflect the repo move (#1943)
+  * Add the project vision to the README (#1935)
+  * Speed up Travis CI builds by using Rebund (#1985)
+  * Use Yarp as a Gem proxy for Travis CI (#1984)
+  * Remove Yarp as a Gem proxy for Travis CI (#2004)
+  * Move the reading of layouts into its own class (#2020)
+  * Test Sass import (#2009)
 
 ### Site Enhancements
-
-## 1.5.1 / 2014-03-27
-
-### Bug Fixes
-
-* Only strip the drive name if it begins the string (#2176)
-
-## 1.5.0 / 2014-03-24
-
-### Minor Enhancements
-
-  * Loosen `safe_yaml` dependency to `~> 1.0` (#2167)
-  * Bump `safe_yaml` dependency to `~> 1.0.0` (#1942)
-
-### Bug Fixes
-
-  * Fix issue where filesystem traversal restriction broke Windows (#2167)
-  * Lock `maruku` at `0.7.0` (#2167)
-
-### Development Fixes
-
-  * Lock `cucmber` at `1.3.11` (#2167)
+  * Document Kramdown's GFM parser option (#1791)
+  * Move CSS to includes & update normalize.css to v2.1.3 (#1787)
+  * Minify CSS only in production (#1803)
+  * Fix broken link to installation of Ruby on Mountain Lion blog post on
+    Troubleshooting docs page (#1797)
+  * Fix issues with 1.4.1 release blog post (#1804)
+  * Add note about deploying to OpenShift (#1812)
+  * Collect all Windows-related docs onto one page (#1818)
+  * Fixed typo in datafiles doc page (#1854)
+  * Clarify how to access `site` in docs (#1864)
+  * Add closing `<code>` tag to `context.registers[:site]` note (#1867)
+  * Fix link to @mojombo's site source (#1897)
+  * Add `paginate: nil` to default configuration in docs (#1896)
+  * Add link to our License in the site footer (#1889)
+  * Add a charset note in "Writing Posts" doc page (#1902)
+  * Disallow selection of path and prompt in bash examples
+  * Add jekyll-compass to the plugin list (#1923)
+  * Add note in Posts docs about stripping `<p>` tags from excerpt (#1933)
+  * Add additional info about the new exclude behavior (#1938)
+  * Linkify 'awesome contributors' to point to the contributors graph on
+    GitHub (#1940)
+  * Update `docs/sites.md` link to GitHub Training materials (#1949)
+  * Update `master` with the release info from 1.4.3 (#1947)
+  * Define docs nav in datafile (#1953)
+  * Clarify the docs around the naming convention for posts (#1971)
+  * Add missing `next` and `previous` docs for post layouts and templates (#1970)
+  * Add note to `Writing posts` page about how to strip html from excerpt (#1962)
+  * Add `jekyll-humanize` plugin to plugin list (#1998)
+  * Add `jekyll-font-awesome` plugin to plugin list (#1999)
+  * Add `sublime-jekyll` to list of Editor plugins (#2001)
+  * Add `vim-jekyll` to the list of Editor plugins (#2005)
+  * Fix non-semantic nesting of `p` tags in `news_item` layout (#2013)
+  * Document destination folder cleaning (#2016)
+  * Updated instructions for NearlyFreeSpeech.NET installation (#2015)
 
 ## 1.4.3 / 2014-01-13
 
 ### Bug Fixes
-
   * Patch show-stopping security vulnerabilities (#1944)
 
 ## 1.4.2 / 2013-12-16

data/README.markdown

@@ -1,4 +1,4 @@
-# Jekyll
+# [Jekyll](http://jekyllrb.com/)
 
 [![Gem Version](https://badge.fury.io/rb/jekyll.png)](http://badge.fury.io/rb/jekyll)
 
@@ -7,9 +7,13 @@
 [![Dependency Status](https://gemnasium.com/jekyll/jekyll.png)](https://gemnasium.com/jekyll/jekyll)
 [![Coverage Status](https://coveralls.io/repos/jekyll/jekyll/badge.png)](https://coveralls.io/r/jekyll/jekyll)
 
-By Tom Preston-Werner, Nick Quaranto, and many awesome contributors!
+By Tom Preston-Werner, Nick Quaranto, and many [awesome contributors](https://github.com/jekyll/jekyll/graphs/contributors)!
 
-Jekyll is a simple, blog aware, static site generator. It takes a template directory (representing the raw form of a website), runs it through Textile or Markdown and Liquid converters, and spits out a complete, static website suitable for serving with Apache or your favorite web server. This is also the engine behind [GitHub Pages](http://pages.github.com), which you can use to host your project's page or blog right here from GitHub.
+Jekyll is a simple, blog-aware, static site generator perfect for personal, project, or organization sites. Think of it like a file-based CMS, without all the complexity. Jekyll takes your content, renders Markdown and Liquid templates, and spits out a complete, static website ready to be served by Apache, Nginx or another web server. Jekyll is the engine behind [GitHub Pages](http://pages.github.com), which you can use to host sites right from your GitHub repositories.
+
+## Philosophy
+
+Jekyll does what you tell it to do — no more, no less. It doesn't try to outsmart users by making bold assumptions, nor does it burden them with needless complexity and configuration. Put simply, Jekyll gets out of your way and allows you to concentrate on what truly matters: your content.
 
 ## Getting Started
 

data/Rakefile

@@ -84,7 +84,7 @@ end
 #
 #############################################################################
 
-if RUBY_VERSION > '1.9' && ENV["TRAVIS"] == "true"
+if ENV["TRAVIS"] == "true"
   require 'coveralls/rake/task'
   Coveralls::RakeTask.new
 
@@ -156,7 +156,7 @@ namespace :site do
 
   desc "Update normalize.css library to the latest version and minify"
   task :update_normalize_css do
-    Dir.chdir("site/css") do
+    Dir.chdir("site/_includes/css") do
       sh 'curl "http://necolas.github.io/normalize.css/latest/normalize.css" -o "normalize.scss"'
       sh 'sass "normalize.scss":"normalize.css" --style compressed'
       sh 'rm "normalize.scss"'
@@ -169,7 +169,7 @@ namespace :site do
     puts "Checking for gh-pages dir..."
     unless File.exist?("./gh-pages")
       puts "No gh-pages directory found. Run the following commands first:"
-      puts "  `git clone git@github.com:mojombo/jekyll gh-pages"
+      puts "  `git clone git@github.com:jekyll/jekyll gh-pages"
       puts "  `cd gh-pages"
       puts "  `git checkout gh-pages`"
       exit(1)
@@ -252,8 +252,8 @@ end
 #############################################################################
 
 task :release => :build do
-  unless `git branch` =~ /^(\* master|\* v1-stable)$/
-    puts "You must be on the master branch or the v1-stable branch to release!"
+  unless `git branch` =~ /^\* master$/
+    puts "You must be on the master branch to release!"
     exit!
   end
   sh "git commit --allow-empty -m 'Release #{version}'"

data/bin/jekyll

@@ -3,156 +3,141 @@ STDOUT.sync = true
 
 $:.unshift File.join(File.dirname(__FILE__), *%w{ .. lib })
 
-require 'commander/import'
 require 'jekyll'
+require 'mercenary'
 
 Jekyll::Deprecator.process(ARGV)
 
-program :name, 'jekyll'
-program :version, Jekyll::VERSION
-program :description, 'Jekyll is a blog-aware, static site generator in Ruby'
-
-default_command :default
-
-global_option '-s', '--source [DIR]', 'Source directory (defaults to ./)'
-global_option '-d', '--destination [DIR]', 'Destination directory (defaults to ./_site)'
-global_option '--safe', 'Safe mode (defaults to false)'
-global_option '-p', '--plugins PLUGINS_DIR1[,PLUGINS_DIR2[,...]]', Array, 'Plugins directory (defaults to ./_plugins)'
-global_option '--layouts DIR', String, 'Layouts directory (defaults to ./_layouts)'
-
-# Option names don't always directly match the configuration value we'd like.
-# This method will rename options to match what Jekyll configuration expects.
-#
-# options - The Hash of options from Commander.
-#
-# Returns the normalized Hash.
-def normalize_options(options)
-  if drafts_state = options.delete(:drafts)
-    options[:show_drafts] = drafts_state
-  end
-  options
-end
-
 def add_build_options(c)
-  c.option '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
-  c.option '--future', 'Publishes posts with a future date'
-  c.option '--limit_posts MAX_POSTS', Integer, 'Limits the number of posts to parse and publish'
-  c.option '-w', '--watch', 'Watch for changes and rebuild'
-  c.option '--lsi', 'Use LSI for improved related posts'
-  c.option '-D', '--drafts', 'Render posts in the _drafts folder'
-  c.option '-V', '--verbose', 'Print verbose output.'
+  c.option 'config',  '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
+  c.option 'future',  '--future', 'Publishes posts with a future date'
+  c.option 'limit_posts', '--limit_posts MAX_POSTS', Integer, 'Limits the number of posts to parse and publish'
+  c.option 'watch',   '-w', '--watch', 'Watch for changes and rebuild'
+  c.option 'lsi',     '--lsi', 'Use LSI for improved related posts'
+  c.option 'show_drafts',  '-D', '--drafts', 'Render posts in the _drafts folder'
+  c.option 'quiet',   '-q', '--quiet', 'Silence output.'
+  c.option 'verbose', '-V', '--verbose', 'Print verbose output.'
 end
 
-command :default do |c|
-  c.action do |args, options|
+Mercenary.program(:jekyll) do |p|
+  p.version Jekyll::VERSION
+  p.description 'Jekyll is a blog-aware, static site generator in Ruby'
+  p.syntax 'jekyll <subcommand> [options]'
+
+  p.option 'source', '-s', '--source [DIR]', 'Source directory (defaults to ./)'
+  p.option 'destination', '-d', '--destination [DIR]', 'Destination directory (defaults to ./_site)'
+  p.option 'safe', '--safe', 'Safe mode (defaults to false)'
+  p.option 'plugins', '-p', '--plugins PLUGINS_DIR1[,PLUGINS_DIR2[,...]]', Array, 'Plugins directory (defaults to ./_plugins)'
+  p.option 'layouts', '--layouts DIR', String, 'Layouts directory (defaults to ./_layouts)'
+
+  p.action do |args, options|
     if args.empty?
-      command(:help).run
+      p.go(["-h"])
     else
-      Jekyll.logger.abort_with "Invalid command. Use --help for more information"
+      unless p.has_command?(args.first)
+        Jekyll.logger.abort_with "Invalid command. Use --help for more information"
+      end
     end
   end
-end
 
-command :new do |c|
-  c.syntax = 'jekyll new PATH'
-  c.description = 'Creates a new Jekyll site scaffold in PATH'
+  p.command(:new) do |c|
+    c.syntax 'jekyll new PATH'
+    c.description 'Creates a new Jekyll site scaffold in PATH'
 
-  c.option '--force', 'Force creation even if PATH already exists'
-  c.option '--blank', 'Creates scaffolding but with empty files'
+    c.option 'force', '--force', 'Force creation even if PATH already exists'
+    c.option 'blank', '--blank', 'Creates scaffolding but with empty files'
 
-  c.action do |args, options|
-    Jekyll::Commands::New.process(args, options.__hash__)
+    c.action do |args, options|
+      Jekyll::Commands::New.process(args)
+    end
   end
-end
 
-command :build do |c|
-  c.syntax = 'jekyll build [options]'
-  c.description = 'Build your site'
+  p.command(:build) do |c|
+    c.syntax      'jekyll build [options]'
+    c.description 'Build your site'
 
-  add_build_options(c)
+    add_build_options(c)
 
-  c.action do |args, options|
-    options = normalize_options(options.__hash__)
-    options = Jekyll.configuration(options)
-    Jekyll::Commands::Build.process(options)
+    c.action do |args, options|
+      options["serving"] = false
+      config = Jekyll.configuration(options)
+      Jekyll::Commands::Build.process(config)
+    end
   end
-end
-
-command :serve do |c|
-  c.syntax = 'jekyll serve [options]'
-  c.description = 'Serve your site locally'
 
-  add_build_options(c)
+  p.command(:serve) do |c|
+    c.syntax 'jekyll serve [options]'
+    c.description 'Serve your site locally'
+    c.alias :server
 
-  c.option '-B', '--detach', 'Run the server in the background (detach)'
-  c.option '-P', '--port [PORT]', 'Port to listen on'
-  c.option '-H', '--host [HOST]', 'Host to bind to'
-  c.option '-b', '--baseurl [URL]', 'Base URL'
+    add_build_options(c)
 
-  c.action do |args, options|
-    options.default :serving => true
+    c.option 'detach', '-B', '--detach', 'Run the server in the background (detach)'
+    c.option 'port', '-P', '--port [PORT]', 'Port to listen on'
+    c.option 'host', '-H', '--host [HOST]', 'Host to bind to'
+    c.option 'baseurl', '-b', '--baseurl [URL]', 'Base URL'
 
-    options = normalize_options(options.__hash__)
-    options = Jekyll.configuration(options)
-    Jekyll::Commands::Build.process(options)
-    Jekyll::Commands::Serve.process(options)
+    c.action do |args, options|
+      options["serving"] ||= true
+      options = Jekyll.configuration(options)
+      Jekyll::Commands::Build.process(options)
+      Jekyll::Commands::Serve.process(options)
+    end
   end
-end
-alias_command :server, :serve
 
-command :doctor do |c|
-  c.syntax = 'jekyll doctor'
-  c.description = 'Search site and print specific deprecation warnings'
+  p.command(:doctor) do |c|
+    c.syntax 'jekyll doctor'
+    c.description 'Search site and print specific deprecation warnings'
+    c.alias(:hyde)
 
-  c.option '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
+    c.option '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
 
-  c.action do |args, options|
-    options = normalize_options(options.__hash__)
-    options = Jekyll.configuration(options)
-    Jekyll::Commands::Doctor.process(options)
-  end
-end
-alias_command :hyde, :doctor
-
-command :docs do |c|
-  c.syntax = 'jekyll docs'
-  c.description = "Launch local server with docs for Jekyll v#{Jekyll::VERSION}"
-
-  c.option '-p', '--port [PORT]', 'Port to listen on'
-  c.option '-u', '--host [HOST]', 'Host to bind to'
-
-  c.action do |args, options|
-    options = normalize_options(options.__hash__)
-    options = Jekyll.configuration(options.merge!({
-      'source' => File.expand_path("../site", File.dirname(__FILE__)),
-      'destination' => File.expand_path("../site/_site", File.dirname(__FILE__))
-    }))
-    puts options
-    Jekyll::Commands::Build.process(options)
-    Jekyll::Commands::Serve.process(options)
+    c.action do |args, options|
+      options = Jekyll.configuration(options)
+      Jekyll::Commands::Doctor.process(options)
+    end
   end
-end
 
-command :import do |c|
-  c.syntax = 'jekyll import <platform> [options]'
-  c.description = 'Import your old blog to Jekyll'
+  p.command(:docs) do |c|
+    c.syntax 'jekyll docs'
+    c.description "Launch local server with docs for Jekyll v#{Jekyll::VERSION}"
+
+    c.option 'port', '-P', '--port [PORT]', 'Port to listen on'
+    c.option 'host', '-H', '--host [HOST]', 'Host to bind to'
+
+    c.action do |args, options|
+      options = normalize_options(options)
+      options = Jekyll.configuration(options.merge!({
+        'source' => File.expand_path("../site", File.dirname(__FILE__)),
+        'destination' => File.expand_path("../site/_site", File.dirname(__FILE__))
+      }))
+      Jekyll::Commands::Build.process(options)
+      Jekyll::Commands::Serve.process(options)
+    end
+  end
 
-  c.option '--source STRING', 'Source file or URL to migrate from'
-  c.option '--file STRING', 'File to migrate from'
-  c.option '--dbname STRING', 'Database name to migrate from'
-  c.option '--user STRING', 'Username to use when migrating'
-  c.option '--pass STRING', 'Password to use when migrating'
-  c.option '--host STRING', 'Host address to use when migrating'
-  c.option '--prefix STRING', 'Database table prefix to use when migrating'
+  p.command(:import) do |c|
+    c.syntax 'jekyll import <platform> [options]'
+    c.description 'Import your old blog to Jekyll'
+    importers = []
 
-  c.action do |args, options|
     begin
       require 'jekyll-import'
+      importers = JekyllImport.add_importer_commands(c)
     rescue LoadError
-      msg  = "You must install the 'jekyll-import' gem before continuing.\n"
-      msg += "* Please see the documentation at http://jekyllrb.com/docs/migrations/ for instructions.\n"
-      abort msg
     end
-    Jekyll::Commands::Import.process(args.first, options)
+
+    c.action do |args, options|
+      unless Object.const_defined?(:JekyllImport)
+        msg  = "You must install the 'jekyll-import' gem before continuing.\n"
+        msg += "* Please see the documentation at http://jekyllrb.com/docs/migrations/ for instructions.\n"
+        abort msg
+      end
+      if args.empty?
+        Jekyll.logger.warn "You must specify an importer."
+        Jekyll.logger.info "Valid options are:"
+        importers.each { |i| Jekyll.logger.info "*", "#{i}" }
+      end
+    end
   end
 end