nanoc 3.5.0 → 3.6.0

data/test/base/test_layout.rb

@@ -17,14 +17,9 @@ class Nanoc::LayoutTest < MiniTest::Unit::TestCase
   def test_frozen_identifier
     layout = Nanoc::Layout.new("foo", {}, '/foo')
 
-    raised = false
-    begin
+    assert_raises_frozen_error do
       layout.identifier.chop!
-    rescue => error
-      raised = true
-      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
 
   def test_lookup_with_known_attribute

data/test/base/test_outdatedness_checker.rb

@@ -284,7 +284,7 @@ class Nanoc::OutdatednessCheckerTest < MiniTest::Unit::TestCase
 
     # Change code
     FileUtils.cd('foo') do
-      File.open('config.yaml', 'w') { |io| io.write('awesome: true') }
+      File.open('nanoc.yaml', 'w') { |io| io.write('awesome: true') }
     end
 
     # Check

data/test/base/test_site.rb

@@ -5,7 +5,7 @@ class Nanoc::SiteTest < MiniTest::Unit::TestCase
   include Nanoc::TestHelpers
 
   def test_initialize_with_dir_without_config_yaml
-    assert_raises(Errno::ENOENT) do
+    assert_raises(Nanoc::Errors::GenericTrivial) do
       Nanoc::Site.new('.')
     end
   end
@@ -16,6 +16,12 @@ class Nanoc::SiteTest < MiniTest::Unit::TestCase
     assert_equal 'public_html', site.config[:output_dir]
   end
 
+  def test_initialize_with_dir_with_nanoc_yaml
+    File.open('nanoc.yaml', 'w') { |io| io.write('output_dir: public_html') }
+    site = Nanoc::Site.new('.')
+    assert_equal 'public_html', site.config[:output_dir]
+  end
+
   def test_initialize_with_config_hash
     site = Nanoc::Site.new(:foo => 'bar')
     assert_equal 'bar', site.config[:foo]
@@ -65,7 +71,7 @@ EOF
       end
 
       # Update configuration
-      File.open('config.yaml', 'w') do |io|
+      File.open('nanoc.yaml', 'w') do |io|
         io.write "data_sources:\n"
         io.write "  - type: site_test_foo"
       end
@@ -170,7 +176,7 @@ describe 'Nanoc::Site#data_sources' do
 
   it 'should also use the toplevel config for data sources' do
     with_site do
-      File.open('config.yaml', 'w') do |io|
+      File.open('nanoc.yaml', 'w') do |io|
         io.write "data_sources:\n"
         io.write "  -\n"
         io.write "    type: filesystem_unified\n"

data/test/cli/commands/test_check.rb

@@ -0,0 +1,22 @@
+# encoding: utf-8
+
+class Nanoc::CLI::Commands::CheckTest < MiniTest::Unit::TestCase
+
+  include Nanoc::TestHelpers
+
+  def test_check_stale
+    with_site do |site|
+      FileUtils.mkdir_p('output')
+
+      # Should not raise now
+      Nanoc::CLI.run %w( check stale )
+
+      # Should raise now
+      File.open('output/blah.html', 'w') { |io| io.write 'moo' }
+      assert_raises Nanoc::Errors::GenericTrivial do
+        Nanoc::CLI.run %w( check stale )
+      end
+    end
+  end
+
+end

data/test/cli/commands/test_compile.rb

@@ -60,7 +60,7 @@ class Nanoc::CLI::Commands::CompileTest < MiniTest::Unit::TestCase
       Nanoc::CLI.run %w( compile )
       assert File.file?('output/stray.html')
 
-      File.open('config.yaml', 'w') do |io|
+      File.open('nanoc.yaml', 'w') do |io|
         io.write "prune:\n"
         io.write "  auto_prune: true\n"
       end
@@ -103,7 +103,7 @@ class Nanoc::CLI::Commands::CompileTest < MiniTest::Unit::TestCase
       Nanoc::CLI.run %w( compile )
       assert File.file?('output/stray.html')
 
