nanoc 3.7.4 → 3.7.5

data/test/extra/checking/test_runner.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Extra::Checking::RunnerTest < Nanoc::TestCase
-
   def test_run_specific
     with_site do |site|
       File.open('output/blah', 'w') { |io| io.write('I am stale! Haha!') }
@@ -41,5 +40,4 @@ class Nanoc::Extra::Checking::RunnerTest < Nanoc::TestCase
       assert ios[:stderr].empty?
     end
   end
-
 end

data/test/extra/core_ext/test_pathname.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Extra::CoreExtPathnameTest < Nanoc::TestCase
-
   def test_components
     assert_equal %w( / a bb ccc dd e ), Pathname.new('/a/bb/ccc/dd/e').components
   end
@@ -10,6 +9,4 @@ class Nanoc::Extra::CoreExtPathnameTest < Nanoc::TestCase
     assert Pathname.new('/home/ddfreyne/').include_component?('ddfreyne')
     refute Pathname.new('/home/ddfreyne/').include_component?('acid')
   end
-
 end
-

data/test/extra/core_ext/test_time.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::ExtraCoreExtTimeTest < Nanoc::TestCase
-
   def test_to_iso8601_date
     assert_equal('2008-05-19', Time.utc(2008, 5, 19, 14, 20, 0, 0).to_iso8601_date)
   end
@@ -9,5 +8,4 @@ class Nanoc::ExtraCoreExtTimeTest < Nanoc::TestCase
   def test_to_iso8601_time
     assert_equal('2008-05-19T14:20:00Z', Time.utc(2008, 5, 19, 14, 20, 0, 0).to_iso8601_time)
   end
-
 end

data/test/extra/deployers/test_fog.rb

@@ -1,16 +1,15 @@
 # encoding: utf-8
 
 class Nanoc::Extra::Deployers::FogTest < Nanoc::TestCase
-
   def test_run
     if_have 'fog' do
       # Create deployer
       fog = Nanoc::Extra::Deployers::Fog.new(
         'output/',
         {
-          :bucket     => 'mybucket',
-          :provider   => 'local',
-          :local_root => 'mylocalcloud'})
+          bucket: 'mybucket',
+          provider: 'local',
+          local_root: 'mylocalcloud' })
 
       # Create site
       FileUtils.mkdir_p('output')
@@ -38,12 +37,12 @@ class Nanoc::Extra::Deployers::FogTest < Nanoc::TestCase
         fog = Nanoc::Extra::Deployers::Fog.new(
           'output/',
           {
-            :provider              => 'aws',
-            # FIXME bucket is necessary for deployer but fog doesn't like it
-            :bucket_name           => 'doesntmatter',
-            :aws_access_key_id     => 'meh',
-            :aws_secret_access_key => 'dontcare'},
-          :dry_run => true)
+            provider: 'aws',
+            # FIXME: bucket is necessary for deployer but fog doesn't like it
+            bucket_name: 'doesntmatter',
+            aws_access_key_id: 'meh',
+            aws_secret_access_key: 'dontcare' },
+          dry_run: true)
 
         # Create site
         FileUtils.mkdir_p('output')
@@ -56,7 +55,7 @@ class Nanoc::Extra::Deployers::FogTest < Nanoc::TestCase
         # Run
         fog.run
       ensure
-        # Hack :(
+        # FIXME: ugly hack
         ::Fog.instance_eval { @mocking = false }
       end
     end
@@ -68,9 +67,9 @@ class Nanoc::Extra::Deployers::FogTest < Nanoc::TestCase
       fog = Nanoc::Extra::Deployers::Fog.new(
         'output/',
         {
-          :bucket     => 'mybucket',
-          :provider   => 'local',
-          :local_root => 'mylocalcloud'})
+          bucket: 'mybucket',
+          provider: 'local',
+          local_root: 'mylocalcloud' })
 
       # Setup fake local cloud
       FileUtils.mkdir_p('mylocalcloud/mybucket')
