nanoc 3.7.3 → 3.7.4

data/test/base/test_outdatedness_checker.rb

@@ -384,7 +384,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
       site = Nanoc::Site.new('.')
       outdatedness_checker = site.compiler.outdatedness_checker
       site.items.each do |item|
-        refute outdatedness_checker.outdated?(item), "item should not be outdated"
+        refute outdatedness_checker.outdated?(item), 'item should not be outdated'
       end
     end
   end
@@ -417,7 +417,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
       site = Nanoc::Site.new('.')
       outdatedness_checker = site.compiler.outdatedness_checker
       site.items.each do |item|
-        refute outdatedness_checker.outdated?(item), "item should not be outdated"
+        refute outdatedness_checker.outdated?(item), 'item should not be outdated'
       end
     end
   end

data/test/base/test_rule_context.rb

@@ -55,8 +55,8 @@ class Nanoc::RuleContextTest < Nanoc::TestCase
     @rule_context = Nanoc::RuleContext.new(:rep => rep, :compiler => compiler)
 
     # Check
-    rep.filter   :foo, :bar => 'baz'
-    rep.layout   'foo'
+    rep.filter :foo, :bar => 'baz'
+    rep.layout 'foo'
     rep.snapshot 'awesome'
   end
 

data/test/base/test_site.rb

@@ -26,7 +26,7 @@ class Nanoc::SiteTest < Nanoc::TestCase
   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])
@@ -146,7 +146,7 @@ EOF
       # Update configuration
       File.open('nanoc.yaml', 'w') do |io|
         io.write "data_sources:\n"
-        io.write "  - type: site_test_foo"
+        io.write '  - type: site_test_foo'
       end
 
       # Create site
@@ -176,9 +176,9 @@ EOF
       bar    = site.items.find { |i| i.identifier == '/parent/bar/' }
       qux    = site.items.find { |i| i.identifier == '/parent/bar/qux/' }
 
-      assert_equal Set.new([ parent, style ]), Set.new(root.children)
-      assert_equal Set.new([ foo, bar ]),      Set.new(parent.children)
-      assert_equal Set.new([ qux ]),           Set.new(bar.children)
+      assert_equal Set.new([parent, style]), Set.new(root.children)
+      assert_equal Set.new([foo, bar]),      Set.new(parent.children)
+      assert_equal Set.new([qux]),           Set.new(bar.children)
 
       assert_equal nil,    root.parent
       assert_equal root,   parent.parent

data/test/cli/commands/test_compile.rb

@@ -118,16 +118,16 @@ 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 = {}
       arguments = []
       cmd = nil
-      listener_classes = [ test_listener_class ]
+      listener_classes = [test_listener_class]
       cmd_runner = Nanoc::CLI::Commands::Compile.new(
         options, arguments, cmd, :listener_classes => listener_classes)
 
@@ -148,7 +148,7 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
     rep.compiled = true
 
     # Listen
-    listener = new_file_action_printer([ rep ])
+    listener = new_file_action_printer([rep])
     listener.start
     Nanoc::NotificationCenter.post(:compilation_started, rep)
     Nanoc::NotificationCenter.post(:rep_written, rep, rep.raw_path, false, true)
@@ -169,7 +169,7 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
     rep.raw_path = 'output/foo.txt'
 
     # Listen
-    listener = new_file_action_printer([ rep ])
+    listener = new_file_action_printer([rep])
     listener.start
     Nanoc::NotificationCenter.post(:compilation_started, rep)
     listener.stop

data/test/cli/commands/test_create_site.rb

@@ -20,7 +20,7 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
   end
 
   def test_default_encoding
-    if !defined?(Encoding)
+    unless defined?(Encoding)
       skip 'No Encoding class'
       return
     end
@@ -38,7 +38,7 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
       exception = assert_raises(RuntimeError) do
         site.compile
       end
-      assert_equal "Could not read content/index.html because the file is not valid UTF-8.", exception.message
+      assert_equal 'Could not read content/index.html because the file is not valid UTF-8.', exception.message
 
       # Try with encoding = specific
       File.open('nanoc.yaml', 'w') { |io| io.write("meh: true\n") }

data/test/cli/commands/test_deploy.rb

@@ -3,13 +3,13 @@
 class Nanoc::CLI::Commands::DeployTest < Nanoc::TestCase
 
   def test_deploy
