s3_website_monadic 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5b1aa15a1ce62e1a349ace807b4a1a3222330ed
-  data.tar.gz: fa293c4a5a8178f60a17049633722a940505a7e1
+  metadata.gz: f19d0eae1ea4ae3a515bc6f26066a2a90b241d58
+  data.tar.gz: 3c8762e1cda26b3f84021b3a071c75c61f1f6e87
 SHA512:
-  metadata.gz: a9b80ed77c9504d795ff67ad5e6ba7151beea0749037b73656c0d2a9128215df3077eaed594f2851cc969ef285f11d1fe98775644df15b86e7cc96be56c2e060
-  data.tar.gz: fcacbb3ea86be21b97900781735fd5d119df26a4cec709feada0a225f51c5c76dc5926953b9a92e103ed74dc50a4e81211a39b26274c36dbabf238f105093b0e
+  metadata.gz: 0eb150f681d4cb2efd22a35a26ee55df9fe4575e560b82a17a0043161deea72a2979839679aec20d3bfefe400a2a46389a93378f346b3da7d55597b34a44d394
+  data.tar.gz: 5937ab122bf4014de4073c1796c4f43cadd38488e2d893d8715cbfeebd3acb6e3a0808976bbd630aeaa03609c0f58e0a8426ad9f8ccc9f58208139e75b1b9b7e

data/bin/s3_website_monadic

@@ -53,6 +53,12 @@ class Cli < Thor
     :default => Dir.pwd,
     :desc => "The directory where your config file is. When not defined, s3_website will look in the current working directory."
   )
+  option(
+    :verbose,
+    :type => :boolean,
+    :default => false,
+    :desc => "Print verbose output"
+  )
   desc 'push', 'Push local files with the S3 website'
   long_desc <<-LONGDESC
     `s3_website push` will upload new and changes files to S3. It will
@@ -61,10 +67,11 @@ class Cli < Thor
   def push
     call_dir = Dir.pwd
     project_root = File.expand_path(File.dirname(__FILE__)+ '/..')
+    logger = Logger.new(options[:verbose])
     Dir.chdir(project_root) {
-      jar_file = resolve_jar project_root
+      jar_file = resolve_jar project_root, logger
       # Then run it
-      run_s3_website_jar(jar_file, call_dir)
+      run_s3_website_jar(jar_file, call_dir, logger)
     }
   end
 
@@ -72,11 +79,11 @@ class Cli < Thor
   subcommand 'cfg', Cfg
 end
 
-def run_s3_website_jar(jar_file, call_dir)
+def run_s3_website_jar(jar_file, call_dir, logger)
   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}"
-  debug_msg "Using #{jar_file}"
+  args = "--site=#{site_path} --config-dir=#{config_dir} #{'--verbose' if options[:verbose]}"
+  logger.debug_msg "Using #{jar_file}"
   if system("java -cp #{jar_file} s3.website.Push #{args}")
     exit 0
   else
@@ -84,7 +91,7 @@ def run_s3_website_jar(jar_file, call_dir)
   end
 end
 
-def resolve_jar(project_root)
+def resolve_jar(project_root, logger)
   development_jar_path =
     project_root + '/target/scala-2.11/s3_website.jar'
   released_jar_lookup_paths = [
@@ -103,26 +110,25 @@ def resolve_jar(project_root)
       is_development = File.exists?(project_root + '/.git')
       if is_development
         system "./sbt assembly"
-        puts development_jar_path
         development_jar_path
       else
-        download_jar(released_jar_lookup_paths)
+        download_jar(released_jar_lookup_paths, logger)
       end
     end
 end
 
-def download_jar(released_jar_lookup_paths)
+def download_jar(released_jar_lookup_paths, logger)
   tag_name = "v#{S3Website::VERSION}"
   downloaded_jar = released_jar_lookup_paths.select { |jar_path|
     File.writable? File.dirname(jar_path)
   }.first
   unless downloaded_jar
-    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."
+    logger.fail_msg "Neither #{released_jar_lookup_paths.join ' or '} is writable. Cannot download s3_website.jar."
+    logger.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"
-  info_msg "Downloading #{download_url} into #{downloaded_jar}"
+  logger.info_msg "Downloading #{download_url} into #{downloaded_jar}"
   require 'open-uri'
   open(downloaded_jar, 'wb') do |file|
     file << open(download_url).read
@@ -130,20 +136,31 @@ def download_jar(released_jar_lookup_paths)
   downloaded_jar
 end
 
-def debug_msg(msg)
-  print_msg 'debg'.cyan, msg
-end
+class Logger
+  attr_reader :verbose
+  def initialize(verbose)
+    @verbose = verbose
+  end
 
-def info_msg(msg)
-  print_msg 'info'.blue, msg
-end
+  def debug_msg(msg)
+    if verbose
+      print_msg 'debg'.cyan, msg
+    end
+  end
 
-def fail_msg(msg)
-  print_msg 'fail'.red, msg
-end
+  def info_msg(msg)
+    print_msg 'info'.blue, msg
+  end
+
+  def fail_msg(msg)
+    print_msg 'fail'.red, msg
+  end
+
+  private
 
-def print_msg(prefix, msg)
-  puts "[#{prefix}] #{msg}"
+  def print_msg(prefix, msg)
+    puts "[#{prefix}] #{msg}"
+  end
 end
 
 Cli.start(ARGV)

data/lib/s3_website/version.rb

@@ -1,3 +1,3 @@
 module S3Website
-  VERSION = '0.0.26'
+  VERSION = '0.0.27'
 end

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

@@ -8,12 +8,11 @@ import scala.collection.JavaConversions._
 import scala.concurrent.duration._
 import s3.website.S3.{SuccessfulDelete, PushSuccessReport, SuccessfulUpload}
 import com.amazonaws.auth.BasicAWSCredentials
-import s3.website.Logger._
 import java.net.URI
 import Utils._
 import scala.concurrent.{ExecutionContextExecutor, Future}
 
-class CloudFront(implicit cloudFrontSettings: CloudFrontSettings, config: Config) {
+class CloudFront(implicit cloudFrontSettings: CloudFrontSettings, config: Config, logger: Logger) {
   val cloudFront = cloudFrontSettings.cfClient(config)
 
   def invalidate(invalidationBatch: InvalidationBatch, distributionId: String, attempt: Attempt = 1)
@@ -22,7 +21,7 @@ class CloudFront(implicit cloudFrontSettings: CloudFrontSettings, config: Config
       val invalidationReq = new CreateInvalidationRequest(distributionId, invalidationBatch)
       cloudFront.createInvalidation(invalidationReq)
       val result = SuccessfulInvalidation(invalidationBatch.getPaths.getItems.size())
-      info(result)
+      logger.info(result)
       Right(result)
     } recoverWith (tooManyInvalidationsRetry(invalidationBatch, distributionId, attempt) orElse retry(attempt)(
       createFailureReport = error => FailedInvalidation(error),
@@ -30,13 +29,13 @@ class CloudFront(implicit cloudFrontSettings: CloudFrontSettings, config: Config
     ))
 
   def tooManyInvalidationsRetry(invalidationBatch: InvalidationBatch, distributionId: String, attempt: Attempt)
-                          (implicit ec: ExecutionContextExecutor): PartialFunction[Throwable, InvalidationResult] = {
+                          (implicit ec: ExecutionContextExecutor, logger: Logger): PartialFunction[Throwable, InvalidationResult] = {
     case e: TooManyInvalidationsInProgressException =>
       val duration: Duration = Duration(
         (fibs drop attempt).head min 15, /* CloudFront invalidations complete within 15 minutes */
         cloudFrontSettings.retryTimeUnit
       )
-      pending(maxInvalidationsExceededInfo(duration, attempt))
+      logger.pending(maxInvalidationsExceededInfo(duration, attempt))
       Thread.sleep(duration.toMillis)
       invalidate(invalidationBatch, distributionId, attempt + 1)
   }

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

@@ -13,13 +13,11 @@ import s3.website.model.LocalFile.resolveLocalFiles
 import scala.collection.parallel.ParSeq
 import java.util.concurrent.ExecutorService
 import s3.website.model._
-import s3.website.Implicits._
 import s3.website.model.Update
 import s3.website.model.NewFile
 import s3.website.S3.PushSuccessReport
 import scala.collection.mutable.ArrayBuffer
 import s3.website.CloudFront._
-import s3.website.Logger._
 import s3.website.S3.SuccessfulDelete
 import s3.website.CloudFront.SuccessfulInvalidation
 import s3.website.S3.S3Settings
@@ -33,10 +31,11 @@ object Push {
                 implicit site: Site,
                 executor: ExecutionContextExecutor,
                 s3Settings: S3Settings,
-                cloudFrontSettings: CloudFrontSettings
+                cloudFrontSettings: CloudFrontSettings,
+                logger: Logger
                 ): ExitCode = {
-    info(s"Deploying ${site.rootDirectory}/* to ${site.config.s3_bucket}")
-    val utils: Utils = new Utils
+    logger.info(s"Deploying ${site.rootDirectory}/* to ${site.config.s3_bucket}")
+    val utils = new Utils
 
     val redirects = Redirect.resolveRedirects
     val redirectResults = redirects.map(new S3() upload(_))
@@ -64,7 +63,7 @@ object Push {
   
   def invalidateCloudFrontItems
     (errorsOrFinishedPushOps: Either[ErrorReport, FinishedPushOperations])
-    (implicit config: Config, cloudFrontSettings: CloudFrontSettings, ec: ExecutionContextExecutor): Option[InvalidationSucceeded] = {
+    (implicit config: Config, cloudFrontSettings: CloudFrontSettings, ec: ExecutionContextExecutor, logger: Logger): Option[InvalidationSucceeded] = {
     config.cloudfront_distribution_id.map {
       distributionId =>
         val pushSuccessReports = errorsOrFinishedPushOps.fold(
@@ -101,12 +100,13 @@ object Push {
 
   type InvalidationSucceeded = Boolean
 
-  def afterPushFinished(errorsOrFinishedUploads: Either[ErrorReport, FinishedPushOperations], invalidationSucceeded: Option[Boolean])(implicit config: Config): ExitCode = {
+  def afterPushFinished(errorsOrFinishedUploads: Either[ErrorReport, FinishedPushOperations], invalidationSucceeded: Option[Boolean])
+                       (implicit config: Config, logger: Logger): ExitCode = {
     errorsOrFinishedUploads.right.foreach { finishedUploads =>
       val pushCounts = pushCountsToString(resolvePushCounts(finishedUploads))
-      info(s"Summary: $pushCounts")
+      logger.info(s"Summary: $pushCounts")
     }
-    errorsOrFinishedUploads.left foreach (err => fail(s"Encountered an error: ${err.reportMessage}"))
+    errorsOrFinishedUploads.left foreach (err => logger.fail(s"Encountered an error: ${err.reportMessage}"))
     val exitCode = errorsOrFinishedUploads.fold(
       _ => 1,
       finishedUploads => finishedUploads.foldLeft(0) { (memo, finishedUpload) =>
@@ -121,9 +121,9 @@ object Push {
     )
 
     if (exitCode == 0)
-      info(s"Successfully pushed the website to http://${config.s3_bucket}.${config.s3_endpoint.s3WebsiteHostname}")
+      logger.info(s"Successfully pushed the website to http://${config.s3_bucket}.${config.s3_endpoint.s3WebsiteHostname}")
     else
-      fail(s"Failed to push the website to http://${config.s3_bucket}.${config.s3_endpoint.s3WebsiteHostname}")
+      logger.fail(s"Failed to push the website to http://${config.s3_bucket}.${config.s3_endpoint.s3WebsiteHostname}")
     exitCode
   }
 
@@ -181,20 +181,21 @@ object Push {
 
     @Option def site: String
     @Option(longName = Array("config-dir")) def configDir: String
-
+    @Option def verbose: Boolean
   }
 
   def main(args: Array[String]) {
     val cliArgs = CliFactory.parseArguments(classOf[CliArgs], args:_*)
     implicit val s3Settings = S3Settings()
     implicit val cloudFrontSettings = CloudFrontSettings()
+    implicit val logger: Logger = new Logger(cliArgs.verbose)
     val errorOrPushStatus = push(siteInDirectory = cliArgs.site, withConfigDirectory = cliArgs.configDir)
-    errorOrPushStatus.left foreach (err => fail(s"Could not load the site: ${err.reportMessage}"))
+    errorOrPushStatus.left foreach (err => logger.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) =
+          (implicit s3Settings: S3Settings, cloudFrontSettings: CloudFrontSettings, logger: Logger) =
     loadSite(withConfigDirectory + "/s3_website.yml", siteInDirectory)
       .right
       .map {

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

@@ -7,7 +7,6 @@ import com.amazonaws.services.s3.model._
 import scala.collection.JavaConversions._
 import scala.concurrent.{ExecutionContextExecutor, Future}
 import com.amazonaws.services.s3.model.StorageClass.ReducedRedundancy
-import s3.website.Logger._
 import scala.concurrent.duration.TimeUnit
 import java.util.concurrent.TimeUnit.SECONDS
 import s3.website.S3.SuccessfulUpload
@@ -19,23 +18,25 @@ import s3.website.S3.S3Settings
 
 class S3(implicit s3Settings: S3Settings, executor: ExecutionContextExecutor) {
 
-  def upload(upload: Upload with UploadTypeResolved, a: Attempt = 1)(implicit config: Config): Future[Either[FailedUpload, SuccessfulUpload]] =
+  def upload(upload: Upload with UploadTypeResolved, a: Attempt = 1)
+            (implicit config: Config, logger: Logger): Future[Either[FailedUpload, SuccessfulUpload]] =
     Future {
       val putObjectRequest = toPutObjectRequest(upload)
       s3Settings.s3Client(config) putObject putObjectRequest
       val report = SuccessfulUpload(upload, putObjectRequest)
-      info(report)
+      logger.info(report)
       Right(report)
     } recoverWith retry(a)(
       createFailureReport = error => FailedUpload(upload.s3Key, error),
       retryAction  = newAttempt => this.upload(upload, newAttempt)
     )
 
-  def delete(s3Key: String,  a: Attempt = 1)(implicit config: Config): Future[Either[FailedDelete, SuccessfulDelete]] =
+  def delete(s3Key: String,  a: Attempt = 1)
+            (implicit config: Config, logger: Logger): Future[Either[FailedDelete, SuccessfulDelete]] =
     Future {
       s3Settings.s3Client(config) deleteObject(config.s3_bucket, s3Key)
       val report = SuccessfulDelete(s3Key)
-      info(report)
+      logger.info(report)
       Right(report)
     } recoverWith retry(a)(
       createFailureReport = error => FailedDelete(s3Key, error),
@@ -83,9 +84,9 @@ object S3 {
 
   def resolveS3FilesAndUpdates(localFiles: Seq[LocalFile])
                               (nextMarker: Option[String] = None, alreadyResolved: Seq[S3File] = Nil,  attempt: Attempt = 1, onFlightUpdateFutures: UpdateFutures = Nil)
-                              (implicit config: Config, s3Settings: S3Settings, ec: ExecutionContextExecutor):
+                              (implicit config: Config, s3Settings: S3Settings, ec: ExecutionContextExecutor, logger: Logger):
   ErrorOrS3FilesAndUpdates = Future {
-    debug(nextMarker.fold
+    logger.debug(nextMarker.fold
       ("Querying S3 files")
       {m => s"Querying more S3 files (starting from $m)"}
     )

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

@@ -16,16 +16,16 @@ object Utils {
   lazy val fibs: Stream[Int] = 0 #:: 1 #:: fibs.zip(fibs.tail).map { n => n._1 + n._2 }
 }
 
-object Logger {
+class Logger(verboseOutput: Boolean, logMessage: (String) => Unit = println) {
   import Rainbow._
-  def debug(msg: String) = println(s"[${"debg".cyan}] $msg")
-  def info(msg: String) = println(s"[${"info".blue}] $msg")
-  def fail(msg: String) = println(s"[${"fail".red}] $msg")
+  def debug(msg: String) = if (verboseOutput) logMessage(s"[${"debg".cyan}] $msg")
+  def info(msg: String) = logMessage(s"[${"info".blue}] $msg")
+  def fail(msg: String) = logMessage(s"[${"fail".red}] $msg")
 
-  def info(report: SuccessReport) = println(s"[${"succ".green}] ${report.reportMessage}")
+  def info(report: SuccessReport) = logMessage(s"[${"succ".green}] ${report.reportMessage}")
   def info(report: FailureReport) = fail(report.reportMessage)
 
-  def pending(msg: String) = println(s"[${"wait".yellow}] $msg")
+  def pending(msg: String) = logMessage(s"[${"wait".yellow}] $msg")
 }
 
 /**

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

@@ -6,7 +6,7 @@ import org.yaml.snakeyaml.Yaml
 import s3.website.model.Config._
 import scala.io.Source.fromFile
 import scala.language.postfixOps
-import s3.website.Logger._
+import s3.website.Logger
 import scala.util.Failure
 import s3.website.model.Config.UnsafeYaml
 import scala.util.Success
@@ -17,7 +17,8 @@ case class Site(rootDirectory: String, config: Config) {
 }
 
 object Site {
-  def loadSite(yamlConfigPath: String, siteRootDirectory: String): Either[ErrorReport, Site] = {
+  def loadSite(yamlConfigPath: String, siteRootDirectory: String)
+              (implicit logger: Logger): Either[ErrorReport, Site] = {
     val yamlObjectTry = for {
       yamlString <- Try(fromFile(new File(yamlConfigPath)).mkString)
       yamlWithErbEvaluated <- erbEval(yamlString, yamlConfigPath)
@@ -43,8 +44,8 @@ object Site {
           concurrency_level <- loadOptionalInt("concurrency_level").right
           redirects <- loadRedirects.right
         } yield {
-          gzip_zopfli.foreach(_ => info("zopfli is not currently supported"))
-          extensionless_mime_type.foreach(_ => info(
+          gzip_zopfli.foreach(_ => logger.info("zopfli is not currently supported"))
+          extensionless_mime_type.foreach(_ => logger.info(
             s"Ignoring the extensionless_mime_type setting in $yamlConfigPath. Counting on Apache Tika to infer correct mime types.")
           )
           Config(

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

@@ -1,12 +1,11 @@
 package s3
 
 import scala.concurrent.{ExecutionContextExecutor, Future}
-import s3.website.Logger._
 import scala.concurrent.duration.{TimeUnit, Duration}
 import s3.website.Utils._
 import s3.website.S3.{PushSuccessReport, PushFailureReport}
-import com.amazonaws.services.s3.model.AmazonS3Exception
 import com.amazonaws.AmazonServiceException
+import s3.website.model.{Config, Site}
 
 package object website {
   trait Report {
@@ -28,16 +27,16 @@ package object website {
 
   def retry[L <: Report, R](attempt: Attempt)
                            (createFailureReport: (Throwable) => L, retryAction: (Attempt) => Future[Either[L, R]])
-                           (implicit retrySettings: RetrySettings, ec: ExecutionContextExecutor):
+                           (implicit retrySettings: RetrySettings, ec: ExecutionContextExecutor, logger: Logger):
   PartialFunction[Throwable, Future[Either[L, R]]] = {
     case error: Throwable if attempt == 6 || isIrrecoverable(error) =>
       val failureReport = createFailureReport(error)
-      fail(failureReport.reportMessage)
+      logger.fail(failureReport.reportMessage)
       Future(Left(failureReport))
     case error: Throwable =>
       val failureReport = createFailureReport(error)
       val sleepDuration = Duration(fibs.drop(attempt + 1).head, retrySettings.retryTimeUnit)
-      pending(s"${failureReport.reportMessage}. Trying again in $sleepDuration.")
+      logger.pending(s"${failureReport.reportMessage}. Trying again in $sleepDuration.")
       Thread.sleep(sleepDuration.toMillis)
       retryAction(attempt + 1)
   }
@@ -59,4 +58,6 @@ package object website {
       s"$count ${if (count > 1) plural else singular}"
     }
   }
+
+  implicit def site2Config(implicit site: Site): Config = site.config
 }

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

@@ -30,7 +30,7 @@ import scala.collection.mutable
 class S3WebsiteSpec extends Specification {
 
   "gzip: true" should {
-    "update a gzipped S3 object if the contents has changed" in new EmptySite with MockAWS {
+    "update a gzipped S3 object if the contents has changed" in new EmptySite with VerboseLogger 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 */))
@@ -38,7 +38,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 EmptySite with MockAWS {
+    "not update a gzipped S3 object if the contents has not changed" in new EmptySite with VerboseLogger with MockAWS {
       config = "gzip: true"
       setLocalFileWithContent(("styles.css", "<h1>hi</h1>"))
       setS3Files(S3File("styles.css", "1c5117e5839ad8fc00ce3c41296255a1" /* md5 of the gzip of the file contents */))
@@ -51,7 +51,7 @@ class S3WebsiteSpec extends Specification {
     gzip:
       - .xml
   """ should {
-    "update a gzipped S3 object if the contents has changed" in new EmptySite with MockAWS {
+    "update a gzipped S3 object if the contents has changed" in new EmptySite with VerboseLogger with MockAWS {
       config = """
         |gzip:
         |  - .xml
@@ -64,40 +64,40 @@ class S3WebsiteSpec extends Specification {
   }
 
   "push" should {
-    "not upload a file if it has not changed" in new EmptySite with MockAWS {
+    "not upload a file if it has not changed" in new EmptySite with VerboseLogger 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 EmptySite with MockAWS {
+    "update a file if it has changed" in new EmptySite with VerboseLogger 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 EmptySite with MockAWS {
+    "create a file if does not exist on S3" in new EmptySite with VerboseLogger 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 EmptySite with MockAWS {
+    "delete files that are on S3 but not on local file system" in new EmptySite with VerboseLogger 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 EmptySite with MockAWS {
+    "try again if the upload fails" in new EmptySite with VerboseLogger 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 EmptySite with MockAWS {
+    "not try again if the upload fails on because of invalid credentials" in new EmptySite with VerboseLogger with MockAWS {
       setLocalFile("index.html")
       when(amazonS3Client.putObject(Matchers.any(classOf[PutObjectRequest]))).thenThrow {
         val e = new AmazonServiceException("your credentials are incorrect")
@@ -108,14 +108,14 @@ class S3WebsiteSpec extends Specification {
       verify(amazonS3Client, times(1)).putObject(Matchers.any(classOf[PutObjectRequest]))
     }
 
-    "try again if the delete fails" in new EmptySite with MockAWS {
+    "try again if the delete fails" in new EmptySite with VerboseLogger 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 EmptySite with MockAWS {
+    "try again if the object listing fails" in new EmptySite with VerboseLogger with MockAWS {
       setS3Files(S3File("old.html", md5Hex("<h1>old text</h1>")))
       objectListingFailsAndThenSucceeds(howManyFailures = 5)
       Push.pushSite
@@ -124,7 +124,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "push with CloudFront" should {
-    "invalidate the updated CloudFront items" in new EmptySite with MockAWS {
+    "invalidate the updated CloudFront items" in new EmptySite with VerboseLogger with MockAWS {
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFiles("css/test.css", "articles/index.html")
       setOutdatedS3Keys("css/test.css", "articles/index.html")
@@ -132,14 +132,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 EmptySite with MockAWS {
+    "not send CloudFront invalidation requests on new objects"  in new EmptySite with VerboseLogger 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 EmptySite with MockAWS {
+    "not send CloudFront invalidation requests on redirect objects" in new EmptySite with VerboseLogger with MockAWS {
       config = """
         |cloudfront_distribution_id: EGM1J2JJX9Z
         |redirects:
@@ -149,7 +149,7 @@ class S3WebsiteSpec extends Specification {
       noInvalidationsOccurred must beTrue
     }
 
-    "retry CloudFront responds with TooManyInvalidationsInProgressException" in new EmptySite with MockAWS {
+    "retry CloudFront responds with TooManyInvalidationsInProgressException" in new EmptySite with VerboseLogger with MockAWS {
       setTooManyInvalidationsInProgress(4)
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("test.css")
@@ -158,7 +158,7 @@ class S3WebsiteSpec extends Specification {
       sentInvalidationRequests.length must equalTo(4)
     }
 
-    "retry if CloudFront is temporarily unreachable" in new EmptySite with MockAWS {
+    "retry if CloudFront is temporarily unreachable" in new EmptySite with VerboseLogger with MockAWS {
       invalidationsFailAndThenSucceed(5)
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("test.css")
@@ -167,7 +167,7 @@ class S3WebsiteSpec extends Specification {
       sentInvalidationRequests.length must equalTo(6)
     }
 
-    "encode unsafe characters in the keys" in new EmptySite with MockAWS {
+    "encode unsafe characters in the keys" in new EmptySite with VerboseLogger with MockAWS {
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("articles/arnold's file.html")
       setOutdatedS3Keys("articles/arnold's file.html")
@@ -179,7 +179,7 @@ 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 EmptySite with MockAWS {
+    "invalidate the root object '/' if a top-level object is updated or deleted" in new EmptySite with VerboseLogger with MockAWS {
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("maybe-index.html")
       setOutdatedS3Keys("maybe-index.html")
@@ -189,7 +189,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "cloudfront_invalidate_root: true" should {
-    "convert CloudFront invalidation paths with the '/index.html' suffix into '/'"  in new EmptySite with MockAWS {
+    "convert CloudFront invalidation paths with the '/index.html' suffix into '/'"  in new EmptySite with VerboseLogger with MockAWS {
       config = """
         |cloudfront_distribution_id: EGM1J2JJX9Z
         |cloudfront_invalidate_root: true
@@ -202,7 +202,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "a site with over 1000 items" should {
-    "split the CloudFront invalidation requests into batches of 1000 items" in new EmptySite with MockAWS {
+    "split the CloudFront invalidation requests into batches of 1000 items" in new EmptySite with VerboseLogger with MockAWS {
       val files = (1 to 1002).map { i => s"lots-of-files/file-$i"}
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFiles(files:_*)
@@ -215,18 +215,18 @@ class S3WebsiteSpec extends Specification {
   }
 
   "push exit status" should {
-    "be 0 all uploads succeed" in new EmptySite with MockAWS {
+    "be 0 all uploads succeed" in new EmptySite with VerboseLogger with MockAWS {
       setLocalFiles("file.txt")
       Push.pushSite must equalTo(0)
     }
 
-    "be 1 if any of the uploads fails" in new EmptySite with MockAWS {
+    "be 1 if any of the uploads fails" in new EmptySite with VerboseLogger 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 EmptySite with MockAWS {
+    "be 1 if any of the redirects fails" in new EmptySite with VerboseLogger with MockAWS {
       config = """
         |redirects:
         |  index.php: /index.html
@@ -235,14 +235,14 @@ class S3WebsiteSpec extends Specification {
       Push.pushSite must equalTo(1)
     }
 
-    "be 0 if CloudFront invalidations and uploads succeed"in new EmptySite with MockAWS {
+    "be 0 if CloudFront invalidations and uploads succeed"in new EmptySite with VerboseLogger 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 EmptySite with MockAWS {
+    "be 1 if CloudFront is unreachable or broken"in new EmptySite with VerboseLogger with MockAWS {
       setCloudFrontAsInternallyBroken()
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("test.css")
@@ -250,19 +250,19 @@ class S3WebsiteSpec extends Specification {
       Push.pushSite must equalTo(1)
     }
 
-    "be 0 if upload retry succeeds" in new EmptySite with MockAWS {
+    "be 0 if upload retry succeeds" in new EmptySite with VerboseLogger with MockAWS {
       setLocalFile("index.html")
       uploadFailsAndThenSucceeds(howManyFailures = 1)
       Push.pushSite must equalTo(0)
     }
 
-    "be 1 if delete retry fails" in new EmptySite with MockAWS {
+    "be 1 if delete retry fails" in new EmptySite with VerboseLogger with MockAWS {
       setLocalFile("index.html")
       uploadFailsAndThenSucceeds(howManyFailures = 6)
       Push.pushSite must equalTo(1)
     }
 
-    "be 1 if an object listing fails" in new EmptySite with MockAWS {
+    "be 1 if an object listing fails" in new EmptySite with VerboseLogger with MockAWS {
       setS3Files(S3File("old.html", md5Hex("<h1>old text</h1>")))
       objectListingFailsAndThenSucceeds(howManyFailures = 6)
       Push.pushSite must equalTo(1)
@@ -270,7 +270,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "s3_website.yml file" should {
-    "never be uploaded" in new EmptySite with MockAWS {
+    "never be uploaded" in new EmptySite with VerboseLogger with MockAWS {
       setLocalFile("s3_website.yml")
       Push.pushSite
       noUploadsOccurred must beTrue
@@ -278,7 +278,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "exclude_from_upload: string" should {
-    "result in matching files not being uploaded" in new EmptySite with MockAWS {
+    "result in matching files not being uploaded" in new EmptySite with VerboseLogger with MockAWS {
       config = "exclude_from_upload: .DS_.*?"
       setLocalFile(".DS_Store")
       Push.pushSite
@@ -291,7 +291,7 @@ class S3WebsiteSpec extends Specification {
        - regex
        - another_exclusion
   """ should {
-    "result in matching files not being uploaded" in new EmptySite with MockAWS {
+    "result in matching files not being uploaded" in new EmptySite with VerboseLogger with MockAWS {
       config = """
         |exclude_from_upload:
         |  - .DS_.*?
@@ -304,7 +304,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "ignore_on_server: value" should {
-    "not delete the S3 objects that match the ignore value" in new EmptySite with MockAWS {
+    "not delete the S3 objects that match the ignore value" in new EmptySite with VerboseLogger with MockAWS {
       config = "ignore_on_server: logs"
       setS3Files(S3File("logs/log.txt", ""))
       Push.pushSite
@@ -317,7 +317,7 @@ class S3WebsiteSpec extends Specification {
        - regex
        - another_ignore
   """ should {
-    "not delete the S3 objects that match the ignore value" in new EmptySite with MockAWS {
+    "not delete the S3 objects that match the ignore value" in new EmptySite with VerboseLogger with MockAWS {
       config = """
         |ignore_on_server:
         |  - .*txt
@@ -329,14 +329,14 @@ class S3WebsiteSpec extends Specification {
   }
 
   "max-age in config" can {
-    "be applied to all files" in new EmptySite with MockAWS {
+    "be applied to all files" in new EmptySite with VerboseLogger 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 EmptySite with MockAWS {
+    "be applied to files that match the glob" in new EmptySite with VerboseLogger with MockAWS {
       config = """
         |max_age:
         |  "*.html": 90
@@ -346,7 +346,7 @@ class S3WebsiteSpec extends Specification {
       sentPutObjectRequest.getMetadata.getCacheControl must equalTo("max-age=90")
     }
 
-    "be applied to directories that match the glob" in new EmptySite with MockAWS {
+    "be applied to directories that match the glob" in new EmptySite with VerboseLogger with MockAWS {
       config = """
         |max_age:
         |  "assets/**/*.js": 90
@@ -356,7 +356,7 @@ class S3WebsiteSpec extends Specification {
       sentPutObjectRequest.getMetadata.getCacheControl must equalTo("max-age=90")
     }
 
-    "not be applied if the glob doesn't match" in new EmptySite with MockAWS {
+    "not be applied if the glob doesn't match" in new EmptySite with VerboseLogger with MockAWS {
       config = """
         |max_age:
         |  "*.js": 90
@@ -366,7 +366,7 @@ class S3WebsiteSpec extends Specification {
       sentPutObjectRequest.getMetadata.getCacheControl must beNull
     }
 
-    "be used to disable caching" in new EmptySite with MockAWS {
+    "be used to disable caching" in new EmptySite with VerboseLogger with MockAWS {
       config = "max_age: 0"
       setLocalFile("index.html")
       Push.pushSite
@@ -375,7 +375,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "max-age in config" should {
-    "respect the more specific glob" in new EmptySite with MockAWS {
+    "respect the more specific glob" in new EmptySite with VerboseLogger with MockAWS {
       config = """
         |max_age:
         |  "assets/*": 150
@@ -389,7 +389,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "s3_reduced_redundancy: true in config" should {
-    "result in uploads being marked with reduced redundancy" in new EmptySite with MockAWS {
+    "result in uploads being marked with reduced redundancy" in new EmptySite with VerboseLogger with MockAWS {
       config = "s3_reduced_redundancy: true"
       setLocalFile("file.exe")
       Push.pushSite
@@ -398,7 +398,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "s3_reduced_redundancy: false in config" should {
-    "result in uploads being marked with the default storage class" in new EmptySite with MockAWS {
+    "result in uploads being marked with the default storage class" in new EmptySite with VerboseLogger with MockAWS {
       config = "s3_reduced_redundancy: false"
       setLocalFile("file.exe")
       Push.pushSite
@@ -407,7 +407,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "redirect in config" should {
-    "result in a redirect instruction that is sent to AWS" in new EmptySite with MockAWS {
+    "result in a redirect instruction that is sent to AWS" in new EmptySite with VerboseLogger with MockAWS {
       config = """
         |redirects:
         |  index.php: /index.html
@@ -416,7 +416,7 @@ class S3WebsiteSpec extends Specification {
       sentPutObjectRequest.getRedirectLocation must equalTo("/index.html")
     }
 
-    "result in max-age=0 Cache-Control header on the object" in new EmptySite with MockAWS {
+    "result in max-age=0 Cache-Control header on the object" in new EmptySite with VerboseLogger with MockAWS {
       config = """
         |redirects:
         |  index.php: /index.html
@@ -427,7 +427,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 EmptySite with MockAWS {
+    "not result in the S3 object being deleted" in new EmptySite with VerboseLogger with MockAWS {
       config = """
         |redirects:
         |  index.php: /index.html
@@ -440,7 +440,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "dotfiles" should {
-    "be included in the pushed files" in new EmptySite with MockAWS {
+    "be included in the pushed files" in new EmptySite with VerboseLogger with MockAWS {
       setLocalFile(".vimrc")
       Push.pushSite
       sentPutObjectRequest.getKey must equalTo(".vimrc")
@@ -448,25 +448,25 @@ class S3WebsiteSpec extends Specification {
   }
 
   "content type inference" should {
-    "add charset=utf-8 to all html documents" in new EmptySite with MockAWS {
+    "add charset=utf-8 to all html documents" in new EmptySite with VerboseLogger 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 EmptySite with MockAWS {
+    "add charset=utf-8 to all text documents" in new EmptySite with VerboseLogger 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 EmptySite with MockAWS {
+    "add charset=utf-8 to all json documents" in new EmptySite with VerboseLogger 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 EmptySite with MockAWS {
+    "resolve the content type from file contents" in new EmptySite with VerboseLogger with MockAWS {
       setLocalFileWithContent(("index", "<html><body><h1>hi</h1></body></html>"))
       Push.pushSite
       sentPutObjectRequest.getMetadata.getContentType must equalTo("text/html; charset=utf-8")
@@ -474,7 +474,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "ERB in config file" should {
-    "be evaluated"  in new EmptySite with MockAWS {
+    "be evaluated"  in new EmptySite with VerboseLogger with MockAWS {
       config = """
         |redirects:
         |<%= ('a'..'f').to_a.map do |t| '  '+t+ ': /'+t+'.html' end.join('\n')%>
@@ -484,8 +484,37 @@ class S3WebsiteSpec extends Specification {
       sentPutObjectRequests.forall(_.getRedirectLocation != null) must beTrue
     }
   }
+
+  "logging" should {
+    "print the debug messages when --verbose is defined" in new EmptySite with VerboseLogger with MockAWS {
+      Push.pushSite
+      logEntries must contain("[debg] Querying S3 files")
+    }
+
+    "not print the debug messages by default" in new EmptySite with NonVerboseLogger with MockAWS {
+      Push.pushSite
+      logEntries.forall(_.contains("[debg]")) must beFalse
+    }
+  }
   
   trait MockAWS extends MockS3 with MockCloudFront with Scope
+
+  trait VerboseLogger extends LogCapturer {
+    implicit val logger: Logger = new Logger(verboseOutput = true, logMessage = captureAndPrint)
+  }
+
+  trait NonVerboseLogger extends LogCapturer {
+    implicit val logger: Logger = new Logger(verboseOutput = false, logMessage = captureAndPrint)
+  }
+
+  trait LogCapturer {
+    val logEntries: mutable.Buffer[String] = mutable.Buffer()
+
+    def captureAndPrint(msg: String) {
+      logEntries += msg.replaceAll("\u001B\\[[;\\d]*m", "") // Remove ANSI coloring
+      println(msg)
+    }
+  }
   
   trait MockCloudFront extends MockAWSHelper {
     val amazonCloudFrontClient = mock(classOf[AmazonCloudFront])
@@ -581,7 +610,7 @@ class S3WebsiteSpec extends Specification {
         .listObjects(Matchers.any(classOf[ListObjectsRequest]))
     }
 
-    def asSeenByS3Client(upload: Upload)(implicit config: Config): PutObjectRequest = {
+    def asSeenByS3Client(upload: Upload)(implicit config: Config, logger: Logger): PutObjectRequest = {
       Await.ready(s3.upload(upload withUploadType NewFile), Duration("1 s"))
       val req = ArgumentCaptor.forClass(classOf[PutObjectRequest])
       verify(amazonS3Client).putObject(req.capture())
@@ -654,7 +683,8 @@ class S3WebsiteSpec extends Specification {
       |s3_bucket: bucket
     """.stripMargin
 
-    implicit def site2: Site = siteWithFilesAndContent(config, localFilesWithContent)
+    implicit lazy val testSite: Site = siteWithFilesAndContent(config, localFilesWithContent)
+    implicit def logger: Logger
 
     def buildSite(
                     config: String = "",
@@ -672,7 +702,7 @@ class S3WebsiteSpec extends Specification {
           |$config
         """.stripMargin
       )
-      val errorOrSite: Either[ErrorReport, Site] = Site.loadSite(configFile.getAbsolutePath, siteDir.getAbsolutePath)
+      val errorOrSite: Either[ErrorReport, Site] = Site.loadSite(configFile.getAbsolutePath, siteDir.getAbsolutePath)(logger)
       errorOrSite.left.foreach (error => throw new RuntimeException(error.reportMessage))
       errorOrSite.right.get
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website_monadic
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -115,7 +115,6 @@ files:
 - sbt
 - src/main/scala/s3/website/CloudFront.scala
 - src/main/scala/s3/website/Diff.scala
-- src/main/scala/s3/website/Implicits.scala
 - src/main/scala/s3/website/Push.scala
 - src/main/scala/s3/website/Ruby.scala
 - src/main/scala/s3/website/S3.scala

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

@@ -1,7 +0,0 @@
-package s3.website
-
-import s3.website.model.{Site, Config}
-
-object Implicits {
-  implicit def site2Config(implicit site: Site): Config = site.config
-}