jekyll 2.0.3 → 2.1.0

data/features/rendering.feature

@@ -0,0 +1,34 @@
+Feature: Rendering
+  As a hacker who likes to blog
+  I want to be able to make a static site
+  In order to share my awesome ideas with the interwebs
+  But I want to make it as simply as possible
+  So render with Liquid and place in Layouts
+
+  Scenario: Render Liquid and place in layout
+    Given I have a "index.html" page with layout "simple" that contains "Hi there, Jekyll {{ jekyll.environment }}!"
+    And I have a simple layout that contains "{{ content }}Ahoy, indeed!"
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "Hi there, Jekyll development!\nAhoy, indeed" in "_site/index.html"
+
+  Scenario: Don't place asset files in layout
+    Given I have an "index.scss" page with layout "simple" that contains ".foo-bar { color:black; }"
+    And I have an "index.coffee" page with layout "simple" that contains "whatever()"
+    And I have a simple layout that contains "{{ content }}Ahoy, indeed!"
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should not see "Ahoy, indeed!" in "_site/index.css"
+    And I should not see "Ahoy, indeed!" in "_site/index.js"
+
+  Scenario: Don't render liquid in Sass
+    Given I have an "index.scss" page that contains ".foo-bar { color:{{site.color}}; }"
+    When I run jekyll build
+    Then the _site directory should not exist
+    And I should see "Invalid CSS after" in the build output
+
+  Scenario: Don't render liquid in CoffeeScript
+    Given I have an "index.coffee" page that contains "hey='for {{site.animal}}'"
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "hey = 'for {{site.animal}}';" in "_site/index.js"

data/features/step_definitions/jekyll_steps.rb

@@ -141,7 +141,7 @@ end
 
 When /^I run jekyll(.*)$/ do |args|
   status = run_jekyll(args)
-  if !status || args.include?("--verbose")
+  if args.include?("--verbose") || ENV['DEBUG']
     puts jekyll_run_output
   end
 end
@@ -195,3 +195,7 @@ end
 Then /^I should see today's date in "(.*)"$/ do |file|
   assert_match Regexp.new(Date.today.to_s), file_contents(file)
 end
+
+Then /^I should see "(.*)" in the build output$/ do |text|
+  assert_match Regexp.new(text), jekyll_run_output
+end

data/features/support/env.rb

@@ -1,6 +1,3 @@
-require 'coveralls'
-Coveralls.wear_merged!
-
 require 'fileutils'
 require 'rr'
 require 'test/unit'

data/jekyll.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.authors  = ["Tom Preston-Werner"]
   s.email    = 'tom@mojombo.com'
-  s.homepage = 'http://github.com/jekyll/jekyll'
+  s.homepage = 'https://github.com/jekyll/jekyll'
 
   s.files         = `git ls-files`.split($/)
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -28,18 +28,20 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.markdown LICENSE]
 
-  s.add_runtime_dependency('liquid', "~> 2.5.5")
+  s.add_runtime_dependency('liquid', "~> 2.6.1")
   s.add_runtime_dependency('classifier', "~> 1.3")
-  s.add_runtime_dependency('listen', "~> 2.5")
   s.add_runtime_dependency('kramdown', "~> 1.3")
-  s.add_runtime_dependency('pygments.rb', "~> 0.5.0")
+  s.add_runtime_dependency('pygments.rb', "~> 0.6.0")
   s.add_runtime_dependency('mercenary', "~> 0.3.3")
   s.add_runtime_dependency('safe_yaml', "~> 1.0")
   s.add_runtime_dependency('colorator', "~> 0.1")
   s.add_runtime_dependency('redcarpet', "~> 3.1")
   s.add_runtime_dependency('toml', '~> 0.1.0')
+  s.add_runtime_dependency('jekyll-paginate', '~> 1.0')
+  s.add_runtime_dependency('jekyll-gist', '~> 1.0')
   s.add_runtime_dependency('jekyll-coffeescript', '~> 1.0')
   s.add_runtime_dependency('jekyll-sass-converter', '~> 1.0')
+  s.add_runtime_dependency('jekyll-watch', '~> 1.0')
 
   s.add_development_dependency('rake', "~> 10.1")
   s.add_development_dependency('rdoc', "~> 3.11")
@@ -53,7 +55,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency('launchy', "~> 2.3")
   s.add_development_dependency('simplecov', "~> 0.7")
   s.add_development_dependency('simplecov-gem-adapter', "~> 1.0.1")
-  s.add_development_dependency('coveralls', "~> 0.7.0")
   s.add_development_dependency('mime-types', "~> 1.5")
   s.add_development_dependency('activesupport', '~> 3.2.13')
   s.add_development_dependency('jekyll_test_plugin')

data/lib/jekyll.rb

@@ -21,6 +21,7 @@ require 'time'
 require 'safe_yaml/load'
 require 'English'
 require 'pathname'
+require 'logger'
 
 # 3rd party
 require 'liquid'
@@ -31,6 +32,7 @@ require 'toml'
 # internal requires
 require 'jekyll/version'
 require 'jekyll/utils'
+require 'jekyll/log_adapter'
 require 'jekyll/stevenson'
 require 'jekyll/deprecator'
 require 'jekyll/configuration'
@@ -72,10 +74,21 @@ require_all 'jekyll/tags'
 # plugins
 require 'jekyll-coffeescript'
 require 'jekyll-sass-converter'
+require 'jekyll-paginate'
+require 'jekyll-gist'
 
 SafeYAML::OPTIONS[:suppress_warnings] = true
 
 module Jekyll
+
+  # Public: Tells you which Jekyll environment you are building in so you can skip tasks
+  # if you need to.  This is useful when doing expensive compression tasks on css and
+  # images and allows you to skip that when working in development.
+
+  def self.env
+    ENV["JEKYLL_ENV"] || "development"
+  end
+
   # Public: Generate a Jekyll configuration Hash by merging the default
   # options with anything in _config.yml, and adding the given options on top.
   #
@@ -106,7 +119,11 @@ module Jekyll
   end
 
   def self.logger
-    @logger ||= Stevenson.new
+    @logger ||= LogAdapter.new(Stevenson.new)
+  end
+
+  def self.logger=(writer)
+    @logger = LogAdapter.new(writer)
   end
 
   # Public: File system root

data/lib/jekyll/cleaner.rb

@@ -30,7 +30,7 @@ module Jekyll
       def existing_files
         files = Set.new
         Dir.glob(File.join(site.dest, "**", "*"), File::FNM_DOTMATCH) do |file|
-          files << file unless file =~ /\/\.{1,2}$/ || file =~ keep_file_regex
+          files << file unless file =~ /\/\.{1,2}$/ || file =~ keep_file_regex || keep_dirs.include?(file)
         end
         files
       end
@@ -49,7 +49,19 @@ module Jekyll
       #
       # Returns a Set with the directory paths
       def new_dirs
-        new_files.map { |file| File.dirname(file) }.to_set
+        new_files.map { |file| parent_dirs(file) }.flatten.to_set
+      end
+
+      # Private: The list of parent directories of a given file
+      #
+      # Returns an Array with the directory paths
+      def parent_dirs(file)
+        parent_dir = File.dirname(file)
+        if parent_dir == site.dest
+          []
+        else
+          [parent_dir] + parent_dirs(parent_dir)
+        end
       end
 
       # Private: The list of existing files that will be replaced by a directory during build
@@ -59,6 +71,14 @@ module Jekyll
         new_dirs.select { |dir| File.file?(dir) }.to_set
       end
 
+      # Private: The list of directories that need to be kept because they are parent directories
+      # of files specified in keep_files
+      #
+      # Returns a Set with the directory paths
+      def keep_dirs
+        site.keep_files.map{|file| parent_dirs(File.join(site.dest, file))}.flatten.to_set
+      end
+
       # Private: Creates a regular expression from the config's keep_files array
       #
       # Examples

data/lib/jekyll/collection.rb

@@ -52,7 +52,7 @@ module Jekyll
     def filtered_entries
       return Array.new unless exists?
       Dir.chdir(directory) do
-        entry_filter.filter(entries)
+        entry_filter.filter(entries).reject { |f| File.directory?(f) }
       end
     end
 
@@ -105,7 +105,7 @@ module Jekyll
     #
     # Returns a sanitized version of the label.
     def sanitize_label(label)
-      label.gsub(/[^a-z0-9_\-]/i, '')
+      label.gsub(/[^a-z0-9_\-\.]/i, '')
     end
 
     # Produce a representation of this Collection for use in Liquid.
@@ -132,6 +132,13 @@ module Jekyll
       !!metadata['output']
     end
 
+    # The URL template to render collection's documents at.
+    #
+    # Returns the URL template to render collection's documents at.
+    def url_template
+      metadata.fetch('permalink', "/:collection/:path:output_ext")
+    end
+
     # Extract options for this collection from the site configuration.
     #
     # Returns the metadata for this collection

data/lib/jekyll/command.rb

@@ -19,19 +19,29 @@ module Jekyll
         super(base)
       end
 
-      # Listing of all directories (globbed to include subfiles and folders)
+      # Paths to ignore for the watch option
       #
-      # source - the source path
-      # destination - the destination path
+      # options - A Hash of options passed to the command
       #
-      # Returns an Array of directory globs in the source, excluding the destination
-      def globs(source, destination)
-        Dir.chdir(source) do
-          dirs = Dir['*'].select { |x| File.directory?(x) }
-          dirs -= [destination, File.expand_path(destination), File.basename(destination)]
-          dirs = dirs.map { |x| "#{x}/**/*" }
-          dirs += ['*']
+      # Returns a list of relative paths from source that should be ignored
+      def ignore_paths(options)
+        source      = options['source']
+        destination = options['destination']
+        config_files = Configuration[options].config_files(options)
+        paths = config_files + Array(destination)
+        ignored = []
+
+        source_abs = Pathname.new(source).expand_path
+        paths.each do |p|
+          path_abs = Pathname.new(p).expand_path
+          begin
+            rel_path = path_abs.relative_path_from(source_abs).to_s
+            ignored << Regexp.new(Regexp.escape(rel_path)) unless rel_path.start_with?('../')
+          rescue ArgumentError
+            # Could not find a relative path
+          end
         end
+        ignored
       end
 
       # Run Site#process and catch errors

data/lib/jekyll/commands/build.rb

@@ -22,19 +22,23 @@ module Jekyll
         # Build your jekyll site
         # Continuously watch if `watch` is set to true in the config.
         def process(options)
+          Jekyll.logger.log_level = :error if options['quiet']
+
           options = configuration_from_options(options)
           site = Jekyll::Site.new(options)
 
-          Jekyll.logger.log_level = :error if options['quiet']
-
-          build(site, options)
+          if options.fetch('skip_initial_build', false)
+            Jekyll.logger.warn "Build Warning:", "Skipping the initial build. This may result in an out-of-date site."
+          else
+            build(site, options)
+          end
           watch(site, options) if options['watch']
         end
 
         # Build your Jekyll site.
         #
         # site - the Jekyll::Site instance to build
-        # options - the
+        # options - A Hash of options passed to the command
         #
         # Returns nothing.
         def build(site, options)
@@ -54,49 +58,8 @@ module Jekyll
         #
         # Returns nothing.
         def watch(site, options)
-          require 'listen'
-
-          source      = options['source']
-          destination = options['destination']
-
-          begin
-            dest    = Pathname.new(destination).relative_path_from(Pathname.new(source)).to_s
-            ignored = Regexp.new(Regexp.escape(dest))
-          rescue ArgumentError
-            # Destination is outside the source, no need to ignore it.
-            ignored = nil
-          end
-
-          listener = Listen.to(
-            source,
-            :ignore => ignored,
-            :force_polling => options['force_polling']
-          ) do |modified, added, removed|
-            t = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-            n = modified.length + added.length + removed.length
-            print Jekyll.logger.formatted_topic("Regenerating:") + "#{n} files at #{t} "
-            begin
-              process_site(site)
-              puts  "...done."
-            rescue => e
-              puts "...error:"
-              Jekyll.logger.warn "Error:", e.message
-              Jekyll.logger.warn "Error:", "Run jekyll build --trace for more information."
-            end
-          end
-          listener.start
-
-          Jekyll.logger.info "Auto-regeneration:", "enabled"
-
-          unless options['serving']
-            trap("INT") do
-              listener.stop
-              puts "     Halting auto-regeneration."
-              exit 0
-            end
-
-            loop { sleep 1000 }
-          end
+          require 'jekyll-watch'
+          Jekyll::Commands::Watch.watch(site, options)
         end
 
       end # end of class << self

data/lib/jekyll/commands/serve.rb

@@ -17,6 +17,7 @@ module Jekyll
             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'
+            c.option 'skip_initial_build', '--skip-initial-build', 'Skips the initial site build which occurs before the server is started.'
 
             c.action do |args, options|
               options["serving"] ||= true

data/lib/jekyll/configuration.rb

@@ -40,6 +40,7 @@ module Jekyll
       'markdown_ext'  => 'markdown,mkdown,mkdn,mkd,md',
       'textile_ext'   => 'textile',
 
+      'quiet'         => false,
       'port'          => '4000',
       'host'          => '0.0.0.0',
 
@@ -103,6 +104,10 @@ module Jekyll
       override['source'] || self['source'] || DEFAULTS['source']
     end
 
+    def quiet?(override = {})
+      override['quiet'] || self['quiet'] || DEFAULTS['quiet']
+    end
+
     def safe_load_file(filename)
       case File.extname(filename)
       when '.toml'
@@ -120,10 +125,16 @@ module Jekyll
     #
     # Returns an Array of config files
     def config_files(override)
+      # Be quiet quickly.
+      Jekyll.logger.log_level = :error if quiet?(override)
+
       # Get configuration from <source>/_config.yml or <source>/<config_file>
       config_files = override.delete('config')
       if config_files.to_s.empty?
-        config_files = File.join(source(override), "_config.yml")
+        default = %w[yml yaml].find(Proc.new { 'yml' }) do |ext|
+          File.exists? Jekyll.sanitized_path(source(override), "_config.#{ext}")
+        end
+        config_files = Jekyll.sanitized_path(source(override), "_config.#{default}")
         @default_config_file = true
       end
       config_files = [config_files] unless config_files.is_a? Array
@@ -231,6 +242,7 @@ module Jekyll
             " as a list of comma-separated values."
           config[option] = csv_to_array(config[option])
         end
+        config[option].map!(&:to_s)
       end
 
       if config.fetch('markdown', 'kramdown').to_s.downcase.eql?("maruku")

data/lib/jekyll/converters/markdown/redcarpet_parser.rb

@@ -67,8 +67,15 @@ module Jekyll
                           end
                         when 'rouge'
                           Class.new(Redcarpet::Render::HTML) do
-                            require 'rouge'
-                            require 'rouge/plugins/redcarpet'
+                            begin
+                              require 'rouge'
+                              require 'rouge/plugins/redcarpet'
+                            rescue LoadError => e
+                              Jekyll.logger.error "You are missing the 'rouge' gem. Please run:"
+                              Jekyll.logger.error " $ [sudo] gem install rouge"
+                              Jekyll.logger.error "Or add 'rouge' to your Gemfile."
+                              raise FatalException.new("Missing dependency: rouge")
+                            end
 
                             if Rouge.version < '1.3.0'
                               abort "Please install Rouge 1.3.0 or greater and try running Jekyll again."

data/lib/jekyll/convertible.rb

@@ -114,6 +114,10 @@ module Jekyll
       Utils.deep_merge_hashes defaults, Utils.deep_merge_hashes(data, further_data)
     end
 
+    # The type of a document,
+    #   i.e., its classname downcase'd and to_sym'd.
+    #
+    # Returns the type of self.
     def type
       if is_a?(Post)
         :post
@@ -124,6 +128,31 @@ module Jekyll
       end
     end
 
+    # Determine whether the document is an asset file.
+    # Asset files include CoffeeScript files and Sass/SCSS files.
+    #
+    # Returns true if the extname belongs to the set of extensions
+    #   that asset files use.
+    def asset_file?
+      %w[.sass .scss .coffee].include?(ext)
+    end
+
+    # Determine whether the file should be rendered with Liquid.
+    #
+    # Returns false if the document is either an asset file or a yaml file,
+    #   true otherwise.
+    def render_with_liquid?
+      !asset_file?
+    end
+
+    # Determine whether the file should be placed into layouts.
+    #
+    # Returns false if the document is either an asset file or a yaml file,
+    #   true otherwise.
+    def place_in_layout?
+      !asset_file?
+    end
+
     # Recursively render layouts
     #
     # layouts - a list of the layouts
@@ -167,13 +196,13 @@ module Jekyll
       payload["highlighter_prefix"] = converter.highlighter_prefix
       payload["highlighter_suffix"] = converter.highlighter_suffix
 
-      self.content = render_liquid(content, payload, info)
+      self.content = render_liquid(content, payload, info) if render_with_liquid?
       transform
 
       # output keeps track of what will finally be written
       self.output = content
 
-      render_all_layouts(layouts, payload, info)
+      render_all_layouts(layouts, payload, info) if place_in_layout?
     end
 
     # Write the generated page file to the destination directory.