s3_website_monadic 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae8555de8425a14c5d8deb7d0dfebea2c7f39fb2
-  data.tar.gz: b6b4da900adcb7afb5422e74ffad3573bf272aa1
+  metadata.gz: da17db15b39a92b2f9f1deb27b63da2cb1bf97ac
+  data.tar.gz: 2cc1ba66a2d6ad0a7fccb559d544331d6d151747
 SHA512:
-  metadata.gz: fe00d27cab7b1a4462221005eb771177485b4e341eb69844768069e1dc86319b25a05bfef076b2dd9192261ebd8d2bc85d891f7791c24d4ef326c8c7f895eacb
-  data.tar.gz: 11363a4e8640319cc8a4a68c8c008346eadf1a3a6397e7e8a4d954202cd1ec784ddba3c9c90c76e53e00bd1c325780d11bdbf7dfcadcf41011d34768c954d9ed
+  metadata.gz: 22968e31e4d71e18a41a7d32e853297f35323670f926097c8d5c6e7dec2cabcd75faf176ae60cd3a7efd3724bb0597caeadf9dda1f46a986c10d1c6ebb057705
+  data.tar.gz: 13400d48b4ea5ee5a5fa247535706c73ac419d9f4f553d85bdb0e4635b16bea9e9f5e14b2fa2c6a0c26838a0c7689103fa8b2af0c413e81a759acff629a9a73e