-    skip_unless_have_command "rsync"
+    skip_unless_have_command 'rsync'
     with_site do |site|
       File.open('nanoc.yaml', 'w') do |io|
         io.write "deploy:\n"
         io.write "  public:\n"
         io.write "    kind: rsync\n"
-        io.write "    dst: mydestination"
+        io.write '    dst: mydestination'
       end
 
       FileUtils.mkdir_p('output')
@@ -28,7 +28,7 @@ class Nanoc::CLI::Commands::DeployTest < Nanoc::TestCase
         io.write "deploy:\n"
         io.write "  public:\n"
         io.write "    kind: rsync\n"
-        io.write "    dst: mydestination"
+        io.write '    dst: mydestination'
       end
 
       FileUtils.mkdir_p('output')
@@ -63,7 +63,7 @@ class Nanoc::CLI::Commands::DeployTest < Nanoc::TestCase
         io.write "deploy:\n"
         io.write "  public:\n"
         io.write "    kind: rsync\n"
-        io.write "    dst: mydestination"
+        io.write '    dst: mydestination'
       end
 
       FileUtils.mkdir_p('output')
@@ -86,7 +86,7 @@ class Nanoc::CLI::Commands::DeployTest < Nanoc::TestCase
         io.write "deploy:\n"
         io.write "  public:\n"
         io.write "    kind: rsync\n"
-        io.write "    dst: mydestination"
+        io.write '    dst: mydestination'
       end
 
       FileUtils.mkdir_p('output')
@@ -104,12 +104,12 @@ class Nanoc::CLI::Commands::DeployTest < Nanoc::TestCase
   end
 
   def test_deploy_without_kind
-    skip_unless_have_command "rsync"
+    skip_unless_have_command 'rsync'
     with_site do |site|
       File.open('nanoc.yaml', 'w') do |io|
         io.write "deploy:\n"
         io.write "  public:\n"
-        io.write "    dst: mydestination"
+        io.write '    dst: mydestination'
       end
 
       FileUtils.mkdir_p('output')
@@ -131,7 +131,7 @@ class Nanoc::CLI::Commands::DeployTest < Nanoc::TestCase
       File.open('nanoc.yaml', 'w') do |io|
         io.write "deploy:\n"
         io.write "  public:\n"
-        io.write "    dst: mydestination"
+        io.write '    dst: mydestination'
       end
 
       FileUtils.mkdir_p('output')
@@ -147,12 +147,12 @@ class Nanoc::CLI::Commands::DeployTest < Nanoc::TestCase
   end
 
   def test_deploy_without_target_with_default
-    skip_unless_have_command "rsync"
+    skip_unless_have_command 'rsync'
     with_site do |site|
       File.open('nanoc.yaml', 'w') do |io|
         io.write "deploy:\n"
         io.write "  default:\n"
-        io.write "    dst: mydestination"
+        io.write '    dst: mydestination'
       end
 
       FileUtils.mkdir_p('output')

data/test/cli/commands/test_prune.rb

@@ -93,9 +93,9 @@ class Nanoc::CLI::Commands::PruneTest < Nanoc::TestCase
   end
 
   def test_run_with_symlink_to_output_dir
-    skip_unless_have_symlink
+    skip_unless_symlinks_supported
     if defined?(JRUBY_VERSION) && JRUBY_VERSION == '1.7.11'
-      skip "JRuby 1.7.11 has buggy File.find behavior (see https://github.com/jruby/jruby/issues/1647)"
+      skip 'JRuby 1.7.11 has buggy File.find behavior (see https://github.com/jruby/jruby/issues/1647)'
     end
 
     with_site do |site|

data/test/cli/commands/test_sync.rb

@@ -16,7 +16,7 @@ class Nanoc::CLI::Commands::SyncTest < Nanoc::TestCase
       File.open('nanoc.yaml', 'w') do |io|
         io.write "data_sources:\n"
         io.write "  - type: sync_test_foo\n"
-        io.write "    items_root: /"
+        io.write '    items_root: /'
       end
 
       Nanoc::CLI.run %w( sync )

data/test/cli/commands/test_watch.rb

@@ -9,10 +9,10 @@ class Nanoc::CLI::Commands::WatchTest < Nanoc::TestCase
       end
 
       File.open('content/index.html', 'w') { |io| io.write('Hello there!') }