@@ -97,5 +96,4 @@ class Nanoc::Extra::Deployers::FogTest < Nanoc::TestCase
       assert_equal 'I am a dog!', File.read('mylocalcloud/mybucket/bark')
     end
   end
-
 end

data/test/extra/deployers/test_rsync.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Extra::Deployers::RsyncTest < Nanoc::TestCase
-
   def test_run_without_dst
     # Create deployer
     rsync = Nanoc::Extra::Deployers::Rsync.new(
@@ -26,7 +25,7 @@ class Nanoc::Extra::Deployers::RsyncTest < Nanoc::TestCase
     # Create deployer
     rsync = Nanoc::Extra::Deployers::Rsync.new(
       'output/',
-      { :dst => 'asdf/' })
+      { dst: 'asdf/' })
 
     # Mock run_shell_cmd
     def rsync.run_shell_cmd(args)
@@ -46,7 +45,7 @@ class Nanoc::Extra::Deployers::RsyncTest < Nanoc::TestCase
     # Create deployer
     rsync = Nanoc::Extra::Deployers::Rsync.new(
       'output',
-      { :dst => 'asdf' })
+      { dst: 'asdf' })
 
     # Mock run_shell_cmd
     def rsync.run_shell_cmd(args)
@@ -68,8 +67,8 @@ class Nanoc::Extra::Deployers::RsyncTest < Nanoc::TestCase
     # Create deployer
     rsync = Nanoc::Extra::Deployers::Rsync.new(
       'output',
-      { :dst => 'asdf' },
-      :dry_run => true)
+      { dst: 'asdf' },
+      dry_run: true)
 
     # Mock run_shell_cmd
     def rsync.run_shell_cmd(args)
@@ -86,5 +85,4 @@ class Nanoc::Extra::Deployers::RsyncTest < Nanoc::TestCase
       rsync.instance_eval { @shell_cms_args }
     )
   end
-
 end

data/test/extra/test_auto_compiler.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Extra::AutoCompilerTest < Nanoc::TestCase
-
   def test_handle_request_with_item_rep_with_index_filename
     if_have 'mime/types', 'rack' do
       # Create site
@@ -77,13 +76,17 @@ class Nanoc::Extra::AutoCompilerTest < Nanoc::TestCase
         @expected_path_info = 'somefile.txt'
         @actual_path_info   = env['PATH_INFO']
       end
-      def file_server.expected_path_info; @expected_path_info; end
-      def file_server.actual_path_info; @actual_path_info; end
+      def file_server.expected_path_info
+        @expected_path_info
+      end
+      def file_server.actual_path_info
+        @actual_path_info
+      end
 
       # Create site
       site = mock
       site.expects(:items).returns([])
-      site.expects(:config).returns({ :output_dir => 'out', :index_filenames => ['index.html'] })
+      site.expects(:config).returns({ output_dir: 'out', index_filenames: ['index.html'] })
 
       # Create autocompiler
       autocompiler = Nanoc::Extra::AutoCompiler.new('.')
@@ -111,13 +114,17 @@ class Nanoc::Extra::AutoCompilerTest < Nanoc::TestCase
         @expected_path_info = '/foo/bar/index.html'
         @actual_path_info   = env['PATH_INFO']
       end
-      def file_server.expected_path_info; @expected_path_info; end
-      def file_server.actual_path_info; @actual_path_info; end
+      def file_server.expected_path_info
+        @expected_path_info
+      end
+      def file_server.actual_path_info
+        @actual_path_info
+      end
 
       # Create site
       site = mock
       site.expects(:items).returns([])
-      site.expects(:config).at_least_once.returns({ :output_dir => 'out', :index_filenames => ['index.html'] })
+      site.expects(:config).at_least_once.returns({ output_dir: 'out', index_filenames: ['index.html'] })
 
       # Create autocompiler
       autocompiler = Nanoc::Extra::AutoCompiler.new('.')
