nanoc 3.6.6 → 3.6.7

data/lib/nanoc/filters/sass.rb

@@ -12,34 +12,19 @@ module Nanoc::Filters
     #
     # @return [String] The filtered content
     def run(content, params={})
-      # Build options
-      options = params.dup
-      sass_filename = options[:filename] ||
-        (@item && @item[:content_filename])
-      options[:filename] ||= sass_filename
-      options[:filesystem_importer] ||=
-        Nanoc::Filters::Sass::SassFilesystemImporter
-
-      # Find items
-      item_dirglob = Pathname.new(sass_filename).dirname.realpath.to_s + '**'
-      clean_items = @items.reject { |i| i.raw_filename.nil? }
-      @scoped_items, @rest_items = clean_items.partition do |i|
-        i.raw_filename &&
-          Pathname.new(i.raw_filename).realpath.fnmatch(item_dirglob)
-      end
-      
-      # Render
-      options[:nanoc_current_filter] = self
+      options = params.merge({
+        :nanoc_current_filter => self,
+        :filename => @item && @item.raw_filename,
+      })
       engine = ::Sass::Engine.new(content, options)
       engine.render
     end
 
     def imported_filename_to_item(filename)
-      filematch = lambda do |i|
+      @items.find do |i|
         i.raw_filename &&
           Pathname.new(i.raw_filename).realpath == Pathname.new(filename).realpath
       end
-      @scoped_items.find(&filematch) || @rest_items.find(&filematch)
     end
 
   end

data/lib/nanoc/version.rb

@@ -3,6 +3,6 @@
 module Nanoc
 
   # The current nanoc version.
-  VERSION = '3.6.6'
+  VERSION = '3.6.7'
 
 end

data/lib/nanoc.rb

@@ -13,6 +13,11 @@ module Nanoc
     res
   end
 
+  # @return [Boolean] True if the current platform is Windows,
+  def self.on_windows?
+    !!(RUBY_PLATFORM =~ /windows|bccwin|cygwin|djgpp|mingw|mswin|wince/i)
+  end
+
 end
 
 Nanoc3 = Nanoc

data/tasks/test.rake

@@ -1,42 +1,33 @@
 # encoding: utf-8
 
-require 'minitest/unit'
+def run_tests(dir_glob)
+  ENV['ARGS'] ||= ''
+  ENV['QUIET'] ||= 'true'
 
-test = namespace :test do
+  $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/..'))
 
-  # test:all
-  desc 'Run all tests'
-  task :all do
-    ENV['QUIET'] ||= 'true'
-    $VERBOSE = (ENV['VERBOSE'] == 'true')
+  # require our test helper so we don't have to in each individual test
+  require 'test/helper'
 
-    $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/..'))
+  test_files = Dir["#{dir_glob}*_spec.rb"] + Dir["#{dir_glob}test_*.rb"]
+  test_files.each { |f| require f }
 
-    # require our test helper so we don't have to in each individual test
-    require 'test/helper'
+  exit MiniTest::Unit.new.run(ENV['ARGS'].split)
+end
 
-    test_files = Dir['test/**/*_spec.rb'] + Dir['test/**/test_*.rb']
-    test_files.each { |f| require f }
+namespace :test do
 
-    exit MiniTest::Unit.new.run($VERBOSE ? %w( --verbose ) : %w())
+  # test:all
+  desc 'Run all tests'
+  task :all do
+    run_tests "test/**/"
   end
 
   # test:...
   %w( base cli data_sources extra filters helpers tasks ).each do |dir|
     desc "Run all #{dir} tests"
     task dir.to_sym do |task|
-      ENV['QUIET'] ||= 'true'
-      $VERBOSE = (ENV['VERBOSE'] == 'true')
-
-      $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/..'))
-
-      # require our test helper so we don't have to in each individual test
-      require 'test/helper'
-
-      test_files = Dir["test/#{dir}/**/*_spec.rb"] + Dir["test/#{dir}/**/test_*.rb"]
-      test_files.each { |f| require f }
-
-      exit MiniTest::Unit.new.run($VERBOSE ? %w( --verbose ) : %w())
+      run_tests "test/#{dir}/**/"
     end
   end
 

data/test/base/test_context.rb

@@ -20,7 +20,7 @@ class Nanoc::ContextTest < Nanoc::TestCase
 
   def test_example
     # Parse
-    YARD.parse('../lib/nanoc/base/context.rb')
+    YARD.parse(LIB_DIR + '/nanoc/base/context.rb')
 
     # Run
     assert_examples_correct 'Nanoc::Context#initialize'

