jekyll 0.12.1 → 1.0.0.beta1

data/cucumber.yml

@@ -1 +1,3 @@
-default: --format progress
+default: --format pretty
+travis: --format progress
+html_report: --format progress --format html --out=features_report.html

data/features/create_sites.feature

@@ -89,7 +89,7 @@ Feature: Create sites
     And I have an "_includes/about.textile" file that contains "Generated by {% include jekyll.textile %}"
     And I have an "_includes/jekyll.textile" file that contains "Jekyll"
     And I have an "index.html" page that contains "Basic Site with include tag: {% include about.textile %}"
-    When I debug jekyll
+    When I run jekyll
     Then the _site directory should exist
     And I should see "Basic Site with include tag: Generated by Jekyll" in "_site/index.html"
 

data/features/drafts.feature

@@ -0,0 +1,25 @@
+Feature: Draft Posts
+  As a hacker who likes to blog
+  I want to be able to preview drafts locally
+  In order to see if they look alright before publishing
+  
+  Scenario: Preview a draft
+    Given I have a configuration file with "permalink" set to "none"
+    And I have a _drafts directory
+    And I have the following draft:
+      | title  | date      | layout  | content        |
+      | Recipe | 3/27/2009 | default | Not baked yet. |
+    When I run jekyll with drafts
+    Then the _site directory should exist
+    And I should see "Not baked yet." in "_site/recipe.html"
+
+  Scenario: Don't preview a draft
+    Given I have a configuration file with "permalink" set to "none"
+    And I have an "index.html" page that contains "Totally index"
+    And I have a _drafts directory
+    And I have the following draft:
+      | title  | date      | layout  | content        |
+      | Recipe | 3/27/2009 | default | Not baked yet. |
+    When I run jekyll
+    Then the _site directory should exist
+    And the "_site/recipe.html" file should not exist

data/features/site_configuration.feature

@@ -22,7 +22,7 @@ Feature: Site configuration
     Given I have an "Rakefile" file that contains "I want to be excluded"
     And I have an "README" file that contains "I want to be excluded"
     And I have an "index.html" file that contains "I want to be included"
-    And I have a configuration file with "exclude" set to "Rakefile", "README"
+    And I have a configuration file with "exclude" set to "['Rakefile', 'README']"
     When I run jekyll
     Then I should see "I want to be included" in "_site/index.html"
     And the "_site/Rakefile" file should not exist

data/features/step_definitions/jekyll_steps.rb

@@ -50,9 +50,8 @@ Given /^I have an? (.*) directory$/ do |dir|
   FileUtils.mkdir_p(dir)
 end
 
-Given /^I have the following posts?(?: (.*) "(.*)")?:$/ do |direction, folder, table|
+Given /^I have the following (draft|post)s?(?: (.*) "(.*)")?:$/ do |status, direction, folder, table|
   table.hashes.each do |post|
-    date = Date.strptime(post['date'], '%m/%d/%Y').strftime('%Y-%m-%d')
     title = post['title'].downcase.gsub(/[^\w]/, " ").strip.gsub(/\s+/, '-')
 
     if direction && direction == "in"
@@ -61,7 +60,14 @@ Given /^I have the following posts?(?: (.*) "(.*)")?:$/ do |direction, folder, t
       after = folder || '.'
     end
 
-    path = File.join(before || '.', '_posts', after || '.', "#{date}-#{title}.#{post['type'] || 'textile'}")
+    ext = post['type'] || 'textile'
+
+    if "draft" == status
+      path = File.join(before || '.', '_drafts', after || '.', "#{title}.#{ext}")
+    else
+      date = Date.strptime(post['date'], '%m/%d/%Y').strftime('%Y-%m-%d')
+      path = File.join(before || '.', '_posts', after || '.', "#{date}-#{title}.#{ext}")
+    end
 
     matter_hash = {}
     %w(title layout tag tags category categories published author).each do |key|
@@ -117,6 +123,10 @@ When /^I run jekyll$/ do
   run_jekyll
 end
 
+When /^I run jekyll with drafts$/ do
+  run_jekyll(:drafts => true)
+end
+
 When /^I debug jekyll$/ do
   run_jekyll(:debug => true)
 end

data/features/support/env.rb

@@ -10,7 +10,9 @@ TEST_DIR    = File.join('/', 'tmp', 'jekyll')
 JEKYLL_PATH = File.join(ENV['PWD'], 'bin', 'jekyll')
 
 def run_jekyll(opts = {})