@@ -145,13 +152,17 @@ class Nanoc::Extra::AutoCompilerTest < Nanoc::TestCase
         @expected_path_info = 'foo/bar/'
         @actual_path_info   = env['PATH_INFO']
       end
-      def file_server.expected_path_info; @expected_path_info; end
-      def file_server.actual_path_info; @actual_path_info; end
+      def file_server.expected_path_info
+        @expected_path_info
+      end
+      def file_server.actual_path_info
+        @actual_path_info
+      end
 
       # Create site
       site = mock
       site.expects(:items).returns([])
-      site.expects(:config).at_least_once.returns({ :output_dir => 'out', :index_filenames => ['index.html'] })
+      site.expects(:config).at_least_once.returns({ output_dir: 'out', index_filenames: ['index.html'] })
 
       # Create autocompiler
       autocompiler = Nanoc::Extra::AutoCompiler.new('.')
@@ -179,13 +190,17 @@ class Nanoc::Extra::AutoCompilerTest < Nanoc::TestCase
         @expected_path_info = 'foo/bar'
         @actual_path_info   = env['PATH_INFO']
       end
-      def file_server.expected_path_info; @expected_path_info; end
-      def file_server.actual_path_info; @actual_path_info; end
+      def file_server.expected_path_info
+        @expected_path_info
+      end
+      def file_server.actual_path_info
+        @actual_path_info
+      end
 
       # Create site
       site = mock
       site.expects(:items).returns([])
-      site.expects(:config).at_least_once.returns({ :output_dir => 'out', :index_filenames => ['index.html'] })
+      site.expects(:config).at_least_once.returns({ output_dir: 'out', index_filenames: ['index.html'] })
 
       # Create autocompiler
       autocompiler = Nanoc::Extra::AutoCompiler.new('.')
@@ -213,13 +228,17 @@ class Nanoc::Extra::AutoCompilerTest < Nanoc::TestCase
         @expected_path_info = 'foo/bar'
         @actual_path_info   = env['PATH_INFO']
       end
-      def file_server.expected_path_info; @expected_path_info; end
-      def file_server.actual_path_info; @actual_path_info; end
+      def file_server.expected_path_info
+        @expected_path_info
+      end
+      def file_server.actual_path_info
+        @actual_path_info
+      end
 
       # Create site
       site = mock
       site.expects(:items).returns([])
-      site.expects(:config).at_least_once.returns({ :output_dir => 'out', :index_filenames => ['index.html'] })
+      site.expects(:config).at_least_once.returns({ output_dir: 'out', index_filenames: ['index.html'] })
 
       # Create autocompiler
       autocompiler = Nanoc::Extra::AutoCompiler.new('.')
@@ -243,13 +262,17 @@ class Nanoc::Extra::AutoCompilerTest < Nanoc::TestCase
         @expected_path_info = 'four-oh-four.txt'
         @actual_path_info   = env['PATH_INFO']
       end
-      def file_server.expected_path_info; @expected_path_info; end
-      def file_server.actual_path_info; @actual_path_info; end
+      def file_server.expected_path_info
+        @expected_path_info
+      end
+      def file_server.actual_path_info
+        @actual_path_info
+      end
 
       # Create site
       site = mock
       site.expects(:items).returns([])
-      site.expects(:config).at_least_once.returns({ :output_dir => 'out', :index_filenames => ['index.html'] })
+      site.expects(:config).at_least_once.returns({ output_dir: 'out', index_filenames: ['index.html'] })
 
       # Create autocompiler
       autocompiler = Nanoc::Extra::AutoCompiler.new('.')
@@ -370,10 +393,10 @@ class Nanoc::Extra::AutoCompilerTest < Nanoc::TestCase
         File.open('nanoc.yaml', 'w') do |io|
           io.write 'value: Foo'
         end
-        File.utime(Time.now+5, Time.now+5, 'nanoc.yaml')
+        File.utime(Time.now + 5, Time.now + 5, 'nanoc.yaml')
 
         # Check
