s3_website 2.7.3 → 2.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d697820d3714dc4f00c997a1424c199d8786691
-  data.tar.gz: 9929b4a2e0d951b8bb58556b0aebca80ee36a82c
+  metadata.gz: 30adad59b826ea4b90e8f5caafd9a203ccfdf053
+  data.tar.gz: 6e3db53bfcfe0d88d5567300831062bb3f6672de
 SHA512:
-  metadata.gz: f8c31db585bdc5d527b90dba36a21e73ec8520eb074feab11ba19aef1a6e01dc7b3faba1c209e720dc7cf0b2768c5cebeb1b97fff8314c8e3675ca3f4ea28766
-  data.tar.gz: 9057ccc704fcd6a31348b4acb36d85cb7f4e23c5236b5e22f2ae63689b4ba5e2c379ddbb0d5595ca1e1caab2b8a055f885a0d1c9317539cc639aea4b73f21bc3
+  metadata.gz: 20b06946d5644940c64c9817c8e1710b80d2c5ee83078bbf34796d828ca090585a246f6e255509a1b7b83512d906dc5fc46b27a2e79408678e75ffee84e34ca3
+  data.tar.gz: 349e3aebe7e012b497d08612b50156f23fc35fd2ca6f8969da4599250aa8f74602306c9871843acf3e3ff89c5362830b4d40af470d165123affbaf935f9ba5d6

data/changelog.md

@@ -2,6 +2,12 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 2.7.4
+
+* Show a helpful error message if the configured site is missing
+
+  See <https://github.com/laurilehmijoki/s3_website/issues/144> for discussion.
+
 ## 2.7.3
 
 * Support valid URI characters in max_age glob

data/lib/s3_website/version.rb

@@ -1,3 +1,3 @@
 module S3Website
-  VERSION = '2.7.3'
+  VERSION = '2.7.4'
 end

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

@@ -1,8 +1,6 @@
 package s3.website
 
