nanoc 4.0.0b4 → 4.0.0rc1

data/test/cli/commands/test_create_site.rb

@@ -10,7 +10,7 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
     Nanoc::CLI.run %w( create_site foo )
 
     FileUtils.cd('foo') do
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
     end
   end
@@ -20,7 +20,7 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
 
     FileUtils.cd('foo') do
       Nanoc::CLI.run %w( create_site ./ )
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
     end
   end
@@ -30,7 +30,7 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
 
     FileUtils.cd('foo') do
       File.open('content/blah', 'w') { |io| io << 'asdf' }
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
 
       assert File.file?('output/blah')
@@ -43,7 +43,7 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
     Nanoc::CLI.run %w( create_site foo --force )
 
     FileUtils.cd('foo') do
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
     end
   end
@@ -54,7 +54,7 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
     Nanoc::CLI.run %w( create_site foo --force )
 
     FileUtils.cd('foo') do
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
 
       assert File.file?('output/index.html')
@@ -75,9 +75,8 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
     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::Int::Site.new('.')
       exception = assert_raises(RuntimeError) do
-        site.compile
+        Nanoc::Int::SiteLoader.new.new_from_cwd
       end
       assert_equal 'Could not read content/index.html because the file is not valid UTF-8.', exception.message
 
@@ -89,7 +88,7 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
         io.write("    type: filesystem\n")
         io.write("    identifier_type: full\n")
       end
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
     end
     FileUtils

data/test/data_sources/test_filesystem.rb

@@ -40,7 +40,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
     output_expected = {
       './foo'       => ['yaml', ['html']],
       './bar.entry' => [nil,    ['html']],
-      './foo/qux'   => ['yaml', [nil]]
+      './foo/qux'   => ['yaml', [nil]],
     }
     output_actual = data_source.send :all_split_files_in, '.'
 
@@ -67,7 +67,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
     output_expected = {
       './foo'       => ['yaml', ['html']],
       './bar'       => [nil,    ['html.erb']],
-      './foo/qux'   => ['yaml', [nil]]
+      './foo/qux'   => ['yaml', [nil]],
     }
     output_actual = data_source.send :all_split_files_in, '.'
 
@@ -89,7 +89,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
     expected = {
       './aaa/foo' => [nil, ['html']],
       './bbb/foo' => [nil, ['html']],
-      './ccc/foo' => [nil, ['html']]
+      './ccc/foo' => [nil, ['html']],
     }
     assert_equal expected, data_source.send(:all_split_files_in, '.')
   end
@@ -146,7 +146,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
       '/foo/bar.xyz.html' => '/foo/bar.xyz',
       '/foo/bar/'         => '/foo/bar/',
       '/foo/bar.xyz/'     => '/foo/bar.xyz/',
-      '/foo.xyz/bar.xyz/' => '/foo.xyz/bar.xyz/'
+      '/foo.xyz/bar.xyz/' => '/foo.xyz/bar.xyz/',
     }
 
     # Check
@@ -176,7 +176,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
       '/foo/bar.xyz.html' => '/foo/bar',
       '/foo/bar/'         => '/foo/bar/',
       '/foo/bar.xyz/'     => '/foo/bar.xyz/',
-      '/foo.xyz/bar.xyz/' => '/foo.xyz/bar.xyz/'
+      '/foo.xyz/bar.xyz/' => '/foo.xyz/bar.xyz/',
     }
 
     # Check
@@ -206,7 +206,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
       '/foo/bar.xyz.html' => '.html',
       '/foo/bar/'         => '',
       '/foo/bar.xyz/'     => '',
-      '/foo.xyz/bar.xyz/' => ''
+      '/foo.xyz/bar.xyz/' => '',
     }
 
     # Check
@@ -236,7 +236,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
       '/foo/bar.xyz.html' => '.xyz.html',
       '/foo/bar/'         => '',
       '/foo/bar.xyz/'     => '',
-      '/foo.xyz/bar.xyz/' => ''
+      '/foo.xyz/bar.xyz/' => '',
     }
 
     # Check

data/test/data_sources/test_filesystem_unified.rb

@@ -1,10 +1,10 @@
 class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
   def new_data_source(params = nil)
     # Mock site
-    site = Nanoc::Int::Site.new({})
+    site = Nanoc::Int::SiteLoader.new.new_empty
 
     # Create data source
-    data_source = Nanoc::DataSources::FilesystemUnified.new(site, nil, nil, params)
+    data_source = Nanoc::DataSources::FilesystemUnified.new(site.config, nil, nil, params)
 
     # Done
     data_source