-        status, headers, body = autocompiler.call('REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/')
+        _status, _headers, body = autocompiler.call('REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/')
         body.each do |b|
           assert_match(/The Grand Value of Configuration is Foo!/, b)
         end
@@ -382,10 +405,10 @@ class Nanoc::Extra::AutoCompilerTest < Nanoc::TestCase
         File.open('nanoc.yaml', 'w') do |io|
           io.write 'value: Bar'
         end
-        File.utime(Time.now+5, Time.now+5, 'nanoc.yaml')
+        File.utime(Time.now + 5, Time.now + 5, 'nanoc.yaml')
 
         # Check
-        status, headers, body = autocompiler.call('REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/')
+        _status, _headers, body = autocompiler.call('REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/')
         body.each do |b|
           assert_match(/The Grand Value of Configuration is Bar!/, b)
         end
@@ -400,7 +423,7 @@ class Nanoc::Extra::AutoCompilerTest < Nanoc::TestCase
 
       # Mock dependencies
       site = mock
-      site.stubs(:config).returns({ :output_dir => 'output/' })
+      site.stubs(:config).returns({ output_dir: 'output/' })
       site.stubs(:items).returns([])
       autocompiler.stubs(:build_site)
       autocompiler.stubs(:site).returns(site)
@@ -411,5 +434,4 @@ class Nanoc::Extra::AutoCompilerTest < Nanoc::TestCase
       assert_match("File not found: /software\n", result[2][0])
     end
   end
-
 end

data/test/extra/test_file_proxy.rb

@@ -1,11 +1,10 @@
 # encoding: utf-8
 
 class Nanoc::Extra::FileProxyTest < Nanoc::TestCase
-
   def test_create_many
     if_implemented do
       # Create test file
-      File.open('test.txt', 'w') { |io| }
+      File.open('test.txt', 'w') { |_io| }
 
       # Create lots of file proxies
       count = Process.getrlimit(Process::RLIMIT_NOFILE)[0] + 5
@@ -13,5 +12,4 @@ class Nanoc::Extra::FileProxyTest < Nanoc::TestCase
       count.times { file_proxies << Nanoc::Extra::FileProxy.new('test.txt') }
     end
   end
-
 end

data/test/extra/test_filesystem_tools.rb

@@ -13,7 +13,7 @@ class Nanoc::Extra::FilesystemToolsTest < Nanoc::TestCase
       File.open("dir#{i}/foo.md", 'w') { |io| io.write('o hai') }
     end
     (1..10).each do |i|
-      File.symlink("../dir#{i}", "dir#{i-1}/sub")
+      File.symlink("../dir#{i}", "dir#{i - 1}/sub")
     end
 
     # Check
@@ -32,7 +32,7 @@ class Nanoc::Extra::FilesystemToolsTest < Nanoc::TestCase
       'dir0/sub/sub/sub/sub/sub/sub/sub/sub/sub/foo.md',
       'dir0/sub/sub/sub/sub/sub/sub/sub/sub/sub/sub/foo.md'
     ]
-    actual_files = Nanoc::Extra::FilesystemTools.all_files_in('dir0').sort
+    actual_files = Nanoc::Extra::FilesystemTools.all_files_in('dir0', nil).sort
     assert_equal expected_files, actual_files
   end
 
@@ -43,11 +43,11 @@ class Nanoc::Extra::FilesystemToolsTest < Nanoc::TestCase
       File.open("dir#{i}/foo.md", 'w') { |io| io.write('o hai') }
     end
     (1..15).each do |i|
-      File.symlink("../dir#{i}", "dir#{i-1}/sub")
+      File.symlink("../dir#{i}", "dir#{i - 1}/sub")
     end
 
     assert_raises Nanoc::Extra::FilesystemTools::MaxSymlinkDepthExceededError do
-      Nanoc::Extra::FilesystemTools.all_files_in('dir0')
+      Nanoc::Extra::FilesystemTools.all_files_in('dir0', nil)
     end
   end
 