-      self.wait_until_content_equals('content/index.html', 'Hello there!')
+      wait_until_content_equals('content/index.html', 'Hello there!')
 
       File.open('content/index.html', 'w') { |io| io.write('Hello there again!') }
-      self.wait_until_content_equals('content/index.html', 'Hello there again!')
+      wait_until_content_equals('content/index.html', 'Hello there again!')
 
       watch_thread.kill
     end
@@ -25,7 +25,7 @@ class Nanoc::CLI::Commands::WatchTest < Nanoc::TestCase
       end
 
       File.open('content/index.html', 'w') { |io| io.write('Hello there!') }
-      self.wait_until_exists('output/index.html')
+      wait_until_exists('output/index.html')
       assert_equal 'Hello there!', File.read('output/index.html')
 
       watch_thread.kill
@@ -35,13 +35,13 @@ class Nanoc::CLI::Commands::WatchTest < Nanoc::TestCase
   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')
+    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')
+    assert_equal ['growlnotify', '/t:nanoc', 'foo'], notifier.send(:growlnotify_windows_cmd_for, 'foo')
   end
 
   def wait_until_exists(filename)
@@ -49,13 +49,13 @@ class Nanoc::CLI::Commands::WatchTest < Nanoc::TestCase
       break if File.file?(filename)
       sleep 0.5
     end
-    if !File.file?(filename)
+    unless File.file?(filename)
       raise RuntimeError, "Expected #{filename} to appear but it didn't :("
     end
   end
 
   def wait_until_content_equals(filename, expected_content)
-    self.wait_until_exists(filename)
+    wait_until_exists(filename)
 
     20.times do
       break if File.read(filename) == expected_content

data/test/cli/test_cleaning_stream.rb

@@ -17,7 +17,7 @@ class Nanoc::CLI::CleaningStreamTest < Nanoc::TestCase
   end
 
   def test_forward
-    methods = [ :write, :<<, :tty?, :flush, :tell, :print, :puts, :string, :reopen, :exist?, :exists?, :close ]
+    methods = [:write, :<<, :tty?, :flush, :tell, :print, :puts, :string, :reopen, :exist?, :exists?, :close]
 
     s = Stream.new
     cs = Nanoc::CLI::CleaningStream.new(s)
@@ -45,13 +45,13 @@ class Nanoc::CLI::CleaningStreamTest < Nanoc::TestCase
     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!")
+    logger.info('Some info')
+    logger.warn('Something could start going wrong!')
   end
 
   def test_broken_pipe
     stream = StringIO.new
-    def stream.write(s) ; raise Errno::EPIPE.new ; end
+    def stream.write(s); raise Errno::EPIPE.new; end
 
     cleaning_stream = Nanoc::CLI::CleaningStream.new(stream)
     cleaning_stream.write('lol')

data/test/cli/test_cli.rb

@@ -119,18 +119,18 @@ EOS
     }
     with_env_vars(new_env_diff) do
       io = StringIO.new
-      def io.tty? ; true ; end
+      def io.tty?; true; end
       refute Nanoc::CLI.enable_utf8?(io)
 
       io = StringIO.new
-      def io.tty? ; false ; end
+      def io.tty?; false; end
       assert Nanoc::CLI.enable_utf8?(io)
     end
   end
 
   def test_enable_utf8
     io = StringIO.new
