nanoc 3.7.4 → 3.7.5

data/test/base/test_site.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::SiteTest < Nanoc::TestCase
-
   def test_initialize_with_dir_without_config_yaml
     assert_raises(Nanoc::Errors::GenericTrivial) do
       Nanoc::Site.new('.')
@@ -21,12 +20,12 @@ class Nanoc::SiteTest < Nanoc::TestCase
   end
 
   def test_initialize_with_config_hash
-    site = Nanoc::Site.new(:foo => 'bar')
+    site = Nanoc::Site.new(foo: 'bar')
     assert_equal 'bar', site.config[:foo]
   end
 
   def test_initialize_with_incomplete_data_source_config
-    site = Nanoc::Site.new(:data_sources => [{ :type => 'foo', :items_root => '/bar/' }])
+    site = Nanoc::Site.new(data_sources: [{ type: 'foo', items_root: '/bar/' }])
     assert_equal('foo',   site.config[:data_sources][0][:type])
     assert_equal('/bar/', site.config[:data_sources][0][:items_root])
     assert_equal('/',     site.config[:data_sources][0][:layouts_root])
@@ -74,7 +73,7 @@ EOF
     end
 
     error = assert_raises(Nanoc::Errors::GenericTrivial) do
-      site = Nanoc::Site.new('.')
+      Nanoc::Site.new('.')
     end
     assert_equal(
       "Could not find parent configuration file 'foo/foo.yaml'",
@@ -98,7 +97,7 @@ EOF
     end
 
     error = assert_raises(Nanoc::Errors::GenericTrivial) do
-      site = Nanoc::Site.new('.')
+      Nanoc::Site.new('.')
     end
     assert_equal(
       "Cycle detected. Could not use parent configuration file '../nanoc.yaml'",
@@ -213,15 +212,13 @@ EOF
       end
     end
   end
-
 end
 
 describe 'Nanoc::Site#initialize' do
-
   include Nanoc::TestHelpers
 
   it 'should merge default config' do
-    site = Nanoc::Site.new(:foo => 'bar')
+    site = Nanoc::Site.new(foo: 'bar')
     site.config[:foo].must_equal 'bar'
     site.config[:output_dir].must_equal 'output'
   end
@@ -231,30 +228,26 @@ describe 'Nanoc::Site#initialize' do
   end
 
   it 'should not raise for non-existant output directory' do
-    Nanoc::Site.new(:output_dir => 'fklsdhailfdjalghlkasdflhagjskajdf')
+    Nanoc::Site.new(output_dir: 'fklsdhailfdjalghlkasdflhagjskajdf')
   end
 
   it 'should not raise for unknown data sources' do
     proc do
-      Nanoc::Site.new(:data_source => 'fklsdhailfdjalghlkasdflhagjskajdf')
+      Nanoc::Site.new(data_source: 'fklsdhailfdjalghlkasdflhagjskajdf')
     end
   end
-
 end
 
 describe 'Nanoc::Site#compiler' do
-
   include Nanoc::TestHelpers
 
   it 'should not raise under normal circumstances' do
     site = Nanoc::Site.new({})
     site.compiler
   end
-
 end
 
 describe 'Nanoc::Site#data_sources' do
-
   include Nanoc::TestHelpers
 
   it 'should not raise for known data sources' do
@@ -265,8 +258,8 @@ describe 'Nanoc::Site#data_sources' do
   it 'should raise for unknown data sources' do
     proc do
       site = Nanoc::Site.new(
-        :data_sources => [
-          { :type => 'fklsdhailfdjalghlkasdflhagjskajdf' }
+        data_sources: [
+          { type: 'fklsdhailfdjalghlkasdflhagjskajdf' }
         ]
       )
       site.data_sources
@@ -291,5 +284,4 @@ describe 'Nanoc::Site#data_sources' do
       assert data_sources.first.config[:bbb] = 'two'
     end
   end
-
 end

data/test/base/test_store.rb

@@ -1,9 +1,7 @@
 # encoding: utf-8
 
 class Nanoc::StoreTest < Nanoc::TestCase
-
   class TestStore < Nanoc::Store
-
     def data
       @data
     end
@@ -11,7 +9,6 @@ class Nanoc::StoreTest < Nanoc::TestCase
     def data=(new_data)
       @data = new_data
     end
-
   end
 
   def test_delete_and_reload_on_error
@@ -19,13 +16,13 @@ class Nanoc::StoreTest < Nanoc::TestCase
 
     # Create
     store.load
-    store.data = { :fun => 'sure' }
+    store.data = { fun: 'sure' }
     store.store
 
     # Test stored values
     store = TestStore.new('test.db', 1)
     store.load
-    assert_equal({ :fun => 'sure' }, store.data)
+    assert_equal({ fun: 'sure' }, store.data)
 
     # Mess up
     File.open('test.db', 'w') do |io|
@@ -37,5 +34,4 @@ class Nanoc::StoreTest < Nanoc::TestCase
     store.load
     assert_equal(nil, store.data)
   end
-
 end

data/test/cli/commands/test_check.rb

@@ -1,9 +1,8 @@
 # encoding: utf-8
 
 class Nanoc::CLI::Commands::CheckTest < Nanoc::TestCase
-
   def test_check_stale
-    with_site do |site|
+    with_site do |_site|
       FileUtils.mkdir_p('output')
 
       # Should not raise now
@@ -16,5 +15,4 @@ class Nanoc::CLI::Commands::CheckTest < Nanoc::TestCase
       end
     end
   end
-
 end

data/test/cli/commands/test_compile.rb

@@ -1,9 +1,8 @@
 # encoding: utf-8
 
 class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
-
   def test_profiling_information
-    with_site do |site|
+    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 )
@@ -29,7 +28,7 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
   end
 
   def test_auto_prune
-    with_site do |site|
+    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 )
@@ -70,7 +69,7 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
   end
 
   def test_auto_prune_with_exclude
-    with_site do |site|
+    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 )
@@ -118,10 +117,21 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
   def test_setup_and_teardown_listeners
     with_site do
       test_listener_class = Class.new(::Nanoc::CLI::Commands::Compile::Listener) do