-import scala.util.Try
-
-class Logger(val verboseOutput: Boolean) {
+class Logger(val verboseOutput: Boolean, onLog: Option[(String) => _] = None) {
   def debug(msg: String) = if (verboseOutput) log(Debug, msg)
   def info(msg: String) = log(Info, msg)
   def fail(msg: String) = log(Failure, msg)
@@ -12,9 +10,11 @@ class Logger(val verboseOutput: Boolean) {
 
   def pending(msg: String) = log(Wait, msg)
 
-  private def log(logType: LogType, msgRaw: String): Try[Unit] = {
+  private def log(logType: LogType, msgRaw: String) = {
     val msg = msgRaw.replaceAll("\\n", "\n       ") // Indent new lines, so that they arrange nicely with other log lines
-    Try(println(s"[$logType] $msg"))
+    val decoratedLogMessage = s"[$logType] $msg"
+    onLog.foreach(_(decoratedLogMessage))
+    println(decoratedLogMessage)
   }
 
   sealed trait LogType {

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

@@ -32,9 +32,11 @@ object Push {
 
   def main(args: Array[String]) {
     implicit val cliArgs = parseArguments(classOf[CliArgs], args:_*)
+    implicit val logger: Logger = new Logger(cliArgs.verbose)
     implicit val s3Settings = S3Setting()
     implicit val cloudFrontSettings = CloudFrontSetting()
     implicit val workingDirectory = new File(System.getProperty("user.dir")).getAbsoluteFile
+
     System exit push
   }
 
@@ -48,8 +50,7 @@ object Push {
     @Option(longName = Array("force")) def force: Boolean
   }
 
-  def push(implicit cliArgs: CliArgs, s3Settings: S3Setting, cloudFrontSettings: CloudFrontSetting, workingDirectory: File): ExitCode = {
-    implicit val logger: Logger = new Logger(cliArgs.verbose)
+  def push(implicit cliArgs: CliArgs, s3Settings: S3Setting, cloudFrontSettings: CloudFrontSetting, workingDirectory: File, logger: Logger): ExitCode = {
     implicit val pushOptions = new PushOptions {
       def dryRun = cliArgs.dryRun
       def force  = cliArgs.force

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

@@ -86,30 +86,61 @@ object Site {
   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))
+      resolveSiteDir.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 noSiteFound(explanation: String) =
+    s"""|
+        |$explanation.
+        |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] = {
+  def resolveSiteDir(implicit yamlConfig: S3_website_yml, config: Config, cliArgs: CliArgs, workingDirectory: File): Either[ErrorReport, File] = {
     val siteFromAutoDetect = autodetectSiteDir(workingDirectory)
-    val siteFromCliArgs = Option(cliArgs.site).map(new File(_))
+    val errOrSiteFromCliArgs: Either[ErrorReport, Option[File]] = Option(cliArgs.site) match {
+      case Some(siteDirFromCliArgs) =>
+        val f = new File(siteDirFromCliArgs)
+        if (f.exists())
+          Right(Some(f))
+        else
+          Left(ErrorReport(noSiteFound(s"Could not find a site at $siteDirFromCliArgs. Check the --site argument.")))
+      case None => Right(None)
+    }
 
-    siteFromCliArgs orElse siteFromConfig orElse siteFromAutoDetect
+    val errOrAvailableSiteDirs: Either[ErrorReport, List[File]] = for {
+      s1 <- errOrSiteFromCliArgs.right
+      s2 <- siteFromConfig.right
+      s3 <- Right(siteFromAutoDetect).right
+    } yield {
+      (s1 :: s2 :: s3 :: Nil) collect {
+        case Some(file) => file
+      }
+    }
+    errOrAvailableSiteDirs.right.flatMap {
+      case mostPreferredSiteDir :: xs => Right(mostPreferredSiteDir)
+      case Nil => Left(ErrorReport(noSiteFound("Could not find a website.")))
+    }
   }
 
-  def siteFromConfig(implicit yamlConfig: S3_website_yml, config: Config, workingDirectory: File): Option[File] =
-    config
+  def siteFromConfig(implicit yamlConfig: S3_website_yml, config: Config, workingDirectory: File): Either[ErrorReport, Option[File]] = {
+    val siteConfig = config
       .site
       .map(new File(_))
       .map { siteDir =>
         if (siteDir.isAbsolute) siteDir
         else new File(yamlConfig.file.getParentFile, siteDir.getPath)
       }
+
+    siteConfig match {
+      case s @ Some(siteDir) =>
+        if (siteDir.exists())
+          Right(s)
+        else
+          Left(ErrorReport(noSiteFound(s"Could not find a website. (The site setting in s3_website.yml points to a non-existing file $siteDir)")))
+      case None =>
+        Right(None)
+    }
+  }
 }

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

@@ -26,6 +26,7 @@ import s3.website.model.Ssg.automaticallySupportedSiteGenerators
 import s3.website.model._
 
 import scala.collection.JavaConversions._
+import scala.collection.mutable
 import scala.concurrent.duration._
 import scala.util.Random
 
@@ -36,7 +37,7 @@ class S3WebsiteSpec extends Specification {
       config = "gzip: true"
       setLocalFileWithContent(("styles.css", "<h1>hi again</h1>"))
       setS3File("styles.css", "1c5117e5839ad8fc00ce3c41296255a1" /* md5 of the gzip of the file contents */)
-      push
+      push()
       sentPutObjectRequest.getKey must equalTo("styles.css")
     }
 
@@ -44,7 +45,7 @@ class S3WebsiteSpec extends Specification {
       config = "gzip: true"
       setLocalFileWithContent(("styles.css", "<h1>hi</h1>"))
       setS3File("styles.css", "1c5117e5839ad8fc00ce3c41296255a1" /* md5 of the gzip of the file contents */)
-      push
+      push()
       noUploadsOccurred must beTrue
     }
   }
@@ -60,7 +61,7 @@ class S3WebsiteSpec extends Specification {
       """.stripMargin
       setLocalFileWithContent(("file.xml", "<h1>hi again</h1>"))
       setS3File("file.xml", "1c5117e5839ad8fc00ce3c41296255a1" /* md5 of the gzip of the file contents */)
-      push
+      push()
       sentPutObjectRequest.getKey must equalTo("file.xml")
     }
   }
@@ -69,33 +70,33 @@ class S3WebsiteSpec extends Specification {
     "not upload a file if it has not changed" in new BasicSetup {
       setLocalFileWithContent(("index.html", "<div>hello</div>"))
       setS3File("index.html", md5Hex("<div>hello</div>"))
-      push
+      push()
       noUploadsOccurred must beTrue
     }
 
     "update a file if it has changed" in new BasicSetup {
       setLocalFileWithContent(("index.html", "<h1>old text</h1>"))
       setS3File("index.html", md5Hex("<h1>new text</h1>"))
-      push
+      push()
       sentPutObjectRequest.getKey must equalTo("index.html")
     }
 
     "create a file if does not exist on S3" in new BasicSetup {
       setLocalFile("index.html")
-      push
+      push()
       sentPutObjectRequest.getKey must equalTo("index.html")
     }
 
     "delete files that are on S3 but not on local file system" in new BasicSetup {
       setS3File("old.html", md5Hex("<h1>old text</h1>"))
-      push
+      push()
       sentDelete must equalTo("old.html")
     }
 
     "try again if the upload fails" in new BasicSetup {
       setLocalFile("index.html")
       uploadFailsAndThenSucceeds(howManyFailures = 5)
-      push
+      push()
       verify(amazonS3Client, times(6)).putObject(Matchers.any(classOf[PutObjectRequest]))
     }
 
@@ -106,7 +107,7 @@ class S3WebsiteSpec extends Specification {
         e.setStatusCode(403)
         e
       }
-      push
+      push()
       verify(amazonS3Client, times(1)).putObject(Matchers.any(classOf[PutObjectRequest]))
     }
 
@@ -126,21 +127,21 @@ class S3WebsiteSpec extends Specification {
         }
       }
       setLocalFile("index.html")
-      val exitStatus = push
+      val exitStatus = push()
       verify(amazonS3Client, times(2)).putObject(Matchers.any(classOf[PutObjectRequest]))
     }
 
     "try again if the delete fails" in new BasicSetup {
       setS3File("old.html", md5Hex("<h1>old text</h1>"))
       deleteFailsAndThenSucceeds(howManyFailures = 5)
-      push
+      push()
       verify(amazonS3Client, times(6)).deleteObject(Matchers.anyString(), Matchers.anyString())
     }
 
     "try again if the object listing fails" in new BasicSetup {
       setS3File("old.html", md5Hex("<h1>old text</h1>"))
       objectListingFailsAndThenSucceeds(howManyFailures = 5)
-      push
+      push()
       verify(amazonS3Client, times(6)).listObjects(Matchers.any(classOf[ListObjectsRequest]))
     }
   }
@@ -150,14 +151,14 @@ class S3WebsiteSpec extends Specification {
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFiles("css/test.css", "articles/index.html")
       setOutdatedS3Keys("css/test.css", "articles/index.html")
-      push
+      push()
       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 BasicSetup {
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("newfile.js")
-      push
+      push()
       noInvalidationsOccurred must beTrue
     }
 
@@ -167,7 +168,7 @@ class S3WebsiteSpec extends Specification {
         |redirects:
         |  /index.php: index.html
       """.stripMargin
-      push
+      push()
       noInvalidationsOccurred must beTrue
     }
 
@@ -176,7 +177,7 @@ class S3WebsiteSpec extends Specification {
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("test.css")
       setOutdatedS3Keys("test.css")
-      push must equalTo(0) // The retries should finally result in a success
+      push() must equalTo(0) // The retries should finally result in a success
       sentInvalidationRequests.length must equalTo(4)
     }
 
@@ -185,7 +186,7 @@ class S3WebsiteSpec extends Specification {
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("test.css")
       setOutdatedS3Keys("test.css")
-      push
+      push()
       sentInvalidationRequests.length must equalTo(6)
     }
 
@@ -193,7 +194,7 @@ class S3WebsiteSpec extends Specification {
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("articles/arnold's file.html")
       setOutdatedS3Keys("articles/arnold's file.html")
-      push
+      push()
       sentInvalidationRequest.getInvalidationBatch.getPaths.getItems.toSeq.sorted must equalTo(("/articles/arnold's%20file.html" :: Nil).sorted)
     }
 
@@ -201,7 +202,7 @@ class S3WebsiteSpec extends Specification {
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("maybe-index.html")
       setOutdatedS3Keys("maybe-index.html")
-      push
+      push()
       sentInvalidationRequest.getInvalidationBatch.getPaths.getItems.toSeq.sorted must equalTo(("/" :: "/maybe-index.html" :: Nil).sorted)
     }
   }
@@ -214,7 +215,7 @@ class S3WebsiteSpec extends Specification {
       """.stripMargin
       setLocalFile("articles/index.html")
       setOutdatedS3Keys("articles/index.html")
-      push
+      push()
       sentInvalidationRequest.getInvalidationBatch.getPaths.getItems.toSeq must contain("/articles/")
     }
 
@@ -225,7 +226,7 @@ class S3WebsiteSpec extends Specification {
       """.stripMargin
       setLocalFile("articles/index.html")
       setOutdatedS3Keys("articles/index.html")
-      push
+      push()
       sentInvalidationRequest.getInvalidationBatch.getPaths.getItems.toSeq must contain("/index.html")
     }
   }
@@ -236,7 +237,7 @@ class S3WebsiteSpec extends Specification {
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFiles(files:_*)
       setOutdatedS3Keys(files:_*)
-      push
+      push()
       sentInvalidationRequests.length must equalTo(2)
       sentInvalidationRequests(0).getInvalidationBatch.getPaths.getItems.length must equalTo(1000)
       sentInvalidationRequests(1).getInvalidationBatch.getPaths.getItems.length must equalTo(2)
@@ -246,13 +247,13 @@ class S3WebsiteSpec extends Specification {
   "push exit status" should {
     "be 0 all uploads succeed" in new BasicSetup {
       setLocalFiles("file.txt")
-      push must equalTo(0)
+      push() must equalTo(0)
     }
 
     "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)
+      push() must equalTo(1)
     }
 
     "be 1 if any of the redirects fails" in new BasicSetup {
@@ -261,14 +262,14 @@ class S3WebsiteSpec extends Specification {
         |  index.php: /index.html
       """.stripMargin
       when(amazonS3Client.putObject(Matchers.any(classOf[PutObjectRequest]))).thenThrow(new AmazonServiceException("AWS failed"))
-      push must equalTo(1)
+      push() must equalTo(1)
     }
 
     "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)
+      push() must equalTo(0)
     }
 
     "be 1 if CloudFront is unreachable or broken"in new BasicSetup {
@@ -276,32 +277,32 @@ class S3WebsiteSpec extends Specification {
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("test.css")
       setOutdatedS3Keys("test.css")
-      push must equalTo(1)
+      push() must equalTo(1)
     }
 
     "be 0 if upload retry succeeds" in new BasicSetup {
       setLocalFile("index.html")
       uploadFailsAndThenSucceeds(howManyFailures = 1)
-      push must equalTo(0)
+      push() must equalTo(0)
     }
 
     "be 1 if delete retry fails" in new BasicSetup {
       setLocalFile("index.html")
       uploadFailsAndThenSucceeds(howManyFailures = 6)
-      push must equalTo(1)
+      push() must equalTo(1)
     }
 
     "be 1 if an object listing fails" in new BasicSetup {
       setS3File("old.html", md5Hex("<h1>old text</h1>"))
       objectListingFailsAndThenSucceeds(howManyFailures = 6)
-      push must equalTo(1)
+      push() must equalTo(1)
     }
   }
 
   "s3_website.yml file" should {
     "never be uploaded" in new BasicSetup {
       setLocalFile("s3_website.yml")
-      push
+      push()
       noUploadsOccurred must beTrue
     }
   }
@@ -309,7 +310,7 @@ class S3WebsiteSpec extends Specification {
   ".env file" should { // The .env file is the https://github.com/bkeepers/dotenv file
     "never be uploaded" in new BasicSetup {
       setLocalFile(".env")
-      push
+      push()
       noUploadsOccurred must beTrue
     }
   }
@@ -318,7 +319,7 @@ class S3WebsiteSpec extends Specification {
     "result in matching files not being uploaded" in new BasicSetup {
       config = "exclude_from_upload: .DS_.*?"
       setLocalFile(".DS_Store")
-      push
+      push()
       noUploadsOccurred must beTrue
     }
   }
@@ -335,7 +336,7 @@ class S3WebsiteSpec extends Specification {
         |  - logs
       """.stripMargin
       setLocalFiles(".DS_Store", "logs/test.log")
-      push
+      push()
       noUploadsOccurred must beTrue
     }
   }
@@ -344,14 +345,14 @@ class S3WebsiteSpec extends Specification {
     "not delete the S3 objects that match the ignore value" in new BasicSetup {
       config = "ignore_on_server: logs"
       setS3File("logs/log.txt")
-      push
+      push()
       noDeletesOccurred must beTrue
     }
 
     "support non-US-ASCII files"  in new BasicSetup {
       setS3File("tags/笔记/test.html", "")
       config = "ignore_on_server: tags/笔记/test.html"
-      push
+      push()
       noDeletesOccurred must beTrue
     }
   }
@@ -362,7 +363,7 @@ class S3WebsiteSpec extends Specification {
         |ignore_on_server: $DELETE_NOTHING_MAGIC_WORD
       """.stripMargin
       setS3File("file.txt")
-      push
+      push()
       noDeletesOccurred
     }
   }
@@ -378,7 +379,7 @@ class S3WebsiteSpec extends Specification {
         |  - .*txt
       """.stripMargin
       setS3File("logs/log.txt", "")
-      push
+      push()
       noDeletesOccurred must beTrue
     }
 
@@ -388,11 +389,24 @@ class S3WebsiteSpec extends Specification {
                  |ignore_on_server:
                  |  - tags/笔记/test.html
                """.stripMargin
-      push
+      push()
       noDeletesOccurred must beTrue
     }
   }
 
+  "error message" should {
+    "be helpful when the site directory is missing" in new BasicSetup {
+      config = "site: nonexisting_site_dir"
+      val logEntries = new mutable.MutableList[String]
+      push(logCapturer = Some((logEntry: String) =>
+        logEntries += logEntry
+      ))
+      logEntries must contain(
+        s"Could not find a website. (The site setting in s3_website.yml points to a non-existing file $siteDirectory/nonexisting_site_dir)"
+      )
+    }
+  }
+
   "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"
@@ -401,14 +415,14 @@ class S3WebsiteSpec extends Specification {
       new File(siteDirectory, ".vimrc").exists() must beTrue // Sanity check
       siteDirectory must not equalTo workingDirectory // Sanity check
 
-      push
+      push()
       sentPutObjectRequest.getKey must equalTo(".vimrc")
     }
 
     "not override the --site command-line switch" in new BasicSetup {
-      config = s"site: dir-that-does-not-exist"
+      config = s"site: ${System.getProperty("java.io.tmpdir")}"
       setLocalFile(".vimrc") // This creates a file in the directory into which the --site CLI arg points
-      push
+      push()
       sentPutObjectRequest.getKey must equalTo(".vimrc")
     }
 
@@ -417,7 +431,7 @@ class S3WebsiteSpec extends Specification {
         addContentToAutomaticallyDetectedSite(workingDirectory)
         config = s"site: $siteDirectory"
         setLocalFile(".vimrc") // Add content to the custom site directory
-        push
+        push()
         sentPutObjectRequest.getKey must equalTo(".vimrc")
       }
 
@@ -433,7 +447,7 @@ class S3WebsiteSpec extends Specification {
     "be applied to all files" in new BasicSetup {
       config = "max_age: 60"
       setLocalFile("index.html")
-      push
+      push()
       sentPutObjectRequest.getMetadata.getCacheControl must equalTo("max-age=60")
     }
 
@@ -444,7 +458,7 @@ class S3WebsiteSpec extends Specification {
       """.stripMargin
       val allValidUrlCharacters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~:/?#[]@!$&'()*+,;=" // See http://stackoverflow.com/a/1547940/990356 for discussion
       setLocalFile(s"$allValidUrlCharacters.html")
-      push
+      push()
       sentPutObjectRequest.getMetadata.getCacheControl must equalTo("max-age=90")
     }
 
@@ -454,7 +468,7 @@ class S3WebsiteSpec extends Specification {
         |  "*.html": 90
       """.stripMargin
       setLocalFile("index.html")
-      push
+      push()
       sentPutObjectRequest.getMetadata.getCacheControl must equalTo("max-age=90")
     }
 
@@ -464,7 +478,7 @@ class S3WebsiteSpec extends Specification {
         |  "assets/**/*.js": 90
       """.stripMargin
       setLocalFile("assets/lib/jquery.js")
-      push
+      push()
       sentPutObjectRequest.getMetadata.getCacheControl must equalTo("max-age=90")
     }
 
@@ -474,14 +488,14 @@ class S3WebsiteSpec extends Specification {
         |  "*.js": 90
       """.stripMargin
       setLocalFile("index.html")
-      push
+      push()
       sentPutObjectRequest.getMetadata.getCacheControl must beNull
     }
 
     "be used to disable caching" in new BasicSetup {
       config = "max_age: 0"
       setLocalFile("index.html")
-      push
+      push()
       sentPutObjectRequest.getMetadata.getCacheControl must equalTo("no-cache; max-age=0")
     }
 
@@ -491,7 +505,7 @@ class S3WebsiteSpec extends Specification {
         |  "*": 21600
       """.stripMargin
       setLocalFile("tags/笔记/index.html")
-      push must equalTo(0)
+      push() must equalTo(0)
     }
   }
 
@@ -503,7 +517,7 @@ class S3WebsiteSpec extends Specification {
         |  "assets/*.gif": 86400
       """.stripMargin
       setLocalFiles("assets/jquery.js", "assets/picture.gif")
-      push
+      push()
       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")
     }
@@ -513,7 +527,7 @@ class S3WebsiteSpec extends Specification {
     "result in uploads being marked with reduced redundancy" in new BasicSetup {
       config = "s3_reduced_redundancy: true"
       setLocalFile("file.exe")
-      push
+      push()
       sentPutObjectRequest.getStorageClass must equalTo("REDUCED_REDUNDANCY")
     }
   }
@@ -522,7 +536,7 @@ class S3WebsiteSpec extends Specification {
     "result in uploads being marked with the default storage class" in new BasicSetup {
       config = "s3_reduced_redundancy: false"
       setLocalFile("file.exe")
-      push
+      push()
       sentPutObjectRequest.getStorageClass must beNull
     }
   }
@@ -533,7 +547,7 @@ class S3WebsiteSpec extends Specification {
         |redirects:
         |  index.php: /index.html
       """.stripMargin
-      push
+      push()
       sentPutObjectRequest.getRedirectLocation must equalTo("/index.html")
     }
 
@@ -542,7 +556,7 @@ class S3WebsiteSpec extends Specification {
                  |redirects:
                  |  index.php: index.html
                """.stripMargin
-      push
+      push()
       sentPutObjectRequest.getRedirectLocation must equalTo("/index.html")
     }
 
@@ -551,7 +565,7 @@ class S3WebsiteSpec extends Specification {
                  |redirects:
                  |  index.php: http://www.youtube.com/watch?v=dQw4w9WgXcQ
                """.stripMargin
-      push
+      push()
       sentPutObjectRequest.getRedirectLocation must equalTo("http://www.youtube.com/watch?v=dQw4w9WgXcQ")
     }
 
@@ -560,7 +574,7 @@ class S3WebsiteSpec extends Specification {
                  |redirects:
                  |  index.php: https://www.youtube.com/watch?v=dQw4w9WgXcQ
                """.stripMargin
-      push
+      push()
       sentPutObjectRequest.getRedirectLocation must equalTo("https://www.youtube.com/watch?v=dQw4w9WgXcQ")
     }
 
@@ -569,7 +583,7 @@ class S3WebsiteSpec extends Specification {
         |redirects:
         |  index.php: /index.html
       """.stripMargin
-      push
+      push()
       sentPutObjectRequest.getMetadata.getCacheControl must equalTo("max-age=0, no-cache")
     }
   }
@@ -582,7 +596,7 @@ class S3WebsiteSpec extends Specification {
       """.stripMargin
       setLocalFile("index.php")
       setS3File("index.php", "md5")
-      push
+      push()
       noDeletesOccurred must beTrue
     }
   }
@@ -590,7 +604,7 @@ class S3WebsiteSpec extends Specification {
   "dotfiles" should {
     "be included in the pushed files" in new BasicSetup {
       setLocalFile(".vimrc")
-      push
+      push()
       sentPutObjectRequest.getKey must equalTo(".vimrc")
     }
   }
@@ -598,25 +612,25 @@ class S3WebsiteSpec extends Specification {
   "content type inference" should {
     "add charset=utf-8 to all html documents" in new BasicSetup {
       setLocalFile("index.html")
-      push
+      push()
       sentPutObjectRequest.getMetadata.getContentType must equalTo("text/html; charset=utf-8")
     }
 
     "add charset=utf-8 to all text documents" in new BasicSetup {
       setLocalFile("index.txt")
-      push
+      push()
       sentPutObjectRequest.getMetadata.getContentType must equalTo("text/plain; charset=utf-8")
     }
 
     "add charset=utf-8 to all json documents" in new BasicSetup {
       setLocalFile("data.json")
-      push
+      push()
       sentPutObjectRequest.getMetadata.getContentType must equalTo("application/json; charset=utf-8")
     }
 
     "resolve the content type from file contents" in new BasicSetup {
       setLocalFileWithContent(("index", "<html><body><h1>hi</h1></body></html>"))
-      push
+      push()
       sentPutObjectRequest.getMetadata.getContentType must equalTo("text/html; charset=utf-8")
     }
   }
@@ -627,7 +641,7 @@ class S3WebsiteSpec extends Specification {
         |redirects:
         |<%= ('a'..'f').to_a.map do |t| '  '+t+ ': /'+t+'.html' end.join('\n')%>
       """.stripMargin
-      push
+      push()
       sentPutObjectRequests.length must equalTo(6)
       sentPutObjectRequests.forall(_.getRedirectLocation != null) must beTrue
     }
@@ -637,7 +651,7 @@ class S3WebsiteSpec extends Specification {
     "push all the files whether they have changed or not" in new ForcePush {
       setLocalFileWithContent(("index.html", "<h1>hi</h1>"))
       setS3File("index.html", "1c5117e5839ad8fc00ce3c41296255a1" /* md5 of the gzip of the file contents */)
-      push
+      push()
       sentPutObjectRequest.getKey must equalTo("index.html")
     }
   }
@@ -646,7 +660,7 @@ class S3WebsiteSpec extends Specification {
     "not push updates" in new DryRun {
       setLocalFileWithContent(("index.html", "<div>new</div>"))
       setS3File("index.html", md5Hex("<div>old</div>"))
-      push
+      push()
       noUploadsOccurred must beTrue
     }
 
@@ -656,26 +670,26 @@ class S3WebsiteSpec extends Specification {
           |redirects:
           |  index.php: /index.html
         """.stripMargin
-      push
+      push()
       noUploadsOccurred must beTrue
     }
 
     "not push deletes" in new DryRun {
       setS3File("index.html", md5Hex("<div>old</div>"))
-      push
+      push()
       noUploadsOccurred must beTrue
     }
 
     "not push new files" in new DryRun {
       setLocalFile("index.html")
-      push
+      push()
       noUploadsOccurred must beTrue
     }
 
     "not invalidate files" in new DryRun {
       config = "cloudfront_invalidation_id: AABBCC"
       setS3File("index.html", md5Hex("<div>old</div>"))
-      push
+      push()
       noInvalidationsOccurred must beTrue
     }
   }
@@ -683,7 +697,7 @@ class S3WebsiteSpec extends Specification {
   "Jekyll site" should {
     "be detected automatically" in new JekyllSite with EmptySite with MockAWS with DefaultRunMode {
       setLocalFile("index.html")
-      push
+      push()
       sentPutObjectRequests.length must equalTo(1)
     }
   }
@@ -691,7 +705,7 @@ class S3WebsiteSpec extends Specification {
   "Nanoc site" should {
     "be detected automatically" in new NanocSite with EmptySite with MockAWS with DefaultRunMode {
       setLocalFile("index.html")
-      push
+      push()
       sentPutObjectRequests.length must equalTo(1)
     }
   }
@@ -705,7 +719,7 @@ class S3WebsiteSpec extends Specification {
           |  index.php: /index.html
         """.stripMargin
       setRedirectObject("index.php")
-      push
+      push()
       noUploadsOccurred
     }
 
@@ -717,7 +731,7 @@ class S3WebsiteSpec extends Specification {
           |  index.php: /index.html
         """.stripMargin
       setRedirectObject("index.php")
-      push
+      push()
       noDeletesOccurred
     }
 
@@ -728,7 +742,7 @@ class S3WebsiteSpec extends Specification {
           |redirects:
           |  index.php: /index.html
         """.stripMargin
-      push
+      push()
       sentPutObjectRequest.getRedirectLocation must equalTo("/index.html")
     }
 
@@ -740,7 +754,7 @@ class S3WebsiteSpec extends Specification {
           |  index.php: /index.html
         """.stripMargin
       setRedirectObject("index.php")
-      push
+      push()
       sentPutObjectRequest.getRedirectLocation must equalTo("/index.html")
     }
   }
@@ -1000,13 +1014,14 @@ class S3WebsiteSpec extends Specification {
       }
   }
 
-  def push(implicit
+  def push(logCapturer: Option[(String) => _] = None)(implicit
            emptyYamlConfig: S3_website_yml,
            configString: ConfigString,
            cliArgs: CliArgs,
            s3Settings: S3Setting,
            cloudFrontSettings: CloudFrontSetting,
            workingDirectory: File) = {
+    implicit val logger = new Logger(verboseOutput = true, logCapturer)
     write(emptyYamlConfig.file, configString.yaml) // Write the yaml config lazily, so that the tests can override the default yaml config
     Push.push
   }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 2.7.3
+  version: 2.7.4
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-05 00:00:00.000000000 Z
+date: 2015-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor