s3_website 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84a98616bd0e1e0030cfd8f1281cd81261bafe0e
-  data.tar.gz: ae9d4a87ea83d249573f2ff9574df0fbe113f066
+  metadata.gz: 58f0b0262858ded1fa65316ca84b921529f02302
+  data.tar.gz: 882765a34ba7e488ef2f08e2838f3c9f1d9f93f3
 SHA512:
-  metadata.gz: 44545f2642cf669c5a93aa2b6a46899250193a2b0d695419edff09386407be7b88502d0d5a024e8ae6d604671c427d641901fc558d340704436f8ef3af5cfc0a
-  data.tar.gz: 1580312823261f06d92d94d4acfd786af01203dffdbe4b81d795d889727923470513d8112d3c5003d36055c6b39bf7d528d6e22649098354602a2ddbeb19d2c6
+  metadata.gz: a209de0e13692763cf9901e8a6f8bf235e8ca90a8dee600495d738ae2992ed27c286fd7138b4ba4fd375afd565b8bbd6bdbcfd97ab149a3fac76e77c56561361
+  data.tar.gz: 0eacf9898f13c40904bd089f5f933dc173a6e955f806be1cdcb15262bc471d1bd634502cf8bf6cebcae8652b34be48444c7bfbeb08d7130a9bfa5782b4ebdbbd

data/README.md

@@ -12,10 +12,15 @@
 * Set HTTP redirects for your website
 * (for other features, see the documentation below)
 
+`s3_website` automatically supports [Jekyll](http://jekyllrb.com) and
+[Nanoc](http://nanoc.ws) by recognising their output directories (*_site* for
+Jekyll and *public/output* for Nanoc). If your website resides in some other
+directory, you can point the directory to `s3_website` with a parameter. See
+`s3_website help push` for more info.
+
 ## Install
 
-<span style="color: yellow">This project is still on beta level. Expect backward
-incompatible changes.</span>
+This project is still on beta level. Expect backward incompatible changes.
 
     gem install s3_website
 
@@ -26,9 +31,8 @@ Here's how you can get started:
 * Go to your website directory
 * Run `s3_website cfg create`. It generates a configuration file called `s3_website.yml`
 * Edit it with your details (you can use [ERB](http://ruby-doc.org/stdlib-1.9.3/libdoc/erb/rdoc/ERB.html) in the file)
-* Run `s3_website cfg apply` This will configure
-  your bucket to function as an S3 website. If the bucket does not exist,
-  `s3_website cfg apply` will create it for you.
+* Run `s3_website cfg apply`. This will configure your bucket to function as an
+  S3 website. If the bucket does not exist, the command will create it for you.
 * Run `s3_website push` to push your website to S3. Congratulations! You are live.
 
 `s3_website` attempts to be a command-line interface tool that is easy to
@@ -165,7 +169,7 @@ S3 bucket, just add the following line into the file `s3_website.yml`:
 
     cloudfront_distribution_id: your-dist-id
 
-Next time you run `s3_website`, it will invalidate the items on CloudFront and
+Next time you run `s3_website push`, it will invalidate the items on CloudFront and
 thus force the CDN system to reload the changes from your website S3 bucket.
 
 #### Specifying custom settings for your CloudFront distribution
@@ -250,7 +254,7 @@ it programmatically by calling the same API as the executable `s3_website` does:
 ````ruby
 require 's3_website'
 is_headless = true
-S3Website::Tasks.push('/path/to/your/website/_site/', is_headless)
+S3Website::Tasks.push('/website/root', '/path/to/your/website/_site/', is_headless)
 ````
 
 You can also use a basic `Hash` instead of a `s3_website.yml` file:

data/Rakefile

@@ -16,3 +16,9 @@ task "cucumber:wip" do
   ENV['disable_parallel_processing'] = 'true'
   sh "bundle exec cucumber --tags @wip"
 end
+
+desc 'Run fast tests'
+task "cucumber:fast" do
+  ENV['disable_parallel_processing'] = 'true'
+  sh "bundle exec cucumber --tags ~@network-io --tags ~@starts-new-os-process"
+end

data/bin/s3_website

@@ -27,8 +27,8 @@ class Cli < Thor
   option(
     :site,
     :type => :string,
-    :default => '_site',
-    :desc => 'The directory where your website files are'
+    :default => 'infer automatically',
+    :desc => "The directory where your website files are. When not defined, s3_website will look for the site in #{S3Website::Paths.site_paths.join(' or ')}."
   )
   option(
     :headless,
@@ -42,7 +42,8 @@ class Cli < Thor
     also delete from S3 the files that you no longer have locally.
   LONGDESC
   def push
-    S3Website::Tasks.push(options[:site], options[:headless])
+    site_path = S3Website::Paths.infer_site_path options[:site]
+    S3Website::Tasks.push(Dir.pwd, site_path, options[:headless])
   end
 
   desc 'cfg SUBCOMMAND ...ARGS', 'Operate on the config file'

data/changelog.md

@@ -2,6 +2,10 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 0.3.0
+
+* Add Nanoc support
+
 ## 0.2.1
 
 * Remove Gemfile.lock

data/features/cloudfront.feature

@@ -23,7 +23,7 @@ Feature: Invalidate the Cloudfront distribution
     Then s3_website will push my blog to S3 and invalidate the Cloudfront distribution
     And the output should equal
       """
-      Deploying _site/* to s3-website-test.net
+      Deploying features/support/test_site_dirs/cdn-powered.with-one-change.blog.fi/_site/* to s3-website-test.net
       Uploading 1 changed file(s)
       Upload index.html: Success!
       Done! Go visit: http://s3-website-test.net.s3-website-us-east-1.amazonaws.com/index.html

data/features/delete.feature

@@ -10,7 +10,7 @@ Feature: remove an S3 website page from S3
     Then s3_website will push my blog to S3
     And the output should equal
       """
-      Deploying _site/* to s3-website-test.net
+      Deploying features/support/test_site_dirs/unpublish-a-post.com/_site/* to s3-website-test.net
       No new or changed files to upload
       Delete index.html: Success!
       Done! Go visit: http://s3-website-test.net.s3-website-us-east-1.amazonaws.com/index.html

data/features/instructions-for-new-user.feature

@@ -4,13 +4,15 @@ Feature: Instructions for a new user
   I would like to get helpful feedback when running `s3_website`
   So that I can upload my S3 website to S3 without headache
 
+  @starts-new-os-process
   Scenario: Run s3_website in the wrong directory
     When I run `s3_website push`
     Then the output should contain:
       """
-      I can't find any directory called _site. Are you in the right directory?
+      I can't find a website in any of the following directories: public/output, _site. Please specify the location of the website with the --site option.
       """
 
+  @starts-new-os-process
   Scenario: Create placeholder config file
     Given a directory named "_site"
     When I run `s3_website cfg create`
@@ -25,6 +27,7 @@ Feature: Instructions for a new user
       s3_bucket: your.blog.bucket.com
       """
 
+  @starts-new-os-process
   Scenario: Run s3_website push for the first time
     Given a directory named "_site"
     When I run `s3_website push`
@@ -39,6 +42,7 @@ Feature: Instructions for a new user
       s3_bucket: your.blog.bucket.com
       """
 
+  @starts-new-os-process
   Scenario: Run s3_website with an empty configuration file
     Given a directory named "_site"
     And an empty file named "s3_website.yml"
@@ -51,6 +55,7 @@ Feature: Instructions for a new user
       s3_bucket: your.blog.bucket.com
       """
 
+  @starts-new-os-process
   Scenario: Run s3_website with a malformed configuration file
     Given a directory named "_site"
     And a file named "s3_website.yml" with:
@@ -67,6 +72,7 @@ Feature: Instructions for a new user
       s3_bucket: your.blog.bucket.com
       """
 
+  @starts-new-os-process
   Scenario: Run s3_website with a configuration file that does not contain a bucket
     Given a directory named "_site"
     And a file named "s3_website.yml" with:

data/features/jekyll-support.feature

@@ -0,0 +1,13 @@
+Feature: upload a Jekyll site
+
+  @new-files
+  Scenario: Push a Jekyll site to S3
+    When my S3 website is in "features/support/test_site_dirs/jekyllrb.com"
+    Then s3_website will push my blog to S3
+    And the output should contain
+      """
+      Deploying features/support/test_site_dirs/jekyllrb.com/_site/* to s3-website-test.net
+      Uploading 2 new file(s)
+      Upload css/styles.css: Success!
+      Upload index.html: Success!
+      """

data/features/nanoc-support.feature

@@ -0,0 +1,13 @@
+Feature: upload a Nanoc site
+
+  @new-files
+  Scenario: Push a Nanoc site to S3
+    When my S3 website is in "features/support/test_site_dirs/nanoc.ws"
+    Then s3_website will push my blog to S3
+    And the output should contain
+      """
+      Deploying features/support/test_site_dirs/nanoc.ws/public/output/* to s3-website-test.net
+      Uploading 2 new file(s)
+      Upload css/styles.css: Success!
+      Upload index.html: Success!
+      """

data/features/{sync.feature → push.feature}

@@ -10,16 +10,27 @@ Feature: upload S3 website to S3
     Then s3_website will push my blog to S3
     And the output should contain
       """
-      Deploying _site/* to s3-website-test.net
+      Deploying features/support/test_site_dirs/my.blog.com/_site/* to s3-website-test.net
       Uploading 2 new file(s)
+      Upload css/styles.css: Success!
+      Upload index.html: Success!
       """
-    And the output should contain
+
+  @new-files
+  @network-io
+  @starts-new-os-process
+  Scenario: The website resides in a non-standard directory
+    Given a directory named "this-is-a-non-standard-website-dir"
+    And a file named "s3_website.yml" with:
       """
-      Upload css/styles.css: Success!
+      s3_id: id
+      s3_secret: secret
+      s3_bucket: website.net
       """
-    And the output should contain
+    And I run `s3_website push --site this-is-a-non-standard-website-dir`
+    Then the output should contain:
       """
-      Upload index.html: Success!
+      Deploying this-is-a-non-standard-website-dir/* to website.net
       """
 
   @new-files-for-sydney
@@ -37,7 +48,7 @@ Feature: upload S3 website to S3
     Then s3_website will push my blog to S3
     And the output should contain
       """
-      Deploying _site/* to s3-website-test.net
+      Deploying features/support/test_site_dirs/new-and-changed-files.com/_site/* to s3-website-test.net
       Uploading 1 new and 1 changed file(s)
       """
     And the output should contain
@@ -60,7 +71,7 @@ Feature: upload S3 website to S3
     Then s3_website will push my blog to S3
     And the output should equal
       """
-      Deploying _site/* to s3-website-test.net
+      Deploying features/support/test_site_dirs/only-changed-files.com/_site/* to s3-website-test.net
       Uploading 1 changed file(s)
       Upload index.html: Success!
       Done! Go visit: http://s3-website-test.net.s3-website-us-east-1.amazonaws.com/index.html
@@ -73,7 +84,7 @@ Feature: upload S3 website to S3
     Then s3_website will push my blog to S3
     And the output should equal
       """
-      Deploying _site/* to s3-website-test.net
+      Deploying features/support/test_site_dirs/no-new-or-changed-files.com/_site/* to s3-website-test.net
       No new or changed files to upload
       Done! Go visit: http://s3-website-test.net.s3-website-us-east-1.amazonaws.com/index.html
 

data/features/redirects.feature

@@ -4,10 +4,8 @@ Feature: configure redirects
   Scenario: The user wants to configure new redirects for HTTP resources
     When my S3 website is in "features/support/test_site_dirs/create-redirects"
     Then s3_website will push my blog to S3
-    And the output should equal
+    And the output should contain
       """
-      Deploying _site/* to s3-website-test.net
-      No new or changed files to upload
       Creating new redirects ...
         Redirect welcome.php to /welcome: Success!
         Redirect pets/dogs to /cats-and-dogs/wuf: Success!

data/features/step_definitions/steps.rb

@@ -41,8 +41,13 @@ end
 def push_files
   @console_output = capture_stdout {
     in_headless_mode = true
+    site_path = S3Website::Paths.infer_site_path(
+      'infer automatically',
+      @blog_dir
+    )
     result = S3Website::Tasks.push(
-      "#{@blog_dir}/_site", 
+      @blog_dir,
+      site_path,
       in_headless_mode
     )
     @amount_of_new_files = result[:new_files_count]

data/features/support/test_site_dirs/jekyllrb.com/_site/css/styles.css

@@ -0,0 +1,3 @@
+body {
+
+}

data/features/support/test_site_dirs/jekyllrb.com/_site/index.html

@@ -0,0 +1,5 @@
+<html>
+  <head>
+    <title>hello!</title>
+  </head>
+</html>

data/features/support/test_site_dirs/jekyllrb.com/s3_website.yml

@@ -0,0 +1,3 @@
+s3_id: key
+s3_secret: pass
+s3_bucket: s3-website-test.net

data/features/support/test_site_dirs/nanoc.ws/public/output/css/styles.css

@@ -0,0 +1,3 @@
+body {
+
+}

data/features/support/test_site_dirs/nanoc.ws/public/output/index.html

@@ -0,0 +1,5 @@
+<html>
+  <head>
+    <title>hello!</title>
+  </head>
+</html>

data/features/support/test_site_dirs/nanoc.ws/s3_website.yml

@@ -0,0 +1,3 @@
+s3_id: key
+s3_secret: pass
+s3_bucket: s3-website-test.net

data/lib/s3_website.rb

@@ -11,7 +11,21 @@ module S3Website
   DEFAULT_GZIP_EXTENSIONS = %w(.html .css .js .svg .txt)
 end
 
-%w{errors upload uploader tasks config_loader retry keyboard diff_helper endpoint parallelism}.each do |file|
+%w{
+  errors
+  upload
+  uploader
+  tasks
+  config_loader
+  retry
+  keyboard
+  diff_helper
+  endpoint
+  parallelism
+  jekyll
+  nanoc
+  paths
+}.each do |file| 
   require File.dirname(__FILE__) + "/s3_website/#{file}"
 end
 

data/lib/s3_website/config_loader.rb

@@ -8,7 +8,7 @@ s3_bucket: your.blog.bucket.com
     EOF
 
     def self.check_project(site_dir)
-      raise NotAJekyllProjectError unless File.directory?(site_dir)
+      raise NoWebsiteDirectoryFound unless File.directory?(site_dir)
     end
 
     # Raise NoConfigurationFileError if the configuration file does not exists
@@ -20,16 +20,12 @@ s3_bucket: your.blog.bucket.com
       end
     end
 
-    def self.get_configuration_file(site_dir)
-      "#{site_dir}/../#{CONFIGURATION_FILE}"
-    end
-
     private
 
     # Load configuration from s3_website.yml
     # Raise MalformedConfigurationFileError if the configuration file does not contain the keys we expect
-    def self.load_configuration(site_dir)
-      config = load_yaml_file_and_validate site_dir
+    def self.load_configuration(config_file_dir)
+      config = load_yaml_file_and_validate config_file_dir
       return config
     end
 
@@ -39,9 +35,11 @@ s3_bucket: your.blog.bucket.com
       }
     end
 
-    def self.load_yaml_file_and_validate(site_dir)
+    def self.load_yaml_file_and_validate(config_file_dir)
       begin
-        config = YAML.load(Erubis::Eruby.new(File.read(get_configuration_file(site_dir))).result)
+        config = YAML.load(Erubis::Eruby.new(
+          File.read(config_file_dir + '/' + CONFIGURATION_FILE)
+        ).result)
       rescue Exception
         raise MalformedConfigurationFileError
       end

data/lib/s3_website/errors.rb

@@ -2,8 +2,14 @@ module S3Website
   class S3WebsiteError < StandardError
   end
 
-  class NotAJekyllProjectError < S3WebsiteError
-    def initialize(message = "I can't find any directory called _site. Are you in the right directory?")
+  class NoWebsiteDirectoryFound < S3WebsiteError
+    def initialize(message = "I can't find any website. Are you in the right directory?")
+      super(message)
+    end
+  end
+
+  class NoPredefinedWebsiteDirectoryFound < NoWebsiteDirectoryFound
+    def initialize(message = "I can't find a website in any of the following directories: #{Paths.site_paths.join(', ')}. Please specify the location of the website with the --site option.")
       super(message)
     end
   end

data/lib/s3_website/jekyll.rb

@@ -0,0 +1,5 @@
+module S3Website
+  module Jekyll
+    SITE_PATH = '_site'
+  end
+end

data/lib/s3_website/keyboard.rb

@@ -7,7 +7,7 @@ module S3Website
         delete = false
         keep = false
         until delete || delete_all || keep || keep_all
-          puts "#{f} is on S3 but not in your _site directory anymore. Do you want to [d]elete, [D]elete all, [k]eep, [K]eep all?"
+          puts "#{f} is on S3 but not in your website directory anymore. Do you want to [d]elete, [D]elete all, [k]eep, [K]eep all?"
           case standard_input.gets.chomp
           when 'd' then delete = true
           when 'D' then delete_all = true

data/lib/s3_website/nanoc.rb

@@ -0,0 +1,5 @@
+module S3Website
+  module Nanoc
+    SITE_PATH = 'public/output'
+  end
+end

data/lib/s3_website/paths.rb

@@ -0,0 +1,32 @@
+module S3Website
+  class Paths
+    def self.site_paths
+      [Nanoc::SITE_PATH, Jekyll::SITE_PATH]
+    end
+
+    def self.infer_site_path(candidate_path, pwd = Dir.pwd)
+      if candidate_path == 'infer automatically'
+        site_path = site_paths.
+          map do |site_path|
+            pwd + '/' + site_path
+          end.
+          find do |site_path|
+            File.exists? site_path
+          end
+        if site_path
+          site_path
+        else
+          raise NoPredefinedWebsiteDirectoryFound
+        end
+      else
+        raise NoWebsiteDirectoryFound.new(
+          "Can't find a website in " + candidate_path
+        ) unless File.exists? candidate_path
+        candidate_path
+      end
+    rescue NoWebsiteDirectoryFound => e
+      puts e.message
+      exit 1
+    end
+  end
+end

data/lib/s3_website/tasks.rb

@@ -1,9 +1,9 @@
 module S3Website
   class Tasks
-    def self.push(site_dir, in_headless_mode = false)
+    def self.push(config_file_dir, site_dir, in_headless_mode = false)
       ConfigLoader.check_project site_dir
-      ConfigLoader.check_s3_configuration site_dir + '/../'
-      config = S3Website::ConfigLoader.load_configuration site_dir
+      ConfigLoader.check_s3_configuration config_file_dir
+      config = S3Website::ConfigLoader.load_configuration config_file_dir
       new_files_count, changed_files_count, deleted_files_count, changed_files, changed_redirects =
         Uploader.run(site_dir, config, in_headless_mode)
       invalidated_items_count =

data/lib/s3_website/uploader.rb

@@ -1,7 +1,7 @@
 module S3Website
   class Uploader
     def self.run(site_dir, config, in_headless_mode = false)
-      puts "Deploying _site/* to #{config['s3_bucket']}"
+      puts "Deploying #{site_dir.sub(Dir.pwd + '/', '')}/* to #{config['s3_bucket']}"
 
       s3_config = { :s3_endpoint => Endpoint.new(config['s3_endpoint']).hostname }
       s3_id, s3_secret = config['s3_id'], config['s3_secret']

data/s3_website.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "s3_website"
-  s.version     = "0.2.1"
+  s.version     = "0.3.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Lauri Lehmijoki"]
   s.email       = ["lauri.lehmijoki@iki.fi"]

data/spec/lib/config_loader_spec.rb

@@ -2,19 +2,19 @@ require 'spec_helper'
 
 describe S3Website::ConfigLoader do
   it 'supports eRuby syntax in s3_website.yml' do
-    config = S3Website::ConfigLoader.load_configuration('spec/sample_files/hyde_site/_site')
+    config = S3Website::ConfigLoader.load_configuration('spec/sample_files/hyde_site/')
     config['s3_id'].should eq('hello')
     config['s3_secret'].should eq('world')
     config['s3_bucket'].should eq('galaxy')
   end
 
   it 'does not define default endpoint' do
-    config = S3Website::ConfigLoader.load_configuration('spec/sample_files/hyde_site/_site')
+    config = S3Website::ConfigLoader.load_configuration('spec/sample_files/hyde_site/')
     config['s3_endpoint'].should be_nil
   end
 
   it 'reads the S3 endpoint setting from s3_website.yml' do
-    config = S3Website::ConfigLoader.load_configuration('spec/sample_files/tokyo_site/_site')
+    config = S3Website::ConfigLoader.load_configuration('spec/sample_files/tokyo_site')
     config['s3_endpoint'].should eq('ap-northeast-1')
   end
 end

data/spec/lib/paths_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe S3Website::Paths do
+  it 'recognises Jekyll and Nanoc site paths' do
+    S3Website::Paths.site_paths.should eq(['public/output', '_site'])
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Lauri Lehmijoki
@@ -237,6 +237,9 @@ files:
 - features/cloudfront.feature
 - features/delete.feature
 - features/instructions-for-new-user.feature
+- features/jekyll-support.feature
+- features/nanoc-support.feature
+- features/push.feature
 - features/redirects.feature
 - features/step_definitions/steps.rb
 - features/support/env.rb
@@ -252,12 +255,18 @@ files:
 - features/support/test_site_dirs/index-and-assets.blog.fi/_site/css/styles.css
 - features/support/test_site_dirs/index-and-assets.blog.fi/_site/index.html
 - features/support/test_site_dirs/index-and-assets.blog.fi/s3_website.yml
+- features/support/test_site_dirs/jekyllrb.com/_site/css/styles.css
+- features/support/test_site_dirs/jekyllrb.com/_site/index.html
+- features/support/test_site_dirs/jekyllrb.com/s3_website.yml
 - features/support/test_site_dirs/my.blog.com/_site/css/styles.css
 - features/support/test_site_dirs/my.blog.com/_site/index.html
 - features/support/test_site_dirs/my.blog.com/s3_website.yml
 - features/support/test_site_dirs/my.sydney.blog.au/_site/css/styles.css
 - features/support/test_site_dirs/my.sydney.blog.au/_site/index.html
 - features/support/test_site_dirs/my.sydney.blog.au/s3_website.yml
+- features/support/test_site_dirs/nanoc.ws/public/output/css/styles.css
+- features/support/test_site_dirs/nanoc.ws/public/output/index.html
+- features/support/test_site_dirs/nanoc.ws/s3_website.yml
 - features/support/test_site_dirs/new-and-changed-files.com/_site/css/styles.css
 - features/support/test_site_dirs/new-and-changed-files.com/_site/index.html
 - features/support/test_site_dirs/new-and-changed-files.com/s3_website.yml
@@ -282,7 +291,6 @@ files:
 - features/support/test_site_dirs/unpublish-a-post.com/_site/css/styles.css
 - features/support/test_site_dirs/unpublish-a-post.com/s3_website.yml
 - features/support/vcr.rb
-- features/sync.feature
 - features/website-performance.feature
 - lib/cloudfront/invalidator.rb
 - lib/s3_website.rb
@@ -290,8 +298,11 @@ files:
 - lib/s3_website/diff_helper.rb
 - lib/s3_website/endpoint.rb
 - lib/s3_website/errors.rb
+- lib/s3_website/jekyll.rb
 - lib/s3_website/keyboard.rb
+- lib/s3_website/nanoc.rb
 - lib/s3_website/parallelism.rb
+- lib/s3_website/paths.rb
 - lib/s3_website/retry.rb
 - lib/s3_website/tasks.rb
 - lib/s3_website/upload.rb
@@ -301,6 +312,7 @@ files:
 - spec/lib/endpoint_spec.rb
 - spec/lib/keyboard_spec.rb
 - spec/lib/parallelism_spec.rb
+- spec/lib/paths_spec.rb
 - spec/lib/retry_spec.rb
 - spec/lib/upload_spec.rb
 - spec/lib/uploader_spec.rb
@@ -350,6 +362,9 @@ test_files:
 - features/cloudfront.feature
 - features/delete.feature
 - features/instructions-for-new-user.feature
+- features/jekyll-support.feature
+- features/nanoc-support.feature
+- features/push.feature
 - features/redirects.feature
 - features/step_definitions/steps.rb
 - features/support/env.rb
@@ -365,12 +380,18 @@ test_files:
 - features/support/test_site_dirs/index-and-assets.blog.fi/_site/css/styles.css
 - features/support/test_site_dirs/index-and-assets.blog.fi/_site/index.html
 - features/support/test_site_dirs/index-and-assets.blog.fi/s3_website.yml
+- features/support/test_site_dirs/jekyllrb.com/_site/css/styles.css
+- features/support/test_site_dirs/jekyllrb.com/_site/index.html
+- features/support/test_site_dirs/jekyllrb.com/s3_website.yml
 - features/support/test_site_dirs/my.blog.com/_site/css/styles.css
 - features/support/test_site_dirs/my.blog.com/_site/index.html
 - features/support/test_site_dirs/my.blog.com/s3_website.yml
 - features/support/test_site_dirs/my.sydney.blog.au/_site/css/styles.css
 - features/support/test_site_dirs/my.sydney.blog.au/_site/index.html
 - features/support/test_site_dirs/my.sydney.blog.au/s3_website.yml
+- features/support/test_site_dirs/nanoc.ws/public/output/css/styles.css
+- features/support/test_site_dirs/nanoc.ws/public/output/index.html
+- features/support/test_site_dirs/nanoc.ws/s3_website.yml
 - features/support/test_site_dirs/new-and-changed-files.com/_site/css/styles.css
 - features/support/test_site_dirs/new-and-changed-files.com/_site/index.html
 - features/support/test_site_dirs/new-and-changed-files.com/s3_website.yml
@@ -395,12 +416,12 @@ test_files:
 - features/support/test_site_dirs/unpublish-a-post.com/_site/css/styles.css
 - features/support/test_site_dirs/unpublish-a-post.com/s3_website.yml
 - features/support/vcr.rb
-- features/sync.feature
 - features/website-performance.feature
 - spec/lib/config_loader_spec.rb
 - spec/lib/endpoint_spec.rb
 - spec/lib/keyboard_spec.rb
 - spec/lib/parallelism_spec.rb
+- spec/lib/paths_spec.rb
 - spec/lib/retry_spec.rb
 - spec/lib/upload_spec.rb
 - spec/lib/uploader_spec.rb