-      File.open('config.yaml', 'w') do |io|
+      File.open('nanoc.yaml', 'w') do |io|
         io.write "prune:\n"
         io.write "  auto_prune: true\n"
         io.write "  exclude: [ 'excluded_dir' ]\n"

data/test/cli/commands/test_deploy.rb

@@ -7,7 +7,7 @@ class Nanoc::CLI::Commands::DeployTest < MiniTest::Unit::TestCase
   def test_deploy
     if_have 'systemu' do
       with_site do |site|
-        File.open('config.yaml', 'w') do |io|
+        File.open('nanoc.yaml', 'w') do |io|
           io.write "deploy:\n"
           io.write "  public:\n"
           io.write "    kind: rsync\n"
@@ -28,7 +28,7 @@ class Nanoc::CLI::Commands::DeployTest < MiniTest::Unit::TestCase
   def test_deploy_with_dry_run
     if_have 'systemu' do
       with_site do |site|
-        File.open('config.yaml', 'w') do |io|
+        File.open('nanoc.yaml', 'w') do |io|
           io.write "deploy:\n"
           io.write "  public:\n"
           io.write "    kind: rsync\n"
@@ -49,7 +49,7 @@ class Nanoc::CLI::Commands::DeployTest < MiniTest::Unit::TestCase
   def test_deploy_with_list
     if_have 'systemu' do
       with_site do |site|
-        File.open('config.yaml', 'w') do |io|
+        File.open('nanoc.yaml', 'w') do |io|
           io.write "deploy:\n"
           io.write "  public:\n"
           io.write "    kind: rsync\n"
@@ -74,7 +74,7 @@ class Nanoc::CLI::Commands::DeployTest < MiniTest::Unit::TestCase
   def test_deploy_without_kind
     if_have 'systemu' do
       with_site do |site|
-        File.open('config.yaml', 'w') do |io|
+        File.open('nanoc.yaml', 'w') do |io|
           io.write "deploy:\n"
           io.write "  public:\n"
           io.write "    dst: mydestination"
@@ -98,7 +98,7 @@ class Nanoc::CLI::Commands::DeployTest < MiniTest::Unit::TestCase
   def test_deploy_without_target_without_default
     if_have 'systemu' do
       with_site do |site|
-        File.open('config.yaml', 'w') do |io|
+        File.open('nanoc.yaml', 'w') do |io|
           io.write "deploy:\n"
           io.write "  public:\n"
           io.write "    dst: mydestination"
@@ -120,7 +120,7 @@ class Nanoc::CLI::Commands::DeployTest < MiniTest::Unit::TestCase
   def test_deploy_without_target_with_default
     if_have 'systemu' do
       with_site do |site|
-        File.open('config.yaml', 'w') do |io|
+        File.open('nanoc.yaml', 'w') do |io|
           io.write "deploy:\n"
           io.write "  default:\n"
           io.write "    dst: mydestination"

data/test/cli/commands/test_prune.rb

@@ -7,7 +7,7 @@ class Nanoc::CLI::Commands::PruneTest < MiniTest::Unit::TestCase
   def test_run_without_yes
     with_site do |site|
       # Set output dir
-      File.open('config.yaml', 'w') { |io| io.write 'output_dir: output2' }
+      File.open('nanoc.yaml', 'w') { |io| io.write 'output_dir: output2' }
       FileUtils.mkdir_p('output2')
 
       # Create source files
@@ -29,7 +29,7 @@ class Nanoc::CLI::Commands::PruneTest < MiniTest::Unit::TestCase
   def test_run_with_yes
     with_site do |site|
       # Set output dir
-      File.open('config.yaml', 'w') { |io| io.write 'output_dir: output2' }
+      File.open('nanoc.yaml', 'w') { |io| io.write 'output_dir: output2' }
       FileUtils.mkdir_p('output2')
 
       # Create source files
@@ -49,7 +49,7 @@ class Nanoc::CLI::Commands::PruneTest < MiniTest::Unit::TestCase
   def test_run_with_dry_run
     with_site do |site|
       # Set output dir
-      File.open('config.yaml', 'w') { |io| io.write 'output_dir: output2' }
+      File.open('nanoc.yaml', 'w') { |io| io.write 'output_dir: output2' }
       FileUtils.mkdir_p('output2')
 
       # Create source files
@@ -69,7 +69,7 @@ class Nanoc::CLI::Commands::PruneTest < MiniTest::Unit::TestCase
   def test_run_with_exclude
      with_site do |site|
       # Set output dir
-      File.open('config.yaml', 'w') { |io| io.write "prune:\n  exclude: [ 'good-dir', 'good-file.html' ]" }
+      File.open('nanoc.yaml', 'w') { |io| io.write "prune:\n  exclude: [ 'good-dir', 'good-file.html' ]" }
       FileUtils.mkdir_p('output')
 
       # Create source files
@@ -117,4 +117,23 @@ class Nanoc::CLI::Commands::PruneTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_run_with_nested_empty_dirs
+    with_site do |site|
+      # Set output dir
+      File.open('nanoc.yaml', 'w') { |io| io.write 'output_dir: output' }
+      FileUtils.mkdir_p('output')
+
+      # Create output files
+      FileUtils.mkdir_p('output/a/b/c')
+      File.open('output/a/b/c/index.html', 'w') { |io| io.write 'stuff' }
+
+      Nanoc::CLI.run %w( prune --yes )
+
+      assert !File.file?('output/a/b/c/index.html')
+      assert !File.directory?('output/a/b/c')
+      assert !File.directory?('output/a/b')
+      assert !File.directory?('output/a')
+    end
+  end
+
 end

data/test/cli/commands/test_sync.rb

@@ -0,0 +1,31 @@
+class Nanoc::CLI::Commands::SyncTest < MiniTest::Unit::TestCase
+
+  include Nanoc::TestHelpers
+
+  def test_run
+    with_site do
+      File.open('lib/foo_data_source.rb', 'w') do |io|
+        io.write "class FooDataSource < Nanoc::DataSource\n"
+        io.write "  identifier :sync_test_foo\n"
+        io.write "  def sync\n"
+        io.write "    File.open('foo_source_data.yaml', 'w') do |io|\n"
+        io.write "      io.write 'sync: true'\n"
+        io.write "    end\n"
+        io.write "  end\n"
+        io.write "end\n"
+      end
+
+      File.open('nanoc.yaml', 'w') do |io|
+        io.write "data_sources:\n"
+        io.write "  - type: sync_test_foo\n"
+        io.write "    items_root: /"
+      end
+
+      Nanoc::CLI.run %w( sync )
+
+      assert File.file?('foo_source_data.yaml')
+      assert_equal File.read('foo_source_data.yaml'), 'sync: true'
+    end
+  end
+
+end

data/test/cli/test_error_handler.rb

@@ -4,26 +4,31 @@ class Nanoc::CLI::ErrorHandlerTest < MiniTest::Unit::TestCase
 
   include Nanoc::TestHelpers
 
+  def setup
+    super
+    @handler = Nanoc::CLI::ErrorHandler.new
+  end
+
   def test_resolution_for_with_unknown_gem
     error = LoadError.new('no such file to load -- afjlrestjlsgrshter')
-    assert_nil handler.send(:resolution_for, error)
+    assert_nil @handler.send(:resolution_for, error)
   end
 
-  def test_resolution_for_with_known_gem
-    $loud = true
+  def test_resolution_for_with_known_gem_without_bundler
+    def @handler.using_bundler? ; false ; end
     error = LoadError.new('no such file to load -- kramdown')
-    assert_match(/^Try installing /, handler.send(:resolution_for, error))
-  ensure
-    $loud = false
+    assert_match(/^Install the 'kramdown' gem using `gem install kramdown`./, @handler.send(:resolution_for, error))
   end
 
-  def test_resolution_for_with_not_load_error
-    error = RuntimeError.new('nuclear meltdown detected')
-    assert_nil handler.send(:resolution_for, error)
+  def test_resolution_for_with_known_gem_with_bundler
+    def @handler.using_bundler? ; true ; end
+    error = LoadError.new('no such file to load -- kramdown')
+    assert_match(/^Make sure the gem is added to Gemfile/, @handler.send(:resolution_for, error))
   end
 
-  def handler
-    Nanoc::CLI::ErrorHandler.new
+  def test_resolution_for_with_not_load_error
+    error = RuntimeError.new('nuclear meltdown detected')
+    assert_nil @handler.send(:resolution_for, error)
   end
 
 end

data/test/extra/checking/checks/test_stale.rb

@@ -45,5 +45,28 @@ class Nanoc::Extra::Checking::Checks::StaleTest < MiniTest::Unit::TestCase
     end
   end
 
-end
+  def test_run_excluded
+    with_site do |site|
+      assert Dir['content/*'].empty?
+      assert Dir['output/*'].empty?
+
+      File.open('nanoc.yaml', 'w') { |io| io.write "prune:\n  exclude: [ 'excluded.html' ]" }
+      File.open('content/index.html', 'w') { |io| io.write('stuff') }
+      File.open('output/excluded.html', 'w') { |io| io.write('stuff') }
+      assert self.calc_issues.empty?
+    end
+  end
 
+  def test_run_excluded_with_broken_config
+    with_site do |site|
+      assert Dir['content/*'].empty?
+      assert Dir['output/*'].empty?
+
+      File.open('nanoc.yaml', 'w') { |io| io.write "prune:\n  blah: meh" }
+      File.open('content/index.html', 'w') { |io| io.write('stuff') }
+      File.open('output/excluded.html', 'w') { |io| io.write('stuff') }
+      refute self.calc_issues.empty?
+    end
+  end
+
+end

data/test/extra/test_auto_compiler.rb

@@ -369,10 +369,10 @@ class Nanoc::Extra::AutoCompilerTest < MiniTest::Unit::TestCase
         autocompiler = Nanoc::Extra::AutoCompiler.new('.')
 
         # Set config to 1st value
-        File.open('config.yaml', 'w') do |io|
+        File.open('nanoc.yaml', 'w') do |io|
           io.write "value: Foo"
         end
-        File.utime(Time.now+5, Time.now+5, 'config.yaml')
+        File.utime(Time.now+5, Time.now+5, 'nanoc.yaml')
 
         # Check
         status, headers, body = autocompiler.call('REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/')
@@ -381,10 +381,10 @@ class Nanoc::Extra::AutoCompilerTest < MiniTest::Unit::TestCase
         end
 
         # Set config to 2nd value
-        File.open('config.yaml', 'w') do |io|
+        File.open('nanoc.yaml', 'w') do |io|
           io.write "value: Bar"
         end
-        File.utime(Time.now+5, Time.now+5, 'config.yaml')
+        File.utime(Time.now+5, Time.now+5, 'nanoc.yaml')
 
         # Check
         status, headers, body = autocompiler.call('REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/')

data/test/filters/test_asciidoc.rb

@@ -14,7 +14,7 @@ class Nanoc::Filters::AsciiDocTest < MiniTest::Unit::TestCase
       filter = ::Nanoc::Filters::AsciiDoc.new
 
       # Run filter
-      result = filter.run("== Blah blah")
+      result = filter.setup_and_run("== Blah blah")
       assert_match %r{<h2 id="_blah_blah">Blah blah</h2>}, result
     end
   end

data/test/filters/test_bluecloth.rb

@@ -10,7 +10,7 @@ class Nanoc::Filters::BlueClothTest < MiniTest::Unit::TestCase
       filter = ::Nanoc::Filters::BlueCloth.new
 
       # Run filter
-      result = filter.run("> Quote")
+      result = filter.setup_and_run("> Quote")
       assert_match %r{<blockquote>\s*<p>Quote</p>\s*</blockquote>}, result
     end
   end

data/test/filters/test_coderay.rb

@@ -12,7 +12,7 @@ class Nanoc::Filters::CodeRayTest < MiniTest::Unit::TestCase
       # Run filter
       code = "def some_function ; x = blah.foo ; x.bar 'xyzzy' ; end"
       assert_raises(ArgumentError) do