@@ -61,7 +61,7 @@ class Nanoc::Extra::FilesystemToolsTest < Nanoc::TestCase
     File.symlink('../bar', 'foo/barlink')
 
     expected_files = ['foo/barlink/y.md', 'foo/x.md']
-    actual_files   = Nanoc::Extra::FilesystemTools.all_files_in('foo').sort
+    actual_files   = Nanoc::Extra::FilesystemTools.all_files_in('foo', nil).sort
     assert_equal expected_files, actual_files
   end
 
@@ -74,7 +74,7 @@ class Nanoc::Extra::FilesystemToolsTest < Nanoc::TestCase
 
     # Check
     expected_files = ['dir/bar-link', 'dir/foo']
-    actual_files   = Nanoc::Extra::FilesystemTools.all_files_in('dir').sort
+    actual_files   = Nanoc::Extra::FilesystemTools.all_files_in('dir', nil).sort
     assert_equal expected_files, actual_files
   end
 
@@ -93,7 +93,7 @@ class Nanoc::Extra::FilesystemToolsTest < Nanoc::TestCase
     File.open('foo', 'w') { |io| io.write('o hai') }
     File.symlink('foo', 'symlin-0')
     (1..7).each do |i|
-      File.symlink("symlink-#{i-1}", "symlink-#{i}")
+      File.symlink("symlink-#{i - 1}", "symlink-#{i}")
     end
 
     assert_raises Nanoc::Extra::FilesystemTools::MaxSymlinkDepthExceededError do
@@ -101,4 +101,44 @@ class Nanoc::Extra::FilesystemToolsTest < Nanoc::TestCase
     end
   end
 
+  def test_unwanted_dotfiles_not_found
+    # Write sample files
+    FileUtils.mkdir_p('dir')
+    File.open('dir/.DS_Store', 'w') { |io| io.write('o hai') }
+    File.open('dir/.htaccess', 'w') { |io| io.write('o hai') }
+
+    actual_files = Nanoc::Extra::FilesystemTools.all_files_in('dir', nil).sort
+    assert_equal [], actual_files
+  end
+
+  def test_user_dotfiles_are_valid_items
+    # Write sample files
+    FileUtils.mkdir_p('dir')
+    File.open('dir/.other', 'w') { |io| io.write('o hai') }
+
+    actual_files = Nanoc::Extra::FilesystemTools.all_files_in('dir', '**/.other').sort
+    assert_equal ['dir/.other'], actual_files
+  end
+
+  def test_multiple_user_dotfiles_are_valid_items
+    # Write sample files
+    FileUtils.mkdir_p('dir')
+    File.open('dir/.other', 'w') { |io| io.write('o hai') }
+    File.open('dir/.DS_Store', 'w') { |io| io.write('o hai') }
+
+    actual_files = Nanoc::Extra::FilesystemTools.all_files_in('dir', ['**/.other', '**/.DS_Store']).sort
+    assert_equal ['dir/.other', 'dir/.DS_Store'].sort, actual_files.sort
+  end
+
+  def test_unknown_pattern
+    # Write sample files
+    FileUtils.mkdir_p('dir')
+    File.open('dir/.other', 'w') { |io| io.write('o hai') }
+
+    pattern = { dotfiles: '**/.other' }
+
+    assert_raises Nanoc::Errors::GenericTrivial, "Do not know how to handle extra_files: #{pattern.inspect}" do
+      Nanoc::Extra::FilesystemTools.all_files_in('dir0', pattern)
+    end
+  end
 end

data/test/extra/test_link_collector.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Extra::LinkCollectorTest < Nanoc::TestCase
-
   def test_all
     # Create dummy data
     File.open('file-a.html', 'w') do |io|
@@ -106,5 +105,4 @@ class Nanoc::Extra::LinkCollectorTest < Nanoc::TestCase
     assert_includes hrefs, '../stuff'
     assert_includes hrefs, '/stuff'
   end
-
 end