data/README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://travis-ci.org/laurilehmijoki/s3_website.png?branch=master)](https://travis-ci.org/laurilehmijoki/s3_website)
 [![Gem Version](https://fury-badge.herokuapp.com/rb/s3_website.png)](http://badge.fury.io/rb/s3_website)
 
-## What `s3_website` can do for you
+## What `s3_website_monadic` can do for you
 
 * Create and configure an S3 website for you
 * Upload your static website to AWS S3
@@ -15,10 +15,10 @@
 
 ## Install
 
-    gem install s3_website
+    gem install s3_website_monadic
 
-`s3_website` requires Ruby and Java. Here is documentation on installing Ruby:
-<http://www.ruby-lang.org/en/downloads/>. and here is documentation for Java:
+`s3_website_monadic` requires Ruby and Java. Here is documentation on installing Ruby:
+<http://www.ruby-lang.org/en/downloads/>, and here is documentation for Java:
 <http://www.oracle.com/technetwork/java/javase/downloads/index.html>.
 
 ## Usage
@@ -28,11 +28,11 @@ Here's how you can get started:
 * Create API credentials that have sufficient permissions to S3. More info
   [here](https://github.com/laurilehmijoki/s3_website/blob/master/additional-docs/setting-up-aws-credentials.md).
 * Go to your website directory
-* Run `s3_website cfg create`. This generates a configuration file called `s3_website.yml`.
+* Run `s3_website_monadic cfg create`. This generates a configuration file called `s3_website.yml`.
 * Put your AWS credentials and the S3 bucket name into the file
-* Run `s3_website cfg apply`. This will configure your bucket to function as an
+* Run `s3_website_monadic 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.
+* Run `s3_website_monadic push` to push your website to S3. Congratulations! You are live.
 
 **Important security note:** if the source code of your website is publicly
 available, ensure that the `s3_website.yml` file is in the list of ignored files.
@@ -52,11 +52,11 @@ S3_website will automatically discover your website in the *public/output* direc
 It's a good idea to store the `s3_website.yml` file in your project's root.
 Let's say the contents you wish to upload to your S3 website bucket are in
 *my_website_output*. You can upload the contents of that directory with
-`s3_website push --site my_website_output`.
+`s3_website_monadic push --site my_website_output`.
 
 If you want to store the `s3_website.yml` file in a directory other than
 the project's root you can specify the directory.
-`s3_website push --config_dir config`.
+`s3_website_monadic push --config_dir config`.
 
 ### Using environment variables
 
@@ -87,8 +87,8 @@ you can omit the `s3_id` and `s3_secret` keys in the config file.)
 * Be as fast as possible. Do in parallel all that can be done in parallel.
 * Maintain 90% backward compatibility with the jekyll-s3 gem
 
-`s3_website` attempts to be a command-line interface tool that is easy to
-understand and use. For example, `s3_website --help` should print you all the
+`s3_website_monadic` attempts to be a command-line interface tool that is easy to
+understand and use. For example, `s3_website_monadic --help` should print you all the
 things it can perform. Please create an issue if you think the tool is
 incomprehensible or inconsistent.
 
@@ -148,21 +148,9 @@ from the zopfli algorithm, which is 100% compatible with the traditional gzip
 algorithm. A zopfli compression takes longer but results in about 5% smaller
 files.
 
-### Specifying a MIME type for files without extensions
-
-`s3_website` will look up the MIME type of each file it uploads, and infer the Content-Type from it automatically. By default, files without an extension will have a blank Content-Type.
-
-You can specify a default MIME type for files without an extension using a line like this in `s3_website.yml`:
-
-```yaml
-extensionless_mime_type: text/html
-```
-
-This is useful when you are uploading HTML files for which you want 'clean' URLs, e.g. `www.domain.com/info`.
-
 ### Using non-standard AWS regions
 
-By default, `s3_website` uses the US Standard Region. You can upload your
+By default, `s3_website_monadic` uses the US Standard Region. You can upload your
 website to other regions by adding the setting `s3_endpoint` into the
 `s3_website.yml` file.
 
@@ -195,7 +183,7 @@ ignore_on_server:
 
 ### Excluding files from upload
 
-You can instruct `s3_website` not to push certain files:
+You can instruct `s3_website_monadic` not to push certain files:
 
 ```yaml
 exclude_from_upload: test
@@ -223,7 +211,7 @@ It is easy to deliver your S3-based web site via Cloudfront, the CDN of Amazon.
 
 #### Creating a new CloudFront distribution
 
-When you run the command `s3_website cfg apply`, it will ask you whether you
+When you run the command `s3_website_monadic cfg apply`, it will ask you whether you
 want to deliver your website via CloudFront. If you answer yes, the command will
 create a CloudFront distribution for you.
 
@@ -234,12 +222,12 @@ 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 push`, it will invalidate the items on CloudFront and
+Next time you run `s3_website_monadic 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
 
-`s3_website` lets you define custom settings for your CloudFront distribution.
+`s3_website_monadic` lets you define custom settings for your CloudFront distribution.
 
 For example, like this you can define a your own TTL and CNAME:
 
@@ -254,11 +242,11 @@ cloudfront_distribution_config:
 ```
 
 Once you've saved the configuration into `s3_website.yml`, you can apply them by
-running `s3_website cfg apply`.
+running `s3_website_monadic cfg apply`.
 
 #### Invalidating root resources instead of index.htmls
 
-By default, `s3_website push` calls the CloudFront invalidation API with the
+By default, `s3_website_monadic push` calls the CloudFront invalidation API with the
 file-name-as-it-is. This means that if your file is *article/index.html*, the
 push command will call the invalidation API on the resource
 *article/index.html*.
@@ -288,7 +276,7 @@ Redirects method. Otherwise, use the Routing Rules method.
 
 #### Simple Redirects
 
-For simple redirects `s3_website` uses Amazon S3's
+For simple redirects `s3_website_monadic` uses Amazon S3's
 [`x-amz-website-redirect-location`](http://docs.aws.amazon.com/AmazonS3/latest/dev/how-to-page-redirect.html)
 metadata. It will create zero-byte objects for each path you want
 redirected with the appropriate `x-amz-website-redirect-location` value.
@@ -318,43 +306,17 @@ routing_rules:
       http_redirect_code: 301
 ```
 
-After adding the configuration, run the command `s3_website cfg apply` on your
+After adding the configuration, run the command `s3_website_monadic cfg apply` on your
 command-line interface. This will apply the routing rules on your S3 bucket.
 
 For more information on configuring redirects, see the documentation of the
 [configure-s3-website](https://github.com/laurilehmijoki/configure-s3-website#configuring-redirects)
-gem, which comes as a transitive dependency of the `s3_website` gem. (The
-command `s3_website cfg apply` internally calls the `configure-s3-website` gem.)
-
-### Using `s3_website` as a library
-
-By nature, `s3_website` is a command-line interface tool. You can, however, use
-it programmatically by calling the same API as the executable `s3_website` does:
-
-````ruby
-require 's3_website'
-is_headless = true
-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:
-
-```ruby
-config = {
-  "s3_id"     => YOUR_AWS_S3_ACCESS_KEY_ID,
-  "s3_secret" => YOUR_AWS_S3_SECRET_ACCESS_KEY,
-  "s3_bucket" => "your.blog.bucket.com"
-}
-in_headless = true
-S3Website::Uploader.run('/path/to/your/website/_site/', config, in_headless)
-```
-
-The code above will assume that you have the `s3_website.yml` in the directory
-`/path/to/your/website`.
+gem, which comes as a transitive dependency of the `s3_website_monadic` gem. (The
+command `s3_website_monadic cfg apply` internally calls the `configure-s3-website` gem.)
 
 ### Specifying custom concurrency level
 
-By default, `s3_website` does 3 operations in parallel. An operation can be an
+By default, `s3_website_monadic` does 3 operations in parallel. An operation can be an
 HTTP PUT operation against the S3 API, for example.
 
 You can increase the concurrency level by adding the following setting into the
@@ -386,10 +348,10 @@ Please create an issue and send a pull request if you spot any.
 
 ### Versioning
 
-s3_website uses [Semantic Versioning](http://semver.org).
+s3_website_monadic uses [Semantic Versioning](http://semver.org).
 
 In the spirit of semantic versioning, here is the definition of public API for
-s3_website: Within a major version, s3_website will not break
+s3_website: Within a major version, s3_website_monadic will not break
 backwards-compatibility of anything that is mentioned in this README file.
 
 ### Tests

data/bin/s3_website_monadic

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require File.expand_path(File.dirname(__FILE__)+ '/../lib/s3_website')
+require 'colored'
 
 class Cfg < Thor
   desc 'create', 'Create a config file with placeholder values'
@@ -75,7 +76,7 @@ def run_s3_website_jar(jar_file, call_dir)
   site_path = File.expand_path(S3Website::Paths.infer_site_path options[:site], call_dir)
   config_dir = File.expand_path options[:config_dir]
   args = "--site=#{site_path} --config-dir=#{config_dir}"
-  puts "[debg] Using #{jar_file}"
+  debug_msg "Using #{jar_file}"
   if system("java -cp #{jar_file} s3.website.Push #{args}")
     exit 0
   else
@@ -116,12 +117,12 @@ def download_jar(released_jar_lookup_paths)
     File.writable? File.dirname(jar_path)
   }.first
   unless downloaded_jar
-    puts "[error] Neither #{released_jar_lookup_paths.join ' or '} is writable. Cannot download s3_website.jar."
-    puts "[error] Set either directory as writable to the current user and try again."
+    fail_msg "Neither #{released_jar_lookup_paths.join ' or '} is writable. Cannot download s3_website.jar."
+    fail_msg "Set either directory as writable to the current user and try again."
     exit 1
   end
   download_url = "https://github.com/laurilehmijoki/s3_website/releases/download/#{tag_name}/s3_website.jar"
-  puts "[info] Downloading #{download_url} into #{downloaded_jar}"
+  info_msg "Downloading #{download_url} into #{downloaded_jar}"
   require 'open-uri'
   open(downloaded_jar, 'wb') do |file|
     file << open(download_url).read
@@ -129,4 +130,20 @@ def download_jar(released_jar_lookup_paths)
   downloaded_jar
 end
 
+def debug_msg(msg)
+  print_msg 'debg'.cyan, msg
+end
+
+def info_msg(msg)
+  print_msg 'info'.blue, msg
+end
+
+def fail_msg(msg)
+  print_msg 'fail'.red, msg
+end
+
+def print_msg(prefix, msg)
+  puts "[#{prefix}] #{msg}"
+end
+
 Cli.start(ARGV)

data/changelog.md

@@ -23,6 +23,8 @@ for more info.
     s3_website always deletes the files that are on the S3 bucket but not on the local file system.
     Use the settings `ignore_on_server` and `exclude_from_upload` to control the retained files.
 
+* You can no longer use this gem as a Ruby library
+
 ## 1.7.6
 
 * Remove a test setting from *Gemfile*

data/lib/s3_website/version.rb

@@ -1,3 +1,3 @@
 module S3Website
-  VERSION = '0.0.24'
+  VERSION = '0.0.25'
 end

data/s3_website.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'thor', '= 0.18.1'
   s.add_dependency 'configure-s3-website', '= 1.5.5'
+  s.add_dependency 'colored', '1.2'
 
   s.add_development_dependency 'rake', '10.1.1'
   s.add_development_dependency 'octokit', '3.1.0'

data/src/main/scala/s3/website/Push.scala

@@ -186,19 +186,23 @@ object Push {
 
   def main(args: Array[String]) {
     val cliArgs = CliFactory.parseArguments(classOf[CliArgs], args:_*)
-    val errorOrPushStatus = loadSite(cliArgs.configDir + "/s3_website.yml", cliArgs.site)
+    implicit val s3Settings = S3Settings()
+    implicit val cloudFrontSettings = CloudFrontSettings()
+    val errorOrPushStatus = push(siteInDirectory = cliArgs.site, withConfigDirectory = cliArgs.configDir)
+    errorOrPushStatus.left foreach (err => fail(s"Could not load the site: ${err.reportMessage}"))
+    System exit errorOrPushStatus.fold(_ => 1, pushStatus => pushStatus)
+  }
+
+  def push(siteInDirectory: String, withConfigDirectory: String)
+          (implicit s3Settings: S3Settings, cloudFrontSettings: CloudFrontSettings) =
+    loadSite(withConfigDirectory + "/s3_website.yml", siteInDirectory)
       .right
       .map {
       implicit site =>
         val threadPool = newFixedThreadPool(site.config.concurrency_level)
         implicit val executor = fromExecutor(threadPool)
-        implicit val s3Settings = S3Settings()
-        implicit val cloudFrontSettings = CloudFrontSettings()
         val pushStatus = pushSite
         threadPool.shutdownNow()
         pushStatus
     }
-    errorOrPushStatus.left foreach (err => fail(s"Could not load the site: ${err.reportMessage}"))
-    System.exit(errorOrPushStatus.fold(_ => 1, pushStatus => pushStatus))
-  }
 }

data/src/main/scala/s3/website/S3.scala

@@ -141,10 +141,7 @@ object S3 {
     val metadata = putObjectRequest.getMetadata
     def metadataReport =
       (metadata.getCacheControl :: metadata.getContentType :: metadata.getContentEncoding :: putObjectRequest.getStorageClass :: Nil)
-        .map(Option(_))
-        .collect {
-          case Some(metadatum) => metadatum
-        }
+        .filterNot(_ == null)
         .mkString(" | ")
 
     def reportMessage =

data/src/test/scala/s3/website/S3WebsiteSpec.scala

@@ -4,7 +4,6 @@ import org.specs2.mutable.{After, Specification}
 import s3.website.model._
 import org.specs2.specification.Scope
 import org.apache.commons.io.FileUtils
-import org.apache.commons.codec.digest.DigestUtils
 import java.io.File
 import scala.util.Random
 import org.mockito.{Mockito, Matchers, ArgumentCaptor}
@@ -14,39 +13,34 @@ import com.amazonaws.services.s3.model._
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Await
 import scala.concurrent.duration._
-import s3.website.S3.{S3Settings, S3ClientProvider}
+import s3.website.S3.S3Settings
 import scala.collection.JavaConversions._
 import s3.website.model.NewFile
-import scala.Some
-import com.amazonaws.{AmazonClientException, AmazonServiceException}
+import com.amazonaws.AmazonServiceException
 import org.apache.commons.codec.digest.DigestUtils.md5Hex
-import s3.website.CloudFront.{CloudFrontSettings, CloudFrontClientProvider}
+import s3.website.CloudFront.CloudFrontSettings
 import com.amazonaws.services.cloudfront.AmazonCloudFront
 import com.amazonaws.services.cloudfront.model.{CreateInvalidationResult, CreateInvalidationRequest, TooManyInvalidationsInProgressException}
 import org.mockito.stubbing.Answer
 import org.mockito.invocation.InvocationOnMock
-import com.amazonaws.AmazonServiceException.ErrorType
 import java.util.concurrent.atomic.AtomicInteger
-import scala.collection.immutable.IndexedSeq
+import org.apache.commons.io.FileUtils.write
+import scala.collection.mutable
 
 class S3WebsiteSpec extends Specification {
 
   "gzip: true" should {
-    "update a gzipped S3 object if the contents has changed" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFilesAndContent(
-        config = defaultConfig.copy(gzip = Some(Left(true))),
-        localFilesWithContent = ("styles.css", "<h1>hi again</h1>") :: Nil
-      )
+    "update a gzipped S3 object if the contents has changed" in new EmptySite with MockAWS {
+      config = "gzip: true"
+      setLocalFileWithContent(("styles.css", "<h1>hi again</h1>"))
       setS3Files(S3File("styles.css", "1c5117e5839ad8fc00ce3c41296255a1" /* md5 of the gzip of the file contents */))
       Push.pushSite
       sentPutObjectRequest.getKey must equalTo("styles.css")
     }
 
-    "not update a gzipped S3 object if the contents has not changed" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFilesAndContent(
-        config = defaultConfig.copy(gzip = Some(Left(true))),
-        localFilesWithContent = ("styles.css", "<h1>hi</h1>") :: Nil
-      )
+    "not update a gzipped S3 object if the contents has not changed" in new EmptySite with MockAWS {
+      config = "gzip: true"
+      setLocalFileWithContent(("styles.css", "<h1>hi</h1>"))
       setS3Files(S3File("styles.css", "1c5117e5839ad8fc00ce3c41296255a1" /* md5 of the gzip of the file contents */))
       Push.pushSite
       noUploadsOccurred must beTrue
@@ -57,55 +51,54 @@ class S3WebsiteSpec extends Specification {
     gzip:
       - .xml
   """ should {
-    "update a gzipped S3 object if the contents has changed" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFilesAndContent(
-        config = defaultConfig.copy(gzip = Some(Right(".xml" :: Nil))),
-        localFilesWithContent = ("file.xml", "<h1>hi again</h1>") :: Nil
-      )
+    "update a gzipped S3 object if the contents has changed" in new EmptySite with MockAWS {
+      config = """
+        |gzip:
+        |  - .xml
+      """.stripMargin
+      setLocalFileWithContent(("file.xml", "<h1>hi again</h1>"))
       setS3Files(S3File("file.xml", "1c5117e5839ad8fc00ce3c41296255a1" /* md5 of the gzip of the file contents */))
       Push.pushSite
       sentPutObjectRequest.getKey must equalTo("file.xml")
     }
   }
 
-
   "push" should {
-    "not upload a file if it has not changed" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFilesAndContent(localFilesWithContent = ("index.html", "<div>hello</div>") :: Nil)
+    "not upload a file if it has not changed" in new EmptySite with MockAWS {
+      setLocalFileWithContent(("index.html", "<div>hello</div>"))
       setS3Files(S3File("index.html", md5Hex("<div>hello</div>")))
       Push.pushSite
       noUploadsOccurred must beTrue
     }
 
-    "update a file if it has changed" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFilesAndContent(localFilesWithContent = ("index.html", "<h1>old text</h1>") :: Nil)
+    "update a file if it has changed" in new EmptySite with MockAWS {
+      setLocalFileWithContent(("index.html", "<h1>old text</h1>"))
       setS3Files(S3File("index.html", md5Hex("<h1>new text</h1>")))
       Push.pushSite
       sentPutObjectRequest.getKey must equalTo("index.html")
     }
 
-    "create a file if does not exist on S3" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFiles(localFiles = "index.html" :: Nil)
+    "create a file if does not exist on S3" in new EmptySite with MockAWS {
+      setLocalFile("index.html")
       Push.pushSite
       sentPutObjectRequest.getKey must equalTo("index.html")
     }
 
-    "delete files that are on S3 but not on local file system" in new SiteDirectory with MockAWS {
-      implicit val site = buildSite()
+    "delete files that are on S3 but not on local file system" in new EmptySite with MockAWS {
       setS3Files(S3File("old.html", md5Hex("<h1>old text</h1>")))
       Push.pushSite
       sentDelete must equalTo("old.html")
     }
 
-    "try again if the upload fails" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFiles(localFiles = "index.html" :: Nil)
+    "try again if the upload fails" in new EmptySite with MockAWS {
+      setLocalFile("index.html")
       uploadFailsAndThenSucceeds(howManyFailures = 5)
       Push.pushSite
       verify(amazonS3Client, times(6)).putObject(Matchers.any(classOf[PutObjectRequest]))
     }
 
-    "not try again if the upload fails on because of invalid credentials" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFiles(localFiles = "index.html" :: Nil)
+    "not try again if the upload fails on because of invalid credentials" in new EmptySite with MockAWS {
+      setLocalFile("index.html")
       when(amazonS3Client.putObject(Matchers.any(classOf[PutObjectRequest]))).thenThrow {
         val e = new AmazonServiceException("your credentials are incorrect")
         e.setStatusCode(403)
@@ -115,16 +108,14 @@ class S3WebsiteSpec extends Specification {
       verify(amazonS3Client, times(1)).putObject(Matchers.any(classOf[PutObjectRequest]))
     }
 
-    "try again if the delete fails" in new SiteDirectory with MockAWS {
-      implicit val site = buildSite()
+    "try again if the delete fails" in new EmptySite with MockAWS {
       setS3Files(S3File("old.html", md5Hex("<h1>old text</h1>")))
       deleteFailsAndThenSucceeds(howManyFailures = 5)
       Push.pushSite
       verify(amazonS3Client, times(6)).deleteObject(Matchers.anyString(), Matchers.anyString())
     }
 
-    "try again if the object listing fails" in new SiteDirectory with MockAWS {
-      implicit val site = buildSite()
+    "try again if the object listing fails" in new EmptySite with MockAWS {
       setS3Files(S3File("old.html", md5Hex("<h1>old text</h1>")))
       objectListingFailsAndThenSucceeds(howManyFailures = 5)
       Push.pushSite
@@ -133,60 +124,52 @@ class S3WebsiteSpec extends Specification {
   }
 
   "push with CloudFront" should {
-    "invalidate the updated CloudFront items" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFiles(
-        config = defaultConfig.copy(cloudfront_distribution_id = Some("EGM1J2JJX9Z")),
-        localFiles = "css/test.css" :: "articles/index.html" :: Nil
-      )
+    "invalidate the updated CloudFront items" in new EmptySite with MockAWS {
+      config = "cloudfront_distribution_id: EGM1J2JJX9Z"
+      setLocalFiles("css/test.css", "articles/index.html")
       setOutdatedS3Keys("css/test.css", "articles/index.html")
       Push.pushSite
       sentInvalidationRequest.getInvalidationBatch.getPaths.getItems.toSeq.sorted must equalTo(("/css/test.css" :: "/articles/index.html" :: Nil).sorted)
     }
 
-    "not send CloudFront invalidation requests on new objects"  in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFiles(
-        config = defaultConfig.copy(cloudfront_distribution_id = Some("EGM1J2JJX9Z")),
-        localFiles = "newfile.js" :: Nil
-      )
+    "not send CloudFront invalidation requests on new objects"  in new EmptySite with MockAWS {
+      config = "cloudfront_distribution_id: EGM1J2JJX9Z"
+      setLocalFile("newfile.js")
       Push.pushSite
       noInvalidationsOccurred must beTrue
     }
 
-    "not send CloudFront invalidation requests on redirect objects" in new SiteDirectory with MockAWS {
-      implicit val site = buildSite(
-        config = defaultConfig.copy(cloudfront_distribution_id = Some("EGM1J2JJX9Z"), redirects = Some(Map("/index.php" -> "index.html")))
-      )
+    "not send CloudFront invalidation requests on redirect objects" in new EmptySite with MockAWS {
+      config = """
+        |cloudfront_distribution_id: EGM1J2JJX9Z
+        |redirects:
+        |  /index.php: index.html
+      """.stripMargin
       Push.pushSite
       noInvalidationsOccurred must beTrue
     }
 
-    "retry CloudFront responds with TooManyInvalidationsInProgressException" in new SiteDirectory with MockAWS {
+    "retry CloudFront responds with TooManyInvalidationsInProgressException" in new EmptySite with MockAWS {
       setTooManyInvalidationsInProgress(4)
-      implicit val site = siteWithFiles(
-        config = defaultConfig.copy(cloudfront_distribution_id = Some("EGM1J2JJX9Z")),
-        localFiles = "test.css" :: Nil
-      )
+      config = "cloudfront_distribution_id: EGM1J2JJX9Z"
+      setLocalFile("test.css")
       setOutdatedS3Keys("test.css")
       Push.pushSite must equalTo(0) // The retries should finally result in a success
       sentInvalidationRequests.length must equalTo(4)
     }
 
-    "retry if CloudFront is temporarily unreachable" in new SiteDirectory with MockAWS {
+    "retry if CloudFront is temporarily unreachable" in new EmptySite with MockAWS {
       invalidationsFailAndThenSucceed(5)
-      implicit val site = siteWithFiles(
-        config = defaultConfig.copy(cloudfront_distribution_id = Some("EGM1J2JJX9Z")),
-        localFiles = "test.css" :: Nil
-      )
+      config = "cloudfront_distribution_id: EGM1J2JJX9Z"
+      setLocalFile("test.css")
       setOutdatedS3Keys("test.css")
       Push.pushSite
       sentInvalidationRequests.length must equalTo(6)
     }
 
-    "encode unsafe characters in the keys" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFiles(
-        config = defaultConfig.copy(cloudfront_distribution_id = Some("EGM1J2JJX9Z")),
-        localFiles = "articles/arnold's file.html" :: Nil
-      )
+    "encode unsafe characters in the keys" in new EmptySite with MockAWS {
+      config = "cloudfront_distribution_id: EGM1J2JJX9Z"
+      setLocalFile("articles/arnold's file.html")
       setOutdatedS3Keys("articles/arnold's file.html")
       Push.pushSite
       sentInvalidationRequest.getInvalidationBatch.getPaths.getItems.toSeq.sorted must equalTo(("/articles/arnold's%20file.html" :: Nil).sorted)
@@ -196,11 +179,9 @@ class S3WebsiteSpec extends Specification {
      * Because CloudFront supports Default Root Objects (http://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/DefaultRootObject.html),
      * we have to guess
      */
-    "invalidate the root object '/' if a top-level object is updated or deleted" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFiles(
-        config = defaultConfig.copy(cloudfront_distribution_id = Some("EGM1J2JJX9Z")),
-        localFiles = "maybe-index.html" :: Nil
-      )
+    "invalidate the root object '/' if a top-level object is updated or deleted" in new EmptySite with MockAWS {
+      config = "cloudfront_distribution_id: EGM1J2JJX9Z"
+      setLocalFile("maybe-index.html")
       setOutdatedS3Keys("maybe-index.html")
       Push.pushSite
       sentInvalidationRequest.getInvalidationBatch.getPaths.getItems.toSeq.sorted must equalTo(("/" :: "/maybe-index.html" :: Nil).sorted)
@@ -208,11 +189,12 @@ class S3WebsiteSpec extends Specification {
   }
 
   "cloudfront_invalidate_root: true" should {
-    "convert CloudFront invalidation paths with the '/index.html' suffix into '/'"  in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFiles(
-        config = defaultConfig.copy(cloudfront_distribution_id = Some("EGM1J2JJX9Z"), cloudfront_invalidate_root = Some(true)),
-        localFiles = "articles/index.html" :: Nil
-      )
+    "convert CloudFront invalidation paths with the '/index.html' suffix into '/'"  in new EmptySite with MockAWS {
+      config = """
+        |cloudfront_distribution_id: EGM1J2JJX9Z
+        |cloudfront_invalidate_root: true
+      """.stripMargin
+      setLocalFile("articles/index.html")
       setOutdatedS3Keys("articles/index.html")
       Push.pushSite
       sentInvalidationRequest.getInvalidationBatch.getPaths.getItems.toSeq.sorted must equalTo(("/articles/" :: Nil).sorted)
@@ -220,12 +202,10 @@ class S3WebsiteSpec extends Specification {
   }
 
   "a site with over 1000 items" should {
-    "split the CloudFront invalidation requests into batches of 1000 items" in new SiteDirectory with MockAWS {
+    "split the CloudFront invalidation requests into batches of 1000 items" in new EmptySite with MockAWS {
       val files = (1 to 1002).map { i => s"lots-of-files/file-$i"}
-      implicit val site = siteWithFiles(
-        config = defaultConfig.copy(cloudfront_distribution_id = Some("EGM1J2JJX9Z")),
-        localFiles = files
-      )
+      config = "cloudfront_distribution_id: EGM1J2JJX9Z"
+      setLocalFiles(files:_*)
       setOutdatedS3Keys(files:_*)
       Push.pushSite
       sentInvalidationRequests.length must equalTo(2)
@@ -235,55 +215,54 @@ class S3WebsiteSpec extends Specification {
   }
 
   "push exit status" should {
-    "be 0 all uploads succeed" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFilesAndContent(localFilesWithContent = ("index.html", "<h1>hello</h1>") :: Nil)
+    "be 0 all uploads succeed" in new EmptySite with MockAWS {
+      setLocalFiles("file.txt")
       Push.pushSite must equalTo(0)
     }
 
-    "be 1 if any of the uploads fails" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFilesAndContent(localFilesWithContent = ("index.html", "<h1>hello</h1>") :: Nil)
+    "be 1 if any of the uploads fails" in new EmptySite with MockAWS {
+      setLocalFiles("file.txt")
       when(amazonS3Client.putObject(Matchers.any(classOf[PutObjectRequest]))).thenThrow(new AmazonServiceException("AWS failed"))
       Push.pushSite must equalTo(1)
     }
 
-    "be 1 if any of the redirects fails" in new SiteDirectory with MockAWS {
-      implicit val site = buildSite(defaultConfig.copy(redirects = Some(Map("index.php" -> "/index.html"))))
+    "be 1 if any of the redirects fails" in new EmptySite with MockAWS {
+      config = """
+        |redirects:
+        |  index.php: /index.html
+      """.stripMargin
       when(amazonS3Client.putObject(Matchers.any(classOf[PutObjectRequest]))).thenThrow(new AmazonServiceException("AWS failed"))
       Push.pushSite must equalTo(1)
     }
 
-    "be 0 if CloudFront invalidations and uploads succeed"in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFiles(
-        config = defaultConfig.copy(cloudfront_distribution_id = Some("EGM1J2JJX9Z")),
-        localFiles = "test.css" :: "articles/index.html" :: Nil
-      )
+    "be 0 if CloudFront invalidations and uploads succeed"in new EmptySite with MockAWS {
+      config = "cloudfront_distribution_id: EGM1J2JJX9Z"
+      setLocalFile("test.css")
+      setOutdatedS3Keys("test.css")
       Push.pushSite must equalTo(0)
     }
 
-    "be 1 if CloudFront is unreachable or broken"in new SiteDirectory with MockAWS {
+    "be 1 if CloudFront is unreachable or broken"in new EmptySite with MockAWS {
       setCloudFrontAsInternallyBroken()
-      implicit val site = siteWithFiles(
-        config = defaultConfig.copy(cloudfront_distribution_id = Some("EGM1J2JJX9Z")),
-        localFiles = "test.css" :: Nil
-      )
+      config = "cloudfront_distribution_id: EGM1J2JJX9Z"
+      setLocalFile("test.css")
       setOutdatedS3Keys("test.css")
       Push.pushSite must equalTo(1)
     }
 
-    "be 0 if upload retry succeeds" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFilesAndContent(localFilesWithContent = ("index.html", "<h1>hello</h1>") :: Nil)
+    "be 0 if upload retry succeeds" in new EmptySite with MockAWS {
+      setLocalFile("index.html")
       uploadFailsAndThenSucceeds(howManyFailures = 1)
       Push.pushSite must equalTo(0)
     }
 
-    "be 1 if delete retry fails" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFilesAndContent(localFilesWithContent = ("index.html", "<h1>hello</h1>") :: Nil)
+    "be 1 if delete retry fails" in new EmptySite with MockAWS {
+      setLocalFile("index.html")
       uploadFailsAndThenSucceeds(howManyFailures = 6)
       Push.pushSite must equalTo(1)
     }
 
-    "be 1 if an object listing fails" in new SiteDirectory with MockAWS {
-      implicit val site = buildSite()
+    "be 1 if an object listing fails" in new EmptySite with MockAWS {
       setS3Files(S3File("old.html", md5Hex("<h1>old text</h1>")))
       objectListingFailsAndThenSucceeds(howManyFailures = 6)
       Push.pushSite must equalTo(1)
@@ -291,19 +270,17 @@ class S3WebsiteSpec extends Specification {
   }
 
   "s3_website.yml file" should {
-    "never be uploaded" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFiles(localFiles = "s3_website.yml" :: Nil)
+    "never be uploaded" in new EmptySite with MockAWS {
+      setLocalFile("s3_website.yml")
       Push.pushSite
       noUploadsOccurred must beTrue
     }
   }
 
   "exclude_from_upload: string" should {
-    "result in matching files not being uploaded" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFiles(
-        config = defaultConfig.copy(exclude_from_upload = Some(Left(".DS_.*?"))),
-        localFiles = ".DS_Store" :: Nil
-      )
+    "result in matching files not being uploaded" in new EmptySite with MockAWS {
+      config = "exclude_from_upload: .DS_.*?"
+      setLocalFile(".DS_Store")
       Push.pushSite
       noUploadsOccurred must beTrue
     }
@@ -314,19 +291,21 @@ class S3WebsiteSpec extends Specification {
        - regex
        - another_exclusion
   """ should {
-    "result in matching files not being uploaded" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFiles(
-        config = defaultConfig.copy(exclude_from_upload = Some(Right(".DS_.*?" :: "logs" :: Nil))),
-        localFiles = ".DS_Store" :: "logs/test.log" :: Nil
-      )
+    "result in matching files not being uploaded" in new EmptySite with MockAWS {
+      config = """
+        |exclude_from_upload:
+        |  - .DS_.*?
+        |  - logs
+      """.stripMargin
+      setLocalFiles(".DS_Store", "logs/test.log")
       Push.pushSite
       noUploadsOccurred must beTrue
     }
   }
 
   "ignore_on_server: value" should {
-    "not delete the S3 objects that match the ignore value" in new SiteDirectory with MockAWS {
-      implicit val site = buildSite(config = defaultConfig.copy(ignore_on_server = Some(Left("logs"))))
+    "not delete the S3 objects that match the ignore value" in new EmptySite with MockAWS {
+      config = "ignore_on_server: logs"
       setS3Files(S3File("logs/log.txt", ""))
       Push.pushSite
       noDeletesOccurred must beTrue
@@ -338,8 +317,11 @@ class S3WebsiteSpec extends Specification {
        - regex
        - another_ignore
   """ should {
-    "not delete the S3 objects that match the ignore value" in new SiteDirectory with MockAWS {
-      implicit val site = buildSite(config = defaultConfig.copy(ignore_on_server = Some(Right(".*txt" :: Nil))))
+    "not delete the S3 objects that match the ignore value" in new EmptySite with MockAWS {
+      config = """
+        |ignore_on_server:
+        |  - .*txt
+      """.stripMargin
       setS3Files(S3File("logs/log.txt", ""))
       Push.pushSite
       noDeletesOccurred must beTrue
@@ -347,46 +329,59 @@ class S3WebsiteSpec extends Specification {
   }
 
   "max-age in config" can {
-    "be applied to all files" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFiles(defaultConfig.copy(max_age = Some(Left(60))), localFiles = "index.html" :: Nil)
+    "be applied to all files" in new EmptySite with MockAWS {
+      config = "max_age: 60"
+      setLocalFile("index.html")
       Push.pushSite
       sentPutObjectRequest.getMetadata.getCacheControl must equalTo("max-age=60")
     }
 
-    "be applied to files that match the glob" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFiles(defaultConfig.copy(max_age = Some(Right(Map("*.html" -> 90)))), localFiles = "index.html" :: Nil)
+    "be applied to files that match the glob" in new EmptySite with MockAWS {
+      config = """
+        |max_age:
+        |  "*.html": 90
+      """.stripMargin
+      setLocalFile("index.html")
       Push.pushSite
       sentPutObjectRequest.getMetadata.getCacheControl must equalTo("max-age=90")
     }
 
-    "be applied to directories that match the glob" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFiles(defaultConfig.copy(max_age = Some(Right(Map("assets/**/*.js" -> 90)))), localFiles = "assets/lib/jquery.js" :: Nil)
+    "be applied to directories that match the glob" in new EmptySite with MockAWS {
+      config = """
+        |max_age:
+        |  "assets/**/*.js": 90
+      """.stripMargin
+      setLocalFile("assets/lib/jquery.js")
       Push.pushSite
       sentPutObjectRequest.getMetadata.getCacheControl must equalTo("max-age=90")
     }
 
-    "not be applied if the glob doesn't match" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFiles(defaultConfig.copy(max_age = Some(Right(Map("*.js" -> 90)))), localFiles = "index.html" :: Nil)
+    "not be applied if the glob doesn't match" in new EmptySite with MockAWS {
+      config = """
+        |max_age:
+        |  "*.js": 90
+      """.stripMargin
+      setLocalFile("index.html")
       Push.pushSite
       sentPutObjectRequest.getMetadata.getCacheControl must beNull
     }
 
-    "be used to disable caching" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFiles(defaultConfig.copy(max_age = Some(Left(0))), localFiles = "index.html" :: Nil)
+    "be used to disable caching" in new EmptySite with MockAWS {
+      config = "max_age: 0"
+      setLocalFile("index.html")
       Push.pushSite
       sentPutObjectRequest.getMetadata.getCacheControl must equalTo("no-cache; max-age=0")
     }
   }
 
   "max-age in config" should {
-    "respect the more specific glob" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFiles(
-        defaultConfig.copy(max_age = Some(Right(Map(
-          "assets/*" -> 150,
-          "assets/*.gif" -> 86400
-        )))),
-        localFiles = "assets/jquery.js" :: "assets/picture.gif" :: Nil
-      )
+    "respect the more specific glob" in new EmptySite with MockAWS {
+      config = """
+        |max_age:
+        |  "assets/*": 150
+        |  "assets/*.gif": 86400
+      """.stripMargin
+      setLocalFiles("assets/jquery.js", "assets/picture.gif")
       Push.pushSite
       sentPutObjectRequests.find(_.getKey == "assets/jquery.js").get.getMetadata.getCacheControl must equalTo("max-age=150")
       sentPutObjectRequests.find(_.getKey == "assets/picture.gif").get.getMetadata.getCacheControl must equalTo("max-age=86400")
@@ -394,41 +389,50 @@ class S3WebsiteSpec extends Specification {
   }
 
   "s3_reduced_redundancy: true in config" should {
-    "result in uploads being marked with reduced redundancy" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFiles(defaultConfig.copy(s3_reduced_redundancy = Some(true)), localFiles = "index.html" :: Nil)
+    "result in uploads being marked with reduced redundancy" in new EmptySite with MockAWS {
+      config = "s3_reduced_redundancy: true"
+      setLocalFile("file.exe")
       Push.pushSite
       sentPutObjectRequest.getStorageClass must equalTo("REDUCED_REDUNDANCY")
     }
   }
 
   "s3_reduced_redundancy: false in config" should {
-    "result in uploads being marked with the default storage class" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFiles(defaultConfig.copy(s3_reduced_redundancy = Some(false)), localFiles = "index.html" :: Nil)
+    "result in uploads being marked with the default storage class" in new EmptySite with MockAWS {
+      config = "s3_reduced_redundancy: false"
+      setLocalFile("file.exe")
       Push.pushSite
       sentPutObjectRequest.getStorageClass must beNull
     }
   }
 
   "redirect in config" should {
-    "result in a redirect instruction that is sent to AWS" in new SiteDirectory with MockAWS {
-      implicit val site = buildSite(defaultConfig.copy(redirects = Some(Map("index.php" -> "/index.html"))))
+    "result in a redirect instruction that is sent to AWS" in new EmptySite with MockAWS {
+      config = """
+        |redirects:
+        |  index.php: /index.html
+      """.stripMargin
       Push.pushSite
       sentPutObjectRequest.getRedirectLocation must equalTo("/index.html")
     }
 
-    "result in max-age=0 Cache-Control header on the object" in new SiteDirectory with MockAWS {
-      implicit val site = buildSite(defaultConfig.copy(redirects = Some(Map("index.php" -> "/index.html"))))
+    "result in max-age=0 Cache-Control header on the object" in new EmptySite with MockAWS {
+      config = """
+        |redirects:
+        |  index.php: /index.html
+      """.stripMargin
       Push.pushSite
       sentPutObjectRequest.getMetadata.getCacheControl must equalTo("max-age=0, no-cache")
     }
   }
 
   "redirect in config and an object on the S3 bucket" should {
-    "not result in the S3 object being deleted" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFiles(
-        localFiles = "index.html" :: Nil,
-        config = defaultConfig.copy(redirects = Some(Map("index.php" -> "/index.html")))
-      )
+    "not result in the S3 object being deleted" in new EmptySite with MockAWS {
+      config = """
+        |redirects:
+        |  index.php: /index.html
+      """.stripMargin
+      setLocalFile("index.php")
       setS3Files(S3File("index.php", "md5"))
       Push.pushSite
       noDeletesOccurred must beTrue
@@ -436,38 +440,50 @@ class S3WebsiteSpec extends Specification {
   }
 
   "dotfiles" should {
-    "be included in the pushed files" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFiles(localFiles = ".vimrc" :: Nil)
+    "be included in the pushed files" in new EmptySite with MockAWS {
+      setLocalFile(".vimrc")
       Push.pushSite
       sentPutObjectRequest.getKey must equalTo(".vimrc")
     }
   }
 
   "content type inference" should {
-    "add charset=utf-8 to all html documents" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFiles(localFiles = "file.html" :: Nil)
+    "add charset=utf-8 to all html documents" in new EmptySite with MockAWS {
+      setLocalFile("index.html")
       Push.pushSite
       sentPutObjectRequest.getMetadata.getContentType must equalTo("text/html; charset=utf-8")
     }
 
-    "add charset=utf-8 to all text documents" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFiles(localFiles = "file.txt" :: Nil)
+    "add charset=utf-8 to all text documents" in new EmptySite with MockAWS {
+      setLocalFile("index.txt")
       Push.pushSite
       sentPutObjectRequest.getMetadata.getContentType must equalTo("text/plain; charset=utf-8")
     }
 
-    "add charset=utf-8 to all json documents" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFiles(localFiles = "file.json" :: Nil)
+    "add charset=utf-8 to all json documents" in new EmptySite with MockAWS {
+      setLocalFile("data.json")
       Push.pushSite
       sentPutObjectRequest.getMetadata.getContentType must equalTo("application/json; charset=utf-8")
     }
 
-    "resolve the content type from file contents" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFilesAndContent(localFilesWithContent = ("index", "<html><body><h1>hi</h1></body></html>") :: Nil)
+    "resolve the content type from file contents" in new EmptySite with MockAWS {
+      setLocalFileWithContent(("index", "<html><body><h1>hi</h1></body></html>"))
       Push.pushSite
       sentPutObjectRequest.getMetadata.getContentType must equalTo("text/html; charset=utf-8")
     }
   }
+
+  "ERB in config file" should {
+    "be evaluated"  in new EmptySite with MockAWS {
+      config = """
+        |redirects:
+        |<%= ('a'..'f').to_a.map do |t| '  '+t+ ': /'+t+'.html' end.join('\n')%>
+      """.stripMargin
+      Push.pushSite
+      sentPutObjectRequests.length must equalTo(6)
+      sentPutObjectRequests.forall(_.getRedirectLocation != null) must beTrue
+    }
+  }
   
   trait MockAWS extends MockS3 with MockCloudFront with Scope
   
@@ -620,22 +636,57 @@ class S3WebsiteSpec extends Specification {
     def after {
       FileUtils.forceDelete(siteDir)
     }
+  }
+  
+  trait EmptySite extends SiteDirectory {
+    type LocalFileWithContent = (String, String)
+
+    val localFilesWithContent: mutable.Buffer[LocalFileWithContent] = mutable.Buffer()
+    def setLocalFile(fileName: String) = setLocalFileWithContent((fileName, ""))
+    def setLocalFiles(fileNames: String*) = fileNames foreach setLocalFile
+    def setLocalFileWithContent(fileNameAndContent: LocalFileWithContent) = localFilesWithContent += fileNameAndContent
+    def setLocalFilesWithContent(fileNamesAndContent: LocalFileWithContent*) = fileNamesAndContent foreach setLocalFileWithContent
+    var config = ""
+    var baseConfig =
+    """
+      |s3_id: foo
+      |s3_secret: bar
+      |s3_bucket: bucket
+    """.stripMargin
+
+    implicit def site2: Site = siteWithFilesAndContent(config, localFilesWithContent)
+
+    def buildSite(
+                    config: String = "",
+                    baseConfig: String =
+                      """
+                        |s3_id: foo
+                        |s3_secret: bar
+                        |s3_bucket: bucket
+                      """.stripMargin
+                    ): Site = {
+      val configFile = new File(siteDir, "s3_website.yml")
+      write(configFile,
+        s"""
+          |$baseConfig
+          |$config
+        """.stripMargin
+      )
+      val errorOrSite: Either[ErrorReport, Site] = Site.loadSite(configFile.getAbsolutePath, siteDir.getAbsolutePath)
+      errorOrSite.left.foreach (error => throw new RuntimeException(error.reportMessage))
+      errorOrSite.right.get
+    }
 
-    def buildSite(config: Config = defaultConfig): Site = Site(siteDir.getAbsolutePath, config)
-
-    def siteWithFilesAndContent(config: Config = defaultConfig, localFilesWithContent: Seq[(String, String)]): Site = {
+    def siteWithFilesAndContent(config: String = "", localFilesWithContent: Seq[LocalFileWithContent]): Site = {
       localFilesWithContent.foreach {
         case (filePath, content) =>
           val file = new File(siteDir, filePath)
           FileUtils.forceMkdir(file.getParentFile)
           file.createNewFile()
-          FileUtils.write(file, content)
+          write(file, content)
       }
       buildSite(config)
     }
-
-    def siteWithFiles(config: Config = defaultConfig, localFiles: Seq[String]): Site =
-      siteWithFilesAndContent(config, localFilesWithContent = localFiles.map((_, "file contents")))
   }
 
   val defaultConfig = Config(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website_monadic
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2014-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -38,6 +38,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.5.5
+- !ruby/object:Gem::Dependency
+  name: colored
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement