jekyll 1.0.2 → 1.0.3

data/features/site_configuration.feature

@@ -88,8 +88,8 @@ Feature: Site configuration
     And I have a _posts directory
     And I have the following posts:
       | title     | date       | layout  | content                                |
-      | entry1    | 12/31/2007 | post    | content for entry1.                    |
-      | entry2    | 01/31/2020 | post    | content for entry2.                    |
+      | entry1    | 2007-12-31 | post    | content for entry1.                    |
+      | entry2    | 2020-01-31 | post    | content for entry2.                    |
     When I run jekyll
     Then the _site directory should exist
     And I should see "Page Layout: 1 on 2010-01-01" in "_site/index.html"
@@ -108,8 +108,8 @@ Feature: Site configuration
     And I have a _posts directory
     And I have the following posts:
       | title     | date       | layout  | content                                |
-      | entry1    | 12/31/2007 | post    | content for entry1.                    |
-      | entry2    | 01/31/2020 | post    | content for entry2.                    |
+      | entry1    | 2007-12-31 | post    | content for entry1.                    |
+      | entry2    | 2020-01-31 | post    | content for entry2.                    |
     When I run jekyll
     Then the _site directory should exist
     And I should see "Page Layout: 2 on 2010-01-01" in "_site/index.html"
@@ -163,9 +163,9 @@ Feature: Site configuration
       | limit_posts | 2           |
     And I have the following posts:
       | title   | date      | content          |
-      | Apples  | 3/27/2009 | An article about apples |
-      | Oranges | 4/1/2009  | An article about oranges |
-      | Bananas | 4/5/2009  | An article about bananas |
+      | Apples  | 2009-03-27 | An article about apples |
+      | Oranges | 2009-04-01  | An article about oranges |
+      | Bananas | 2009-04-05  | An article about bananas |
     When I run jekyll
     Then the _site directory should exist
     And the "_site/2009/04/05/bananas.html" file should exist
@@ -197,8 +197,8 @@ Feature: Site configuration
     And I have a _posts directory
     And I have the following posts:
       | title     | date       | layout  | content                                |
-      | entry1    | 12/31/2007 | post    | content for entry1.                    |
-      | entry2    | 01/31/2020 | post    | content for entry2.                    |
+      | entry1    | 2007-12-31 | post    | content for entry1.                    |
+      | entry2    | 2020-01-31 | post    | content for entry2.                    |
     When I run jekyll
     Then the _site directory should exist
     And I should see "Page Layout: 2 on 2010-01-01" in "_site/index.html"

data/features/site_data.feature

@@ -39,9 +39,9 @@ Feature: Site data
     And I have an "index.html" page that contains "{{ site.posts.first.title }}: {{ site.posts.first.url }}"
     And I have the following posts:
       | title       | date      | content         |
-      | First Post  | 3/25/2009 | My First Post   |
-      | Second Post | 3/26/2009 | My Second Post  |
-      | Third Post  | 3/27/2009 | My Third Post   |
+      | First Post  | 2009-03-25 | My First Post   |
+      | Second Post | 2009-03-26 | My Second Post  |
+      | Third Post  | 2009-03-27 | My Third Post   |
     When I run jekyll
     Then the _site directory should exist
     And I should see "Third Post: /2009/03/27/third-post.html" in "_site/index.html"
@@ -51,9 +51,9 @@ Feature: Site data
     And I have an "index.html" page that contains "{% for post in site.posts %} {{ post.title }} {% endfor %}"
     And I have the following posts:
       | title       | date      | content         |
-      | First Post  | 3/25/2009 | My First Post   |
-      | Second Post | 3/26/2009 | My Second Post  |
-      | Third Post  | 3/27/2009 | My Third Post   |
+      | First Post  | 2009-03-25 | My First Post   |
+      | Second Post | 2009-03-26 | My Second Post  |
+      | Third Post  | 2009-03-27 | My Third Post   |
     When I run jekyll
     Then the _site directory should exist
     And I should see "Third Post  Second Post  First Post" in "_site/index.html"