-        def start; @started = true; end
-        def stop; @stopped = true; end
-        def started?; @started; end
-        def stopped?; @stopped; end
+        def start
+          @started = true
+        end
+
+        def stop
+          @stopped = true
+        end
+
+        def started?
+          @started
+        end
+
+        def stopped?
+          @stopped
+        end
       end
 
       options = {}
@@ -129,7 +139,7 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
       cmd = nil
       listener_classes = [test_listener_class]
       cmd_runner = Nanoc::CLI::Commands::Compile.new(
-        options, arguments, cmd, :listener_classes => listener_classes)
+        options, arguments, cmd, listener_classes: listener_classes)
 
       cmd_runner.run
 
@@ -183,15 +193,15 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
   end
 
   def new_file_action_printer(reps)
-    listener = Nanoc::CLI::Commands::Compile::FileActionPrinter.new(:reps => 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
+        level: level,
+        action: action,
+        path: path,
+        duration: duration
       }
     end
 
@@ -201,5 +211,4 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
 
     listener
   end
-
 end

data/test/cli/commands/test_create_item.rb

@@ -1,12 +1,10 @@
 # encoding: utf-8
 
 class Nanoc::CLI::Commands::CreateItemTest < Nanoc::TestCase
-
   def test_run
-    with_site do |site|
+    with_site do |_site|
       Nanoc::CLI.run %w( create_item /blah/ )
       assert File.file?('content/blah.html')
     end
   end
-
 end

data/test/cli/commands/test_create_layout.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::CLI::Commands::CreateLayoutTest < Nanoc::TestCase
-
   def test_can_compile_new_layout
     require 'nanoc/cli'
 
@@ -22,5 +21,4 @@ class Nanoc::CLI::Commands::CreateLayoutTest < Nanoc::TestCase
       site.compile
     end
   end
-
 end

data/test/cli/commands/test_create_site.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
-
   def test_create_site_with_existing_name
     Nanoc::CLI.run %w( create_site foo )
     assert_raises(::Nanoc::Errors::GenericTrivial) do
@@ -31,7 +30,6 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
     Nanoc::CLI.run %w( create_site foo )
 
     FileUtils.cd('foo') do
-
       # Try with encoding = default encoding = utf-8
       File.open('content/index.html', 'w') { |io| io.write("Hello <\xD6>!\n") }
       site = Nanoc::Site.new('.')
@@ -59,5 +57,4 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
       assert_match(/\/stylesheet.css/, File.read('output/index.html'))
     end
   end
-
 end

data/test/cli/commands/test_deploy.rb

@@ -1,10 +1,9 @@
 # encoding: utf-8
 
 class Nanoc::CLI::Commands::DeployTest < Nanoc::TestCase
-
   def test_deploy
     skip_unless_have_command 'rsync'
-    with_site do |site|
+    with_site do |_site|
       File.open('nanoc.yaml', 'w') do |io|
         io.write "deploy:\n"
         io.write "  public:\n"
@@ -23,7 +22,7 @@ class Nanoc::CLI::Commands::DeployTest < Nanoc::TestCase
   end
 
   def test_deploy_with_dry_run
-    with_site do |site|
+    with_site do |_site|
       File.open('nanoc.yaml', 'w') do |io|
         io.write "deploy:\n"
         io.write "  public:\n"
@@ -42,7 +41,7 @@ class Nanoc::CLI::Commands::DeployTest < Nanoc::TestCase
   end
 
   def test_deploy_with_list_without_config
-    with_site do |site|
+    with_site do |_site|
       FileUtils.mkdir_p('output')
       File.open('output/blah.html', 'w') { |io| io.write 'moo' }
 
@@ -58,7 +57,7 @@ class Nanoc::CLI::Commands::DeployTest < Nanoc::TestCase
   end
 
   def test_deploy_with_list