data/test/base/test_directed_graph.rb

@@ -282,7 +282,7 @@ class Nanoc::DirectedGraphTest < Nanoc::TestCase
   end
 
   def test_example
-    YARD.parse('../lib/nanoc/base/directed_graph.rb')
+    YARD.parse(LIB_DIR + '/nanoc/base/directed_graph.rb')
     assert_examples_correct 'Nanoc::DirectedGraph'
   end
 

data/test/cli/commands/test_compile.rb

@@ -140,4 +140,65 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
     end
   end
 
+  def test_file_action_printer_normal
+    # Create data
+    item = Nanoc::Item.new('content', {}, '/')
+    rep = Nanoc::ItemRep.new(item, :default)
+    rep.raw_path = 'output/foo.txt'
+
+    # Listen
+    listener = new_file_action_printer([ rep ])
+    listener.start
+    Nanoc::NotificationCenter.post(:compilation_started, rep)
+    Nanoc::NotificationCenter.post(:compilation_ended, rep)
+    listener.stop
+
+    # Check
+    assert_equal 1, listener.events.size
+    assert_equal :low,             listener.events[0][:level]
+    assert_equal :skip,            listener.events[0][:action]
+    assert_equal 'output/foo.txt', listener.events[0][:path]
+    assert_in_delta 0.0,           listener.events[0][:duration], 1.0
+  end
+
+  def test_file_action_printer_skip
+    # Create data
+    item = Nanoc::Item.new('content', {}, '/')
+    rep = Nanoc::ItemRep.new(item, :default)
+    rep.raw_path = 'output/foo.txt'
+
+    # Listen
+    listener = new_file_action_printer([ rep ])
+    listener.start
+    Nanoc::NotificationCenter.post(:compilation_started, rep)
+    listener.stop
+
+    # Check
+    assert_equal 1, listener.events.size
+    assert_equal :low,             listener.events[0][:level]
+    assert_equal :skip,            listener.events[0][:action]
+    assert_equal 'output/foo.txt', listener.events[0][:path]
+    assert_nil listener.events[0][:duration]
+  end
+
+  def new_file_action_printer(reps)
+    listener = Nanoc::CLI::Commands::Compile::FileActionPrinter.new(:reps => reps)
+
+    def listener.log(level, action, path, duration)
+      @events ||= []
+      @events << {
+        :level    => level,
+        :action   => action,
+        :path     => path,
+        :duration => duration
+      }
+    end
+
+    def listener.events
+      @events
+    end
+
+    listener
+  end
+
 end

data/test/cli/commands/test_deploy.rb

@@ -3,6 +3,7 @@
 class Nanoc::CLI::Commands::DeployTest < Nanoc::TestCase
 
   def test_deploy
+    skip_unless_have_command "rsync"
     if_have 'systemu' do
       with_site do |site|
         File.open('nanoc.yaml', 'w') do |io|
@@ -113,6 +114,7 @@ class Nanoc::CLI::Commands::DeployTest < Nanoc::TestCase
   end
 
   def test_deploy_without_kind
+    skip_unless_have_command "rsync"
     if_have 'systemu' do
       with_site do |site|
         File.open('nanoc.yaml', 'w') do |io|
@@ -159,6 +161,7 @@ class Nanoc::CLI::Commands::DeployTest < Nanoc::TestCase
   end
 
   def test_deploy_without_target_with_default
+    skip_unless_have_command "rsync"
     if_have 'systemu' do
       with_site do |site|
         File.open('nanoc.yaml', 'w') do |io|

data/test/cli/commands/test_prune.rb

@@ -93,6 +93,7 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
   end
 
   def test_run_with_symlink_to_output_dir
+    skip_unless_have_symlink
     with_site do |site|
       # Set output dir
       FileUtils.rm_rf('output')

data/test/cli/commands/test_watch.rb

@@ -33,11 +33,13 @@ class Nanoc::CLI::Commands::WatchTest < Nanoc::TestCase
   end
 
   def test_growlnotify_cmd
+    Nanoc::CLI.setup
     notifier = Nanoc::CLI::Commands::Watch::Notifier.new
     assert_equal [ 'growlnotify', '-m', 'foo' ], notifier.send(:growlnotify_cmd_for, 'foo')
   end
 
   def test_growlnotify_windows_cmd
+    Nanoc::CLI.setup
     notifier = Nanoc::CLI::Commands::Watch::Notifier.new
     assert_equal [ 'growlnotify', '/t:nanoc', 'foo' ], notifier.send(:growlnotify_windows_cmd_for, 'foo')
   end

data/test/cli/test_cleaning_stream.rb

@@ -9,7 +9,7 @@ class Nanoc::CLI::CleaningStreamTest < Nanoc::TestCase
     def initialize
       @called_methods = Set.new
     end
-    
+
     def method_missing(symbol, *args)
       @called_methods << symbol
     end
@@ -49,4 +49,12 @@ class Nanoc::CLI::CleaningStreamTest < Nanoc::TestCase
     logger.warn("Something could start going wrong!")
   end
 
+  def test_broken_pipe
+    stream = StringIO.new
+    def stream.write(s) ; raise Errno::EPIPE.new ; end
+
+    cleaning_stream = Nanoc::CLI::CleaningStream.new(stream)
+    cleaning_stream.write('lol')
+  end
+
 end

data/test/data_sources/test_filesystem.rb

@@ -372,7 +372,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
       io.write "content goes here\n"
     end
 
-    data_source = Nanoc::DataSources::FilesystemCombined.new(nil, nil, nil, nil)
+    data_source = Nanoc::DataSources::FilesystemCombined.new(nil, nil, nil, :encoding => 'utf-8')
 
     result = data_source.instance_eval { parse('test.html', nil, 'foobar') }
     assert_equal({ 'utf8bomawareness' => 'high' }, result[0])

data/test/data_sources/test_static.rb

@@ -14,6 +14,8 @@ class Nanoc::DataSources::StaticTest < Nanoc::TestCase
   end
 
   def test_items_with_symlinks
+    skip_unless_have_symlink
+
     # Create data source
     data_source = new_data_source(:prefix => 'foo')
 

data/test/extra/test_filesystem_tools.rb

@@ -1,6 +1,10 @@
 # encoding: utf-8
 
 class Nanoc::Extra::FilesystemToolsTest < Nanoc::TestCase
+  def setup
+    super
+    skip_unless_have_symlink
+  end
 
   def test_all_files_in_follows_symlinks_to_dirs
     # Write sample files

data/test/filters/test_asciidoc.rb

@@ -4,9 +4,7 @@ class Nanoc::Filters::AsciiDocTest < Nanoc::TestCase
 
   def test_filter
     if_have 'systemu' do
-      if `which asciidoc`.strip.empty?
-        skip "could not find asciidoc"
-      end
+      skip_unless_have_command "asciidoc"
 
       # Create filter
       filter = ::Nanoc::Filters::AsciiDoc.new

data/test/filters/test_colorize_syntax.rb

@@ -122,9 +122,7 @@ EOS
 
   def test_pygmentize
     if_have 'nokogiri', 'systemu' do
-      if `which pygmentize`.strip.empty?
-        skip "could not find pygmentize"
-      end
+      skip_unless_have_command "pygmentize"
 
       # Create filter
       filter = ::Nanoc::Filters::ColorizeSyntax.new
@@ -140,6 +138,7 @@ EOS
   end
 
   def test_pygmentsrb
+    skip "pygments.rb does not support Windows" if on_windows?
     if_have 'pygments', 'nokogiri' do
       # Create filter
       filter = ::Nanoc::Filters::ColorizeSyntax.new
@@ -156,9 +155,7 @@ EOS
 
   def test_simon_highlight
     if_have 'nokogiri', 'systemu' do
-      if `which highlight`.strip.empty?
-        skip "could not find `highlight`"
-      end
+      skip_unless_have_command "highlight"
 
       # Create filter
       filter = ::Nanoc::Filters::ColorizeSyntax.new
@@ -216,10 +213,7 @@ EOS
   end
 
   def test_colorize_syntax_with_default_colorizer
-    if `which pygmentize`.strip.empty?
-      skip 'no pygmentize found, which is required for this test'
-      return
-    end
+    skip_unless_have_command "pygmentize"
 
     if_have 'nokogiri', 'systemu' do
       # Create filter

data/test/filters/test_handlebars.rb

@@ -34,4 +34,25 @@ class Nanoc::Filters::HandlebarsTest < Nanoc::TestCase
     end
   end
 
+  def test_filter_without_layout
+    if_have 'handlebars' do
+      # Create data
+      item = Nanoc::Item.new(
+        'content',
+        { :title => 'Max Payne', :protagonist => 'Max Payne', :location => 'here' },
+        '/games/max-payne/')
+
+      # Create filter
+      assigns = {
+        :item    => item,
+        :content => 'No Payne No Gayne'
+      }
+      filter = ::Nanoc::Filters::Handlebars.new(assigns)
+
+      # Run filter
+      result = filter.setup_and_run('{{protagonist}} says: {{yield}}.')
+      assert_equal('Max Payne says: No Payne No Gayne.', result)
+    end
+  end
+
 end

data/test/filters/test_less.rb

@@ -118,7 +118,7 @@ class Nanoc::Filters::LessTest < Nanoc::TestCase
 
       # Run filter with compress option
       result = filter.setup_and_run('.foo { bar: a; } .bar { foo: b; }', :compress => true)
-      assert_match(/^\.foo\{bar:a;\}\n\.bar\{foo:b;\}/, result)
+      assert_match(/^\.foo\{bar:a\}\n\.bar\{foo:b\}/, result)
     end
   end
 

data/test/filters/test_maruku.rb

@@ -9,7 +9,7 @@ class Nanoc::Filters::MarukuTest < Nanoc::TestCase
 
       # Run filter
       result = filter.setup_and_run("This is _so_ *cool*!")
-      assert_equal("<p>This is <em>so</em> <em>cool</em>!</p>", result)
+      assert_equal("<p>This is <em>so</em> <em>cool</em>!</p>", result.strip)
     end
   end
 

data/test/filters/test_pandoc.rb

@@ -4,9 +4,7 @@ class Nanoc::Filters::PandocTest < Nanoc::TestCase
 
   def test_filter
     if_have 'pandoc-ruby' do
-      if `which pandoc`.strip.empty?
-        skip "could not find pandoc"
-      end
+      skip_unless_have_command "pandoc"
 
       # Create filter
       filter = ::Nanoc::Filters::Pandoc.new

data/test/filters/test_sass.rb

@@ -206,6 +206,71 @@ class Nanoc::Filters::SassTest < Nanoc::TestCase
     end
   end
 
+  def test_recompile_includes_with_relative_path
+    if_have 'sass', 'compass' do
+      with_site do |site|
+        # Write compass config
+        FileUtils.mkdir_p('compass')
+        File.open('compass/config.rb', 'w') do |io|
+          io << "project_path = \".\"\n"
+          io << "sass_path = \"content/style\"\n"
+        end
+
+        # Create two Sass files
+        Dir['content/*'].each { |i| FileUtils.rm(i) }
+        FileUtils.mkdir_p('content/style/super')
+        FileUtils.mkdir_p('content/style/sub')
+        File.open('content/style/super/main.sass', 'w') do |io|
+          io.write('@import sub/include.sass')
+        end
+        File.open('content/style/sub/include.sass', 'w') do |io|
+          io.write("p\n  color: red")
+        end
+
+        # Update rules
+        File.open('Rules', 'w') do |io|
+          io.write "require 'compass'\n"
+          io.write "Compass.add_project_configuration 'compass/config.rb'\n"
+          io.write "\n"
+          io.write "compile '*' do\n"
+          io.write "  filter :sass, Compass.sass_engine_options\n"
+          io.write "end\n"
+          io.write "\n"
+          io.write "route '/style/super/main/' do\n"
+          io.write "  item.identifier.chop + '.css'\n"
+          io.write "end\n"
+          io.write "\n"
+          io.write "route '/style/sub/include/' do\n"
+          io.write "  nil\n"
+          io.write "end\n"
+        end
+
+        # Compile
+        site = Nanoc::Site.new('.')
+        site.compile
+
+        # Check
+        output_files = Dir['output/**/*'].select { |f| File.file?(f) }
+        assert_equal [ 'output/style/super/main.css' ], output_files
+        assert_match(/^p\s*\{\s*color:\s*red;?\s*\}/, File.read('output/style/super/main.css'))
+
+        # Update included file
+        File.open('content/style/sub/include.sass', 'w') do |io|
+          io.write("p\n  color: blue")
+        end
+
+        # Recompile
+        site = Nanoc::Site.new('.')
+        site.compile
+
+        # Recheck
+        output_files = Dir['output/**/*'].select { |f| File.file?(f) }
+        assert_equal [ 'output/style/super/main.css' ], output_files
+        assert_match(/^p\s*\{\s*color:\s*blue;?\s*\}/, File.read('output/style/super/main.css'))
+      end
+    end
+  end
+
 private
 
   def create_filter(params={})

data/test/helper.rb