@@ -63,8 +63,8 @@ Feature: Site data
     And I have an "index.html" page that contains "{% for post in site.categories.code %} {{ post.title }} {% endfor %}"
     And I have the following posts:
       | title          | date      | category | content            |
-      | Awesome Hack   | 3/26/2009 | code     | puts 'Hello World' |
-      | Delicious Beer | 3/26/2009 | food     | 1) Yuengling       |
+      | Awesome Hack   | 2009-03-26 | code     | puts 'Hello World' |
+      | Delicious Beer | 2009-03-26 | food     | 1) Yuengling       |
     When I run jekyll
     Then the _site directory should exist
     And I should see "Awesome Hack" in "_site/index.html"
@@ -74,7 +74,7 @@ Feature: Site data
     And I have an "index.html" page that contains "{% for post in site.tags.beer %} {{ post.content }} {% endfor %}"
     And I have the following posts:
       | title          | date      | tag  | content            |
-      | Delicious Beer | 3/26/2009 | beer | 1) Yuengling       |
+      | Delicious Beer | 2009-03-26 | beer | 1) Yuengling       |
     When I run jekyll
     Then the _site directory should exist
     And I should see "Yuengling" in "_site/index.html"
@@ -84,11 +84,11 @@ Feature: Site data
   And I have an "index.html" page that contains "{% for post in site.posts %}{{ post.title }}:{{ post.previous.title}},{{ post.next.title}} {% endfor %}"
   And I have the following posts:
     | title | date      | content |
-    | first | 2/26/2009 | first   |
-    | A     | 3/26/2009 | A       |
-    | B     | 3/26/2009 | B       |
-    | C     | 3/26/2009 | C       |
-    | last  | 4/26/2009 | last    |
+    | first | 2009-02-26 | first   |
+    | A     | 2009-03-26 | A       |
+    | B     | 2009-03-26 | B       |
+    | C     | 2009-03-26 | C       |
+    | last  | 2009-04-26 | last    |
   When I run jekyll
   Then the _site directory should exist
   And I should see "last:C, C:B,last B:A,C A:first,B first:,A" in "_site/index.html"

data/features/step_definitions/jekyll_steps.rb

@@ -47,44 +47,33 @@ Given /^I have an? (.*) directory$/ do |dir|
   FileUtils.mkdir_p(dir)
 end
 
-Given /^I have the following (draft|post)s?(?: (.*) "(.*)")?:$/ do |status, direction, folder, table|
+Given /^I have the following (draft|post)s?(?: (in|under) "([^"]+)")?:$/ do |status, direction, folder, table|
   table.hashes.each do |post|
-    title = post['title'].downcase.gsub(/[^\w]/, " ").strip.gsub(/\s+/, '-')
-
-    if direction && direction == "in"
-      before = folder || '.'
-    elsif direction && direction == "under"
-      after = folder || '.'
-    end
-
+    title = slug(post['title'])
     ext = post['type'] || 'textile'
+    before, after = location(folder, direction)
 
     if "draft" == status
-      path = File.join(before || '.', '_drafts', after || '.', "#{title}.#{ext}")
-    else
-      format = if has_time_component?(post['date'])
-        '%Y-%m-%d %H:%M %z'
-      else
-        '%m/%d/%Y' # why even
-      end
-      parsed_date = DateTime.strptime(post['date'], format)
-      post['date'] = parsed_date.to_s
-      date = parsed_date.strftime('%Y-%m-%d')
-      path = File.join(before || '.', '_posts', after || '.', "#{date}-#{title}.#{ext}")
+      folder_post = '_drafts'
+      filename = "#{title}.#{ext}"
+    elsif "post" == status
+      parsed_date = Time.xmlschema(post['date']) rescue Time.parse(post['date'])
+      folder_post = '_posts'
+      filename = "#{parsed_date.strftime('%Y-%m-%d')}-#{title}.#{ext}"
     end
 
+    path = File.join(before, folder_post, after, filename)
+
     matter_hash = {}
-    %w(title layout tag tags category categories published author path).each do |key|
+    %w(title layout tag tags category categories published author path date).each do |key|
       matter_hash[key] = post[key] if post[key]
     end
-    if "post" == status
-      matter_hash["date"] = post["date"] if post["date"]
-    end
     matter = matter_hash.map { |k, v| "#{k}: #{v}\n" }.join.chomp
 
-    content = post['content']
-    if post['input'] && post['filter']
-      content = "{{ #{post['input']} | #{post['filter']} }}"
+    content = if post['input'] && post['filter']
+      "{{ #{post['input']} | #{post['filter']} }}"
+    else
+      post['content']
     end
 
     File.open(path, 'w') do |f|

data/features/support/env.rb

@@ -1,10 +1,7 @@
 require 'fileutils'
 require 'rr'
 require 'test/unit'
-
-World do
-  include Test::Unit::Assertions
-end
+require 'time'
 
 TEST_DIR    = File.join('/', 'tmp', 'jekyll')
 JEKYLL_PATH = File.join(File.dirname(__FILE__), '..', '..', 'bin', 'jekyll')
@@ -17,8 +14,16 @@ def run_jekyll(opts = {})
   system command
 end
 
-def has_time_component?(date_string)
-  date_string.split(" ").size > 1
+def slug(title)
+  title.downcase.gsub(/[^\w]/, " ").strip.gsub(/\s+/, '-')
+end
+
+def location(folder, direction)
+  if folder
+    before = folder if direction == "in"
+    after = folder if direction == "under"
+  end
+  [before || '.', after || '.']
 end
 
 # work around "invalid option: --format" cucumber bug (see #296)

data/jekyll.gemspec

@@ -4,9 +4,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'jekyll'
-  s.version           = '1.0.2'
+  s.version           = '1.0.3'
   s.license           = 'MIT'
-  s.date              = '2013-05-12'
+  s.date              = '2013-06-07'
   s.rubyforge_project = 'jekyll'
 
   s.summary     = "A simple, blog aware, static site generator."
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rdoc', "~> 3.11")
   s.add_development_dependency('redgreen', "~> 1.2")
   s.add_development_dependency('shoulda', "~> 3.3.2")
-  s.add_development_dependency('rr', "~> 1.0")
+  s.add_development_dependency('rr', "~> 1.0.0")
   s.add_development_dependency('cucumber', "~> 1.2.1", '!= 1.2.4')
   s.add_development_dependency('RedCloth', "~> 4.2")
   s.add_development_dependency('rdiscount', "~> 1.6")
@@ -92,13 +92,14 @@ Gem::Specification.new do |s|
     lib/jekyll/generator.rb
     lib/jekyll/generators/pagination.rb
     lib/jekyll/layout.rb
-    lib/jekyll/logger.rb
     lib/jekyll/mime.types
     lib/jekyll/page.rb
     lib/jekyll/plugin.rb
     lib/jekyll/post.rb
+    lib/jekyll/related_posts.rb
     lib/jekyll/site.rb
     lib/jekyll/static_file.rb
+    lib/jekyll/stevenson.rb
     lib/jekyll/tags/gist.rb
     lib/jekyll/tags/highlight.rb
     lib/jekyll/tags/include.rb
@@ -137,6 +138,7 @@ Gem::Specification.new do |s|
     site/docs/frontmatter.md
     site/docs/github-pages.md
     site/docs/heroku.md
+    site/docs/history.md
     site/docs/index.md
     site/docs/installation.md
     site/docs/migrations.md
@@ -235,6 +237,7 @@ Gem::Specification.new do |s|
     test/test_rdiscount.rb
     test/test_redcarpet.rb
     test/test_redcloth.rb
+    test/test_related_posts.rb
     test/test_site.rb
     test/test_tags.rb
   ]

data/lib/jekyll.rb

@@ -28,7 +28,7 @@ require 'colorator'
 
 # internal requires
 require 'jekyll/core_ext'
-require 'jekyll/logger'
+require 'jekyll/stevenson'
 require 'jekyll/deprecator'
 require 'jekyll/configuration'
 require 'jekyll/site'
