jekyll 1.0.0.beta4 → 1.0.0.rc1

data/lib/jekyll/command.rb

@@ -8,5 +8,20 @@ module Jekyll
         dirs += ['*']
       end
     end
+
+    # Static: Run Site#process and catch errors
+    #
+    # site - the Jekyll::Site object
+    #
+    # Returns nothing
+    def self.process_site(site)
+      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
+      exit(1)
+    end
   end
 end

data/lib/jekyll/commands/build.rb

@@ -17,18 +17,10 @@ module Jekyll
       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
+        Jekyll::Logger.info "Source:", source
+        Jekyll::Logger.info "Destination:", destination
+        print Jekyll::Logger.formatted_topic "Generating..."
+        self.process_site(site)
         puts "done."
       end
 
@@ -44,23 +36,15 @@ module Jekyll
         source = options['source']
         destination = options['destination']
 
-        puts " 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 "      Regenerating: #{args.size} files at #{t} "
-          begin
-            site.process
-          rescue Jekyll::FatalException => e
-            puts
-            puts "ERROR: YOUR SITE COULD NOT BE BUILT:"
-            puts "------------------------------------"
-            puts e.message
-            exit(1)
-          end
+          print Jekyll::Logger.formatted_topic("Regenerating:") + "#{args.size} files at #{t} "
+          self.process_site(site)
           puts  "...done."
         end
 

data/lib/jekyll/configuration.rb

@@ -0,0 +1,169 @@
+module Jekyll
+  class Configuration < Hash
+
+    # Default options. Overriden by values in _config.yml.
+    # Strings rather than symbols are used for compatability with YAML.
+    DEFAULTS = {
+      'source'        => Dir.pwd,
+      'destination'   => File.join(Dir.pwd, '_site'),
+      'plugins'       => '_plugins',
+      'layouts'       => '_layouts',
+      'keep_files'    => ['.git','.svn'],
+
+      'timezone'      => nil,           # use the local timezone
+
+      'safe'          => false,
+      'show_drafts'   => nil,
+      'limit_posts'   => nil,
+      'lsi'           => false,
+      'future'        => true,           # remove and make true just default
+      'pygments'      => true,           # remove and make true just default
+
+      'markdown'      => 'maruku',
+      'permalink'     => 'date',
+      'baseurl'       => '/',
+      'include'       => ['.htaccess'],
+      'exclude'       => [],
+      'paginate_path' => 'page:num',
+
+      'markdown_ext'  => 'markdown,mkd,mkdn,md',
+      'textile_ext'   => 'textile',
+
+      'port'          => '4000',
+      'host'          => '0.0.0.0',
+
+      'excerpt_separator' => "\n\n",
+
+      'maruku' => {
+        'use_tex'    => false,
+        'use_divs'   => false,
+        'png_engine' => 'blahtex',
+        'png_dir'    => 'images/latex',
+        'png_url'    => '/images/latex'
+      },
+
+      'rdiscount' => {
+        'extensions' => []
+      },
+
+      'redcarpet' => {
+        'extensions' => []
+      },
+
+      'kramdown' => {
+        'auto_ids'      => true,
+        'footnote_nr'   => 1,
+        'entity_output' => 'as_char',
+        'toc_levels'    => '1..6',
+        'smart_quotes'  => 'lsquo,rsquo,ldquo,rdquo',
+        'use_coderay'   => false,
+
+        'coderay' => {
+          'coderay_wrap'              => 'div',
+          'coderay_line_numbers'      => 'inline',
+          'coderay_line_number_start' => 1,
+          'coderay_tab_width'         => 4,
+          'coderay_bold_every'        => 10,
+          'coderay_css'               => 'style'
+        }
+      },
+
+      'redcloth' => {
+        'hard_breaks' => true
+      }
+    }
+
+    # Public: Turn all keys into string
+    #
+    # Return a copy of the hash where all its keys are strings
+    def stringify_keys
+      reduce({}) { |hsh,(k,v)| hsh.merge(k.to_s => v) }
+    end
+
+    # Public: Directory of the Jekyll source folder
+    #
+    # override - the command-line options hash
+    #
+    # Returns the path to the Jekyll source directory
+    def source(override)
+      override['source'] || self['source'] || DEFAULTS['source']
+    end
+
+    # Public: Generate list of configuration files from the override
+    #
+    # override - the command-line options hash
+    #
+    # Returns an Array of config files
+    def config_files(override)
+      # Get configuration from <source>/_config.yml or <source>/<config_file>
+      config_files = override.delete('config')
+      config_files = File.join(source(override), "_config.yml") if config_files.to_s.empty?
+      config_files = [config_files] unless config_files.is_a? Array
+      config_files
+    end
+
+    # Public: Read configuration and return merged Hash
+    #
+    # file - the path to the YAML file to be read in
+    #
+    # Returns this configuration, overridden by the values in the file
+    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
+      next_config
+    end
+
+    # Public: Read in a list of configuration files and merge with this hash
+    #
+    # files - the list of configuration file paths
+    #
+    # Returns the full configuration, with the defaults overridden by the values in the
+    # configuration files
+    def read_config_files(files)
+      configuration = clone
+
+      begin
+        files.each do |config_file|
+          new_config = read_config_file(config_file)
+          configuration = configuration.deep_merge(new_config)
+        end
+      rescue SystemCallError
+        # Errno:ENOENT = file not found
+        Jekyll::Logger.warn "Configuration file:", "none"
+      rescue => err
+        Jekyll::Logger.warn "WARNING:", "Error reading configuration. " +
+                     "Using defaults (and options)."
+        $stderr.puts "#{err}"
+      end
+
+      configuration.backwards_compatibilize
+    end
+
+    # Public: Ensure the proper options are set in the configuration to allow for
+    # backwards-compatibility with Jekyll pre-1.0
+    #
+    # Returns the backwards-compatible configuration
+    def backwards_compatibilize
+      config = clone
+      # Provide backwards-compatibility
+      if config.has_key?('auto') || config.has_key?('watch')
+        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')
+        config.delete('watch')
+      end
+
+      if config.has_key? 'server'
+        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
+
+      config
+    end
+
+  end
+end

data/lib/jekyll/converters/markdown.rb

@@ -8,87 +8,23 @@ module Jekyll
 
       def setup
         return if @setup
-        case @config['markdown']
+        @parser = case @config['markdown']
           when 'redcarpet'
-            begin
-              require 'redcarpet'
-
-              @renderer ||= Class.new(Redcarpet::Render::HTML) do
-                def block_code(code, lang)
-                  lang = lang && lang.split.first || "text"
-                  output = add_code_tags(
-                    Pygments.highlight(code, :lexer => lang, :options => { :encoding => 'utf-8' }),
-                    lang
-                  )
-                end
-
-                def add_code_tags(code, lang)
-                  code = code.sub(/<pre>/,'<pre><code class="' + lang + '">')
-                  code = code.sub(/<\/pre>/,"</code></pre>")
-                end
-              end
-
-              @redcarpet_extensions = {}
-              @config['redcarpet']['extensions'].each { |e| @redcarpet_extensions[e.to_sym] = true }
-            rescue LoadError
-              STDERR.puts 'You are missing a library required for Markdown. Please run:'
-              STDERR.puts '  $ [sudo] gem install redcarpet'
-              raise FatalException.new("Missing dependency: redcarpet")
-            end
+            RedcarpetParser.new @config
           when 'kramdown'
-            begin
-              require 'kramdown'
-            rescue LoadError
-              STDERR.puts 'You are missing a library required for Markdown. Please run:'
-              STDERR.puts '  $ [sudo] gem install kramdown'
-              raise FatalException.new("Missing dependency: kramdown")
-            end
+            KramdownParser.new @config
           when 'rdiscount'
-            begin
-              require 'rdiscount'
-              @rdiscount_extensions = @config['rdiscount']['extensions'].map { |e| e.to_sym }
-            rescue LoadError
-              STDERR.puts 'You are missing a library required for Markdown. Please run:'
-              STDERR.puts '  $ [sudo] gem install rdiscount'
-              raise FatalException.new("Missing dependency: rdiscount")
-            end
+            RDiscountParser.new @config
           when 'maruku'
-            begin
-              require 'maruku'
-
-              if @config['maruku']['use_divs']
-                require 'maruku/ext/div'
-                STDERR.puts 'Maruku: Using extended syntax for div elements.'
-              end
-
-              if @config['maruku']['use_tex']
-                require 'maruku/ext/math'
-                STDERR.puts "Maruku: Using LaTeX extension. Images in `#{@config['maruku']['png_dir']}`."
-
-                # Switch off MathML output
-                MaRuKu::Globals[:html_math_output_mathml] = false
-                MaRuKu::Globals[:html_math_engine] = 'none'
-
-                # Turn on math to PNG support with blahtex
-                # Resulting PNGs stored in `images/latex`
-                MaRuKu::Globals[:html_math_output_png] = true
-                MaRuKu::Globals[:html_png_engine] =  @config['maruku']['png_engine']
-                MaRuKu::Globals[:html_png_dir] = @config['maruku']['png_dir']
-                MaRuKu::Globals[:html_png_url] = @config['maruku']['png_url']
-              end
-            rescue LoadError
-              STDERR.puts 'You are missing a library required for Markdown. Please run:'
-              STDERR.puts '  $ [sudo] gem install maruku'
-              raise FatalException.new("Missing dependency: maruku")
-            end
+            MarukuParser.new @config
           else
             STDERR.puts "Invalid Markdown processor: #{@config['markdown']}"
-            STDERR.puts "  Valid options are [ maruku | rdiscount | kramdown ]"
+            STDERR.puts "  Valid options are [ maruku | rdiscount | kramdown | redcarpet ]"
             raise FatalException.new("Invalid Markdown process: #{@config['markdown']}")
         end
         @setup = true
       end
-      
+
       def matches(ext)
         rgx = '(' + @config['markdown_ext'].gsub(',','|') +')'
         ext =~ Regexp.new(rgx, Regexp::IGNORECASE)
@@ -100,49 +36,7 @@ module Jekyll
 
       def convert(content)
         setup
-        case @config['markdown']
-          when 'redcarpet'
-            @redcarpet_extensions[:fenced_code_blocks] = !@redcarpet_extensions[:no_fenced_code_blocks]
-            @renderer.send :include, Redcarpet::Render::SmartyPants if @redcarpet_extensions[:smart]
-            markdown = Redcarpet::Markdown.new(@renderer.new(@redcarpet_extensions), @redcarpet_extensions)
-            markdown.render(content)
-          when 'kramdown'
-            # Check for use of coderay
-            if @config['kramdown']['use_coderay']
-              Kramdown::Document.new(content, {
-                :auto_ids      => @config['kramdown']['auto_ids'],
-                :footnote_nr   => @config['kramdown']['footnote_nr'],
-                :entity_output => @config['kramdown']['entity_output'],
-                :toc_levels    => @config['kramdown']['toc_levels'],
-                :smart_quotes  => @config['kramdown']['smart_quotes'],
-
-                :coderay_wrap               => @config['kramdown']['coderay']['coderay_wrap'],
-                :coderay_line_numbers       => @config['kramdown']['coderay']['coderay_line_numbers'],
-                :coderay_line_number_start  => @config['kramdown']['coderay']['coderay_line_number_start'],
-                :coderay_tab_width          => @config['kramdown']['coderay']['coderay_tab_width'],
-                :coderay_bold_every         => @config['kramdown']['coderay']['coderay_bold_every'],
-                :coderay_css                => @config['kramdown']['coderay']['coderay_css']
-              }).to_html
-            else
-              # not using coderay
-              Kramdown::Document.new(content, {
-                :auto_ids      => @config['kramdown']['auto_ids'],
-                :footnote_nr   => @config['kramdown']['footnote_nr'],
-                :entity_output => @config['kramdown']['entity_output'],
-                :toc_levels    => @config['kramdown']['toc_levels'],
-                :smart_quotes  => @config['kramdown']['smart_quotes']
-              }).to_html
-            end
-          when 'rdiscount'
-            rd = RDiscount.new(content, *@rdiscount_extensions)
-            html = rd.to_html
-            if rd.generate_toc and html.include?(@config['rdiscount']['toc_token'])
-              html.gsub!(@config['rdiscount']['toc_token'], rd.toc_content.force_encoding('utf-8'))
-            end
-            html
-          when 'maruku'
-            Maruku.new(content).to_html
-        end
+        @parser.convert(content)
       end
     end
   end

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