@@ -21,10 +21,13 @@ require 'nanoc/cli'
 require 'nanoc/tasks'
 
 # Load miscellaneous requirements
+require 'tmpdir'
 require 'stringio'
 
 module Nanoc::TestHelpers
 
+  LIB_DIR = File.expand_path(File.dirname(__FILE__) + '/../lib')
+
   def if_have(*libs)
     libs.each do |lib|
       begin
@@ -113,14 +116,17 @@ EOS
 
     # Go quiet
     unless ENV['QUIET'] == 'false'
+      @orig_stdout = $stdout
+      @orig_stderr = $stderr
+
       $stdout = StringIO.new
       $stderr = StringIO.new
     end
 
     # Enter tmp
-    FileUtils.mkdir_p('tmp')
+    @tmp_dir = Dir.mktmpdir('nanoc-test')
     @orig_wd = FileUtils.pwd
-    FileUtils.cd('tmp')
+    FileUtils.cd(@tmp_dir)
 
     # Let us get to the raw errors
     Nanoc::CLI::ErrorHandler.disable
@@ -132,12 +138,12 @@ EOS
 
     # Exit tmp
     FileUtils.cd(@orig_wd)
-    FileUtils.rm_rf('tmp')
+    FileUtils.rm_rf(@tmp_dir)
 
     # Go unquiet
     unless ENV['QUIET'] == 'false'
-      $stdout = STDOUT
-      $stderr = STDERR
+      $stdout = @orig_stdout
+      $stderr = @orig_stderr
     end
   end
 
@@ -213,6 +219,31 @@ EOS
     orig_env_hash.each_pair { |k,v| ENV[k] = v }
   end
 
+  def on_windows?
+    Nanoc.on_windows?
+  end
+
+  def have_command?(cmd)
+    which, null = on_windows? ? ["where", "NUL"] : ["which", "/dev/null"]
+    system("#{which} #{cmd} > #{null} 2>&1")
+  end
+
+  def have_symlink?
+    File.symlink nil, nil
+  rescue NotImplementedError
+    return false
+  rescue
+    return true
+  end
+
+  def skip_unless_have_command(cmd)
+    skip "Could not find external command \"#{cmd}\"" unless have_command?(cmd)
+  end
+
+  def skip_unless_have_symlink
+    skip "Symlinks are not supported by Ruby on Windows" unless have_symlink?
+  end
+
 end
 
 class Nanoc::TestCase < MiniTest::Unit::TestCase

data/test/helpers/test_link_to.rb

@@ -207,7 +207,7 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
 
   def test_examples_link_to
     # Parse
-    YARD.parse('../lib/nanoc/helpers/link_to.rb')
+    YARD.parse(LIB_DIR + '/nanoc/helpers/link_to.rb')
 
     # Mock
     @items = [ mock, mock, mock ]
@@ -227,7 +227,7 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
 
   def test_examples_link_to_unless_current
     # Parse
-    YARD.parse('../lib/nanoc/helpers/link_to.rb')
+    YARD.parse(LIB_DIR + '/nanoc/helpers/link_to.rb')
 
     # Mock
     @item_rep = mock
@@ -241,7 +241,7 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
 
   def test_examples_relative_path_to
     # Parse
-    YARD.parse('../lib/nanoc/helpers/link_to.rb')
+    YARD.parse(LIB_DIR + '/nanoc/helpers/link_to.rb')
 
     # Mock
     @item_rep = mock

data/test/helpers/test_rendering.rb

@@ -38,7 +38,7 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
         io.write("layout '/foo/', nil\n")
       end
 
-      File.open('layouts/foo.xyz', 'w')
+      File.open('layouts/foo.xyz', 'w').close()
 
       assert_raises(Nanoc::Errors::CannotDetermineFilter) do
         render '/foo/'
@@ -54,7 +54,7 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
         io.write("layout '/foo/', :asdf\n")
       end
 
-      File.open('layouts/foo.xyz', 'w')
+      File.open('layouts/foo.xyz', 'w').close()
 
       assert_raises(Nanoc::Errors::UnknownFilter) do
         render '/foo/'

data/test/test_gem.rb

@@ -31,7 +31,7 @@ class Nanoc::GemTest < Nanoc::TestCase
     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_match(/Successfully built RubyGem\s+Name: nanoc\s+Version: .*\s+File: nanoc-.*\.gem\s+/, stdout)
     assert_equal '', stderr
   ensure
     Dir['nanoc-*.gem'].each { |f| FileUtils.rm(f) }