@@ -40,6 +40,7 @@ require 'jekyll/draft'
 require 'jekyll/filters'
 require 'jekyll/static_file'
 require 'jekyll/errors'
+require 'jekyll/related_posts'
 
 # extensions
 require 'jekyll/plugin'
@@ -56,7 +57,7 @@ require_all 'jekyll/tags'
 SafeYAML::OPTIONS[:suppress_warnings] = true
 
 module Jekyll
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 
   # Public: Generate a Jekyll configuration Hash by merging the default
   # options with anything in _config.yml, and adding the given options on top.
@@ -86,4 +87,8 @@ module Jekyll
   def self.set_timezone(timezone)
     ENV['TZ'] = timezone
   end
+
+  def self.logger
+    @logger ||= Stevenson.new
+  end
 end

data/lib/jekyll/command.rb

@@ -18,9 +18,9 @@ module Jekyll
       site.process
     rescue Jekyll::FatalException => e
       puts
-      Jekyll::Logger.error "ERROR:", "YOUR SITE COULD NOT BE BUILT:"
-      Jekyll::Logger.error "", "------------------------------------"
-      Jekyll::Logger.error "", e.message
+      Jekyll.logger.error "ERROR:", "YOUR SITE COULD NOT BE BUILT:"
+      Jekyll.logger.error "", "------------------------------------"
+      Jekyll.logger.error "", e.message
       exit(1)
     end
   end

data/lib/jekyll/commands/build.rb

@@ -17,9 +17,9 @@ module Jekyll
       def self.build(site, options)
         source = options['source']
         destination = options['destination']
-        Jekyll::Logger.info "Source:", source
-        Jekyll::Logger.info "Destination:", destination
-        print Jekyll::Logger.formatted_topic "Generating..."
+        Jekyll.logger.info "Source:", source
+        Jekyll.logger.info "Destination:", destination
+        print Jekyll.logger.formatted_topic "Generating..."
         self.process_site(site)
         puts "done."
       end
@@ -36,14 +36,14 @@ module Jekyll
         source = options['source']
         destination = options['destination']
 
-        Jekyll::Logger.info "Auto-regeneration:", "enabled"
+        Jekyll.logger.info "Auto-regeneration:", "enabled"
 
         dw = DirectoryWatcher.new(source, :glob => self.globs(source, destination), :pre_load => true)
         dw.interval = 1
 
         dw.add_observer do |*args|
           t = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-          print Jekyll::Logger.formatted_topic("Regenerating:") + "#{args.size} files at #{t} "
+          print Jekyll.logger.formatted_topic("Regenerating:") + "#{args.size} files at #{t} "
           self.process_site(site)
           puts  "...done."
         end

data/lib/jekyll/commands/doctor.rb

@@ -7,7 +7,7 @@ module Jekyll
           site.read
 
           unless deprecated_relative_permalinks(site)
-            Jekyll::Logger.info "Your test results", "are in. Everything looks fine."
+            Jekyll.logger.info "Your test results", "are in. Everything looks fine."
           end
         end
 
@@ -15,7 +15,7 @@ module Jekyll
           contains_deprecated_pages = false
           site.pages.each do |page|
             if page.uses_relative_permalinks
-              Jekyll::Logger.warn "Deprecation:", "'#{page.path}' uses relative" +
+              Jekyll.logger.warn "Deprecation:", "'#{page.path}' uses relative" +
                                   " permalinks which will be deprecated in" +
                                   " Jekyll v1.1 and beyond."
               contains_deprecated_pages = true

data/lib/jekyll/commands/new.rb

@@ -3,13 +3,13 @@ require 'erb'
 module Jekyll
   module Commands
     class New < Command
-      def self.process(args)
+      def self.process(args, options = {})
         raise ArgumentError.new('You must specify a path.') if args.empty?
 
         new_blog_path = File.expand_path(args.join(" "), Dir.pwd)
         FileUtils.mkdir_p new_blog_path
-        unless Dir["#{new_blog_path}/**/*"].empty?
-          Jekyll::Logger.error "Conflict:", "#{new_blog_path} exists and is not empty."
+        if preserve_source_location?(new_blog_path, options)
+          Jekyll.logger.error "Conflict:", "#{new_blog_path} exists and is not empty."
           exit(1)
         end
 
