nanoc 3.4.1 → 3.4.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (3.4.0)
+    nanoc (3.4.1)
       cri (~> 2.2)
 
 GEM
@@ -10,10 +10,9 @@ GEM
     RedCloth (4.2.9)
     adsf (1.1.1)
       rack (>= 1.0.0)
-    blankslate (2.1.2.4)
     bluecloth (2.2.0)
-    builder (3.0.0)
-    coderay (1.0.7)
+    builder (3.1.4)
+    coderay (1.0.8)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
@@ -23,11 +22,10 @@ GEM
     cri (2.3.0)
       colored (>= 1.2)
     erubis (2.7.0)
-    excon (0.16.2)
+    excon (0.16.7)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    ffi (1.0.11)
-    fog (1.5.0)
+    fog (1.6.0)
       builder
       excon (~> 0.14)
       formatador (~> 0.2.0)
@@ -40,55 +38,55 @@ GEM
     formatador (0.2.3)
     haml (3.1.7)
     json (1.7.5)
-    kramdown (0.13.7)
-    less (2.2.1)
+    kramdown (0.14.0)
+    less (2.2.2)
       commonjs (~> 0.2.6)
     markaby (0.7.2)
       builder (>= 2.0.0)
-    maruku (0.6.0)
+    maruku (0.6.1)
       syntax (>= 1.0.0)
     metaclass (0.0.1)
     mime-types (1.19)
-    minitest (3.3.0)
-    mocha (0.12.3)
+    minitest (4.1.0)
+    mocha (0.12.7)
       metaclass (~> 0.0.1)
     multi_json (1.3.6)
     mustache (0.99.4)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
-    net-ssh (2.5.2)
+    net-ssh (2.6.1)
     nokogiri (1.5.5)
-    pygments.rb (0.2.13)
-      rubypython (~> 0.5.3)
+    posix-spawn (0.3.6)
+    pygments.rb (0.3.2)
+      posix-spawn (~> 0.3.6)
+      yajl-ruby (~> 1.1.0)
     rack (1.4.1)
     rainpress (1.0)
     rake (0.9.2.2)
     rdiscount (1.6.8)
     rdoc (3.12)
       json (~> 1.4)
-    redcarpet (2.1.1)
+    redcarpet (2.2.2)
     ruby-hmac (0.4.0)
     rubypants (0.2.0)
-    rubypython (0.5.3)
-      blankslate (>= 2.1.2.3)
-      ffi (~> 1.0.7)
     sass (3.2.1)
-    slim (1.2.2)
-      temple (~> 0.4.0)
+    slim (1.3.3)
+      temple (~> 0.5.5)
       tilt (~> 1.3.3)
     syntax (1.0.0)
     systemu (2.5.2)
-    temple (0.4.0)
+    temple (0.5.5)
     tilt (1.3.3)
     typogruby (1.0.15)
       rubypants
-    uglifier (1.2.7)
+    uglifier (1.3.0)
       execjs (>= 0.3.0)
-      multi_json (~> 1.3)
+      multi_json (~> 1.0, >= 1.0.2)
     w3c_validators (1.2)
       json
       nokogiri
-    yard (0.8.2.1)
+    yajl-ruby (1.1.0)
+    yard (0.8.3)
     yuicompressor (1.2.0)
 
 PLATFORMS
@@ -113,7 +111,7 @@ DEPENDENCIES
   mocha
   mustache
   nanoc!
-  nokogiri
+  nokogiri (~> 1.5.5)
   pygments.rb
   rack
   rainpress

data/NEWS.md

@@ -1,5 +1,22 @@
 # nanoc news
 
+## 3.4.2 (2012-11-01)
+
+Fixes:
+
+* Made passthrough rules be inserted in the right place [Gregory Pakosz]
+* Fixed crashes in the progress indicator when compiling
+* Made auto-pruning honor excluded files [Greg Karékinian]
+* Made lack of which/where not crash watch command
+
+Improvements:
+
+* Fixed constant reinitialization warnings [Damien Pollet]
+* Made UTF-8 not be decomposed when outputting to a file from a non-UTF-8 terminal
+* Made syntax colorizer wrap CodeRay output in required CodeRay divs
+* Made fog delete after upload, not before [Go Maeda]
+* Made requesting compiled content of binary item impossible
+
 ## 3.4.1 (2012-09-22)
 
 Fixes:

data/lib/nanoc.rb

@@ -3,7 +3,7 @@
 module Nanoc
 
   # The current nanoc version.
-  VERSION = '3.4.1'
+  VERSION = '3.4.2'
 
   # @return [String] A string containing information about this nanoc version
   #   and its environment (Ruby engine and version, Rubygems version if any).

data/lib/nanoc/base/compilation/compiler_dsl.rb

@@ -180,14 +180,14 @@ module Nanoc
       # Create compilation rule
       compilation_block = proc { }
       compilation_rule = Rule.new(identifier_to_regex(identifier), rep_name, compilation_block)