-        filter.run(code)
+        filter.setup_and_run(code)
       end
     end
   end
@@ -24,7 +24,7 @@ class Nanoc::Filters::CodeRayTest < MiniTest::Unit::TestCase
 
       # Run filter
       code = "def some_function ; x = blah.foo ; x.bar 'xyzzy' ; end"
-      result = filter.run(code, :language => 'ruby')
+      result = filter.setup_and_run(code, :language => 'ruby')
       assert_match %r{^<span class="keyword">def</span> <span class="function">some_function</span>}, result
     end
   end
@@ -36,7 +36,7 @@ class Nanoc::Filters::CodeRayTest < MiniTest::Unit::TestCase
 
       # Run filter
       code = "def some_function ; x = blah.foo ; x.bar 'xyzzy' ; end"
-      result = filter.run(code, :language => 'skldfhjsdhfjszfnocmluhfixfmersumulh')
+      result = filter.setup_and_run(code, :language => 'skldfhjsdhfjszfnocmluhfixfmersumulh')
       assert_equal code, result
     end
   end

data/test/filters/test_coffeescript.rb

@@ -10,7 +10,7 @@ class Nanoc::Filters::CoffeeScriptTest < MiniTest::Unit::TestCase
       filter = ::Nanoc::Filters::CoffeeScript.new
 
       # Run filter (no assigns)
-      result = filter.run('alert 42')
+      result = filter.setup_and_run('alert 42')
       assert_equal("(function() { alert(42); }).call(this); ", result.gsub(/\s+/, ' '))
     end
   end

data/test/filters/test_colorize_syntax.rb

@@ -17,7 +17,7 @@ class Nanoc::Filters::ColorizeSyntaxTest < MiniTest::Unit::TestCase
       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)
+      actual_output = filter.setup_and_run(input)
       assert_equal(expected_output, actual_output)
     end
   end
@@ -32,7 +32,7 @@ class Nanoc::Filters::ColorizeSyntaxTest < MiniTest::Unit::TestCase
       expected_output = input # because we are using a dummy
 
       # Run filter
-      actual_output = filter.run(input, :default_colorizer => :dummy)
+      actual_output = filter.setup_and_run(input, :default_colorizer => :dummy)
       assert_equal(expected_output, actual_output)
     end
   end
@@ -68,7 +68,7 @@ EOS
 EOS
 
       # Run filter
-      actual_output = filter.run(input, :default_colorizer => :dummy, :is_fullpage => true)
+      actual_output = filter.setup_and_run(input, :default_colorizer => :dummy, :is_fullpage => true)
       assert_equal(expected_output, actual_output)
     end
   end
@@ -83,7 +83,7 @@ EOS
       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)
+      actual_output = filter.setup_and_run(input)
       assert_equal(expected_output, actual_output)
     end
   end
@@ -98,7 +98,7 @@ EOS
       expected_output = "<pre title=\"moo\"><code>def moo ; end\n#!ruby\n# comment</code></pre>"
 
       # Run filter
-      actual_output = filter.run(input)
+      actual_output = filter.setup_and_run(input)
       assert_equal(expected_output, actual_output)
     end
   end
@@ -113,7 +113,7 @@ EOS
       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)
+      actual_output = filter.setup_and_run(input)
       assert_equal(expected_output, actual_output)
     end
   end
@@ -128,7 +128,7 @@ EOS
       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)
+      actual_output = filter.setup_and_run(input)
       assert_equal(expected_output, actual_output)
     end
   end
@@ -147,7 +147,7 @@ EOS
       expected_output = '<pre title="moo"><code class="language-ruby"><span class="c1"># comment</span></code></pre>'
 
       # Run filter
-      actual_output = filter.run(input, :colorizers => { :ruby => :pygmentize })
+      actual_output = filter.setup_and_run(input, :colorizers => { :ruby => :pygmentize })
       assert_equal(expected_output, actual_output)
     end
   end