@@ -0,0 +1,44 @@
+module Jekyll
+  module Converters
+    class Markdown
+      class KramdownParser
+        def initialize(config)
+          require 'kramdown'
+          @config = config
+        rescue LoadError
+          STDERR.puts 'You are missing a library required for Markdown. Please run:'
+          STDERR.puts '  $ [sudo] gem install kramdown'
+          raise FatalException.new("Missing dependency: kramdown")
+        end
+
+        def convert(content)
+          # Check for use of coderay
+          kramdown_configs = if @config['kramdown']['use_coderay']
+            base_kramdown_configs.merge({
+              :coderay_wrap               => @config['kramdown']['coderay']['coderay_wrap'],
+              :coderay_line_numbers       => @config['kramdown']['coderay']['coderay_line_numbers'],
+              :coderay_line_number_start  => @config['kramdown']['coderay']['coderay_line_number_start'],
+              :coderay_tab_width          => @config['kramdown']['coderay']['coderay_tab_width'],
+              :coderay_bold_every         => @config['kramdown']['coderay']['coderay_bold_every'],
+              :coderay_css                => @config['kramdown']['coderay']['coderay_css']
+            })
+          else
+            # not using coderay
+            base_kramdown_configs
+          end
+          Kramdown::Document.new(content, kramdown_configs).to_html
+        end
+
+        def base_kramdown_configs
+          {
+            :auto_ids      => @config['kramdown']['auto_ids'],
+            :footnote_nr   => @config['kramdown']['footnote_nr'],
+            :entity_output => @config['kramdown']['entity_output'],
+            :toc_levels    => @config['kramdown']['toc_levels'],
+            :smart_quotes  => @config['kramdown']['smart_quotes']
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+module Jekyll
+  module Converters
+    class Markdown
+      class MarukuParser
+        def initialize(config)
+          require 'maruku'
+          @config = config
+          if @config['maruku']['use_divs']
+            load_divs_library
+          end
+          if @config['maruku']['use_tex']
+            load_blahtext_library
+          end
+        rescue LoadError
+          STDERR.puts 'You are missing a library required for Markdown. Please run:'
+          STDERR.puts '  $ [sudo] gem install maruku'
+          raise FatalException.new("Missing dependency: maruku")
+        end
+
+        def load_divs_library
+          require 'maruku/ext/div'
+          STDERR.puts 'Maruku: Using extended syntax for div elements.'
+        end
+
+        def load_blahtext_library
+          require 'maruku/ext/math'
+          STDERR.puts "Maruku: Using LaTeX extension. Images in `#{@config['maruku']['png_dir']}`."
+
+          # Switch off MathML output
+          MaRuKu::Globals[:html_math_output_mathml] = false
+          MaRuKu::Globals[:html_math_engine] = 'none'
+
+          # Turn on math to PNG support with blahtex
+          # Resulting PNGs stored in `images/latex`
+          MaRuKu::Globals[:html_math_output_png] = true
+          MaRuKu::Globals[:html_png_engine] =  @config['maruku']['png_engine']
+          MaRuKu::Globals[:html_png_dir] = @config['maruku']['png_dir']
+          MaRuKu::Globals[:html_png_url] = @config['maruku']['png_url']
+        end
+
+        def convert(content)
+          Maruku.new(content).to_html
+        end
+      end
+    end
+  end
+end