-    with_site do |site|
+    with_site do |_site|
       File.open('nanoc.yaml', 'w') do |io|
         io.write "deploy:\n"
         io.write "  public:\n"
@@ -81,7 +80,7 @@ class Nanoc::CLI::Commands::DeployTest < Nanoc::TestCase
   end
 
   def test_deploy_with_list_deployers
-    with_site do |site|
+    with_site do |_site|
       File.open('nanoc.yaml', 'w') do |io|
         io.write "deploy:\n"
         io.write "  public:\n"
@@ -105,7 +104,7 @@ class Nanoc::CLI::Commands::DeployTest < Nanoc::TestCase
 
   def test_deploy_without_kind
     skip_unless_have_command 'rsync'
-    with_site do |site|
+    with_site do |_site|
       File.open('nanoc.yaml', 'w') do |io|
         io.write "deploy:\n"
         io.write "  public:\n"
@@ -127,7 +126,7 @@ class Nanoc::CLI::Commands::DeployTest < Nanoc::TestCase
   end
 
   def test_deploy_without_target_without_default
-    with_site do |site|
+    with_site do |_site|
       File.open('nanoc.yaml', 'w') do |io|
         io.write "deploy:\n"
         io.write "  public:\n"
@@ -137,7 +136,7 @@ class Nanoc::CLI::Commands::DeployTest < Nanoc::TestCase
       FileUtils.mkdir_p('output')
       File.open('output/blah.html', 'w') { |io| io.write 'moo' }
 
-       capturing_stdio do
+      capturing_stdio do
         err = assert_raises Nanoc::Errors::GenericTrivial do
           Nanoc::CLI.run %w( deploy )
         end
@@ -148,7 +147,7 @@ class Nanoc::CLI::Commands::DeployTest < Nanoc::TestCase
 
   def test_deploy_without_target_with_default
     skip_unless_have_command 'rsync'
-    with_site do |site|
+    with_site do |_site|
       File.open('nanoc.yaml', 'w') do |io|
         io.write "deploy:\n"
         io.write "  default:\n"
@@ -166,5 +165,4 @@ class Nanoc::CLI::Commands::DeployTest < Nanoc::TestCase
       assert File.file?('mydestination/blah.html')
     end
   end
-
 end

data/test/cli/commands/test_help.rb

@@ -1,10 +1,8 @@
 # encoding: utf-8
 
 class Nanoc::CLI::Commands::HelpTest < Nanoc::TestCase
-
   def test_run
     Nanoc::CLI.run %w( help )
     Nanoc::CLI.run %w( help co )
   end
-
 end

data/test/cli/commands/test_info.rb

@@ -1,9 +1,7 @@
 # encoding: utf-8
 
 class Nanoc::CLI::Commands::InfoTest < Nanoc::TestCase
-
   def test_run
     Nanoc::CLI.run %w( info )
   end
-
 end

data/test/cli/commands/test_prune.rb

@@ -1,9 +1,8 @@
 # encoding: utf-8
 
 class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
-
   def test_run_without_yes
-    with_site do |site|
+    with_site do |_site|
       # Set output dir
       File.open('nanoc.yaml', 'w') { |io| io.write 'output_dir: output2' }
       FileUtils.mkdir_p('output2')
@@ -25,7 +24,7 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
   end
 
   def test_run_with_yes
-    with_site do |site|
+    with_site do |_site|
       # Set output dir
       File.open('nanoc.yaml', 'w') { |io| io.write 'output_dir: output2' }
       FileUtils.mkdir_p('output2')
@@ -45,7 +44,7 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
   end
 
   def test_run_with_dry_run
-    with_site do |site|
+    with_site do |_site|
       # Set output dir
       File.open('nanoc.yaml', 'w') { |io| io.write 'output_dir: output2' }
       FileUtils.mkdir_p('output2')
@@ -65,7 +64,7 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
   end
 
   def test_run_with_exclude
-     with_site do |site|
+    with_site do |_site|
       # Set output dir
       File.open('nanoc.yaml', 'w') { |io| io.write "prune:\n  exclude: [ 'good-dir', 'good-file.html' ]" }
       FileUtils.mkdir_p('output')
@@ -98,7 +97,7 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
       skip 'JRuby 1.7.11 has buggy File.find behavior (see https://github.com/jruby/jruby/issues/1647)'
     end
 
-    with_site do |site|
+    with_site do |_site|
       # Set output dir
       FileUtils.rm_rf('output')
       FileUtils.mkdir_p('output-real')
@@ -121,7 +120,7 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
   end
 
   def test_run_with_nested_empty_dirs
-    with_site do |site|
+    with_site do |_site|
       # Set output dir
       File.open('nanoc.yaml', 'w') { |io| io.write 'output_dir: output' }
       FileUtils.mkdir_p('output')
@@ -138,5 +137,4 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
       assert !File.directory?('output/a')
     end
   end
-
 end