@@ -162,7 +162,7 @@ EOS
       expected_output = '<pre title="moo"><code class="language-ruby"><span class="c1"># comment…</span></code></pre>'
 
       # Run filter
-      actual_output = filter.run(input, :colorizers => { :ruby => :pygmentsrb })
+      actual_output = filter.setup_and_run(input, :colorizers => { :ruby => :pygmentsrb })
       assert_equal(expected_output, actual_output)
     end
   end
@@ -181,7 +181,7 @@ EOS
       expected_output = '<pre title="moo"><code class="language-ruby"><span class="hl slc"># comment</span></code></pre>'
 
       # Run filter
-      actual_output = filter.run(input, :default_colorizer => :simon_highlight)
+      actual_output = filter.setup_and_run(input, :default_colorizer => :simon_highlight)
       assert_equal(expected_output, actual_output)
     end
   end
@@ -193,7 +193,7 @@ EOS
 
       # Run filter
       assert_raises RuntimeError do
-        filter.run('<p>whatever</p>', :syntax => :kasflwafhaweoineurl)
+        filter.setup_and_run('<p>whatever</p>', :syntax => :kasflwafhaweoineurl)
       end
     end
   end
@@ -208,7 +208,7 @@ EOS
       expected_output = '<p>foo<br/>bar</p>'
 
       # Run filter
-      actual_output = filter.run(input, :syntax => :xml)
+      actual_output = filter.setup_and_run(input, :syntax => :xml)
       assert_equal(expected_output, actual_output)
     end
   end
@@ -223,7 +223,7 @@ EOS
       expected_output = '<p>foo<br />bar</p>'
 
       # Run filter
-      actual_output = filter.run(input, :syntax => :xhtml)
+      actual_output = filter.setup_and_run(input, :syntax => :xhtml)
       assert_equal(expected_output, actual_output)
     end
   end
@@ -243,7 +243,7 @@ EOS
       expected_output = '<pre><code class="language-ruby"><span class="nb">puts</span> <span class="s2">"foo"</span></code></pre>'
 
       # Run filter
-      actual_output = filter.run(input, :default_colorizer => :pygmentize)
+      actual_output = filter.setup_and_run(input, :default_colorizer => :pygmentize)
       assert_equal(expected_output, actual_output)
     end
   end
@@ -264,7 +264,7 @@ EOS
         [ :albino, :pygmentize, :simon_highlight ].each do |colorizer|
           begin
             input = '<pre><code class="language-ruby">puts "foo"</code></pre>'
-            filter.run(
+            filter.setup_and_run(
               input,
               :colorizers => { :ruby => colorizer })
             flunk "expected colorizer to raise if no executable is available"
@@ -301,7 +301,7 @@ after
 EOS
 
       # Run filter
-      actual_output = filter.run(input)
+      actual_output = filter.setup_and_run(input)
       assert_equal(expected_output, actual_output)
     end
   end
@@ -329,7 +329,7 @@ after
 EOS
 
       # Run filter
-      actual_output = filter.run(input)
+      actual_output = filter.setup_and_run(input)
       assert_equal(expected_output, actual_output)
     end
   end
@@ -344,7 +344,7 @@ EOS
       expected_output = '<code class="language-ruby"># comment</code>'
 
       # Run filter
-      actual_output = filter.run(input, :outside_pre => false)
+      actual_output = filter.setup_and_run(input, :outside_pre => false)
       assert_equal(expected_output, actual_output)
     end
   end
@@ -359,7 +359,7 @@ EOS
       expected_output = '<code class="language-ruby"><span class="comment"># comment</span></code>'
 
       # Run filter
-      actual_output = filter.run(input, :outside_pre => true)
+      actual_output = filter.setup_and_run(input, :outside_pre => true)
       assert_equal(expected_output, actual_output)
     end
   end
@@ -389,7 +389,7 @@ after
 EOS
 
       # Run filter
-      actual_output = filter.run(input)
+      actual_output = filter.setup_and_run(input)
       assert_equal(expected_output, actual_output)
     end
   end