-  command = JEKYLL_PATH
+  command = JEKYLL_PATH.clone
+  command << " build"
+  command << " --drafts" if opts[:drafts]
   command << " >> /dev/null 2>&1" if opts[:debug].nil?
   system command
 end

data/jekyll.gemspec

@@ -4,9 +4,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'jekyll'
-  s.version           = '0.12.1'
+  s.version           = '1.0.0.beta1'
   s.license           = 'MIT'
-  s.date              = '2013-02-19'
+  s.date              = '2013-03-14'
   s.rubyforge_project = 'jekyll'
 
   s.summary     = "A simple, blog aware, static site generator."
@@ -29,6 +29,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('maruku', "~> 0.5")
   s.add_runtime_dependency('kramdown', "~> 0.14")
   s.add_runtime_dependency('pygments.rb', "~> 0.3.2")
+  s.add_runtime_dependency('commander', "~> 4.1.3")
+  s.add_runtime_dependency('safe_yaml', "~> 0.7.0")
 
   s.add_development_dependency('rake', "~> 10.0.3")
   s.add_development_dependency('rdoc', "~> 3.11")
@@ -39,9 +41,13 @@ Gem::Specification.new do |s|
   s.add_development_dependency('RedCloth', "~> 4.2")
   s.add_development_dependency('rdiscount', "~> 1.6")
   s.add_development_dependency('redcarpet', "~> 2.2.2")