@@ -53,7 +53,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
         'test 3',
         { 'num' => 3, :filename => 'foo/a/b/c.html', :extension => 'html', mtime: File.mtime('foo/a/b/c.html') },
         '/a/b/c/',
-      )
+      ),
     ]
     actual_out = data_source.send(:load_objects, 'foo', 'The Foo', klass).sort_by { |i| i.stuff[0].string }
 
@@ -171,7 +171,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
       '/foo'            => '/foo/',
       '/foo.html'       => '/foo/',
       '/foo/index.html' => '/foo/',
-      '/foo.entry.html' => '/foo.entry/'
+      '/foo.entry.html' => '/foo.entry/',
     }
 
     # Check
@@ -193,7 +193,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
       '/foo'            => '/foo/',
       '/foo.html'       => '/foo/',
       '/foo/index.html' => '/foo/',
-      '/foo.html.erb'   => '/foo/'
+      '/foo.html.erb'   => '/foo/',
     }
 
     # Check
@@ -217,7 +217,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
       'foo/qux.bar.qux.yaml' => '/foo/qux.bar.qux/',
       'foo/index.yaml'       => '/foo/',
       'index.yaml'           => '/',
-      'foo/blah_index.yaml'  => '/foo/blah_index/'
+      'foo/blah_index.yaml'  => '/foo/blah_index/',
     }
 
     data_source = new_data_source(allow_periods_in_identifiers: true)
@@ -226,7 +226,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
       [meta_filename, content_filename].each do |filename|
         assert_equal(
           expected_identifier,
-          data_source.instance_eval { identifier_for_filename(filename) }
+          data_source.instance_eval { identifier_for_filename(filename) },
         )
       end
     end
@@ -243,7 +243,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
       'foo/qux.bar.qux.yaml' => '/foo/qux/',
       'foo/index.yaml'       => '/foo/',
       'index.yaml'           => '/',
-      'foo/blah_index.yaml'  => '/foo/blah_index/'
+      'foo/blah_index.yaml'  => '/foo/blah_index/',
     }
 
     data_source = new_data_source
@@ -252,7 +252,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
       [meta_filename, content_filename].each do |filename|
         assert_equal(
           expected_identifier,
-          data_source.instance_eval { identifier_for_filename(filename) }
+          data_source.instance_eval { identifier_for_filename(filename) },
         )
       end
     end
@@ -337,7 +337,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
           :meta_filename    => 'foo/a/b/c.yaml',
           :extension        => nil,
           :file             => nil,
-          mtime: File.mtime('foo/a/b/c.yaml')
+          mtime: File.mtime('foo/a/b/c.yaml'),
         },
         '/a/b/c/',
       ),
@@ -349,7 +349,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
           :meta_filename    => 'foo/b.c.yaml',
           :extension        => 'html',
           :file             => File.open('foo/b.c.html'),
-          mtime: File.mtime('foo/b.c.html') > File.mtime('foo/b.c.yaml') ? File.mtime('foo/b.c.html') : File.mtime('foo/b.c.yaml')
+          mtime: File.mtime('foo/b.c.html') > File.mtime('foo/b.c.yaml') ? File.mtime('foo/b.c.html') : File.mtime('foo/b.c.yaml'),
         },
         '/b.c/',
       ),
@@ -360,10 +360,10 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
           meta_filename: nil,
           extension: 'html',
           file: File.open('foo/car.html'),
-          mtime: File.mtime('foo/car.html')
+          mtime: File.mtime('foo/car.html'),
         },
         '/car/',
-      )
+      ),
     ]
 
     # Get actual output ordered by identifier
@@ -419,7 +419,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
           :meta_filename    => 'foo/a/b/c.yaml',
           :extension        => nil,
           :file             => nil,
-          mtime: File.mtime('foo/a/b/c.yaml')
+          mtime: File.mtime('foo/a/b/c.yaml'),
         },
         '/a/b/c/',
       ),
@@ -431,7 +431,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
           :meta_filename    => 'foo/b.yaml',
           :extension        => 'html.erb',
           :file             => File.open('foo/b.html.erb'),
-          mtime: File.mtime('foo/b.html.erb') > File.mtime('foo/b.yaml') ? File.mtime('foo/b.html.erb') : File.mtime('foo/b.yaml')
+          mtime: File.mtime('foo/b.html.erb') > File.mtime('foo/b.yaml') ? File.mtime('foo/b.html.erb') : File.mtime('foo/b.yaml'),
         },
         '/b/',
       ),
@@ -442,10 +442,10 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
           meta_filename: nil,
           extension: 'html',
           file: File.open('foo/car.html'),
-          mtime: File.mtime('foo/car.html')
+          mtime: File.mtime('foo/car.html'),
         },
         '/car/',
-      )
+      ),
     ]
 
     # Get actual output ordered by identifier

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

@@ -20,7 +20,7 @@ class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
         '<form action="https://nanoc.ws/process.cgi"></form>',
         '<iframe src="https://nanoc.ws/preview.html"></iframe>',
         '<audio src="https://nanoc.ws/theme-song.flac"></audio>',
-        '<video src="https://nanoc.ws/screen-cast.mkv"></video>'
+        '<video src="https://nanoc.ws/screen-cast.mkv"></video>',
       ])
       check = Nanoc::Extra::Checking::Checks::MixedContent.create(site)
       check.run
@@ -38,7 +38,7 @@ class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
         '<form action="/process.cgi"></form>',
         '<iframe src="/preview.html"></iframe>',
         '<audio src="/theme-song.flac"></audio>',
-        '<video src="/screen-cast.mkv"></video>'
+        '<video src="/screen-cast.mkv"></video>',
       ])
       check = Nanoc::Extra::Checking::Checks::MixedContent.create(site)
       check.run
@@ -56,7 +56,7 @@ class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
         '<form action="//nanoc.ws/process.cgi"></form>',
         '<iframe src="//nanoc.ws/preview.html"></iframe>',
         '<audio src="//nanoc.ws/theme-song.flac"></audio>',
-        '<video src="//nanoc.ws/screen-cast.mkv"></video>'
+        '<video src="//nanoc.ws/screen-cast.mkv"></video>',
       ])
       check = Nanoc::Extra::Checking::Checks::MixedContent.create(site)
       check.run
@@ -74,7 +74,7 @@ class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
         '<form action="process.cgi"></form>',
         '<iframe src="preview.html"></iframe>',
         '<audio src="theme-song.flac"></audio>',
-        '<video src="screen-cast.mkv"></video>'
+        '<video src="screen-cast.mkv"></video>',
       ])
       check = Nanoc::Extra::Checking::Checks::MixedContent.create(site)
       check.run
@@ -92,7 +92,7 @@ class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
         '<form action="?query-string"></form>',
         '<iframe src="?query-string"></iframe>',
         '<audio src="?query-string"></audio>',
-        '<video src="?query-string"></video>'
+        '<video src="?query-string"></video>',
       ])
       check = Nanoc::Extra::Checking::Checks::MixedContent.create(site)
       check.run
@@ -110,7 +110,7 @@ class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
         '<form action="#fragment"></form>',
         '<iframe src="#fragment"></iframe>',
         '<audio src="#fragment"></audio>',
-        '<video src="#fragment"></video>'
+        '<video src="#fragment"></video>',
       ])
       check = Nanoc::Extra::Checking::Checks::MixedContent.create(site)
       check.run
@@ -129,7 +129,7 @@ class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
         '<form action="http://nanoc.ws/process.cgi"></form>',
         '<iframe src="http://nanoc.ws/preview.html"></iframe>',
         '<audio src="http://nanoc.ws/theme-song.flac"></audio>',
-        '<video src="http://nanoc.ws/screencast.mkv"></video>'
+        '<video src="http://nanoc.ws/screencast.mkv"></video>',
       ])
       check = Nanoc::Extra::Checking::Checks::MixedContent.create(site)
       check.run
@@ -175,7 +175,7 @@ class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
         '<iframe href="http://nanoc.ws/preview.html"></iframe>',
         '<audio href="http://nanoc.ws/theme-song.flac"></audio>',
         '<video target="http://nanoc.ws/screen-cast.mkv"></video>',
-        '<p>http://nanoc.ws/harmless-text</p>'
+        '<p>http://nanoc.ws/harmless-text</p>',
       ])
       check = Nanoc::Extra::Checking::Checks::MixedContent.create(site)
       check.run

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

@@ -4,10 +4,9 @@ class Nanoc::Extra::Checking::Checks::StaleTest < Nanoc::TestCase
   end
 
   def calc_issues
-    site = Nanoc::Int::Site.new('.')
-    check = check_class.create(site)
-    check.run
-    check.issues
+    site = Nanoc::Int::SiteLoader.new.new_from_cwd
+    runner = Nanoc::Extra::Checking::Runner.new(site)
+    issues = runner.run_checks([check_class])
   end
 
   def test_run_ok

data/test/extra/deployers/test_fog.rb

@@ -85,7 +85,7 @@ class Nanoc::Extra::Deployers::FogTest < Nanoc::TestCase
         # Run
         fog.run
       ensure
-        # HACK :(
+        # HACK: (
         ::Fog.instance_eval { @mocking = false }
       end
     end

data/test/extra/deployers/test_rsync.rb

@@ -57,7 +57,7 @@ class Nanoc::Extra::Deployers::RsyncTest < Nanoc::TestCase
     opts = Nanoc::Extra::Deployers::Rsync::DEFAULT_OPTIONS
     assert_equal(
       ['rsync', opts, 'output/', 'asdf'].flatten,
-      rsync.instance_eval { @shell_cms_args }
+      rsync.instance_eval { @shell_cms_args },
     )
   end
 
@@ -80,7 +80,7 @@ class Nanoc::Extra::Deployers::RsyncTest < Nanoc::TestCase
     opts = Nanoc::Extra::Deployers::Rsync::DEFAULT_OPTIONS
     assert_equal(
       ['echo', 'rsync', opts, 'output/', 'asdf'].flatten,
-      rsync.instance_eval { @shell_cms_args }
+      rsync.instance_eval { @shell_cms_args },
     )
   end
 end

data/test/extra/test_filesystem_tools.rb

@@ -28,7 +28,7 @@ class Nanoc::Extra::FilesystemToolsTest < Nanoc::TestCase
       'dir0/sub/sub/sub/sub/sub/sub/sub/foo.md',
       'dir0/sub/sub/sub/sub/sub/sub/sub/sub/foo.md',
       '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'
+      'dir0/sub/sub/sub/sub/sub/sub/sub/sub/sub/sub/foo.md',
     ]
     actual_files = Nanoc::Extra::FilesystemTools.all_files_in('dir0', nil).sort
     assert_equal expected_files, actual_files

data/test/filters/test_erb.rb

@@ -28,7 +28,7 @@ class Nanoc::Filters::ERBTest < Nanoc::TestCase
     filter = ::Nanoc::Filters::ERB.new({
       item: item,
       item_rep: item_rep,
-      location: 'a cheap motel'
+      location: 'a cheap motel',
     })
 
     # Run filter

data/test/filters/test_handlebars.rb

@@ -17,7 +17,7 @@ class Nanoc::Filters::HandlebarsTest < Nanoc::TestCase
         item: item,
         layout: layout,
         config: config,
-        content: 'No Payne No Gayne'
+        content: 'No Payne No Gayne',
       }
       filter = ::Nanoc::Filters::Handlebars.new(assigns)
 
@@ -42,7 +42,7 @@ class Nanoc::Filters::HandlebarsTest < Nanoc::TestCase
       # Create filter
       assigns = {
         item: item,
-        content: 'No Payne No Gayne'
+        content: 'No Payne No Gayne',
       }
       filter = ::Nanoc::Filters::Handlebars.new(assigns)
 

data/test/filters/test_less.rb

@@ -78,7 +78,7 @@ class Nanoc::Filters::LessTest < Nanoc::TestCase
         end
 
         # Compile
-        site = Nanoc::Int::Site.new('.')
+        site = Nanoc::Int::SiteLoader.new.new_from_cwd
         site.compile
 
         # Check
@@ -93,7 +93,7 @@ class Nanoc::Filters::LessTest < Nanoc::TestCase
         end
 
         # Recompile
-        site = Nanoc::Int::Site.new('.')
+        site = Nanoc::Int::SiteLoader.new.new_from_cwd
         site.compile
 
         # Recheck

data/test/filters/test_mustache.rb

@@ -5,7 +5,7 @@ class Nanoc::Filters::MustacheTest < Nanoc::TestCase
       item = Nanoc::Int::Item.new(
         'content',
         { title: 'Max Payne', protagonist: 'Max Payne' },
-        '/games/max-payne/'
+        '/games/max-payne/',
       )
 
       # Create filter
@@ -23,7 +23,7 @@ class Nanoc::Filters::MustacheTest < Nanoc::TestCase
       item = Nanoc::Int::Item.new(
         'content',
         { title: 'Max Payne', protagonist: 'Max Payne' },
-        '/games/max-payne/'
+        '/games/max-payne/',
       )
 
       # Create filter