@@ -33,6 +33,11 @@ module Jekyll
       end
 
       private
+
+      def self.preserve_source_location?(path, options)
+        !options[:force] && !Dir["#{path}/**/*"].empty?
+      end
+
       def self.create_sample_files(path)
         FileUtils.cp_r site_template + '/.', path
         FileUtils.rm File.expand_path(scaffold_path, path)

data/lib/jekyll/configuration.rb

@@ -115,7 +115,7 @@ module Jekyll
     def read_config_file(file)
       next_config = YAML.safe_load_file(file)
       raise "Configuration file: (INVALID) #{file}".yellow if !next_config.is_a?(Hash)
-      Jekyll::Logger.info "Configuration file:", file
+      Jekyll.logger.info "Configuration file:", file
       next_config
     end
 
@@ -135,9 +135,9 @@ module Jekyll
         end
       rescue SystemCallError
         # Errno:ENOENT = file not found
-        Jekyll::Logger.warn "Configuration file:", "none"
+        Jekyll.logger.warn "Configuration file:", "none"
       rescue => err
-        Jekyll::Logger.warn "WARNING:", "Error reading configuration. " +
+        Jekyll.logger.warn "WARNING:", "Error reading configuration. " +
                      "Using defaults (and options)."
         $stderr.puts "#{err}"
       end
@@ -145,6 +145,15 @@ module Jekyll
       configuration.backwards_compatibilize
     end
 
+    # Public: Split a CSV string into an array containing its values
+    #
+    # csv - the string of comma-separated values
+    #
+    # Returns an array of the values contained in the CSV
+    def csv_to_array(csv)
+      csv.split(",").map(&:strip)
+    end
+
     # Public: Ensure the proper options are set in the configuration to allow for
     # backwards-compatibility with Jekyll pre-1.0
     #
@@ -153,7 +162,7 @@ module Jekyll
       config = clone
       # Provide backwards-compatibility
       if config.has_key?('auto') || config.has_key?('watch')
-        Jekyll::Logger.warn "Deprecation:", "Auto-regeneration can no longer" +
+        Jekyll.logger.warn "Deprecation:", "Auto-regeneration can no longer" +
                             " be set from your configuration file(s). Use the"+
                             " --watch/-w command-line option instead."
         config.delete('auto')
@@ -161,14 +170,14 @@ module Jekyll
       end
 
       if config.has_key? 'server'
-        Jekyll::Logger.warn "Deprecation:", "The 'server' configuration option" +
+        Jekyll.logger.warn "Deprecation:", "The 'server' configuration option" +
                             " is no longer accepted. Use the 'jekyll serve'" +
                             " subcommand to serve your site with WEBrick."
         config.delete('server')
       end
 
       if config.has_key? 'server_port'
-        Jekyll::Logger.warn "Deprecation:", "The 'server_port' configuration option" +
+        Jekyll.logger.warn "Deprecation:", "The 'server_port' configuration option" +
                             " has been renamed to 'port'. Please update your config" +
                             " file accordingly."
         # copy but don't overwrite:
@@ -176,6 +185,22 @@ module Jekyll
         config.delete('server_port')
       end
 
+      if config.has_key?('exclude') && config['exclude'].is_a?(String)
+        Jekyll.logger.warn "Deprecation:", "The 'exclude' configuration option" +
+                               " must now be specified as an array, but you specified" +
+                               " a string. For now, we've treated the string you provided" +
+                               " as a list of comma-separated values."
+        config['exclude'] = csv_to_array(config['exclude'])
+      end
+
+      if config.has_key?('include') && config['include'].is_a?(String)
+        Jekyll.logger.warn "Deprecation:", "The 'include' configuration option" +
+                               " must now be specified as an array, but you specified" +
+                               " a string. For now, we've treated the string you provided" +
+                               " as a list of comma-separated values."
+        config['include'] = csv_to_array(config['include'])
+      end
+
       config
     end