-      @rules_collection.add_item_compilation_rule(compilation_rule, :before)
+      @rules_collection.add_item_compilation_rule(compilation_rule)
 
       # Create routing rule
       routing_block = proc do
         item[:extension].nil? ? item.identifier.chop : item.identifier.chop + '.' + item[:extension]
       end
-      routing_rule = Rule.new(identifier_to_regex(identifier), rep_name, routing_block)
-      @rules_collection.add_item_routing_rule(routing_rule, :before)
+      routing_rule = Rule.new(identifier_to_regex(identifier), rep_name, routing_block, :snapshot_name => :last)
+      @rules_collection.add_item_routing_rule(routing_rule)
     end
 
   private

data/lib/nanoc/base/compilation/rules_collection.rb

@@ -40,38 +40,18 @@ module Nanoc
     #
     # @param [Nanoc::Rule] rule The item compilation rule to add
     #
-    # @param [:before, :after] position The place where the rule should be
-    #   added (either at the beginning or the end of the list of rules)
-    #
     # @return [void]
-    def add_item_compilation_rule(rule, position=:after)
-      case position
-      when :before
-        @item_compilation_rules.unshift(rule)
-      when :after
-        @item_compilation_rules << rule
-      else
-        raise "#add_item_routing_rule expected position to be :after or :before"
-      end
+    def add_item_compilation_rule(rule)
+      @item_compilation_rules << rule
     end
 
     # Add the given rule to the list of item routing rules.
     #
     # @param [Nanoc::Rule] rule The item routing rule to add
     #
-    # @param [:before, :after] position The place where the rule should be
-    #   added (either at the beginning or the end of the list of rules)
-    #
     # @return [void]
-    def add_item_routing_rule(rule, position=:after)
-      case position
-      when :before
-        @item_routing_rules.unshift(rule)
-      when :after
-        @item_routing_rules << rule
-      else
-        raise "#add_item_routing_rule expected position to be :after or :before"
-      end
+    def add_item_routing_rule(rule)
+      @item_routing_rules << rule
     end
 
     # @param [Nanoc::Item] item The item for which the compilation rules

data/lib/nanoc/base/errors.rb

@@ -202,6 +202,16 @@ module Nanoc
 
     end
 
+    # Error that is raised when the compiled content of a binary item is attempted to be accessed.
+    class CannotGetCompiledContentOfBinaryItem < Generic
+
+      # @param [Nanoc::ItemRep] rep The binary item representation whose compiled content was attempted to be accessed
+      def initialize(rep)
+        super("You cannot access the compiled content of a binary item representation (but you can access the path). The offending item rep is #{rep.inspect}.")
+      end
+
+    end
+
     # @deprecated No longer necessary, but kept for backwards compatibility.
     class DataNotYetAvailable < Generic
 

data/lib/nanoc/base/result_data/item_rep.rb

@@ -240,6 +240,11 @@ module Nanoc
     # @return [String] The compiled content at the given snapshot (or the
     #   default snapshot if no snapshot is specified)
     def compiled_content(params={})
+      # Make sure we're not binary
+      if self.item.binary?
+        raise Nanoc::Errors::CannotGetCompiledContentOfBinaryItem.new(self)
+      end
+
       # Notify
       Nanoc::NotificationCenter.post(:visit_started, self.item)
       Nanoc::NotificationCenter.post(:visit_ended,   self.item)

data/lib/nanoc/cli.rb

@@ -49,7 +49,6 @@ module Nanoc::CLI
   def self.run(args)
     Nanoc::CLI::ErrorHandler.handle_while do
       self.setup
-      self.load_custom_commands
       self.root_command.run(args)
     end
   end
@@ -65,13 +64,19 @@ module Nanoc::CLI
 
 protected
 
-  # Makes the commandline interface ready for using by loading the commands.
+  # Makes the commandline interface ready for use.
   #
   # @return [void]
   def self.setup
-    # Set up output streams
     self.setup_cleaning_streams
+    self.setup_commands
+    self.load_custom_commands
+  end
 
+  # Sets up the root command and base subcommands.
+  #
+  # @return [void]
+  def self.setup_commands
     # Reinit
     @root_command = nil
 
@@ -88,7 +93,7 @@ protected
     end
   end
 
-  # Loads the commands in `commands/`.
+  # Loads site-specific commands in `commands/`.
   #
   # @return [void]
   def self.load_custom_commands
@@ -153,25 +158,33 @@ protected
     $stdout = Nanoc::CLI::CleaningStream.new($stdout)
     $stderr = Nanoc::CLI::CleaningStream.new($stderr)
 
-    if !self.enable_utf8?
+    if !self.enable_utf8?($stdout)
       $stdout.add_stream_cleaner(Nanoc::CLI::StreamCleaners::UTF8)
+    end
+
+    if !self.enable_utf8?($stderr)
       $stderr.add_stream_cleaner(Nanoc::CLI::StreamCleaners::UTF8)
     end
 
-    if !self.enable_ansi_colors?
+    if !self.enable_ansi_colors?($stdout)
       $stdout.add_stream_cleaner(Nanoc::CLI::StreamCleaners::ANSIColors)
+    end
+
+    if !self.enable_ansi_colors?($stderr)
       $stderr.add_stream_cleaner(Nanoc::CLI::StreamCleaners::ANSIColors)
     end
   end
 
   # @return [Boolean] true if UTF-8 support is present, false if not
-  def self.enable_utf8?
+  def self.enable_utf8?(io)
+    return true if !io.tty?
+
     %w( LC_ALL LC_CTYPE LANG ).any? { |e| ENV[e] =~ /UTF/ }
   end
 
   # @return [Boolean] true if color support is present, false if not
-  def self.enable_ansi_colors?
-    return false if !$stdout.tty?
+  def self.enable_ansi_colors?(io)
+    return false if !io.tty?
 
     begin
       require 'Win32/Console/ANSI' if RUBY_PLATFORM =~ /mswin|mingw/

data/lib/nanoc/cli/commands/compile.rb

@@ -22,11 +22,12 @@ option :f, :force, '(ignored)'
 
 module Nanoc::CLI::Commands
 
+  # FIXME this command is horribly long and complicated and does way too much. plz cleanup thx.
   class Compile < ::Nanoc::CLI::CommandRunner
 
     def run
       # Make sure we are in a nanoc site directory
-      puts "Loading site data..."
+      puts "Loading site data…"
       self.require_site
 
       # Check presence of --all option
@@ -42,7 +43,7 @@ module Nanoc::CLI::Commands
       end
 
       # Give feedback
-      puts "Compiling site..."
+      puts "Compiling site…"
 
       # Initialize profiling stuff
       time_before = Time.now
@@ -50,10 +51,6 @@ module Nanoc::CLI::Commands
       @filter_times  = {}
       setup_notifications
 
-      # Set up progress indicator threads
-      @progress_locks   = {}
-      @progress_threads = {}
-
       # Prepare for generating diffs
       setup_diffs
 
@@ -81,7 +78,7 @@ module Nanoc::CLI::Commands
 
       # Prune
       if self.site.config[:prune][:auto_prune]
-        Nanoc::Extra::Pruner.new(self.site).run
+        Nanoc::Extra::Pruner.new(self.site, :exclude => self.prune_config_exclude).run
       end
 
       # Give general feedback
@@ -232,31 +229,32 @@ module Nanoc::CLI::Commands
       # Only show progress on terminals
       return if !$stdout.tty?
 
-      @progress_locks[rep.inspect + filter_name.inspect] = lock = Mutex.new
-      lock.synchronize do
-        @progress_threads[rep.inspect + filter_name.inspect] = Thread.new do
-          delay = 1.0
-          step  = 0
+      @progress_thread = Thread.new do
+        delay = 1.0
+        step  = 0
 
-          text = "Running #{filter_name} filter… "
+        text = "  running #{filter_name} filter… "
 
-          while !Thread.current[:stopped]
-            sleep 0.1
+        loop do
+          if Thread.current[:stopped]
+            # Clear
+            if delay < 0.1
+              $stdout.print ' ' * (text.length + 3) + "\r"
+            end
 
-            # Wait for a while before showing text
-            delay -= 0.1
-            next if delay > 0.05
+            break
+          end
 
-            # Print progress
+          # Show progress
+          if delay < 0.1
             $stdout.print text + %w( | / - \\ )[step] + "\r"
             step = (step + 1) % 4
           end
 
-          # Clear text
-          if delay < 0.05
-            $stdout.print ' ' * (text.length + 1 + 1) + "\r"
-          end
+          sleep 0.1
+          delay -= 0.1
         end
+
       end
     end
 
@@ -264,10 +262,7 @@ module Nanoc::CLI::Commands
       # Only show progress on terminals
       return if !$stdout.tty?
 
-      lock = @progress_locks[rep.inspect + filter_name.inspect]
-      lock.synchronize do
-        @progress_threads[rep.inspect + filter_name.inspect][:stopped] = true
-      end
+      @progress_thread[:stopped] = true
     end
 
     def print_profiling_feedback(reps)
@@ -311,6 +306,16 @@ module Nanoc::CLI::Commands
       end
     end
 
+  protected
+
+    def prune_config
+      self.site.config[:prune] || {}
+    end
+
+    def prune_config_exclude
+      self.prune_config[:exclude] || {}
+    end
+
   end
 
 end

data/lib/nanoc/cli/commands/create-site.rb

@@ -24,7 +24,7 @@ module Nanoc::CLI::Commands
 
     end
 
-    DEFAULT_CONFIG = <<EOS
+    DEFAULT_CONFIG = <<EOS unless defined? DEFAULT_CONFIG
 # A list of file extensions that nanoc will consider to be textual rather than
 # binary. If an item with an extension not in this list is found,  the file
 # will be considered as binary.
@@ -104,7 +104,7 @@ watcher:
   notify_on_compilation_failure: true
 EOS
 
-    DEFAULT_RULES = <<EOS
+    DEFAULT_RULES = <<EOS unless defined? DEFAULT_RULES
 #!/usr/bin/env ruby
 
 # A few helpful tips about the Rules file:
@@ -150,7 +150,7 @@ end
 layout '*', :erb
 EOS
 
-    DEFAULT_ITEM = <<EOS
+    DEFAULT_ITEM = <<EOS unless defined? DEFAULT_ITEM
 <h1>A Brand New nanoc Site</h1>
 
 <p>You’ve just created a new nanoc site. The page you are looking at right now is the home page for your site. To get started, consider replacing this default homepage with your own customized homepage. Some pointers on how to do so:</p>
@@ -163,7 +163,7 @@ EOS
 <p>If you need any help with customizing your nanoc web site, be sure to check out the documentation (see sidebar), and be sure to subscribe to the discussion group (also see sidebar). Enjoy!</p>
 EOS
 
-    DEFAULT_STYLESHEET = <<EOS
+    DEFAULT_STYLESHEET = <<EOS unless defined? DEFAULT_STYLESHEET
 * {
   margin: 0;
   padding: 0;
@@ -267,7 +267,7 @@ a:hover {
 }
 EOS
 
-    DEFAULT_LAYOUT = <<EOS
+    DEFAULT_LAYOUT = <<EOS unless defined? DEFAULT_LAYOUT
 <!DOCTYPE HTML>
 <html lang="en">
   <head>

data/lib/nanoc/cli/commands/show-plugins.rb

@@ -78,14 +78,14 @@ module Nanoc::CLI::Commands
       Nanoc::Extra::VCS,
       Nanoc::DataSource,
       Nanoc::Extra::Deployer
-    ]
+    ] unless defined? PLUGIN_CLASS_ORDER
 
     PLUGIN_CLASSES = {
       Nanoc::Filter          => 'Filters',
       Nanoc::DataSource      => 'Data Sources',
       Nanoc::Extra::VCS      => 'VCSes',
       Nanoc::Extra::Deployer => 'Deployers'
-    }
+    } unless defined? PLUGIN_CLASSES
 
     def name_for_plugin_class(klass)
       PLUGIN_CLASSES[klass]

data/lib/nanoc/cli/commands/watch.rb

@@ -87,10 +87,10 @@ module Nanoc::CLI::Commands
     class Notifier
 
       # A list of commandline tool names that can be used to send notifications
-      TOOLS = %w( growlnotify notify-send )
+      TOOLS = %w( growlnotify notify-send ) unless defined? TOOLS
 
       # The tool to use for discovering binaries' locations
-      FIND_BINARY_COMMAND = RUBY_PLATFORM =~ /mingw|mswin/ ? "where" : "which"
+      FIND_BINARY_COMMAND = RUBY_PLATFORM =~ /mingw|mswin/ ? "where" : "which" unless defined? FIND_BINARY_COMMAND
 
       # Send a notification. If no notifier is found, no notification will be
       # created.
@@ -104,7 +104,11 @@ module Nanoc::CLI::Commands
     private
 
       def tool
-        @tool ||= TOOLS.find { |t| !`#{FIND_BINARY_COMMAND} #{t}`.empty? }
+        @tool ||= begin
+          TOOLS.find { |t| !`#{FIND_BINARY_COMMAND} #{t}`.empty? }
+        rescue Errno::ENOENT
+          nil
+        end
       end
 
       def growlnotify(message)

data/lib/nanoc/extra/checking/checker_cli.rb

@@ -0,0 +1,151 @@
+# encoding: utf-8
+
+module Nanoc::Extra::Checking
+
+  class CheckerCLI
+
+    def list_all_checkers
+      puts "Available checkers:"
+      puts
+      puts all_checker_classes.map { |i| "  " + i.identifier.to_s }.sort.join("\n")
+    end
+
+    def run_all
+    end
+
+    def run(identifiers)
+    end
+
+    def run_for_deploy
+    end
+
+  protected
+
+    def all_checker_classes
+      Nanoc::Extra::Checking::Checker.all.map { |p| p.last }.uniq
+    end
+
+  end
+
+end
+
+usage       'check [options] [names]'
+summary     'run issue checks'
+description <<-EOS
+Run the given issue checks (or all, if none are given) on the current site.
+EOS
+
+flag :a, :all,    'run all checkers'
+flag :l, :list,   'list all checkers'
+flag :d, :deploy, 'run checkers for deployment'
+
+module Nanoc::CLI::Commands
+
+  class Check < ::Nanoc::CLI::CommandRunner
+
+    def run
+      validate_options_and_arguments
+
+      # Load DSL
+      if File.exist?('Checkers')
+        dsl = Nanoc::Extra::Checking::DSL.from_file('Checkers')
+      end
+
+      # List
+      if options[:list]
+        self.list_checkers
+        return
+      end
+
+      # Make sure we are in a nanoc site directory
+      self.require_site
+
+      # Find and run
+      classes = self.find_checker_classes(dsl)
+      issues = self.run_checkers(classes)
+      self.print_issues(issues)
+    end
+
+  protected
+
+    def validate_options_and_arguments
+      if arguments.empty? && !options[:all] && !options[:deploy] && !options[:list]
+        raise Nanoc::Errors::GenericTrivial,
+          "nothing to do (pass either --all, --deploy or --list or a list of checkers)"
+      end
+    end
+
+    def all_checker_classes
+      Nanoc::Extra::Checking::Checker.all.map { |p| p.last }.uniq
+    end
+
+    def list_checkers
+      puts "Available checkers:"
+      puts
+      puts all_checker_classes.map { |i| "  " + i.identifier.to_s }.sort.join("\n")
+    end
+
+    def checker_classes_named(n)
+      classes = n.map do |a|
+        klass = Nanoc::Extra::Checking::Checker.named(a)
+        raise Nanoc::Errors::GenericTrivial, "Unknown checker: #{a}" if klass.nil?
+        klass
+      end
+    end
+
+    def find_checker_classes(dsl)
+      if options[:all]
+        return self.all_checker_classes
+      elsif options[:deploy]
+        if dsl
+          return self.checker_classes_named(dsl.deploy_checks)
+        end
+      else
+        return self.checker_classes_named(arguments)
+      end
+
+      raise Nanoc::Errors::GenericTrivial, "No checkers to run"
+    end
+
+    def run_checkers(classes)
+      puts
+      checkers = []
+      issues = Set.new
+      length = classes.map { |c| c.identifier.to_s.length }.max + 20
+      classes.each do |klass|
+        print format("%-#{length}s", "Running #{klass.identifier} checker… ")
+
+        checker = klass.new(site)
+        checkers << checker
+        checker.run
+        issues.merge checker.issues
+
+        # TODO report progress
+
+        puts issues.empty? ? 'ok'.green : 'error'.red
+      end
+      issues
+    end
+
+    def print_issues(issues)
+      require 'colored'
+
+      have_issues = false
+      issues.group_by { |i| i.subject }.each_pair do |subject, issues|
+        unless issues.empty?
+          puts unless have_issues
+          have_issues = true
+          puts "#{subject}:"
+          issues.each do |i|
+            puts "  [ #{'ERROR'.red} ] #{i.checker_class.identifier} - #{i.description}"
+          end
+        end
+      end
+    end
+
+  end
+
+end
+
+runner Nanoc::CLI::Commands::Check
+

data/lib/nanoc/extra/deployers/fog.rb

@@ -64,25 +64,28 @@ module Nanoc::Extra::Deployers
         truncated = set.is_truncated
         files = files + set
       end
-
-      # Delete all the files in the bucket
-      puts "Removing remote files"
-      files.all.each do |file|
-        file.destroy
-      end
+      keys_to_destroy = files.all.map {|file| file.key}
 
       # Upload all the files in the output folder to the clouds
       puts "Uploading local files"
       FileUtils.cd(src) do
         files = Dir['**/*'].select { |f| File.file?(f) }
         files.each do |file_path|
+          key = "#{path}#{file_path}"
           directory.files.create(
-            :key => "#{path}#{file_path}",
+            :key => key,
             :body => File.open(file_path),
             :public => true)
+          keys_to_destroy.delete(key)
         end
       end
 
+      # delete extraneous remote files
+      puts "Removing remote files"
+      keys_to_destroy.each do |key|
+        directory.files.get(key).destroy
+      end
+
       puts "Done!"
     end
 

data/lib/nanoc/filters/colorize_syntax.rb

@@ -130,13 +130,15 @@ module Nanoc::Filters
         highlighted_code = highlight(raw, language, params)
         element.children = Nokogiri::HTML.fragment(strip(highlighted_code), 'utf-8')
 
-        # Add class
+        # Add language-something class
         unless has_class
           klass = element['class'] || ''
           klass << ' ' unless [' ', nil].include?(klass[-1,1])
           klass << "language-#{language}"
           element['class'] = klass
         end
+
+        self.highlight_postprocess(language, element.parent)
       end
 
       method = "to_#{syntax}".to_sym
@@ -273,10 +275,29 @@ module Nanoc::Filters
       stdout.read
     end
 
-  private
+  protected
 
     KNOWN_COLORIZERS = [ :coderay, :dummy, :pygmentize, :pygmentsrb, :simon_highlight ]
 
+    # Wraps the element in <div class="CodeRay"><div class="code">
+    def coderay_postprocess(language, element)
+      # Skip if we're a free <code>
+      return if element.parent.nil?
+      
+      # <div class="code">
+      div_inner = Nokogiri::XML::Node.new('div', element.document)
+      div_inner['class'] = 'code'
+      div_inner.children = element.dup
+
+      # <div class="CodeRay">
+      div_outer = Nokogiri::XML::Node.new('div', element.document)
+      div_outer['class'] = 'CodeRay'
+      div_outer.children = div_inner
+
+      # orig element
+      element.swap div_outer
+    end
+
     # Removes the first blank lines and any whitespace at the end.
     def strip(s)
       s.lines.drop_while { |line| line.strip.empty? }.join.rstrip
@@ -291,6 +312,18 @@ module Nanoc::Filters
       end
     end
 
+    def highlight_postprocess(language, element)
+      colorizer = @colorizers[language.to_sym]
+      if KNOWN_COLORIZERS.include?(colorizer)
+        sym = (colorizer.to_s + '_postprocess').to_sym
+        if self.respond_to?(sym)
+          self.send(sym, language, element)
+        end
+      else
+        raise RuntimeError, "I don’t know how to highlight code using the “#{colorizer}” colorizer"
+      end
+    end
+
     def check_availability(*cmd)
       systemu cmd
       raise "Could not spawn #{cmd.join(' ')}" if $?.exitstatus != 0

data/lib/nanoc/helpers/blogging.rb

@@ -49,7 +49,10 @@ module Nanoc::Helpers
     #
     # * `title` - The title of the blog post
     #
-    # * `kind` and `created_at` (described above)
+    # * `created_at` (described above)
+    #
+    # * `kind` (described above) *unless* you are passing an explicit list of
+    #   articles using the `:articles` parameter
     #
     # The following attributes can optionally be set on blog articles to
     # change the behaviour of the Atom feed:

data/test/base/test_compiler_dsl.rb

@@ -17,58 +17,86 @@ class Nanoc::CompilerDSLTest < MiniTest::Unit::TestCase
   end
 
   def test_passthrough
-    # Create site
-    Nanoc::CLI.run %w( create_site bar)
-    FileUtils.cd('bar') do
-      # Create rep
-      item = Nanoc::Item.new('foo', { :extension => 'bar' }, '/foo/')
-      rep = Nanoc::ItemRep.new(item, :default)
-
-      # Create other necessary stuff
+    with_site do
+      # Create rules
+      File.open('Rules', 'w') do |io|
+        io.write <<EOS
+passthrough "/robots/"
+        
+compile '*' do ; end
+route '*' do ; item.identifier.chop + '-xyz' + item[:extension] ; end
+EOS
+      end
+
+      # Create items
+      assert Dir['content/*'].empty?
+      File.open('content/robots.txt', 'w') do |io|
+        io.write "Hello I am robots"
+      end
+
+      # Compile
       site = Nanoc::Site.new('.')
-      site.items << item
-      compiler = site.compiler
-      dsl = site.compiler.rules_collection.dsl
+      site.compile
 
-      # Create rule
-      dsl.passthrough '/foo/'
-
-      # Route and compile
-      rule = compiler.rules_collection.routing_rule_for(rep)
-      path = rule.apply_to(rep, :compiler => compiler)
-      compiler.send :compile_rep, rep
-
-      # Check result
-      assert_equal 'foo', rep.compiled_content
-      assert_equal '/foo.bar', path
+      # Check paths
+      assert_equal [ 'output/robots.txt' ], Dir['output/*']
     end
   end
 
   def test_passthrough_no_ext
-    # Create site
-    Nanoc::CLI.run %w( create_site bar)
-    FileUtils.cd('bar') do
-      # Create rep
-      item = Nanoc::Item.new('foo', { :extension => nil }, '/foo/')
-      rep = Nanoc::ItemRep.new(item, :default)
-
-      # Create other necessary stuff
+    with_site do
+      # Create rules
+      File.open('Rules', 'w') do |io|
+        io.write <<EOS
+passthrough "/foo/"
+EOS
+      end
+
+      # Create items
+      assert Dir['content/*'].empty?
+      File.open('content/foo', 'w') do |io|
+        io.write "Hello I am foo"
+      end
+
+      # Compile
       site = Nanoc::Site.new('.')
-      site.items << item
-      compiler = site.compiler
-      dsl = site.compiler.rules_collection.dsl
+      site.compile
+
+      # Check paths
+      assert_equal [ 'output/foo' ], Dir['output/*']
+    end
+  end
 
-      # Create rule
-      dsl.passthrough '/foo/'
+  def test_passthrough_priority
+    with_site do
+      # Create rules
+      File.open('Rules', 'w') do |io|
+        io.write <<EOS
+compile '*' do
+  filter :erb
+end
 
-      # Route and compile
-      rule = compiler.rules_collection.routing_rule_for(rep)
-      path = rule.apply_to(rep, :compiler => compiler)
-      compiler.send :compile_rep, rep
+route '*' do
+  item.identifier + 'index.html'
+end
+
+passthrough "/foo/"
+EOS
+      end
+
+      # Create items
+      assert Dir['content/*'].empty?
+      File.open('content/foo.txt', 'w') do |io|
+        io.write "Hello I am <%= 'foo' %>"
+      end
+
+      # Compile
+      site = Nanoc::Site.new('.')
+      site.compile
 
-      # Check result
-      assert_equal 'foo', rep.compiled_content
-      assert_equal '/foo', path
+      # Check paths
+      assert_equal [ 'output/foo' ],            Dir['output/*']
+      assert_equal [ 'output/foo/index.html' ], Dir['output/foo/*']
     end
   end
 

data/test/base/test_item_rep.rb

@@ -528,6 +528,14 @@ class Nanoc::ItemRepTest < MiniTest::Unit::TestCase
     assert_equal [ items[1] ], dt.objects_causing_outdatedness_of(items[0])
   end
 
+  def test_access_compiled_content_of_binary_item
+    item = Nanoc::Item.new("content/somefile.dat", {}, '/somefile/', :binary => true)
+    item_rep = Nanoc::ItemRep.new(item, :foo)
+    assert_raises(Nanoc::Errors::CannotGetCompiledContentOfBinaryItem) do
+      item_rep.compiled_content
+    end
+  end
+
 private
 
   def create_binary_item

data/test/cli/commands/test_compile.rb

@@ -71,4 +71,49 @@ class Nanoc::CLI::Commands::CompileTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_auto_prune_with_exclude
+    with_site do |site|
+      Nanoc::CLI.run %w( create_item foo )
+      Nanoc::CLI.run %w( create_item bar )
+      Nanoc::CLI.run %w( create_item baz )
+
+      File.open('Rules', 'w') do |io|
+        io.write "compile '*' do\n"
+        io.write "  filter :erb\n"
+        io.write "end\n"
+        io.write "\n"
+        io.write "route '*' do\n"
+        io.write "  if item.binary?\n"
+        io.write "    item.identifier.chop + '.' + item[:extension]\n"
+        io.write "  else\n"
+        io.write "    item.identifier + 'index.html'\n"
+        io.write "  end\n"
+        io.write "end\n"
+        io.write "\n"
+        io.write "layout '*', :erb\n"
+      end
+
+      Dir.mkdir('output/excluded_dir')
+
+      File.open('output/stray.html', 'w') do |io|
+        io.write 'I am a stray file and I am about to be deleted!'
+      end
+
+      assert File.file?('output/stray.html')
+      Nanoc::CLI.run %w( compile )
+      assert File.file?('output/stray.html')
+
+      File.open('config.yaml', 'w') do |io|
+        io.write "prune:\n"
+        io.write "  auto_prune: true\n"
+        io.write "  exclude: [ 'excluded_dir' ]\n"
+      end
+
+      assert File.file?('output/stray.html')
+      Nanoc::CLI.run %w( compile )
+      refute File.file?('output/stray.html')
+      assert File.directory?('output/excluded_dir'),
+             'excluded_dir should still be there'
+    end
+  end
 end

data/test/cli/commands/test_watch.rb

@@ -0,0 +1,51 @@
+# encoding: utf-8
+
+class Nanoc::CLI::Commands::WatchTest < MiniTest::Unit::TestCase
+
+  include Nanoc::TestHelpers
+
+  def setup
+    super
+    @@warned ||= begin
+      STDERR.puts "\n(fssm deprecation warning can be ignored; master branch uses guard/listen)"
+      true
+    end
+  end
+
+  def test_run
+    with_site do |s|
+      watch_thread = Thread.new do
+        Nanoc::CLI.run %w( watch )
+      end
+      sleep 1
+
+      File.open('content/index.html', 'w') { |io| io.write('Hello there!') }
+      sleep 1
+      assert_equal 'Hello there!', File.read('output/index.html')
+
+      File.open('content/index.html', 'w') { |io| io.write('Hello there again!') }
+      sleep 1
+      assert_equal 'Hello there again!', File.read('output/index.html')
+
+      watch_thread.kill
+    end
+  end
+
+  def test_notify
+    old_path = ENV['PATH']
+    with_site do |s|
+      watch_thread = Thread.new do
+        Nanoc::CLI.run %w( watch )
+      end
+      sleep 1
+
+      ENV['PATH'] = '.' # so that neither which nor where can be found
+      File.open('content/index.html', 'w') { |io| io.write('Hello there!') }
+      sleep 1
+      assert_equal 'Hello there!', File.read('output/index.html')
+    end
+  ensure
+    ENV['PATH'] = old_path
+  end
+
+end

data/test/extra/deployers/test_fog.rb

@@ -64,4 +64,40 @@ class Nanoc::Extra::Deployers::FogTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_run_delete_stray
+    if_have 'fog' do
+      # Create deployer
+      fog = Nanoc::Extra::Deployers::Fog.new(
+        'output/',
+        {
+          :bucket     => 'mybucket',
+          :provider   => 'local',
+          :local_root => 'mylocalcloud'})
+
+      # Setup fake local cloud
+      FileUtils.mkdir_p('mylocalcloud/mybucket')
+      File.open('mylocalcloud/mybucket/etc', 'w')  { |io| io.write('meh-etc')  }
+      File.open('mylocalcloud/mybucket/meow', 'w') { |io| io.write('meh-meow') }
+      File.open('mylocalcloud/mybucket/bark', 'w') { |io| io.write('meh-bark') }
+
+      # Create site
+      FileUtils.mkdir_p('output')
+      File.open('output/meow', 'w') { |io| io.write "I am a cat!" }
+      File.open('output/bark', 'w') { |io| io.write "I am a dog!" }
+
+      # Create local cloud (but not bucket)
+      FileUtils.mkdir_p('mylocalcloud')
+
+      # Run
+      fog.run
+
+      # Check
+      refute File.file?('mylocalcloud/mybucket/etc')
+      assert File.file?('mylocalcloud/mybucket/meow')
+      assert File.file?('mylocalcloud/mybucket/bark')
+      assert_equal "I am a cat!", File.read('mylocalcloud/mybucket/meow')
+      assert_equal "I am a dog!", File.read('mylocalcloud/mybucket/bark')
+    end
+  end
+
 end