-  
+  s.add_development_dependency('launchy', "~> 2.1.2")
+  s.add_development_dependency('simplecov', "~> 0.7")
+  s.add_development_dependency('simplecov-gem-adapter', "~> 1.0.1")
+
   # = MANIFEST =
   s.files = %w[
+    CONTRIBUTING.md
     Gemfile
     History.txt
     LICENSE
@@ -50,6 +56,7 @@ Gem::Specification.new do |s|
     bin/jekyll
     cucumber.yml
     features/create_sites.feature
+    features/drafts.feature
     features/embed_filters.feature
     features/markdown.feature
     features/pagination.feature
@@ -61,40 +68,85 @@ Gem::Specification.new do |s|
     features/support/env.rb
     jekyll.gemspec
     lib/jekyll.rb
+    lib/jekyll/command.rb
+    lib/jekyll/commands/build.rb
+    lib/jekyll/commands/serve.rb
     lib/jekyll/converter.rb
     lib/jekyll/converters/identity.rb
     lib/jekyll/converters/markdown.rb
     lib/jekyll/converters/textile.rb
     lib/jekyll/convertible.rb
     lib/jekyll/core_ext.rb
+    lib/jekyll/draft.rb
     lib/jekyll/errors.rb
     lib/jekyll/filters.rb
     lib/jekyll/generator.rb
     lib/jekyll/generators/pagination.rb
     lib/jekyll/layout.rb
-    lib/jekyll/migrators/csv.rb
-    lib/jekyll/migrators/drupal.rb
-    lib/jekyll/migrators/enki.rb
-    lib/jekyll/migrators/joomla.rb
-    lib/jekyll/migrators/marley.rb
-    lib/jekyll/migrators/mephisto.rb
-    lib/jekyll/migrators/mt.rb
-    lib/jekyll/migrators/posterous.rb
-    lib/jekyll/migrators/rss.rb
-    lib/jekyll/migrators/textpattern.rb
-    lib/jekyll/migrators/tumblr.rb
-    lib/jekyll/migrators/typo.rb
-    lib/jekyll/migrators/wordpress.rb
-    lib/jekyll/migrators/wordpressdotcom.rb
+    lib/jekyll/mime.types
     lib/jekyll/page.rb
     lib/jekyll/plugin.rb
     lib/jekyll/post.rb
     lib/jekyll/site.rb
     lib/jekyll/static_file.rb
+    lib/jekyll/tags/gist.rb
     lib/jekyll/tags/highlight.rb
     lib/jekyll/tags/include.rb
     lib/jekyll/tags/post_url.rb
+    script/bootstrap
+    site/.gitignore
+    site/CNAME
+    site/README
+    site/_config.yml
+    site/_includes/analytics.html
+    site/_includes/docs_contents.html
+    site/_includes/footer.html
+    site/_includes/header.html
+    site/_includes/section_nav.html
+    site/_includes/top.html
+    site/_layouts/default.html
+    site/_layouts/docs.html
+    site/_posts/2012-07-01-configuration.md
+    site/_posts/2012-07-01-contributing.md
+    site/_posts/2012-07-01-deployment-methods.md
+    site/_posts/2012-07-01-extras.md
+    site/_posts/2012-07-01-frontmatter.md
+    site/_posts/2012-07-01-github-pages.md
+    site/_posts/2012-07-01-heroku.md
+    site/_posts/2012-07-01-home.md
+    site/_posts/2012-07-01-installation.md
+    site/_posts/2012-07-01-migrations.md
+    site/_posts/2012-07-01-pages.md
+    site/_posts/2012-07-01-pagination.md
+    site/_posts/2012-07-01-permalinks.md
+    site/_posts/2012-07-01-plugins.md
+    site/_posts/2012-07-01-posts.md
+    site/_posts/2012-07-01-resources.md
+    site/_posts/2012-07-01-sites.md
+    site/_posts/2012-07-01-structure.md
+    site/_posts/2012-07-01-templates.md
+    site/_posts/2012-07-01-troubleshooting.md
+    site/_posts/2012-07-01-usage.md
+    site/_posts/2012-07-01-variables.md
+    site/css/grid.css
+    site/css/normalize.css
+    site/css/pygments.css
+    site/css/style.css
+    site/docs/index.html
+    site/favicon.png
+    site/img/article-footer.png
+    site/img/footer-arrow.png
+    site/img/footer-logo.png
+    site/img/logo-2x.png
+    site/img/octojekyll.png
+    site/img/tube.png
+    site/img/tube1x.png
+    site/index.html
+    site/js/modernizr-2.5.3.min.js
     test/fixtures/broken_front_matter1.erb
+    test/fixtures/broken_front_matter2.erb
+    test/fixtures/broken_front_matter3.erb
+    test/fixtures/exploit_front_matter.erb
     test/fixtures/front_matter.erb
     test/helper.rb
     test/source/.htaccess
@@ -126,9 +178,13 @@ Gem::Specification.new do |s|
     test/source/_posts/2010-01-16-override-data.textile
     test/source/_posts/2011-04-12-md-extension.md
     test/source/_posts/2011-04-12-text-extension.text
+    test/source/_posts/2013-01-12-nil-layout.textile
+    test/source/_posts/2013-01-12-no-layout.textile
     test/source/about.html
     test/source/category/_posts/2008-9-23-categories.textile
     test/source/contacts.html
+    test/source/contacts/bar.html
+    test/source/contacts/index.html
     test/source/css/screen.css
     test/source/deal.with.dots.html
     test/source/foo/_posts/bar/2008-12-12-topical-post.textile

data/lib/jekyll.rb

@@ -18,7 +18,7 @@ require 'rubygems'
 # stdlib
 require 'fileutils'
 require 'time'
-require 'yaml'
+require 'safe_yaml'
 require 'English'
 
 # 3rd party
@@ -33,6 +33,7 @@ require 'jekyll/convertible'
 require 'jekyll/layout'
 require 'jekyll/page'
 require 'jekyll/post'
+require 'jekyll/draft'
 require 'jekyll/filters'
 require 'jekyll/static_file'
 require 'jekyll/errors'
@@ -41,33 +42,34 @@ require 'jekyll/errors'
 require 'jekyll/plugin'
 require 'jekyll/converter'
 require 'jekyll/generator'
+require 'jekyll/command'
+
+require_all 'jekyll/commands'
 require_all 'jekyll/converters'
 require_all 'jekyll/generators'
 require_all 'jekyll/tags'
 
+SafeYAML::OPTIONS[:suppress_warnings] = true
+
 module Jekyll
-  VERSION = '0.12.1'
+  VERSION = '1.0.0.beta1'
 
-  # Default options. Overriden by values in _config.yml or command-line opts.
+  # Default options. Overriden by values in _config.yml.
   # Strings rather than symbols are used for compatability with YAML.
   DEFAULTS = {
-    'safe'          => false,
-    'auto'          => false,
-    'server'        => false,
-    'server_port'   => 4000,
-
     'source'        => Dir.pwd,
     'destination'   => File.join(Dir.pwd, '_site'),
-    'plugins'       => File.join(Dir.pwd, '_plugins'),
+    'plugins'       => '_plugins',
     'layouts'       => '_layouts',
+    'keep_files'   => ['.git','.svn'],
 
-    'future'        => true,
-    'lsi'           => false,
-    'pygments'      => false,
-    'markdown'      => 'maruku',
-    'permalink'     => 'date',
-    'include'       => ['.htaccess'],
-    'paginate_path' => 'page:num',
+    'future'        => true,           # remove and make true just default
+    'pygments'      => false,          # remove and make true just default
+
+    'markdown'      => 'maruku',       # no longer a command option
+    'permalink'     => 'date',         # no longer a command option
+    'include'       => ['.htaccess'],  # no longer a command option
+    'paginate_path' => 'page:num',     # no longer a command option
 
     'markdown_ext'  => 'markdown,mkd,mkdn,md',
     'textile_ext'   => 'textile',
@@ -120,6 +122,9 @@ module Jekyll
   #
   # Returns the final configuration Hash.
   def self.configuration(override)
+    # Convert any symbol keys to strings and remove the old key/values
+    override = override.reduce({}) { |hsh,(k,v)| hsh.merge(k.to_s => v) }
+
     # _config.yml may override default source location, but until
     # then, we need to know where to look for _config.yml
     source = override['source'] || Jekyll::DEFAULTS['source']
@@ -127,13 +132,18 @@ module Jekyll
     # Get configuration from <source>/_config.yml
     config_file = File.join(source, '_config.yml')
     begin
-      config = YAML.load_file(config_file)
-      raise "Invalid configuration - #{config_file}" if !config.is_a?(Hash)
-      $stdout.puts "Configuration from #{config_file}"
+      config = YAML.safe_load_file(config_file)
+      raise "Configuration file: (INVALID) #{config_file}" if !config.is_a?(Hash)
+      $stdout.puts "Configuration file: #{config_file}"
+    rescue SystemCallError
+      # Errno:ENOENT = file not found
+      $stderr.puts "Configuration file: none"
+      config = {}
     rescue => err
-      $stderr.puts "WARNING: Could not read configuration. " +
+      $stderr.puts "           " +
+                   "WARNING: Error reading configuration. " +
                    "Using defaults (and options)."
-      $stderr.puts "\t" + err.to_s
+      $stderr.puts "#{err}"
       config = {}
     end
 

data/lib/jekyll/command.rb

@@ -0,0 +1,12 @@
+module Jekyll
+  class Command
+    def self.globs(source, destination)
+      Dir.chdir(source) do
+        dirs = Dir['*'].select { |x| File.directory?(x) }
+        dirs -= [destination]
+        dirs = dirs.map { |x| "#{x}/**/*" }
+        dirs += ['*']
+      end
+    end
+  end
+end

data/lib/jekyll/commands/build.rb

@@ -0,0 +1,81 @@
+module Jekyll
+  module Commands
+    class Build < Command
+      def self.process(options)
+        site = Jekyll::Site.new(options)
+
+        source = options['source']
+        destination = options['destination']
+
+        if options['watch']
+          self.watch(site, options)
+        else
+          self.build(site, options)
+        end
+      end
+
+      # Private: Build the site from source into destination.
+      #
+      # site - A Jekyll::Site instance
+      # options - A Hash of options passed to the command
+      #
+      # Returns nothing.
+      def self.build(site, options)
+        source = options['source']
+        destination = options['destination']
+        puts  "            Source: #{source}"
+        puts  "       Destination: #{destination}"
+        print "      Generating... "
+        begin
+          site.process
+        rescue Jekyll::FatalException => e
+          puts
+          puts "ERROR: YOUR SITE COULD NOT BE BUILT:"
+          puts "------------------------------------"
+          puts e.message
+          exit(1)
+        end
+        puts "done."
+      end
+
+      # Private: Watch for file changes and rebuild the site.
+      #
+      # site - A Jekyll::Site instance
+      # options - A Hash of options passed to the command
+      #
+      # Returns nothing.
+      def self.watch(site, options)
+        require 'directory_watcher'
+
+        source = options['source']
+        destination = options['destination']
+
+        puts "            Source: #{source}"
+        puts "       Destination: #{destination}"
+        puts " Auto-regeneration: enabled"
+
+        dw = DirectoryWatcher.new(source)
+        dw.interval = 1
+        dw.glob = self.globs(source, destination)
+
+        dw.add_observer do |*args|
+          t = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+          print "      Regenerating: #{args.size} files at #{t} "
+          site.process
+          puts  "...done."
+        end
+
+        dw.start
+
+        unless options['serving']
+          trap("INT") do
+            puts "     Halting auto-regeneration."
+            exit 0
+          end
+
+          loop { sleep 1000 }
+        end
+      end
+    end
+  end
+end