s3_website 2.1.16 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed15b1ca2ef35ae9db46ac7fb1fe4551ab935457
-  data.tar.gz: 2dd43e7bcf6708f25e6ebd178cf91d96777cf244
+  metadata.gz: a0db818cde92ba72ae2bca269f676c18e63277ac
+  data.tar.gz: 20315d8fde0ef16cad751cf104f45eea931612d0
 SHA512:
-  metadata.gz: 9e94858d9c5de224370e6b91ec88f3eefa62e5662e084ff0ab3e3d8de9bc7162017f050ea7cd00d899265bec303f3d8875f4ad9d78a5bc8f78dde128a5e0dcaf
-  data.tar.gz: 99614f6a9649063480a9227a06429ed602eecc6bcedfbaa7eb0b695686a823bbc7c663a4298354a3f2fb4be438ed46359810d75722acbf0642d104d286f042df
+  metadata.gz: 0229a6d300c77da0ea0e01d151994c26fd7cd62fd84e64fdf6c58e7b1ee087b5a6f29bd8667ec7432efd3a6dfbf058facfb07aa90e764840be78c32aeb2c4fef
+  data.tar.gz: 03fd97df2738bd7a8e0b09f37e759d7de45b3075932bf828cdda04eae2667eb7f547b8563a4bb2b80e2d4c8a1acbbd36c892bc0fd4b9f8522dbd013febcc0abe

data/README.md

@@ -33,23 +33,19 @@ Here's how you can get started:
   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.
 
-### For Jekyll users
+### Specifying the location of your website
 
-S3_website will automatically discover your website in the *_site* directory.
+S3_website will automatically discover websites in the *_site* and
+*public/output* directories.
 
-### For Nanoc users
+If your website is not in either of those directories, you can
+point the location of your website in two ways:
 
-S3_website will automatically discover your website in the *public/output* directory.
-
-### For others
-
-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`.
+1. Add the line `site: path-to-your-website` into the `s3_website.yml` file
+2. Or, use the `--site=path-to-your-site` command-line argument
 
 If you want to store the `s3_website.yml` file in a directory other than
-the project's root you can specify the directory.
+the project's root you can specify the directory like so:
 `s3_website push --config-dir config`.
 
 ### Using environment variables

data/bin/s3_website

@@ -149,8 +149,6 @@ def autoinstall_java_or_print_help_and_exit(logger)
     exit 1
   end
 
-  manual_method_help =
-
   automatic_method = automatic_methods.find { |automatic_method|
     resolve_exit_status automatic_method.fetch(:package_manager_lookup)
   }

data/build.sbt

@@ -4,7 +4,7 @@ name := "s3_website"
 
 version := "0.0.1"
 
-scalaVersion := "2.11.1"
+scalaVersion := "2.11.2"
 
 scalacOptions += "-feature"
 
@@ -14,8 +14,6 @@ scalacOptions += "-language:postfixOps"
 
 scalacOptions += "-target:jvm-1.6"
 
-javacOptions in Compile ++= Seq("-source", "1.6", "-target", "1.6")
-
 libraryDependencies += "org.yaml" % "snakeyaml" % "1.13"
 
 libraryDependencies += "org.jruby" % "jruby" % "1.7.11"

data/changelog.md

@@ -2,6 +2,16 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 2.2.0
+
+* Specify the location of the website in the *s3_website.yml* file
+
+  Just add the setting `site: path-to-your-website` into the file.
+
+* Fix Nanoc auto detection
+
+  Previously, a website in *public/output* was not automatically detected.
+
 ## 2.1.16
 
 * Support non-US-ASCII files when using `ignore_on_server`

data/lib/s3_website/version.rb

@@ -1,3 +1,3 @@
 module S3Website
-  VERSION = '2.1.16'
+  VERSION = '2.2.0'
 end

data/resources/configuration_file_template.yml

@@ -5,6 +5,8 @@ s3_bucket: your.blog.bucket.com
 # Below are examples of all the available configurations.
 # See README for more detailed info on each of them.
 
+# site: path-to-your-website
+
 # max_age:
 #   "assets/*": 6000
 #   "*": 300

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

@@ -0,0 +1,18 @@
+package s3.website
+
+object ByteHelper {
+
+  // Adapted from http://stackoverflow.com/a/3758880/219947
+  def humanReadableByteCount(bytes: Long): String = {
+    val si: Boolean = true
+    val unit: Int = if (si) 1000 else 1024
+    if (bytes < unit) {
+      bytes + " B"
+    } else {
+      val exp: Int = (Math.log(bytes) / Math.log(unit)).asInstanceOf[Int]
+      val pre: String = (if (si) "kMGTPE" else "KMGTPE").charAt(exp - 1) + (if (si) "" else "i")
+      val formatArgs = (bytes / Math.pow(unit, exp)).asInstanceOf[AnyRef] :: pre :: Nil
+      String.format("%.1f %sB", formatArgs.toArray:_*)
+    }
+  }
+}

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

@@ -1,5 +1,6 @@
 package s3.website
 
+import s3.website.model.Config.S3_website_yml
 import s3.website.model.Site._
 import scala.concurrent.{ExecutionContextExecutor, Future, Await}
 import scala.concurrent.duration._
@@ -21,7 +22,6 @@ import s3.website.S3.S3Setting
 import s3.website.CloudFront.CloudFrontSetting
 import s3.website.S3.SuccessfulUpload
 import s3.website.CloudFront.FailedInvalidation
-import scala.Int
 import java.io.File
 import com.lexicalscope.jewel.cli.CliFactory.parseArguments
 import s3.website.ByteHelper.humanReadableByteCount
@@ -52,15 +52,11 @@ object Push {
       def dryRun = cliArgs.dryRun
     }
 
-    val errorOrSiteDir: ErrorOrFile =
-      Option(cliArgs.site).fold(Ssg.findSiteDirectory(workingDirectory))(siteDirFromCli => Right(new File(siteDirFromCli)))
-    def errorOrSite(siteInDirectory: File): Either[ErrorReport, Site] =
-      loadSite(Option(cliArgs.configDir).getOrElse(workingDirectory.getPath) + "/s3_website.yml", siteInDirectory.getAbsolutePath)
+    implicit val yamlConfig = S3_website_yml(new File(Option(cliArgs.configDir).getOrElse(workingDirectory.getPath) + "/s3_website.yml"))
 
-    val errorOrPushStatus = for {
-      siteInDirectory <- errorOrSiteDir.right
-      loadedSite <- errorOrSite(siteInDirectory).right
-    } yield {
+    val errorOrPushStatus = for (
+      loadedSite <- loadSite.right
+    ) yield {
       implicit val site = loadedSite
       val threadPool = newFixedThreadPool(site.config.concurrency_level)
       implicit val executor = fromExecutor(threadPool)

data/src/main/scala/s3/website/model/Config.scala

@@ -1,5 +1,7 @@
 package s3.website.model
 
+import java.io.File
+
 import scala.util.{Failure, Try}
 import scala.collection.JavaConversions._
 import s3.website.Ruby.rubyRuntime
@@ -11,6 +13,7 @@ case class Config(
   s3_secret:                  Option[String], // If undefined, use IAM Roles (http://docs.aws.amazon.com/AWSSdkDocsJava/latest/DeveloperGuide/java-dg-roles.html)
   s3_bucket:                  String,
   s3_endpoint:                S3Endpoint,
+  site:                       Option[String],
   max_age:                    Option[Either[Int, Map[String, Int]]],
   gzip:                       Option[Either[Boolean, Seq[String]]],
   gzip_zopfli:                Option[Boolean],
@@ -154,7 +157,7 @@ object Config {
       unsafeYaml.yamlObject.asInstanceOf[java.util.Map[String, _]].toMap get key
     }
 
-  def erbEval(erbString: String, yamlConfigPath: String): Try[String] = Try {
+  def erbEval(erbString: String, yamlConfig: S3_website_yml): Try[String] = Try {
     val erbStringWithoutComments = erbString.replaceAll("^\\s*#.*", "")
     rubyRuntime.evalScriptlet(
       s"""|# encoding: utf-8
@@ -167,9 +170,13 @@ object Config {
       """.stripMargin
     ).asJavaString()
   } match {
-    case Failure(err) => Failure(new RuntimeException(s"Failed to parse ERB in $yamlConfigPath:\n${err.getMessage}"))
+    case Failure(err) => Failure(new RuntimeException(s"Failed to parse ERB in $yamlConfig:\n${err.getMessage}"))
     case x => x
   }
 
   case class UnsafeYaml(yamlObject: AnyRef)
+
+  case class S3_website_yml(file: File) {
+    override def toString = file.getPath
+  }
 }

data/src/main/scala/s3/website/model/Site.scala

@@ -1,6 +1,9 @@
 package s3.website.model
 
 import java.io.File
+import s3.website.Push.CliArgs
+import s3.website.model.Ssg.autodetectSiteDir
+
 import scala.util.Try
 import org.yaml.snakeyaml.Yaml
 import s3.website.model.Config._
@@ -11,8 +14,8 @@ import scala.util.Failure
 import s3.website.model.Config.UnsafeYaml
 import scala.util.Success
 
-case class Site(rootDirectory: String, config: Config) {
-  def resolveS3Key(file: File) = file.getAbsolutePath.replace(rootDirectory, "").replaceFirst("^/", "")
+case class Site(rootDirectory: File, config: Config) {
+  def resolveS3Key(file: File) = file.getAbsolutePath.replace(rootDirectory.getAbsolutePath, "").replaceFirst("^/", "")
 
   def resolveFile(s3File: S3File): File = resolveFile(s3File.s3Key)
 
@@ -20,21 +23,22 @@ case class Site(rootDirectory: String, config: Config) {
 }
 
 object Site {
-  def loadSite(yamlConfigPath: String, siteRootDirectory: String)
-              (implicit logger: Logger): Either[ErrorReport, Site] = {
+  def parseConfig(implicit logger: Logger, yamlConfig: S3_website_yml): Either[ErrorReport, Config] = {
     val yamlObjectTry = for {
-      yamlString <- Try(fromFile(new File(yamlConfigPath)).mkString)
-      yamlWithErbEvaluated <- erbEval(yamlString, yamlConfigPath)
+      yamlString <- Try(fromFile(yamlConfig.file).mkString)
+      yamlWithErbEvaluated <- erbEval(yamlString, yamlConfig)
       yamlObject <- Try(new Yaml() load yamlWithErbEvaluated)
     } yield yamlObject
+
     yamlObjectTry match {
       case Success(yamlObject) =>
         implicit val unsafeYaml = UnsafeYaml(yamlObject)
-        val config: Either[ErrorReport, Config] = for {
+        for {
           s3_id <- loadOptionalString("s3_id").right
           s3_secret <- loadOptionalString("s3_secret").right
           s3_bucket <- loadRequiredString("s3_bucket").right
           s3_endpoint <- loadEndpoint.right
+          site <- loadOptionalString("site").right
           max_age <- loadMaxAge.right
           gzip <- loadOptionalBooleanOrStringSeq("gzip").right
           gzip_zopfli <- loadOptionalBoolean("gzip_zopfli").right
@@ -49,16 +53,17 @@ object Site {
         } yield {
           gzip_zopfli.foreach(_ => logger.info(
             """|Zopfli is not currently supported. Falling back to regular gzip.
-               |If you find a stable Java implementation for zopfli, please send an email to lauri.lehmijoki@iki.fi about it."""
-            .stripMargin))
+              |If you find a stable Java implementation for zopfli, please send an email to lauri.lehmijoki@iki.fi about it."""
+              .stripMargin))
           extensionless_mime_type.foreach(_ => logger.info(
-            s"Ignoring the extensionless_mime_type setting in $yamlConfigPath. Counting on Apache Tika to infer correct mime types.")
+            s"Ignoring the extensionless_mime_type setting in $yamlConfig. Counting on Apache Tika to infer correct mime types.")
           )
           Config(
             s3_id,
             s3_secret,
             s3_bucket,
             s3_endpoint getOrElse S3Endpoint.defaultEndpoint,
+            site,
             max_age,
             gzip,
             gzip_zopfli,
@@ -71,10 +76,38 @@ object Site {
             concurrency_level.fold(20)(_ max 20) // At minimum, run 20 concurrent operations
           )
         }
-
-        config.right.map(Site(siteRootDirectory, _))
       case Failure(error) =>
         Left(ErrorReport(error))
     }
   }
+
+  def loadSite(implicit yamlConfig: S3_website_yml, cliArgs: CliArgs, workingDirectory: File, logger: Logger): Either[ErrorReport, Site] =
+    parseConfig.right.flatMap { cfg =>
+      implicit val config: Config = cfg
+      val errorOrSiteDir = resolveSiteDir.fold(Left(ErrorReport(noSiteFound)): Either[ErrorReport, File])(Right(_))
+      errorOrSiteDir.right.map(Site(_, config))
+    }
+
+  val noSiteFound =
+    """|Could not find a website.
+       |Either use the --site=DIR command-line argument or define the location of the site in s3_website.yml.
+       |
+       |Here's an example of how you can define the site directory in s3_website.yml:
+       |   site: dist/website""".stripMargin
+
+  def resolveSiteDir(implicit yamlConfig: S3_website_yml, config: Config, cliArgs: CliArgs, workingDirectory: File): Option[File] = {
+    val siteFromAutoDetect = autodetectSiteDir(workingDirectory)
+    val siteFromCliArgs = Option(cliArgs.site).map(new File(_))
+
+    siteFromCliArgs orElse siteFromConfig orElse siteFromAutoDetect
+  }
+
+  def siteFromConfig(implicit yamlConfig: S3_website_yml, config: Config, workingDirectory: File): Option[File] =
+    config
+      .site
+      .map(new File(_))
+      .map { siteDir =>
+        if (siteDir.isAbsolute) siteDir
+        else new File(yamlConfig.file.getParentFile, siteDir.getPath)
+      }
 }

data/src/main/scala/s3/website/model/push.scala

@@ -142,7 +142,7 @@ object Files {
       if (doNotUpload) logger.debug(s"Excluded $s3Key from upload")
       doNotUpload
     }
-    recursiveListFiles(new File(site.rootDirectory))
+    recursiveListFiles(site.rootDirectory)
       .filterNot(_.isDirectory)
       .filterNot(f => excludeFromUpload(site.resolveS3Key(f)))
   }

data/src/main/scala/s3/website/model/ssg.scala

@@ -1,6 +1,7 @@
 package s3.website.model
 
 import java.io.File
+import s3.website.model.Files.recursiveListFiles
 import s3.website.{ErrorOrFile, ErrorReport}
 
 // ssg = static site generator
@@ -11,17 +12,10 @@ trait Ssg {
 object Ssg {
   val automaticallySupportedSiteGenerators = Jekyll :: Nanoc :: Nil
 
-  val notFoundErrorReport =
-    new ErrorReport {
-      def reportMessage =
-        """|Could not find a website in any of the pre-defined directories.
-           |Specify the website location with the --site=path argument and try again.""".stripMargin
+  def autodetectSiteDir(workingDirectory: File): Option[File] =
+    recursiveListFiles(workingDirectory).find { file =>
+      file.isDirectory && automaticallySupportedSiteGenerators.exists(ssg => file.getAbsolutePath.endsWith(ssg.outputDirectory))
     }
-
-  def findSiteDirectory(workingDirectory: File): ErrorOrFile =
-    Files.recursiveListFiles(workingDirectory).find { file =>
-      file.isDirectory && automaticallySupportedSiteGenerators.exists(_.outputDirectory == file.getName)
-    }.fold(Left(notFoundErrorReport): ErrorOrFile)(Right(_))
 }
 
 case object Jekyll extends Ssg {

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

@@ -1,40 +1,37 @@
 package s3.website
 
-import org.specs2.mutable.{BeforeAfter, After, Specification}
-import s3.website.model._
-import org.specs2.specification.Scope
-import org.apache.commons.io.FileUtils
 import java.io.File
-import scala.util.Random
-import org.mockito.{Mockito, Matchers, ArgumentCaptor}
-import org.mockito.Mockito._
+import java.util.concurrent.atomic.AtomicInteger
+
+import com.amazonaws.AmazonServiceException
+import com.amazonaws.services.cloudfront.AmazonCloudFront
+import com.amazonaws.services.cloudfront.model.{CreateInvalidationRequest, CreateInvalidationResult, TooManyInvalidationsInProgressException}
 import com.amazonaws.services.s3.AmazonS3
 import com.amazonaws.services.s3.model._
-import scala.concurrent.duration._
-import s3.website.S3.S3Setting
-import scala.collection.JavaConversions._
-import com.amazonaws.AmazonServiceException
 import org.apache.commons.codec.digest.DigestUtils._
-import s3.website.CloudFront.CloudFrontSetting
-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 java.util.concurrent.atomic.AtomicInteger
+import org.apache.commons.io.FileUtils
 import org.apache.commons.io.FileUtils._
-import scala.collection.mutable
-import s3.website.Push.{push, CliArgs}
-import s3.website.CloudFront.CloudFrontSetting
-import s3.website.S3.S3Setting
-import org.apache.commons.codec.digest.DigestUtils
-import java.util.Date
+import org.mockito.Mockito._
+import org.mockito.invocation.InvocationOnMock
+import org.mockito.stubbing.Answer
+import org.mockito.{ArgumentCaptor, Matchers, Mockito}
+import org.specs2.mutable.{BeforeAfter, Specification}
+import org.specs2.specification.Scope
 import s3.website.CloudFront.CloudFrontSetting
+import s3.website.Push.{CliArgs}
 import s3.website.S3.S3Setting
+import s3.website.model.Config.S3_website_yml
+import s3.website.model.Ssg.automaticallySupportedSiteGenerators
+import s3.website.model._
+
+import scala.collection.JavaConversions._
+import scala.concurrent.duration._
+import scala.util.Random
 
 class S3WebsiteSpec extends Specification {
 
   "gzip: true" should {
-    "update a gzipped S3 object if the contents has changed" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "update a gzipped S3 object if the contents has changed" in new BasicSetup {
       config = "gzip: true"
       setLocalFileWithContent(("styles.css", "<h1>hi again</h1>"))
       setS3Files(S3File("styles.css", "1c5117e5839ad8fc00ce3c41296255a1" /* md5 of the gzip of the file contents */))
@@ -42,7 +39,7 @@ class S3WebsiteSpec extends Specification {
       sentPutObjectRequest.getKey must equalTo("styles.css")
     }
 
-    "not update a gzipped S3 object if the contents has not changed" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "not update a gzipped S3 object if the contents has not changed" in new BasicSetup {
       config = "gzip: true"
       setLocalFileWithContent(("styles.css", "<h1>hi</h1>"))
       setS3Files(S3File("styles.css", "1c5117e5839ad8fc00ce3c41296255a1" /* md5 of the gzip of the file contents */))
@@ -55,7 +52,7 @@ class S3WebsiteSpec extends Specification {
     gzip:
       - .xml
   """ should {
-    "update a gzipped S3 object if the contents has changed" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "update a gzipped S3 object if the contents has changed" in new BasicSetup {
       config = """
         |gzip:
         |  - .xml
@@ -68,40 +65,40 @@ class S3WebsiteSpec extends Specification {
   }
 
   "push" should {
-    "not upload a file if it has not changed" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "not upload a file if it has not changed" in new BasicSetup {
       setLocalFileWithContent(("index.html", "<div>hello</div>"))
       setS3Files(S3File("index.html", md5Hex("<div>hello</div>")))
       push
       noUploadsOccurred must beTrue
     }
 
-    "update a file if it has changed" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "update a file if it has changed" in new BasicSetup {
       setLocalFileWithContent(("index.html", "<h1>old text</h1>"))
       setS3Files(S3File("index.html", md5Hex("<h1>new text</h1>")))
       push
       sentPutObjectRequest.getKey must equalTo("index.html")
     }
 
-    "create a file if does not exist on S3" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "create a file if does not exist on S3" in new BasicSetup {
       setLocalFile("index.html")
       push
       sentPutObjectRequest.getKey must equalTo("index.html")
     }
 
-    "delete files that are on S3 but not on local file system" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "delete files that are on S3 but not on local file system" in new BasicSetup {
       setS3Files(S3File("old.html", md5Hex("<h1>old text</h1>")))
       push
       sentDelete must equalTo("old.html")
     }
 
-    "try again if the upload fails" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "try again if the upload fails" in new BasicSetup {
       setLocalFile("index.html")
       uploadFailsAndThenSucceeds(howManyFailures = 5)
       push
       verify(amazonS3Client, times(6)).putObject(Matchers.any(classOf[PutObjectRequest]))
     }
 
-    "not try again if the upload fails on because of invalid credentials" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "not try again if the upload fails on because of invalid credentials" in new BasicSetup {
       setLocalFile("index.html")
       when(amazonS3Client.putObject(Matchers.any(classOf[PutObjectRequest]))).thenThrow {
         val e = new AmazonServiceException("your credentials are incorrect")
@@ -112,7 +109,7 @@ class S3WebsiteSpec extends Specification {
       verify(amazonS3Client, times(1)).putObject(Matchers.any(classOf[PutObjectRequest]))
     }
 
-    "try again if the request times out"  in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "try again if the request times out"  in new BasicSetup {
       var attempt = 0
       when(amazonS3Client putObject Matchers.any(classOf[PutObjectRequest])) thenAnswer new Answer[PutObjectResult] {
         def answer(invocation: InvocationOnMock) = {
@@ -132,14 +129,14 @@ class S3WebsiteSpec extends Specification {
       verify(amazonS3Client, times(2)).putObject(Matchers.any(classOf[PutObjectRequest]))
     }
 
-    "try again if the delete fails" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "try again if the delete fails" in new BasicSetup {
       setS3Files(S3File("old.html", md5Hex("<h1>old text</h1>")))
       deleteFailsAndThenSucceeds(howManyFailures = 5)
       push
       verify(amazonS3Client, times(6)).deleteObject(Matchers.anyString(), Matchers.anyString())
     }
 
-    "try again if the object listing fails" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "try again if the object listing fails" in new BasicSetup {
       setS3Files(S3File("old.html", md5Hex("<h1>old text</h1>")))
       objectListingFailsAndThenSucceeds(howManyFailures = 5)
       push
@@ -148,7 +145,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "push with CloudFront" should {
-    "invalidate the updated CloudFront items" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "invalidate the updated CloudFront items" in new BasicSetup {
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFiles("css/test.css", "articles/index.html")
       setOutdatedS3Keys("css/test.css", "articles/index.html")
@@ -156,14 +153,14 @@ class S3WebsiteSpec extends Specification {
       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 AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "not send CloudFront invalidation requests on new objects"  in new BasicSetup {
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("newfile.js")
       push
       noInvalidationsOccurred must beTrue
     }
 
-    "not send CloudFront invalidation requests on redirect objects" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "not send CloudFront invalidation requests on redirect objects" in new BasicSetup {
       config = """
         |cloudfront_distribution_id: EGM1J2JJX9Z
         |redirects:
@@ -173,7 +170,7 @@ class S3WebsiteSpec extends Specification {
       noInvalidationsOccurred must beTrue
     }
 
-    "retry CloudFront responds with TooManyInvalidationsInProgressException" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "retry CloudFront responds with TooManyInvalidationsInProgressException" in new BasicSetup {
       setTooManyInvalidationsInProgress(4)
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("test.css")
@@ -182,7 +179,7 @@ class S3WebsiteSpec extends Specification {
       sentInvalidationRequests.length must equalTo(4)
     }
 
-    "retry if CloudFront is temporarily unreachable" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "retry if CloudFront is temporarily unreachable" in new BasicSetup {
       invalidationsFailAndThenSucceed(5)
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("test.css")
@@ -191,7 +188,7 @@ class S3WebsiteSpec extends Specification {
       sentInvalidationRequests.length must equalTo(6)
     }
 
-    "encode unsafe characters in the keys" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "encode unsafe characters in the keys" in new BasicSetup {
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("articles/arnold's file.html")
       setOutdatedS3Keys("articles/arnold's file.html")
@@ -199,7 +196,7 @@ class S3WebsiteSpec extends Specification {
       sentInvalidationRequest.getInvalidationBatch.getPaths.getItems.toSeq.sorted must equalTo(("/articles/arnold's%20file.html" :: Nil).sorted)
     }
 
-    "invalidate the root object '/' if a top-level object is updated or deleted" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "invalidate the root object '/' if a top-level object is updated or deleted" in new BasicSetup {
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("maybe-index.html")
       setOutdatedS3Keys("maybe-index.html")
@@ -209,7 +206,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "cloudfront_invalidate_root: true" should {
-    "convert CloudFront invalidation paths with the '/index.html' suffix into '/'"  in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "convert CloudFront invalidation paths with the '/index.html' suffix into '/'"  in new BasicSetup {
       config = """
         |cloudfront_distribution_id: EGM1J2JJX9Z
         |cloudfront_invalidate_root: true
@@ -222,7 +219,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "a site with over 1000 items" should {
-    "split the CloudFront invalidation requests into batches of 1000 items" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "split the CloudFront invalidation requests into batches of 1000 items" in new BasicSetup {
       val files = (1 to 1002).map { i => s"lots-of-files/file-$i"}
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFiles(files:_*)
@@ -235,18 +232,18 @@ class S3WebsiteSpec extends Specification {
   }
 
   "push exit status" should {
-    "be 0 all uploads succeed" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "be 0 all uploads succeed" in new BasicSetup {
       setLocalFiles("file.txt")
       push must equalTo(0)
     }
 
-    "be 1 if any of the uploads fails" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "be 1 if any of the uploads fails" in new BasicSetup {
       setLocalFiles("file.txt")
       when(amazonS3Client.putObject(Matchers.any(classOf[PutObjectRequest]))).thenThrow(new AmazonServiceException("AWS failed"))
       push must equalTo(1)
     }
 
-    "be 1 if any of the redirects fails" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "be 1 if any of the redirects fails" in new BasicSetup {
       config = """
         |redirects:
         |  index.php: /index.html
@@ -255,14 +252,14 @@ class S3WebsiteSpec extends Specification {
       push must equalTo(1)
     }
 
-    "be 0 if CloudFront invalidations and uploads succeed"in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "be 0 if CloudFront invalidations and uploads succeed"in new BasicSetup {
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("test.css")
       setOutdatedS3Keys("test.css")
       push must equalTo(0)
     }
 
-    "be 1 if CloudFront is unreachable or broken"in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "be 1 if CloudFront is unreachable or broken"in new BasicSetup {
       setCloudFrontAsInternallyBroken()
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("test.css")
@@ -270,19 +267,19 @@ class S3WebsiteSpec extends Specification {
       push must equalTo(1)
     }
 
-    "be 0 if upload retry succeeds" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "be 0 if upload retry succeeds" in new BasicSetup {
       setLocalFile("index.html")
       uploadFailsAndThenSucceeds(howManyFailures = 1)
       push must equalTo(0)
     }
 
-    "be 1 if delete retry fails" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "be 1 if delete retry fails" in new BasicSetup {
       setLocalFile("index.html")
       uploadFailsAndThenSucceeds(howManyFailures = 6)
       push must equalTo(1)
     }
 
-    "be 1 if an object listing fails" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "be 1 if an object listing fails" in new BasicSetup {
       setS3Files(S3File("old.html", md5Hex("<h1>old text</h1>")))
       objectListingFailsAndThenSucceeds(howManyFailures = 6)
       push must equalTo(1)
@@ -290,7 +287,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "s3_website.yml file" should {
-    "never be uploaded" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "never be uploaded" in new BasicSetup {
       setLocalFile("s3_website.yml")
       push
       noUploadsOccurred must beTrue
@@ -298,7 +295,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   ".env file" should { // The .env file is the https://github.com/bkeepers/dotenv file
-    "never be uploaded" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "never be uploaded" in new BasicSetup {
       setLocalFile(".env")
       push
       noUploadsOccurred must beTrue
@@ -306,7 +303,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "exclude_from_upload: string" should {
-    "result in matching files not being uploaded" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "result in matching files not being uploaded" in new BasicSetup {
       config = "exclude_from_upload: .DS_.*?"
       setLocalFile(".DS_Store")
       push
@@ -319,7 +316,7 @@ class S3WebsiteSpec extends Specification {
        - regex
        - another_exclusion
   """ should {
-    "result in matching files not being uploaded" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "result in matching files not being uploaded" in new BasicSetup {
       config = """
         |exclude_from_upload:
         |  - .DS_.*?
@@ -332,14 +329,14 @@ class S3WebsiteSpec extends Specification {
   }
 
   "ignore_on_server: value" should {
-    "not delete the S3 objects that match the ignore value" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "not delete the S3 objects that match the ignore value" in new BasicSetup {
       config = "ignore_on_server: logs"
       setS3Files(S3File("logs/log.txt", ""))
       push
       noDeletesOccurred must beTrue
     }
 
-    "support non-US-ASCII files"  in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "support non-US-ASCII files"  in new BasicSetup {
       setS3Files(S3File("tags/笔记/test.html", ""))
       config = "ignore_on_server: tags/笔记/test.html"
       push
@@ -352,7 +349,7 @@ class S3WebsiteSpec extends Specification {
        - regex
        - another_ignore
   """ should {
-    "not delete the S3 objects that match the ignore value" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "not delete the S3 objects that match the ignore value" in new BasicSetup {
       config = """
         |ignore_on_server:
         |  - .*txt
@@ -362,7 +359,7 @@ class S3WebsiteSpec extends Specification {
       noDeletesOccurred must beTrue
     }
 
-    "support non-US-ASCII files"  in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "support non-US-ASCII files" in new BasicSetup {
       setS3Files(S3File("tags/笔记/test.html", ""))
       config = """
                  |ignore_on_server:
@@ -373,15 +370,51 @@ class S3WebsiteSpec extends Specification {
     }
   }
 
+  "site in config" should {
+    "let the user deploy a site from a custom location" in new CustomSiteDirectory with EmptySite with MockAWS with DefaultRunMode {
+      config = s"site: $siteDirectory"
+      setLocalFile(".vimrc")
+
+      new File(siteDirectory, ".vimrc").exists() must beTrue // Sanity check
+      siteDirectory must not equalTo workingDirectory // Sanity check
+
+      push
+      sentPutObjectRequest.getKey must equalTo(".vimrc")
+    }
+
+    "not override the --site command-line switch" in new BasicSetup {
+      config = s"site: dir-that-does-not-exist"
+      setLocalFile(".vimrc") // This creates a file in the directory into which the --site CLI arg points
+      push
+      sentPutObjectRequest.getKey must equalTo(".vimrc")
+    }
+
+    automaticallySupportedSiteGenerators foreach { siteGenerator =>
+      "override an automatically detected site" in new CustomSiteDirectory with EmptySite with MockAWS with DefaultRunMode {
+        addContentToAutomaticallyDetectedSite(workingDirectory)
+        config = s"site: $siteDirectory"
+        setLocalFile(".vimrc") // Add content to the custom site directory
+        push
+        sentPutObjectRequest.getKey must equalTo(".vimrc")
+      }
+
+      def addContentToAutomaticallyDetectedSite(workingDirectory: File) {
+        val automaticallyDetectedSiteDir = new File(workingDirectory, siteGenerator.outputDirectory)
+        automaticallyDetectedSiteDir.mkdirs()
+        write(new File(automaticallyDetectedSiteDir, ".bashrc"), "echo hello")
+      }
+    }
+  }
+
   "max-age in config" can {
-    "be applied to all files" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "be applied to all files" in new BasicSetup {
       config = "max_age: 60"
       setLocalFile("index.html")
       push
       sentPutObjectRequest.getMetadata.getCacheControl must equalTo("max-age=60")
     }
 
-    "be applied to files that match the glob" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "be applied to files that match the glob" in new BasicSetup {
       config = """
         |max_age:
         |  "*.html": 90
@@ -391,7 +424,7 @@ class S3WebsiteSpec extends Specification {
       sentPutObjectRequest.getMetadata.getCacheControl must equalTo("max-age=90")
     }
 
-    "be applied to directories that match the glob" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "be applied to directories that match the glob" in new BasicSetup {
       config = """
         |max_age:
         |  "assets/**/*.js": 90
@@ -401,7 +434,7 @@ class S3WebsiteSpec extends Specification {
       sentPutObjectRequest.getMetadata.getCacheControl must equalTo("max-age=90")
     }
 
-    "not be applied if the glob doesn't match" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "not be applied if the glob doesn't match" in new BasicSetup {
       config = """
         |max_age:
         |  "*.js": 90
@@ -411,14 +444,14 @@ class S3WebsiteSpec extends Specification {
       sentPutObjectRequest.getMetadata.getCacheControl must beNull
     }
 
-    "be used to disable caching" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "be used to disable caching" in new BasicSetup {
       config = "max_age: 0"
       setLocalFile("index.html")
       push
       sentPutObjectRequest.getMetadata.getCacheControl must equalTo("no-cache; max-age=0")
     }
 
-    "support non-US-ASCII directory names"  in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "support non-US-ASCII directory names"  in new BasicSetup {
       config = """
         |max_age:
         |  "*": 21600
@@ -429,7 +462,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "max-age in config" should {
-    "respect the more specific glob" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "respect the more specific glob" in new BasicSetup {
       config = """
         |max_age:
         |  "assets/*": 150
@@ -443,7 +476,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "s3_reduced_redundancy: true in config" should {
-    "result in uploads being marked with reduced redundancy" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "result in uploads being marked with reduced redundancy" in new BasicSetup {
       config = "s3_reduced_redundancy: true"
       setLocalFile("file.exe")
       push
@@ -452,7 +485,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "s3_reduced_redundancy: false in config" should {
-    "result in uploads being marked with the default storage class" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "result in uploads being marked with the default storage class" in new BasicSetup {
       config = "s3_reduced_redundancy: false"
       setLocalFile("file.exe")
       push
@@ -461,7 +494,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "redirect in config" should {
-    "result in a redirect instruction that is sent to AWS" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "result in a redirect instruction that is sent to AWS" in new BasicSetup {
       config = """
         |redirects:
         |  index.php: /index.html
@@ -470,7 +503,7 @@ class S3WebsiteSpec extends Specification {
       sentPutObjectRequest.getRedirectLocation must equalTo("/index.html")
     }
 
-    "add slash to the redirect target" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "add slash to the redirect target" in new BasicSetup {
       config = """
                  |redirects:
                  |  index.php: index.html
@@ -479,7 +512,7 @@ class S3WebsiteSpec extends Specification {
       sentPutObjectRequest.getRedirectLocation must equalTo("/index.html")
     }
 
-    "support external redirects" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "support external redirects" in new BasicSetup {
       config = """
                  |redirects:
                  |  index.php: http://www.youtube.com/watch?v=dQw4w9WgXcQ
@@ -488,7 +521,7 @@ class S3WebsiteSpec extends Specification {
       sentPutObjectRequest.getRedirectLocation must equalTo("http://www.youtube.com/watch?v=dQw4w9WgXcQ")
     }
 
-    "support external redirects that point to an HTTPS target" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "support external redirects that point to an HTTPS target" in new BasicSetup {
       config = """
                  |redirects:
                  |  index.php: https://www.youtube.com/watch?v=dQw4w9WgXcQ
@@ -497,7 +530,7 @@ class S3WebsiteSpec extends Specification {
       sentPutObjectRequest.getRedirectLocation must equalTo("https://www.youtube.com/watch?v=dQw4w9WgXcQ")
     }
 
-    "result in max-age=0 Cache-Control header on the object" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "result in max-age=0 Cache-Control header on the object" in new BasicSetup {
       config = """
         |redirects:
         |  index.php: /index.html
@@ -508,7 +541,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "redirect in config and an object on the S3 bucket" should {
-    "not result in the S3 object being deleted" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "not result in the S3 object being deleted" in new BasicSetup {
       config = """
         |redirects:
         |  index.php: /index.html
@@ -521,7 +554,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "dotfiles" should {
-    "be included in the pushed files" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "be included in the pushed files" in new BasicSetup {
       setLocalFile(".vimrc")
       push
       sentPutObjectRequest.getKey must equalTo(".vimrc")
@@ -529,25 +562,25 @@ class S3WebsiteSpec extends Specification {
   }
 
   "content type inference" should {
-    "add charset=utf-8 to all html documents" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "add charset=utf-8 to all html documents" in new BasicSetup {
       setLocalFile("index.html")
       push
       sentPutObjectRequest.getMetadata.getContentType must equalTo("text/html; charset=utf-8")
     }
 
-    "add charset=utf-8 to all text documents" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "add charset=utf-8 to all text documents" in new BasicSetup {
       setLocalFile("index.txt")
       push
       sentPutObjectRequest.getMetadata.getContentType must equalTo("text/plain; charset=utf-8")
     }
 
-    "add charset=utf-8 to all json documents" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "add charset=utf-8 to all json documents" in new BasicSetup {
       setLocalFile("data.json")
       push
       sentPutObjectRequest.getMetadata.getContentType must equalTo("application/json; charset=utf-8")
     }
 
-    "resolve the content type from file contents" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "resolve the content type from file contents" in new BasicSetup {
       setLocalFileWithContent(("index", "<html><body><h1>hi</h1></body></html>"))
       push
       sentPutObjectRequest.getMetadata.getContentType must equalTo("text/html; charset=utf-8")
@@ -555,7 +588,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "ERB in config file" should {
-    "be evaluated"  in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+    "be evaluated"  in new BasicSetup {
       config = """
         |redirects:
         |<%= ('a'..'f').to_a.map do |t| '  '+t+ ': /'+t+'.html' end.join('\n')%>
@@ -567,14 +600,14 @@ class S3WebsiteSpec extends Specification {
   }
 
   "dry run" should {
-    "not push updates" in new AllInSameDirectory with EmptySite with MockAWS with DryRunMode {
+    "not push updates" in new SiteLocationFromCliArg with EmptySite with MockAWS with DryRunMode {
       setLocalFileWithContent(("index.html", "<div>new</div>"))
       setS3Files(S3File("index.html", md5Hex("<div>old</div>")))
       push
       noUploadsOccurred must beTrue
     }
 
-    "not push redirects" in new AllInSameDirectory with EmptySite with MockAWS with DryRunMode {
+    "not push redirects" in new SiteLocationFromCliArg with EmptySite with MockAWS with DryRunMode {
       config =
         """
           |redirects:
@@ -584,19 +617,19 @@ class S3WebsiteSpec extends Specification {
       noUploadsOccurred must beTrue
     }
 
-    "not push deletes" in new AllInSameDirectory with EmptySite with MockAWS with DryRunMode {
+    "not push deletes" in new SiteLocationFromCliArg with EmptySite with MockAWS with DryRunMode {
       setS3Files(S3File("index.html", md5Hex("<div>old</div>")))
       push
       noUploadsOccurred must beTrue
     }
 
-    "not push new files" in new AllInSameDirectory with EmptySite with MockAWS with DryRunMode {
+    "not push new files" in new SiteLocationFromCliArg with EmptySite with MockAWS with DryRunMode {
       setLocalFile("index.html")
       push
       noUploadsOccurred must beTrue
     }
-    
-    "not invalidate files" in new AllInSameDirectory with EmptySite with MockAWS with DryRunMode {
+
+    "not invalidate files" in new SiteLocationFromCliArg with EmptySite with MockAWS with DryRunMode {
       config = "cloudfront_invalidation_id: AABBCC"
       setS3Files(S3File("index.html", md5Hex("<div>old</div>")))
       push
@@ -619,6 +652,8 @@ class S3WebsiteSpec extends Specification {
       sentPutObjectRequests.length must equalTo(1)
     }
   }
+  
+  trait BasicSetup extends SiteLocationFromCliArg with EmptySite with MockAWS with DefaultRunMode
 
   trait DefaultRunMode {
     implicit def pushMode: PushMode = new PushMode {
@@ -633,7 +668,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   trait MockAWS extends MockS3 with MockCloudFront with Scope
-  
+
   trait MockCloudFront extends MockAWSHelper {
     val amazonCloudFrontClient = mock(classOf[AmazonCloudFront])
     implicit val cfSettings: CloudFrontSetting = CloudFrontSetting(
@@ -677,7 +712,7 @@ class S3WebsiteSpec extends Specification {
       when(amazonCloudFrontClient.createInvalidation(Matchers.anyObject())).thenThrow(new AmazonServiceException("CloudFront is down"))
     }
   }
-  
+
   trait MockS3 extends MockAWSHelper {
     val amazonS3Client = mock(classOf[AmazonS3])
     implicit val s3Settings: S3Setting = S3Setting(
@@ -754,7 +789,7 @@ class S3WebsiteSpec extends Specification {
       true // Mockito is based on exceptions
     }
 
-    type S3Key = String 
+    type S3Key = String
   }
 
   trait MockAWSHelper {
@@ -770,8 +805,10 @@ class S3WebsiteSpec extends Specification {
   }
 
   trait Directories extends BeforeAfter {
-    implicit final val workingDirectory: File = new File(FileUtils.getTempDirectory, "s3_website_dir" + Random.nextLong())
-    val siteDirectory: File // Represents the --site=X option
+    def randomDir() = new File(FileUtils.getTempDirectory, "s3_website_dir" + Random.nextLong())
+    implicit final val workingDirectory: File = randomDir()
+    implicit def yamlConfig: S3_website_yml = S3_website_yml(new File(workingDirectory, "s3_website.yml"))
+    val siteDirectory: File
     val configDirectory: File = workingDirectory // Represents the --config-dir=X option
 
     def before {
@@ -785,22 +822,28 @@ class S3WebsiteSpec extends Specification {
     }
   }
 
-  /**
-   * Represents the situation where the current working directory, site dir and config dir are in the same directory
-   */
-  trait AllInSameDirectory extends Directories {
+  trait SiteLocationFromCliArg extends Directories {
     val siteDirectory = workingDirectory
+    val siteDirFromCLIArg = true
   }
 
   trait JekyllSite extends Directories {
     val siteDirectory = new File(workingDirectory, "_site")
+    val siteDirFromCLIArg = false
   }
 
   trait NanocSite extends Directories {
     val siteDirectory = new File(workingDirectory, "public/output")
+    val siteDirFromCLIArg = false
   }
-  
+
+  trait CustomSiteDirectory extends Directories {
+    val siteDirectory = randomDir()
+    val siteDirFromCLIArg = false
+  }
+
   trait EmptySite extends Directories {
+    val siteDirFromCLIArg: Boolean
     type LocalFileWithContent = (String, String)
 
     def setLocalFile(fileName: String) = setLocalFileWithContent((fileName, ""))
@@ -812,6 +855,7 @@ class S3WebsiteSpec extends Specification {
       file.createNewFile()
       write(file, fileNameAndContent._2)
     }
+
     var config = ""
     val baseConfig =
     """
@@ -820,34 +864,38 @@ class S3WebsiteSpec extends Specification {
       |s3_bucket: bucket
     """.stripMargin
 
-    implicit def cliArgs: CliArgs = buildCliArgs(config)
-    def pushMode: PushMode // Represents the --dry-run switch
-
-    private def buildCliArgs(
-                    config: String = "",
-                    baseConfig: String =
-                      """
-                        |s3_id: foo
-                        |s3_secret: bar
-                        |s3_bucket: bucket
-                      """.stripMargin
-                    ): CliArgs = {
-      val configFile = new File(configDirectory, "s3_website.yml")
-      write(configFile,
+    implicit def configString: ConfigString =
+      ConfigString(
         s"""
           |$baseConfig
           |$config
         """.stripMargin
       )
+
+    def pushMode: PushMode // Represents the --dry-run switch
+
+    implicit def cliArgs: CliArgs =
       new CliArgs {
-        override def verbose = true
+        def verbose = true
 
-        override def dryRun = pushMode.dryRun
+        def dryRun = pushMode.dryRun
 
-        override def site = siteDirectory.getAbsolutePath
+        def site = if (siteDirFromCLIArg) siteDirectory.getAbsolutePath else null
 
-        override def configDir = configDirectory.getAbsolutePath
+        def configDir = configDirectory.getAbsolutePath
       }
-    }
   }
+
+  def push(implicit
+           emptyYamlConfig: S3_website_yml,
+           configString: ConfigString,
+           cliArgs: CliArgs,
+           s3Settings: S3Setting,
+           cloudFrontSettings: CloudFrontSetting,
+           workingDirectory: File) = {
+    write(emptyYamlConfig.file, configString.yaml) // Write the yaml config lazily, so that the tests can override the default yaml config
+    Push.push
+  }
+
+  case class ConfigString(yaml: String)
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 2.1.16
+  version: 2.2.0
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-06 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -126,8 +126,8 @@ files:
 - resources/s3_website.jar.md5
 - s3_website.gemspec
 - sbt
-- src/main/java/s3/website/ByteHelper.java
 - src/main/resources/log4j.properties
+- src/main/scala/s3/website/ByteHelper.scala
 - src/main/scala/s3/website/CloudFront.scala
 - src/main/scala/s3/website/Diff.scala
 - src/main/scala/s3/website/Logger.scala

data/src/main/java/s3/website/ByteHelper.java

@@ -1,14 +0,0 @@
-package s3.website;
-
-public class ByteHelper {
-
-    // Adapted from http://stackoverflow.com/a/3758880/219947
-    public static String humanReadableByteCount(long bytes) {
-        boolean si = true;
-        int unit = si ? 1000 : 1024;
-        if (bytes < unit) return bytes + " B";
-        int exp = (int) (Math.log(bytes) / Math.log(unit));
-        String pre = (si ? "kMGTPE" : "KMGTPE").charAt(exp-1) + (si ? "" : "i");
-        return String.format("%.1f %sB", bytes / Math.pow(unit, exp), pre);
-    }
-}