data/test/filters/test_colorize_syntax.rb

@@ -4,6 +4,9 @@ class Nanoc::Filters::ColorizeSyntaxTest < MiniTest::Unit::TestCase
 
   include Nanoc::TestHelpers
 
+  CODERAY_PRE  = '<div class="CodeRay"><div class="code">'
+  CODERAY_POST = '</div></div>'
+
   def test_coderay_simple
     if_have 'coderay', 'nokogiri' do
       # Create filter
@@ -11,7 +14,7 @@ class Nanoc::Filters::ColorizeSyntaxTest < MiniTest::Unit::TestCase
 
       # Get input and expected output
       input = '<pre title="moo"><code class="language-ruby"># comment</code></pre>'
-      expected_output = '<pre title="moo"><code class="language-ruby"><span class="comment"># comment</span></code></pre>'
+      expected_output = CODERAY_PRE + '<pre title="moo"><code class="language-ruby"><span class="comment"># comment</span></code></pre>' + CODERAY_POST
 
       # Run filter
       actual_output = filter.run(input)
@@ -77,7 +80,7 @@ EOS
 
       # Get input and expected output
       input = %[<pre title="moo"><code>#!ruby\n# comment</code></pre>]
-      expected_output = '<pre title="moo"><code class="language-ruby"><span class="comment"># comment</span></code></pre>'
+      expected_output = CODERAY_PRE + '<pre title="moo"><code class="language-ruby"><span class="comment"># comment</span></code></pre>' + CODERAY_POST
 
       # Run filter
       actual_output = filter.run(input)
@@ -92,7 +95,7 @@ EOS
 
       # Get input and expected output
       input = %[<pre title="moo"><code class="language-ruby">#!ruby\n# comment</code></pre>]
-      expected_output = %[<pre title="moo"><code class="language-ruby"><span class="doctype">#!ruby</span>\n<span class="comment"># comment</span></code></pre>]
+      expected_output = CODERAY_PRE + %[<pre title="moo"><code class="language-ruby"><span class="doctype">#!ruby</span>\n<span class="comment"># comment</span></code></pre>] + CODERAY_POST
 
       # Run filter
       actual_output = filter.run(input)
@@ -107,7 +110,7 @@ EOS
 
       # Get input and expected output
       input = '<pre title="moo"><code class="abc language-ruby xyz"># comment</code></pre>'
-      expected_output = '<pre title="moo"><code class="abc language-ruby xyz"><span class="comment"># comment</span></code></pre>'
+      expected_output = CODERAY_PRE + '<pre title="moo"><code class="abc language-ruby xyz"><span class="comment"># comment</span></code></pre>' + CODERAY_POST
 
       # Run filter
       actual_output = filter.run(input)
@@ -305,8 +308,8 @@ after
 EOS
       expected_output = <<EOS
 before
-<pre><code class=\"language-ruby\"><span class=\"doctype\">#!/usr/bin/env ruby</span>
-puts <span class=\"string\"><span class=\"delimiter\">'</span><span class=\"content\">hi!</span><span class=\"delimiter\">'</span></span></code></pre>
+#{CODERAY_PRE}<pre><code class=\"language-ruby\"><span class=\"doctype\">#!/usr/bin/env ruby</span>
+puts <span class=\"string\"><span class=\"delimiter\">'</span><span class=\"content\">hi!</span><span class=\"delimiter\">'</span></span></code></pre>#{CODERAY_POST}
 after
 EOS
 
@@ -365,8 +368,8 @@ after
 EOS
       expected_output = <<EOS
 before
-<pre><code class="language-ruby">  <span class=\"keyword\">def</span> <span class=\"function\">foo</span>
-  <span class=\"keyword\">end</span></code></pre>
+#{CODERAY_PRE}<pre><code class="language-ruby">  <span class=\"keyword\">def</span> <span class=\"function\">foo</span>
+  <span class=\"keyword\">end</span></code></pre>#{CODERAY_POST}
 after
 EOS
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-22 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -202,6 +202,7 @@ files:
 - lib/nanoc/data_sources/filesystem_verbose.rb
 - lib/nanoc/data_sources.rb
 - lib/nanoc/extra/auto_compiler.rb
+- lib/nanoc/extra/checking/checker_cli.rb
 - lib/nanoc/extra/chick.rb
 - lib/nanoc/extra/core_ext/enumerable.rb
 - lib/nanoc/extra/core_ext/pathname.rb
@@ -308,6 +309,7 @@ files:
 - test/cli/commands/test_info.rb
 - test/cli/commands/test_prune.rb
 - test/cli/commands/test_update.rb
+- test/cli/commands/test_watch.rb
 - test/cli/test_cleaning_stream.rb
 - test/cli/test_cli.rb
 - test/cli/test_error_handler.rb