-    def io.tty? ; true ; end
+    def io.tty?; true; end
 
     new_env_diff = {
       'LC_ALL'   => 'en_US.ISO-8859-1',

data/test/cli/test_error_handler.rb

@@ -13,13 +13,13 @@ class Nanoc::CLI::ErrorHandlerTest < Nanoc::TestCase
   end
 
   def test_resolution_for_with_known_gem_without_bundler
-    def @handler.using_bundler? ; false ; end
+    def @handler.using_bundler?; false; end
     error = LoadError.new('no such file to load -- kramdown')
     assert_match(/^Install the 'kramdown' gem using `gem install kramdown`./, @handler.send(:resolution_for, error))
   end
 
   def test_resolution_for_with_known_gem_with_bundler
-    def @handler.using_bundler? ; true ; end
+    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
@@ -48,7 +48,7 @@ class Nanoc::CLI::ErrorHandlerTest < Nanoc::TestCase
   def new_error(amount_factor)
     backtrace_generator = lambda do |af|
       if af == 0
-        raise "finally!"
+        raise 'finally!'
       else
         backtrace_generator.call(af - 1)
       end

data/test/data_sources/test_filesystem.rb

@@ -86,9 +86,9 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
 
     # Get all files
     output_expected = {
-      './foo'       => [ 'yaml', 'html' ],
-      './bar.entry' => [ nil,    'html' ],
-      './foo/qux'   => [ 'yaml', nil    ]
+      './foo'       => ['yaml', 'html'],
+      './bar.entry' => [nil,    'html'],
+      './foo/qux'   => ['yaml', nil]
     }
     output_actual = data_source.send :all_split_files_in, '.'
 
@@ -113,9 +113,9 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
 
     # Get all files
     output_expected = {
-      './foo'       => [ 'yaml', 'html'     ],
-      './bar'       => [ nil,    'html.erb' ],
-      './foo/qux'   => [ 'yaml', nil        ]
+      './foo'       => ['yaml', 'html'],
+      './bar'       => [nil,    'html.erb'],
+      './foo/qux'   => ['yaml', nil]
     }
     output_actual = data_source.send :all_split_files_in, '.'
 
@@ -135,9 +135,9 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
 
     # Check
     expected = {
-      './aaa/foo' => [ nil, 'html' ],
-      './bbb/foo' => [ nil, 'html' ],
-      './ccc/foo' => [ nil, 'html' ]
+      './aaa/foo' => [nil, 'html'],
+      './bbb/foo' => [nil, 'html'],
+      './ccc/foo' => [nil, 'html']
     }
     assert_equal expected, data_source.send(:all_split_files_in, '.')
   end
@@ -291,7 +291,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
     # Parse it
     result = data_source.instance_eval { parse('test.html', nil, 'foobar') }
     assert_equal({ 'foo' => 'bar' }, result[0])
-    assert_equal("", result[1])
+    assert_equal('', result[1])
   end
 
   def test_parse_embedded_meta_only_2
@@ -308,7 +308,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
     # Parse it
     result = data_source.instance_eval { parse('test.html', nil, 'foobar') }
     assert_equal({ 'foo' => 'bar' }, result[0])
-    assert_equal("", result[1])
+    assert_equal('', result[1])
   end
 
   def test_parse_embedded_meta_only_3
@@ -316,7 +316,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
     File.open('test.html', 'w') do |io|
       io.write "-----\r\n"
       io.write "foo: bar\n"
-      io.write "-----"
+      io.write '-----'
     end
 
     # Create data source
@@ -325,7 +325,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
     # Parse it
     result = data_source.instance_eval { parse('test.html', nil, 'foobar') }
     assert_equal({ 'foo' => 'bar' }, result[0])
-    assert_equal("", result[1])
+    assert_equal('', result[1])
   end
 
   def test_parse_embedded_invalid_2
@@ -403,7 +403,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
       io.write "-----\n"
       io.write "-----\n"
       io.write "\nblah blah\n"
-      io.write "-----"
+      io.write '-----'
     end
 
     # Create data source
@@ -417,7 +417,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
 
   def test_parse_utf8_bom
     File.open('test.html', 'w') do |io|
-      io.write [ 0xEF, 0xBB, 0xBF ].map { |i| i.chr }.join
+      io.write [0xEF, 0xBB, 0xBF].map { |i| i.chr }.join
       io.write "-----\n"
       io.write "utf8bomawareness: high\n"
       io.write "-----\n"
@@ -468,16 +468,16 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
 
   def test_parse_external
     # Create a file
-    File.open('test.html', 'w') { |io| io.write("blah blah") }
-    File.open('test.yaml', 'w') { |io| io.write("foo: bar") }
+    File.open('test.html', 'w') { |io| io.write('blah blah') }
+    File.open('test.yaml', 'w') { |io| io.write('foo: bar') }
 
     # Create data source
     data_source = Nanoc::DataSources::FilesystemCombined.new(nil, nil, nil, nil)
 
     # Parse it
     result = data_source.instance_eval { parse('test.html', 'test.yaml', 'foobar') }
-    assert_equal({ "foo" => "bar"}, result[0])
-    assert_equal("blah blah",       result[1])
+    assert_equal({ 'foo' => 'bar'}, result[0])
+    assert_equal('blah blah',       result[1])
   end
 
 end