data/test/filters/test_relativize_paths.rb

@@ -565,7 +565,7 @@ XML
       actual_content = filter.setup_and_run(raw_content, {
         type: :xml,
         namespaces: { ex: 'http://example.org' },
-        select: ['ex:a/@href']
+        select: ['ex:a/@href'],
       })
 
       assert_match(/<foo xmlns="http:\/\/example.org">/,    actual_content)

data/test/filters/test_sass.rb

@@ -121,7 +121,7 @@ class Nanoc::Filters::SassTest < Nanoc::TestCase
         end
 
         # Compile
-        site = Nanoc::Int::Site.new('.')
+        site = Nanoc::Int::SiteLoader.new.new_from_cwd
         site.compile
 
         # Check
@@ -136,7 +136,7 @@ class Nanoc::Filters::SassTest < Nanoc::TestCase
         end
 
         # Recompile
-        site = Nanoc::Int::Site.new('.')
+        site = Nanoc::Int::SiteLoader.new.new_from_cwd
         site.compile
 
         # Recheck
@@ -176,7 +176,7 @@ class Nanoc::Filters::SassTest < Nanoc::TestCase
         end
 
         # Compile
-        site = Nanoc::Int::Site.new('.')
+        site = Nanoc::Int::SiteLoader.new.new_from_cwd
         site.compile
 
         # Check
@@ -191,7 +191,7 @@ class Nanoc::Filters::SassTest < Nanoc::TestCase
         end
 
         # Recompile
-        site = Nanoc::Int::Site.new('.')
+        site = Nanoc::Int::SiteLoader.new.new_from_cwd
         site.compile
 
         # Recheck
@@ -243,7 +243,7 @@ class Nanoc::Filters::SassTest < Nanoc::TestCase
         end
 
         # Compile
-        site = Nanoc::Int::Site.new('.')
+        site = Nanoc::Int::SiteLoader.new.new_from_cwd
         site.compile
 
         # Check
@@ -257,7 +257,7 @@ class Nanoc::Filters::SassTest < Nanoc::TestCase
         end
 
         # Recompile
-        site = Nanoc::Int::Site.new('.')
+        site = Nanoc::Int::SiteLoader.new.new_from_cwd
         site.compile
 
         # Recheck

data/test/filters/test_xsl.rb

@@ -97,7 +97,7 @@ EOS
       assigns = {
         item: item,
         layout: layout,
-        content: item.raw_content
+        content: item.raw_content,
       }
       filter = ::Nanoc::Filters::XSL.new(assigns)
 
@@ -123,7 +123,7 @@ EOS
       assigns = {
         item: item,
         layout: layout,
-        content: item.raw_content
+        content: item.raw_content,
       }
       filter = ::Nanoc::Filters::XSL.new(assigns)
 
@@ -150,7 +150,7 @@ EOS
       assigns = {
         item: item,
         layout: layout,
-        content: item.raw_content
+        content: item.raw_content,
       }
       filter = ::Nanoc::Filters::XSL.new(assigns)
 

data/test/helper.rb

@@ -1,32 +1,27 @@
-# Set up gem loading (necessary for cri dependency)
-require File.dirname(__FILE__) + '/gem_loader.rb'
+require 'simplecov'
+SimpleCov.start
 
-# Load unit testing stuff
 require 'minitest/test'
 require 'minitest/spec'
 require 'minitest/mock'
+require 'minitest/autorun'
 require 'mocha/setup'
 require 'vcr'
 
-# Setup coverage
-require 'coveralls'
-Coveralls.wear!
-
-# Load nanoc
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
-require 'nanoc'
-require 'nanoc/cli'
-Nanoc::CLI.setup
-
-# Load miscellaneous requirements
 require 'tmpdir'
 require 'stringio'
+require 'yard'
 
 VCR.configure do |c|
   c.cassette_library_dir = 'test/fixtures/vcr_cassettes'
   c.hook_into :webmock
 end
 
+require 'nanoc'
+require 'nanoc/cli'
+
+Nanoc::CLI.setup
+
 module Nanoc::TestHelpers
   LIB_DIR = File.expand_path(File.dirname(__FILE__) + '/../lib')
 
@@ -115,7 +110,7 @@ EOS
 
     # Yield site
     FileUtils.cd(site_name) do
-      yield Nanoc::Int::Site.new('.')
+      yield Nanoc::Int::SiteLoader.new.new_from_cwd
     end
   end