nanoc 3.4.2 → 3.4.3

data/Gemfile

@@ -9,6 +9,7 @@ gem 'coderay'
 gem 'coffee-script'
 gem 'erubis'
 gem 'fog'
+gem 'fssm'
 gem 'haml'
 gem 'kramdown'
 gem 'less', '~> 2.0'
@@ -26,7 +27,7 @@ gem 'rdoc'
 gem 'redcarpet'
 gem 'RedCloth'
 gem 'rubypants'
-gem 'sass', '~> 3.1'
+gem 'sass', '~> 3.2.2'
 gem 'slim'
 gem 'systemu'
 gem 'typogruby'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (3.4.1)
+    nanoc (3.4.2)
       cri (~> 2.2)
 
 GEM
@@ -16,16 +16,16 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.3.3)
+    coffee-script-source (1.4.0)
     colored (1.2)
     commonjs (0.2.6)
     cri (2.3.0)
       colored (>= 1.2)
     erubis (2.7.0)
-    excon (0.16.7)
+    excon (0.16.10)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    fog (1.6.0)
+    fog (1.7.0)
       builder
       excon (~> 0.14)
       formatador (~> 0.2.0)
@@ -35,7 +35,8 @@ GEM
       net-ssh (>= 2.1.3)
       nokogiri (~> 1.5.0)
       ruby-hmac
-    formatador (0.2.3)
+    formatador (0.2.4)
+    fssm (0.2.9)
     haml (3.1.7)
     json (1.7.5)
     kramdown (0.14.0)
@@ -47,14 +48,14 @@ GEM
       syntax (>= 1.0.0)
     metaclass (0.0.1)
     mime-types (1.19)
-    minitest (4.1.0)
-    mocha (0.12.7)
+    minitest (4.3.1)
+    mocha (0.13.0)
       metaclass (~> 0.0.1)
-    multi_json (1.3.6)
+    multi_json (1.3.7)
     mustache (0.99.4)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
-    net-ssh (2.6.1)
+    net-ssh (2.6.2)
     nokogiri (1.5.5)
     posix-spawn (0.3.6)
     pygments.rb (0.3.2)
@@ -62,15 +63,15 @@ GEM
       yajl-ruby (~> 1.1.0)
     rack (1.4.1)
     rainpress (1.0)
-    rake (0.9.2.2)
+    rake (10.0.2)
     rdiscount (1.6.8)
     rdoc (3.12)
       json (~> 1.4)
     redcarpet (2.2.2)
     ruby-hmac (0.4.0)
     rubypants (0.2.0)
-    sass (3.2.1)
-    slim (1.3.3)
+    sass (3.2.3)
+    slim (1.3.4)
       temple (~> 0.5.5)
       tilt (~> 1.3.3)
     syntax (1.0.0)
@@ -101,6 +102,7 @@ DEPENDENCIES
   coffee-script
   erubis
   fog
+  fssm
   haml
   kramdown
   less (~> 2.0)
@@ -120,7 +122,7 @@ DEPENDENCIES
   rdoc
   redcarpet
   rubypants
-  sass (~> 3.1)
+  sass (~> 3.2.2)
   slim
   systemu
   typogruby

data/NEWS.md

@@ -1,5 +1,21 @@
 # nanoc news
 
+## 3.4.3 (2012-12-09)
+
+Improvements:
+
+* Item reps are now accessible in a consistent way: in Rules and during
+  compilation, they can be accessed using both `@rep` and `@item_rep`
+
+Fixes:
+
+* Made cleaning streams (stdout/stderr as used by nanoc) compatible with
+  Ruby’s built-in Logger
+* Made prune work when the output directory is a symlink
+* Made Handlebars filter compatible with the latest version
+* Made `show-data` command show more accurate dependencies [Stefan Bühler]
+* Restored compatibility with Sass 3.2.2
+
 ## 3.4.2 (2012-11-01)
 
 Fixes:

data/README.md

@@ -96,14 +96,18 @@ may be interested in the development dependencies:
 * Starr Horne
 * Daniel Hofstetter
 * Tuomas Kareinen
+* Greg Karékinian
 * Matt Keveney
 * Kevin Lynagh
+* Go Maeda
 * Nikhil Marathe
 * Daniel Mendler
 * Ale Muñoz
 * John Nishinaga
+* Gregory Pakosz
 * Nicky Peeters
 * Christian Plessl
+* Damien Pollet
 * Šime Ramov
 * Xavier Shay
 * Arnau Siches

data/lib/nanoc.rb

@@ -3,7 +3,7 @@
 module Nanoc
 
   # The current nanoc version.
-  VERSION = '3.4.2'
+  VERSION = '3.4.3'
 
   # @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.rb

@@ -81,6 +81,10 @@ module Nanoc
       # Compile reps
       load
       @site.freeze
+
+      # Determine which reps need to be recompiled
+      forget_dependencies_if_outdated(items)
+
       dependency_tracker.start
       compile_reps(reps)
       dependency_tracker.stop
@@ -121,9 +125,6 @@ module Nanoc
       # Load auxiliary stores
       stores.each { |s| s.load }
 
-      # Determine which reps need to be recompiled
-      forget_dependencies_if_outdated(items)
-
       @loaded = true
     rescue => e
       unload
@@ -272,6 +273,7 @@ module Nanoc
 
       content_or_filename_assigns.merge({
         :item       => rep.item,
+        :rep        => rep,
         :item_rep   => rep,
         :items      => site.items,
         :layouts    => site.layouts,

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

@@ -29,12 +29,13 @@ module Nanoc
       compiler = params[:compiler] or raise ArgumentError, "Required :compiler option is missing"
 
       super({
-        :rep     => rep,
-        :item    => rep.item,
-        :site    => compiler.site,
-        :config  => compiler.site.config,
-        :items   => compiler.site.items,
-        :layouts => compiler.site.layouts
+        :rep      => rep,
+        :item_rep => rep,
+        :item     => rep.item,
+        :site     => compiler.site,
+        :config   => compiler.site.config,
+        :items    => compiler.site.items,
+        :layouts  => compiler.site.layouts
       })
     end
 

data/lib/nanoc/cli/cleaning_stream.rb

@@ -84,6 +84,11 @@ module Nanoc::CLI
       @stream.reopen(*a)
     end
 
+    # @see IO#close
+    def close
+      @stream.close
+    end
+
     # @see File#exist?
     def exist?
       @stream.exist?

data/lib/nanoc/extra/pruner.rb

@@ -35,7 +35,7 @@ module Nanoc::Extra
 
       # Get present files and dirs
       present_files_and_dirs = Set.new
-      Find.find(self.site.config[:output_dir]) do |f|
+      Find.find(self.site.config[:output_dir] + '/') do |f|
         present_files_and_dirs << f
       end
       present_files = present_files_and_dirs.select { |f| File.file?(f) }

data/lib/nanoc/filters/handlebars.rb

@@ -22,7 +22,9 @@ module Nanoc::Filters
       context[:config] = assigns[:config]
       context[:yield]  = assigns[:content]
 
-      ::Handlebars.compile(content).call(context)
+      handlebars = ::Handlebars::Context.new
+      template = handlebars.compile(content)
+      template.call(context)
     end
 
   end

data/lib/nanoc/filters/sass.rb

@@ -19,10 +19,10 @@ module Nanoc::Filters
     private
 
       def _find(dir, name, options)
-        full_filename, syntax = find_real_file(dir, name)
+        full_filename, syntax = ::Sass::Util.destructure(find_real_file(dir, name, options))
         return unless full_filename && File.readable?(full_filename)
 
-        filter = Nanoc::Filters::Sass.current
+        filter = Nanoc::Filters::Sass.current # FIXME ew global
         item = filter.imported_filename_to_item(full_filename)
         filter.depend_on([ item ]) unless item.nil?
 

data/lib/nanoc/helpers/xml_sitemap.rb

@@ -40,7 +40,7 @@ module Nanoc::Helpers
       require 'builder'
 
       # Extract parameters
-      items = params[:items] || @items.reject { |i| i[:is_hidden] }
+      items = params.fetch(:items) { @items.reject { |i| i[:is_hidden] } }
 
       # Create builder
       buffer = ''
@@ -59,7 +59,7 @@ module Nanoc::Helpers
           item.reps.reject { |r| r.raw_path.nil? }.each do |rep|
             xml.url do
               xml.loc         @site.config[:base_url] + rep.path
-              xml.lastmod     item.mtime.to_iso8601_date unless item.mtime.nil?
+              xml.lastmod     item[:mtime].to_iso8601_date unless item[:mtime].nil?
               xml.changefreq  item[:changefreq] unless item[:changefreq].nil?
               xml.priority    item[:priority] unless item[:priority].nil?
             end

data/nanoc.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.files              = Dir['[A-Z]*'] +
                          Dir['doc/yardoc_templates/**/*'] +
                          Dir['{bin,lib,tasks,test}/**/*'] +
-                         [ 'nanoc.gemspec', '.gemtest' ]
+                         [ 'nanoc.gemspec' ]
   s.executables        = [ 'nanoc' ]
   s.require_paths      = [ 'lib' ]
 

data/test/base/core_ext/array_spec.rb

@@ -31,7 +31,7 @@ describe 'Array#freeze_recursively' do
       array[0] = 123
     rescue => e
       raised = true
-      assert_match /(^can't modify frozen |^unable to modify frozen object$)/, e.message
+      assert_match(/(^can't modify frozen |^unable to modify frozen object$)/, e.message)
     end
     assert raised
   end
@@ -45,7 +45,7 @@ describe 'Array#freeze_recursively' do
       array[1][0] = 123
     rescue => e
       raised = true
-      assert_match /(^can't modify frozen |^unable to modify frozen object$)/, e.message
+      assert_match(/(^can't modify frozen |^unable to modify frozen object$)/, e.message)
     end
     assert raised
   end

data/test/base/core_ext/hash_spec.rb

@@ -49,7 +49,7 @@ describe 'Hash#freeze_recursively' do
       hash[:a] = 123
     rescue => e
       raised = true
-      assert_match /(^can't modify frozen |^unable to modify frozen object$)/, e.message
+      assert_match(/(^can't modify frozen |^unable to modify frozen object$)/, e.message)
     end
     assert raised
   end
@@ -63,7 +63,7 @@ describe 'Hash#freeze_recursively' do
       hash[:a][:b] = 123
     rescue => e
       raised = true
-      assert_match /(^can't modify frozen |^unable to modify frozen object$)/, e.message
+      assert_match(/(^can't modify frozen |^unable to modify frozen object$)/, e.message)
     end
     assert raised
   end

data/test/base/test_checksum_store.rb

@@ -28,7 +28,6 @@ class Nanoc::ChecksumStoreTest < MiniTest::Unit::TestCase
 
     # Check
     obj = Nanoc::Item.new('Moo?', {}, '/animals/cow/')
-    new_checksum = 'Moo?'.checksum + '-' + {}.checksum
     assert_equal nil, store[obj]
   end
 

data/test/base/test_compiler.rb

@@ -275,7 +275,7 @@ class Nanoc::CompilerTest < MiniTest::Unit::TestCase
       error = assert_raises(RuntimeError) do
         site.compile
       end
-      assert_match /^The path returned for the.*does not start with a slash. Please ensure that all routing rules return a path that starts with a slash./, error.message
+      assert_match(/^The path returned for the.*does not start with a slash. Please ensure that all routing rules return a path that starts with a slash./, error.message)
     end
   end
 
@@ -488,4 +488,35 @@ class Nanoc::CompilerTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_rep_assigns
+    with_site do |site|
+      # Create item
+      File.open('content/index.html', 'w') do |io|
+        io.write('@rep.name = <%= @rep.name %> - @item_rep.name = <%= @item_rep.name %>')
+      end
+
+      # Create routes
+      File.open('Rules', 'w') do |io|
+        io.write "compile '*' do\n"
+        io.write "  if @rep.name == :default && @item_rep.name == :default\n"
+        io.write "    filter :erb\n"
+        io.write "  end\n"
+        io.write "end\n"
+        io.write "\n"
+        io.write "route '*' do\n"
+        io.write "  '/index.html'\n"
+        io.write "end\n"
+        io.write "\n"
+        io.write "layout '*', :erb\n"
+      end
+
+      # Compile
+      site = Nanoc::Site.new('.')
+      site.compile
+
+      # Check
+      assert_equal '@rep.name = default - @item_rep.name = default', File.read('output/index.html')
+    end
+  end
+
 end

data/test/base/test_item.rb

@@ -25,7 +25,7 @@ class Nanoc::ItemTest < MiniTest::Unit::TestCase
       item.identifier.chop!
     rescue => error
       raised = true
-      assert_match /(^can't modify frozen [Ss]tring|^unable to modify frozen object$)/, error.message
+      assert_match(/(^can't modify frozen [Ss]tring|^unable to modify frozen object$)/, error.message)
     end
     assert raised, 'Should have raised when trying to modify a frozen string'
   end
@@ -149,7 +149,7 @@ class Nanoc::ItemTest < MiniTest::Unit::TestCase
       item[:abc] = '123'
     rescue => e
       raised = true
-      assert_match /(^can't modify frozen |^unable to modify frozen object$)/, e.message
+      assert_match(/(^can't modify frozen |^unable to modify frozen object$)/, e.message)
     end
     assert raised
 
@@ -158,7 +158,7 @@ class Nanoc::ItemTest < MiniTest::Unit::TestCase
       item[:a][:b] = '456'
     rescue => e
       raised = true
-      assert_match /(^can't modify frozen |^unable to modify frozen object$)/, e.message
+      assert_match(/(^can't modify frozen |^unable to modify frozen object$)/, e.message)
     end
     assert raised
   end

data/test/base/test_item_rep.rb

@@ -459,7 +459,7 @@ class Nanoc::ItemRepTest < MiniTest::Unit::TestCase
       rep.filter(:whatever)
     rescue => e
       raised = true
-      assert_match /(^can't modify frozen |^unable to modify frozen object$)/, e.message
+      assert_match(/(^can't modify frozen |^unable to modify frozen object$)/, e.message)
     end
     assert raised
   end
@@ -483,7 +483,7 @@ class Nanoc::ItemRepTest < MiniTest::Unit::TestCase
       rep.filter(:whatever)
     rescue => e
       raised = true
-      assert_match /(^can't modify frozen |^unable to modify frozen object$)/, e.message
+      assert_match(/(^can't modify frozen |^unable to modify frozen object$)/, e.message)
     end
     assert raised
   end

data/test/base/test_layout.rb

@@ -22,7 +22,7 @@ class Nanoc::LayoutTest < MiniTest::Unit::TestCase
       layout.identifier.chop!
     rescue => error
       raised = true
-      assert_match /(^can't modify frozen [Ss]tring|^unable to modify frozen object$)/, error.message
+      assert_match(/(^can't modify frozen [Ss]tring|^unable to modify frozen object$)/, error.message)
     end
     assert raised, 'Should have raised when trying to modify a frozen string'
   end

data/test/base/test_memoization.rb

@@ -68,10 +68,10 @@ class Nanoc::MemoizationTest < MiniTest::Unit::TestCase
     sample2b = Sample2.new(25)
 
     3.times do
-      assert_equal (10*10+5),  sample1a.run(5)
-      assert_equal (10*15+7),  sample1b.run(7)
-      assert_equal (100*20+5), sample2a.run(5)
-      assert_equal (100*25+7), sample2b.run(7)
+      assert_equal 10*10+5,  sample1a.run(5)
+      assert_equal 10*15+7,  sample1b.run(7)
+      assert_equal 100*20+5, sample2a.run(5)
+      assert_equal 100*25+7, sample2b.run(7)
     end
   end
 
@@ -80,10 +80,10 @@ class Nanoc::MemoizationTest < MiniTest::Unit::TestCase
     sample2 = EqualSample.new(3)
 
     3.times do
-      assert_equal (2*10+5), sample1.run(5)
-      assert_equal (2*10+3), sample1.run(3)
-      assert_equal (3*10+5), sample2.run(5)
-      assert_equal (3*10+3), sample2.run(3)
+      assert_equal 2*10+5, sample1.run(5)
+      assert_equal 2*10+3, sample1.run(3)
+      assert_equal 3*10+5, sample2.run(5)
+      assert_equal 3*10+3, sample2.run(3)
     end
   end
 

data/test/base/test_site.rb

@@ -6,7 +6,7 @@ class Nanoc::SiteTest < MiniTest::Unit::TestCase
 
   def test_initialize_with_dir_without_config_yaml
     assert_raises(Errno::ENOENT) do
-      site = Nanoc::Site.new('.')
+      Nanoc::Site.new('.')
     end
   end
 

data/test/cli/commands/test_deploy.rb

@@ -107,18 +107,17 @@ class Nanoc::CLI::Commands::DeployTest < MiniTest::Unit::TestCase
         FileUtils.mkdir_p('output')
         File.open('output/blah.html', 'w') { |io| io.write 'moo' }
 
-        ios = capturing_stdio do
-          assert_raises SystemExit do
+         capturing_stdio do
+          err = assert_raises Nanoc::Errors::GenericTrivial do
             Nanoc::CLI.run %w( deploy )
           end
+          assert_equal 'The site configuration has no deploy configuration for default.', err.message
         end
-
-        assert ios[:stderr].include?('The site configuration has no deploy configuration for default.')
       end
     end
   end
 
-  def test_deploy_without_target_without_default
+  def test_deploy_without_target_with_default
     if_have 'systemu' do
       with_site do |site|
         File.open('config.yaml', 'w') do |io|
@@ -130,7 +129,7 @@ class Nanoc::CLI::Commands::DeployTest < MiniTest::Unit::TestCase
         FileUtils.mkdir_p('output')
         File.open('output/blah.html', 'w') { |io| io.write 'moo' }
 
-        ios = capturing_stdio do
+        capturing_stdio do
           Nanoc::CLI.run %w( deploy )
         end
 

data/test/cli/commands/test_prune.rb

@@ -94,5 +94,27 @@ class Nanoc::CLI::Commands::PruneTest < MiniTest::Unit::TestCase
     end
   end
 
-end
+  def test_run_with_symlink_to_output_dir
+    with_site do |site|
+      # Set output dir
+      FileUtils.rm_rf('output')
+      FileUtils.mkdir_p('output-real')
+      File.symlink('output-real', 'output')
+
+      # Create source files
+      File.open('content/index.html', 'w') { |io| io.write 'stuff' }
+
+      # Create output files
+      FileUtils.mkdir_p('output-real/some-dir')
+      File.open('output-real/some-file.html', 'w') { |io| io.write 'stuff' }
+      File.open('output-real/index.html', 'w')     { |io| io.write 'stuff' }
+
+      Nanoc::CLI.run %w( prune --yes )
 
+      assert File.file?('output-real/index.html')
+      assert !File.directory?('output-real/some-dir')
+      assert !File.file?('output-real/some-file.html')
+    end
+  end
+
+end

data/test/cli/commands/test_watch.rb

@@ -17,15 +17,12 @@ class Nanoc::CLI::Commands::WatchTest < MiniTest::Unit::TestCase
       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')
+      self.wait_until_content_equals('content/index.html', 'Hello there!')
 
       File.open('content/index.html', 'w') { |io| io.write('Hello there again!') }
-      sleep 1
-      assert_equal 'Hello there again!', File.read('output/index.html')
+      self.wait_until_content_equals('content/index.html', 'Hello there again!')
 
       watch_thread.kill
     end
@@ -37,15 +34,38 @@ class Nanoc::CLI::Commands::WatchTest < MiniTest::Unit::TestCase
       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
+      self.wait_until_exists('output/index.html')
       assert_equal 'Hello there!', File.read('output/index.html')
+
+      watch_thread.kill
     end
   ensure
     ENV['PATH'] = old_path
   end
 
+  def wait_until_exists(filename)
+    20.times do
+      break if File.file?(filename)
+      sleep 0.5
+    end
+    if !File.file?(filename)
+      raise RuntimeError, "Expected #{filename} to appear but it didn't :("
+    end
+  end
+
+  def wait_until_content_equals(filename, content)
+    self.wait_until_exists(filename)
+
+    20.times do
+      break if File.read(filename) == content
+      sleep 0.5
+    end
+    if File.read(filename) != content
+      raise RuntimeError, "Expected #{filename} to have content #{content} but it doesn't :("
+    end
+  end
+
 end

data/test/cli/test_cleaning_stream.rb

@@ -19,7 +19,7 @@ class Nanoc::CLI::CleaningStreamTest < MiniTest::Unit::TestCase
   end
 
   def test_forward
-    methods = [ :write, :<<, :tty?, :flush, :tell, :print, :puts, :string, :reopen, :exist?, :exists? ]
+    methods = [ :write, :<<, :tty?, :flush, :tell, :print, :puts, :string, :reopen, :exist?, :exists?, :close ]
 
     s = Stream.new
     cs = Nanoc::CLI::CleaningStream.new(s)
@@ -35,11 +35,20 @@ class Nanoc::CLI::CleaningStreamTest < MiniTest::Unit::TestCase
     cs.reopen('/dev/null', 'r')
     cs.exist?
     cs.exists?
+    cs.close
 
     methods.each do |m|
       assert s.called_methods.include?(m), "expected #{m} to be called"
     end
   end
 
-end
+  def test_works_with_logger
+    require 'logger'
+    stream = StringIO.new
+    cleaning_stream = Nanoc::CLI::CleaningStream.new(stream)
+    logger = Logger.new(cleaning_stream)
+    logger.info("Some info")
+    logger.warn("Something could start going wrong!")
+  end
 
+end

data/test/cli/test_error_handler.rb

@@ -12,7 +12,7 @@ class Nanoc::CLI::ErrorHandlerTest < MiniTest::Unit::TestCase
   def test_resolution_for_with_known_gem
     $loud = true
     error = LoadError.new('no such file to load -- kramdown')
-    assert_match /^Try installing /, handler.send(:resolution_for, error)
+    assert_match(/^Try installing /, handler.send(:resolution_for, error))
   ensure
     $loud = false
   end

data/test/extra/test_auto_compiler.rb

@@ -59,7 +59,7 @@ class Nanoc::Extra::AutoCompilerTest < MiniTest::Unit::TestCase
         autocompiler.stubs(:site).returns(site)
 
         # Serve
-        status, headers, body = autocompiler.instance_eval { call('REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/afjwiagoawf.html') }
+        status, _, _ = autocompiler.instance_eval { call('REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/afjwiagoawf.html') }
 
         # Check response
         assert_equal(404, status)
@@ -377,7 +377,7 @@ class Nanoc::Extra::AutoCompilerTest < MiniTest::Unit::TestCase
         # Check
         status, headers, body = autocompiler.call('REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/')
         body.each do |b|
-          assert_match /The Grand Value of Configuration is Foo!/, b
+          assert_match(/The Grand Value of Configuration is Foo!/, b)
         end
 
         # Set config to 2nd value
@@ -389,7 +389,7 @@ class Nanoc::Extra::AutoCompilerTest < MiniTest::Unit::TestCase
         # Check
         status, headers, body = autocompiler.call('REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/')
         body.each do |b|
-          assert_match /The Grand Value of Configuration is Bar!/, b
+          assert_match(/The Grand Value of Configuration is Bar!/, b)
         end
       end
     end
@@ -410,7 +410,7 @@ class Nanoc::Extra::AutoCompilerTest < MiniTest::Unit::TestCase
       # Test
       result = autocompiler.call('REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/%73oftware')
       assert_equal 404, result[0]
-      assert_match "File not found: /software\n", result[2][0]
+      assert_match("File not found: /software\n", result[2][0])
     end
   end
 

data/test/filters/test_colorize_syntax.rb

@@ -249,11 +249,11 @@ EOS
         [ :albino, :pygmentize, :simon_highlight ].each do |colorizer|
           begin
             input = '<pre><code class="language-ruby">puts "foo"</code></pre>'
-            actual_output = filter.run(
+            filter.run(
               input,
               :colorizers => { :ruby => colorizer })
             flunk "expected colorizer to raise if no executable is available"
-          rescue => e
+          rescue
           end
         end
       ensure

data/test/filters/test_handlebars.rb

@@ -24,7 +24,6 @@ class Nanoc::Filters::HandlebarsTest < MiniTest::Unit::TestCase
         :config  => config,
         :content => 'No Payne No Gayne'
       }
-      Handlebars.register_helper(:upcase) { |b| b.call.upcase }
       filter = ::Nanoc::Filters::Handlebars.new(assigns)
 
       # Run filter
@@ -34,8 +33,6 @@ class Nanoc::Filters::HandlebarsTest < MiniTest::Unit::TestCase
       assert_equal('We can’t stop here! This is the Max Payne layout!', result)
       result = filter.run('It’s raining {{config.animals}} here!')
       assert_equal('It’s raining cats and dogs here!', result)
-      result = filter.run('I am {{#upcase}}shouting{{/upcase}}!')
-      assert_equal('I am SHOUTING!', result)
     end
   end
 

data/test/filters/test_less.rb

@@ -14,7 +14,7 @@ class Nanoc::Filters::LessTest < MiniTest::Unit::TestCase
 
       # Run filter
       result = filter.run('.foo { bar: 1 + 1 }')
-      assert_match /\.foo\s*\{\s*bar:\s*2;?\s*\}/, result
+      assert_match(/\.foo\s*\{\s*bar:\s*2;?\s*\}/, result)
     end
   end
 
@@ -32,7 +32,7 @@ class Nanoc::Filters::LessTest < MiniTest::Unit::TestCase
 
       # Run filter
       result = filter.run('@import "content/foo/bar/imported_file.less";')
-      assert_match /p\s*\{\s*color:\s*red;?\s*\}/, result
+      assert_match(/p\s*\{\s*color:\s*red;?\s*\}/, result)
     end
   end
 
@@ -51,7 +51,7 @@ class Nanoc::Filters::LessTest < MiniTest::Unit::TestCase
 
       # Run filter
       result = filter.run('@import "bar/imported_file.less";')
-      assert_match /p\s*\{\s*color:\s*red;?\s*\}/, result
+      assert_match(/p\s*\{\s*color:\s*red;?\s*\}/, result)
     end
   end
 
@@ -90,7 +90,7 @@ class Nanoc::Filters::LessTest < MiniTest::Unit::TestCase
         assert Dir['output/*'].size == 1
         assert File.file?('output/a.css')
         refute File.file?('output/b.css')
-        assert_match /^p\s*\{\s*color:\s*red;?\s*\}/, File.read('output/a.css')
+        assert_match(/^p\s*\{\s*color:\s*red;?\s*\}/, File.read('output/a.css'))
 
         # Update included file
         File.open('content/b.less', 'w') do |io|
@@ -105,7 +105,7 @@ class Nanoc::Filters::LessTest < MiniTest::Unit::TestCase
         assert Dir['output/*'].size == 1
         assert File.file?('output/a.css')
         refute File.file?('output/b.css')
-        assert_match /^p\s*\{\s*color:\s*blue;?\s*\}/, File.read('output/a.css')
+        assert_match(/^p\s*\{\s*color:\s*blue;?\s*\}/, File.read('output/a.css'))
       end
     end
   end

data/test/filters/test_sass.rb

@@ -22,11 +22,11 @@ class Nanoc::Filters::SassTest < MiniTest::Unit::TestCase
 
       # Check with compact
       result = filter.run(".foo #bar\n  color: #f00", :style => 'compact')
-      assert_match(/^\.foo #bar[\s\n]*\{[\s\n]*color:\s*(red|#f00);?[\s\n]*\}/m, result)
+      assert_match(/^\.foo #bar[\s]*\{[\s]*color:\s*(red|#f00);?[\s]*\}/m, result)
 
       # Check with compressed
       result = filter.run(".foo #bar\n  color: #f00", :style => 'compressed')
-      assert_match(/^\.foo #bar[\s\n]*\{[\s\n]*color:\s*(red|#f00);?[\s\n]*\}/m, result)
+      assert_match(/^\.foo #bar[\s]*\{[\s]*color:\s*(red|#f00);?[\s]*\}/m, result)
     end
   end
 
@@ -133,8 +133,7 @@ class Nanoc::Filters::SassTest < MiniTest::Unit::TestCase
         assert Dir['output/*'].size == 1
         assert File.file?('output/a.css')
         refute File.file?('output/b.css')
-        assert_match /^p\s*\{\s*color:\s*red;?\s*\}/,
-          File.read('output/a.css')
+        assert_match(/^p\s*\{\s*color:\s*red;?\s*\}/, File.read('output/a.css'))
 
         # Update included file
         File.open('content/b.sass', 'w') do |io|
@@ -149,8 +148,7 @@ class Nanoc::Filters::SassTest < MiniTest::Unit::TestCase
         assert Dir['output/*'].size == 1
         assert File.file?('output/a.css')
         refute File.file?('output/b.css')
-        assert_match /^p\s*\{\s*color:\s*blue;?\s*\}/,
-          File.read('output/a.css')
+        assert_match(/^p\s*\{\s*color:\s*blue;?\s*\}/, File.read('output/a.css'))
       end
     end
   end
@@ -190,8 +188,7 @@ class Nanoc::Filters::SassTest < MiniTest::Unit::TestCase
         assert Dir['output/*'].size == 1
         assert File.file?('output/a.css')
         refute File.file?('output/b.css')
-        assert_match /^p\s*\{\s*color:\s*red;?\s*\}/,
-          File.read('output/a.css')
+        assert_match(/^p\s*\{\s*color:\s*red;?\s*\}/, File.read('output/a.css'))
 
         # Update included file
         File.open('content/_b.sass', 'w') do |io|
@@ -206,8 +203,7 @@ class Nanoc::Filters::SassTest < MiniTest::Unit::TestCase
         assert Dir['output/*'].size == 1
         assert File.file?('output/a.css')
         refute File.file?('output/b.css')
-        assert_match /^p\s*\{\s*color:\s*blue;?\s*\}/,
-          File.read('output/a.css')
+        assert_match(/^p\s*\{\s*color:\s*blue;?\s*\}/, File.read('output/a.css'))
       end
     end
   end

data/test/helper.rb

@@ -8,7 +8,7 @@ begin
   require 'minitest/unit'
   require 'minitest/spec'
   require 'minitest/mock'
-  require 'mocha'
+  require 'mocha/setup'
 rescue => e
   $stderr.puts "To run the nanoc unit tests, you need minitest and mocha."
   raise e
@@ -119,6 +119,7 @@ EOS
 
     # Enter tmp
     FileUtils.mkdir_p('tmp')
+    @orig_wd = FileUtils.pwd
     FileUtils.cd('tmp')
 
     # Let us get to the raw errors
@@ -130,7 +131,7 @@ EOS
     Nanoc::CLI::ErrorHandler.enable
 
     # Exit tmp
-    FileUtils.cd('..')
+    FileUtils.cd(@orig_wd)
     FileUtils.rm_rf('tmp')
 
     # Go unquiet

data/test/helpers/test_filtering.rb

@@ -63,7 +63,7 @@ class Nanoc::Helpers::FilteringTest < MiniTest::Unit::TestCase
               "<% end %>\n"
 
     # Evaluate content
-    error = assert_raises(Nanoc::Errors::UnknownFilter) do
+    assert_raises(Nanoc::Errors::UnknownFilter) do
       ::ERB.new(content).result(binding)
     end
   end

data/test/helpers/test_xml_sitemap.rb

@@ -6,98 +6,114 @@ class Nanoc::Helpers::XMLSitemapTest < MiniTest::Unit::TestCase
 
   include Nanoc::Helpers::XMLSitemap
 
+  def teardown
+    @items = nil
+    @item  = nil
+    @site  = nil
+    super
+  end
+
   def test_xml_sitemap
-    if_have 'builder' do
+    if_have 'builder', 'nokogiri' do
       # Create items
-      @items = [ mock, mock, mock, mock ]
-
-      # Create item 0
-      @items[0].expects(:[]).with(:is_hidden).returns(false)
-      @items[0].expects(:mtime).times(2).returns(nil)
-      @items[0].expects(:[]).times(2).with(:changefreq).returns(nil)
-      @items[0].expects(:[]).times(2).with(:priority).returns(nil)
-      item_reps = [ mock, mock ]
-      item_reps[0].expects(:path).returns('/kkk/')
-      item_reps[0].expects(:raw_path).returns('output/kkk/index.html')
-      item_reps[1].expects(:path).returns('/lll/')
-      item_reps[1].expects(:raw_path).returns('output/lll/index.html')
-      @items[0].expects(:reps).returns(item_reps)
+      @items = []
 
       # Create item 1
-      @items[1].expects(:[]).with(:is_hidden).returns(true)
+      @items << Nanoc::Item.new('some content 1', {}, '/item-one/')
+      self.create_item_rep(@items.last, :one_a, '/item-one/a/')
+      self.create_item_rep(@items.last, :one_b, '/item-one/b/')
 
       # Create item 2
-      @items[2].expects(:[]).with(:is_hidden).returns(false)
-      @items[2].expects(:mtime).times(4).returns(Time.parse('12/07/2004'))
-      @items[2].expects(:[]).with(:changefreq).times(4).returns('daily')
-      @items[2].expects(:[]).with(:priority).times(4).returns(0.5)
-      item_reps = [ mock, mock ]
-      item_reps[0].expects(:path).returns('/aaa/')
-      item_reps[0].expects(:raw_path).returns('output/aaa/index.html')
-      item_reps[1].expects(:path).returns('/bbb/')
-      item_reps[1].expects(:raw_path).returns('output/bbb/index.html')
-      @items[2].expects(:reps).returns(item_reps)
+      @items << Nanoc::Item.new('some content 2', { :is_hidden => true }, '/item-two/')
 
       # Create item 3
-      @items[3].expects(:[]).with(:is_hidden).returns(false)
-      item_rep = mock
-      item_rep.expects(:raw_path).returns(nil)
-      @items[3].expects(:reps).returns([ item_rep ])
+      attrs = { :mtime => Time.parse('2004-07-12'), :changefreq => 'daily', :priority => 0.5 }
+      @items << Nanoc::Item.new('some content 3', attrs, '/item-three/')
+      self.create_item_rep(@items.last, :three_a, '/item-three/a/')
+      self.create_item_rep(@items.last, :three_b, '/item-three/b/')
+
+      # Create item 4
+      @items << Nanoc::Item.new('some content 4', {}, '/item-four/')
+      self.create_item_rep(@items.last, :four_a, nil)
 
       # Create sitemap item
-      @item = mock
+      @item = Nanoc::Item.new('sitemap content', {}, '/sitemap/')
 
       # Create site
-      config = mock
-      config.expects(:[]).with(:base_url).at_least_once.returns('http://example.com')
-      @site = mock
-      @site.expects(:config).at_least_once.returns(config)
+      @site = Nanoc::Site.new({ :base_url => 'http://example.com' })
+
+      # Build sitemap
+      res = xml_sitemap
 
       # Check
-      xml_sitemap
+      doc = Nokogiri::XML(res)
+      urlsets = doc.css('> urlset')
+      assert_equal 1, urlsets.size
+      urls = urlsets.css('> url')
+      assert_equal 4, urls.size
+      assert_equal 'http://example.com/item-one/a/',   urls[0].css('> loc').inner_text
+      assert_equal 'http://example.com/item-one/b/',   urls[1].css('> loc').inner_text
+      assert_equal 'http://example.com/item-three/a/', urls[2].css('> loc').inner_text
+      assert_equal 'http://example.com/item-three/b/', urls[3].css('> loc').inner_text
+      assert_equal '',                                 urls[0].css('> changefreq').inner_text
+      assert_equal '',                                 urls[1].css('> changefreq').inner_text
+      assert_equal 'daily',                            urls[2].css('> changefreq').inner_text
+      assert_equal 'daily',                            urls[3].css('> changefreq').inner_text
+      assert_equal '',                                 urls[0].css('> priority').inner_text
+      assert_equal '',                                 urls[1].css('> priority').inner_text
+      assert_equal '0.5',                              urls[2].css('> priority').inner_text
+      assert_equal '0.5',                              urls[3].css('> priority').inner_text
+      assert_equal '',                                 urls[0].css('> lastmod').inner_text
+      assert_equal '',                                 urls[1].css('> lastmod').inner_text
+      assert_equal '2004-07-12',                       urls[2].css('> lastmod').inner_text
+      assert_equal '2004-07-12',                       urls[3].css('> lastmod').inner_text
     end
-  ensure
-    @items = nil
-    @item  = nil
-    @site  = nil
   end
 
   def test_sitemap_with_items_as_param
-    if_have 'builder' do
+    if_have 'builder', 'nokogiri' do
       # Create items
-      @items = [ mock, mock, mock ]
-
-      # Create item 0
-      @items[0].expects(:[]).never
-
-      # Create item 1
-      @items[1].expects(:[]).never
-
-      # Create item 2
-      @items[2].expects(:mtime).times(2).returns(nil)
-      @items[2].expects(:[]).times(2).with(:changefreq).returns(nil)
-      @items[2].expects(:[]).times(2).with(:priority).returns(nil)
-      item_reps = [ mock, mock ]
-      item_reps[0].expects(:path).returns('/kkk/')
-      item_reps[0].expects(:raw_path).returns('output/kkk/index.html')
-      item_reps[1].expects(:path).returns('/lll/')
-      item_reps[1].expects(:raw_path).returns('output/lll/index.html')
-      @items[2].expects(:reps).returns(item_reps)
+      @items = []
+      @items << nil
+      @items << Nanoc::Item.new('some content 1', {}, '/item-one/')
+      self.create_item_rep(@items.last, :one_a, '/item-one/a/')
+      self.create_item_rep(@items.last, :one_b, '/item-one/b/')
+      @items << nil
 
       # Create sitemap item
-      @item = mock
+      @item = Nanoc::Item.new('sitemap content', {}, '/sitemap/')
 
       # Create site
-      config = mock
-      config.expects(:[]).with(:base_url).at_least_once.returns('http://example.com')
-      @site = mock
-      @site.expects(:config).at_least_once.returns(config)
+      @site = Nanoc::Site.new({ :base_url => 'http://example.com' })
+
+      # Build sitemap
+      res = xml_sitemap(:items => [ @items[1] ])
 
       # Check
-      xml_sitemap(
-        :items => [@items[2]]
-      )
+      doc = Nokogiri::XML(res)
+      urlsets = doc.css('> urlset')
+      assert_equal 1, urlsets.size
+      urls = urlsets.css('> url')
+      assert_equal 2, urls.size
+      assert_equal 'http://example.com/item-one/a/',   urls[0].css('> loc').inner_text
+      assert_equal 'http://example.com/item-one/b/',   urls[1].css('> loc').inner_text
+      assert_equal '',                                 urls[0].css('> changefreq').inner_text
+      assert_equal '',                                 urls[1].css('> changefreq').inner_text
+      assert_equal '',                                 urls[0].css('> priority').inner_text
+      assert_equal '',                                 urls[1].css('> priority').inner_text
+      assert_equal '',                                 urls[0].css('> lastmod').inner_text
+      assert_equal '',                                 urls[1].css('> lastmod').inner_text
     end
   end
 
+protected
+
+  def create_item_rep(item, name, path)
+    rep = Nanoc::ItemRep.new(item, name)
+    rep.paths     = { :last => path }
+    rep.raw_paths = { :last => path }
+    item.reps << rep
+    rep
+  end
+
 end

data/test/test_gem.rb

@@ -0,0 +1,42 @@
+# encoding: utf-8
+
+class Nanoc::GemTest < MiniTest::Unit::TestCase
+
+  include Nanoc::TestHelpers
+
+  def setup
+    super
+    FileUtils.cd(@orig_wd)
+  end
+
+  def test_build
+    require 'systemu'
+
+    # Require clean environment
+    assert_empty Dir['nanoc-*.gem'], "Ensure no nanoc-*.gem files exist"
+
+    # Build
+    files_before = Set.new Dir['**/*']
+    stdout = ''
+    stderr = ''
+    status = systemu(
+      [ 'gem', 'build', 'nanoc.gemspec' ],
+      'stdin'  => '',
+      'stdout' => stdout,
+      'stderr' => stderr)
+    assert status.success?
+    files_after = Set.new Dir['**/*']
+
+    # Check new files
+    diff = files_after - files_before
+    assert_equal 1, diff.size
+    assert_match(/^nanoc-.*\.gem$/, diff.to_a[0])
+
+    # Check output
+    assert_match(/Successfully built RubyGem\n  Name: nanoc\n  Version: .*\n  File: nanoc-.*\.gem\n/, stdout)
+    assert_equal '', stderr
+  ensure
+    Dir['nanoc-*.gem'].each { |f| FileUtils.rm(f) }
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -202,7 +202,6 @@ 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
@@ -368,8 +367,8 @@ files:
 - test/helpers/test_text.rb
 - test/helpers/test_xml_sitemap.rb
 - test/tasks/test_clean.rb
+- test/test_gem.rb
 - nanoc.gemspec
-- .gemtest
 homepage: http://nanoc.stoneship.org/
 licenses: []
 post_install_message: 

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

@@ -1,151 +0,0 @@
-# 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
-