s3_website_monadic 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f19d0eae1ea4ae3a515bc6f26066a2a90b241d58
-  data.tar.gz: 3c8762e1cda26b3f84021b3a071c75c61f1f6e87
+  metadata.gz: 7900f28823f8541d10361f8b99020be7a403bb70
+  data.tar.gz: 2e0dad3c0abf21757fce241e11a7145f58d44cd4
 SHA512:
-  metadata.gz: 0eb150f681d4cb2efd22a35a26ee55df9fe4575e560b82a17a0043161deea72a2979839679aec20d3bfefe400a2a46389a93378f346b3da7d55597b34a44d394
-  data.tar.gz: 5937ab122bf4014de4073c1796c4f43cadd38488e2d893d8715cbfeebd3acb6e3a0808976bbd630aeaa03609c0f58e0a8426ad9f8ccc9f58208139e75b1b9b7e
+  metadata.gz: 38a3e67004aeeb887118d7f8bfa7f5fef076bbc1c8d72ce6d6aaf409f51ed279c6602b51240ab7532bd45bf961189d2a75c1f25949e28d782b151d7b1cea8903
+  data.tar.gz: a1e09461dec20cec96591c7b67fe6ff4299a474e30b339972cedf49408e7629028e11ae0cb9ab5e7e67a12fdbd04f03af3f2e563ffa9a1a2ac739abd99bfa7e5

data/README.md

@@ -335,6 +335,16 @@ If you experience the "too many open files" error, either increase the amount of
 maximum open files (on Unix-like systems, see `man ulimit`) or decrease the
 `concurrency_level` setting.
 
+## Simulating deployments
+
+You can simulate the `s3_website_monadic push` operation by adding the
+`--dry-run` switch. The dry run mode will not apply any modifications on your S3
+bucket or CloudFront distribution. It will merely print out what the `push`
+operation would actually do if run without the dry switch.
+
+You can use the dry run mode if you are unsure what kind of effects the `push`
+operation would cause to your live website.
+
 ## Example configurations
 
 See

data/bin/s3_website_monadic

@@ -59,6 +59,12 @@ class Cli < Thor
     :default => false,
     :desc => "Print verbose output"
   )
+  option(
+    :dry_run,
+    :type => :boolean,
+    :default => false,
+    :desc => "Run the operation without actually making the modifications. When this switch is on, changes will not be applied on the S3 website. They will be only printed to the console."
+  )
   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
@@ -82,7 +88,13 @@ end
 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} #{'--verbose' if options[:verbose]}"
+
+  args = [
+    "--site=#{site_path}",
+    "--config-dir=#{config_dir}",
+    "#{'--verbose' if options[:verbose]}",
+    "#{'--dry-run' if options[:dry_run]}"
+  ].join ' '
   logger.debug_msg "Using #{jar_file}"
   if system("java -cp #{jar_file} s3.website.Push #{args}")
     exit 0

data/lib/s3_website/version.rb

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

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

@@ -1,8 +1,8 @@
 package s3.website
 
-import s3.website.model.{Update, Redirect, Config}
+import s3.website.model.{Update, Config}
 import com.amazonaws.services.cloudfront.{AmazonCloudFrontClient, AmazonCloudFront}
-import s3.website.CloudFront.{CloudFrontSettings, SuccessfulInvalidation, FailedInvalidation}
+import s3.website.CloudFront.{CloudFrontSetting, SuccessfulInvalidation, FailedInvalidation}
 import com.amazonaws.services.cloudfront.model.{TooManyInvalidationsInProgressException, Paths, InvalidationBatch, CreateInvalidationRequest}
 import scala.collection.JavaConversions._
 import scala.concurrent.duration._
@@ -12,15 +12,15 @@ import java.net.URI
 import Utils._
 import scala.concurrent.{ExecutionContextExecutor, Future}
 
-class CloudFront(implicit cloudFrontSettings: CloudFrontSettings, config: Config, logger: Logger) {
+class CloudFront(implicit cloudFrontSettings: CloudFrontSetting, config: Config, logger: Logger, pushMode: PushMode) {
   val cloudFront = cloudFrontSettings.cfClient(config)
 
   def invalidate(invalidationBatch: InvalidationBatch, distributionId: String, attempt: Attempt = 1)
                 (implicit ec: ExecutionContextExecutor): InvalidationResult =
     Future {
-      val invalidationReq = new CreateInvalidationRequest(distributionId, invalidationBatch)
-      cloudFront.createInvalidation(invalidationReq)
+      if (!pushMode.dryRun) cloudFront createInvalidation new CreateInvalidationRequest(distributionId, invalidationBatch)
       val result = SuccessfulInvalidation(invalidationBatch.getPaths.getItems.size())
+      logger.debug(invalidationBatch.getPaths.getItems.map(item => s"${Invalidated.renderVerb} $item") mkString "\n")
       logger.info(result)
       Right(result)
     } recoverWith (tooManyInvalidationsRetry(invalidationBatch, distributionId, attempt) orElse retry(attempt)(
@@ -44,7 +44,7 @@ class CloudFront(implicit cloudFrontSettings: CloudFrontSettings, config: Config
     val basicInfo = s"The maximum amount of CloudFront invalidations has exceeded. Trying again in $sleepDuration, please wait."
     val extendedInfo =
       s"""|$basicInfo
-          |  For more information, see http://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/Invalidation.html#InvalidationLimits"""
+          |For more information, see http://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/Invalidation.html#InvalidationLimits"""
         .stripMargin
     if (attempt == 1)
       extendedInfo
@@ -59,8 +59,8 @@ object CloudFront {
 
   type CloudFrontClientProvider = (Config) => AmazonCloudFront
 
-  case class SuccessfulInvalidation(invalidatedItemsCount: Int) extends SuccessReport {
-    def reportMessage = s"Invalidated ${invalidatedItemsCount ofType "item"} on CloudFront"
+  case class SuccessfulInvalidation(invalidatedItemsCount: Int)(implicit pushMode: PushMode) extends SuccessReport {
+    def reportMessage = s"${Invalidated.renderVerb} ${invalidatedItemsCount ofType "item"} on CloudFront"
   }
 
   case class FailedInvalidation(error: Throwable) extends FailureReport {
@@ -129,8 +129,8 @@ object CloudFront {
     case _ => false
   }
 
-  case class CloudFrontSettings(
+  case class CloudFrontSetting(
     cfClient: CloudFrontClientProvider = CloudFront.awsCloudFrontClient,
     retryTimeUnit: TimeUnit = MINUTES
-  ) extends RetrySettings
+  ) extends RetrySetting
 }

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

@@ -20,21 +20,23 @@ import scala.collection.mutable.ArrayBuffer
 import s3.website.CloudFront._
 import s3.website.S3.SuccessfulDelete
 import s3.website.CloudFront.SuccessfulInvalidation
-import s3.website.S3.S3Settings
-import s3.website.CloudFront.CloudFrontSettings
+import s3.website.S3.S3Setting
+import s3.website.CloudFront.CloudFrontSetting
 import s3.website.S3.SuccessfulUpload
 import s3.website.CloudFront.FailedInvalidation
+import scala.Int
 
 object Push {
 
   def pushSite(
                 implicit site: Site,
                 executor: ExecutionContextExecutor,
-                s3Settings: S3Settings,
-                cloudFrontSettings: CloudFrontSettings,
-                logger: Logger
+                s3Settings: S3Setting,
+                cloudFrontSettings: CloudFrontSetting,
+                logger: Logger,
+                pushMode: PushMode
                 ): ExitCode = {
-    logger.info(s"Deploying ${site.rootDirectory}/* to ${site.config.s3_bucket}")
+    logger.info(s"${Deploy.renderVerb} ${site.rootDirectory}/* to ${site.config.s3_bucket}")
     val utils = new Utils
 
     val redirects = Redirect.resolveRedirects
@@ -63,7 +65,8 @@ object Push {
   
   def invalidateCloudFrontItems
     (errorsOrFinishedPushOps: Either[ErrorReport, FinishedPushOperations])
-    (implicit config: Config, cloudFrontSettings: CloudFrontSettings, ec: ExecutionContextExecutor, logger: Logger): Option[InvalidationSucceeded] = {
+    (implicit config: Config, cloudFrontSettings: CloudFrontSetting, ec: ExecutionContextExecutor, logger: Logger, pushMode: PushMode):
+  Option[InvalidationSucceeded] = {
     config.cloudfront_distribution_id.map {
       distributionId =>
         val pushSuccessReports = errorsOrFinishedPushOps.fold(
@@ -101,7 +104,7 @@ object Push {
   type InvalidationSucceeded = Boolean
 
   def afterPushFinished(errorsOrFinishedUploads: Either[ErrorReport, FinishedPushOperations], invalidationSucceeded: Option[Boolean])
-                       (implicit config: Config, logger: Logger): ExitCode = {
+                       (implicit config: Config, logger: Logger, pushMode: PushMode): ExitCode = {
     errorsOrFinishedUploads.right.foreach { finishedUploads =>
       val pushCounts = pushCountsToString(resolvePushCounts(finishedUploads))
       logger.info(s"Summary: $pushCounts")
@@ -120,10 +123,13 @@ object Push {
       if (allInvalidationsSucceeded) 0 else 1
     )
 
-    if (exitCode == 0)
-      logger.info(s"Successfully pushed the website to http://${config.s3_bucket}.${config.s3_endpoint.s3WebsiteHostname}")
-    else
-      logger.fail(s"Failed to push the website to http://${config.s3_bucket}.${config.s3_endpoint.s3WebsiteHostname}")
+    exitCode match {
+      case 0 if !pushMode.dryRun =>
+        logger.info(s"Successfully pushed the website to http://${config.s3_bucket}.${config.s3_endpoint.s3WebsiteHostname}")
+      case 1 =>
+        logger.fail(s"Failed to push the website to http://${config.s3_bucket}.${config.s3_endpoint.s3WebsiteHostname}")
+      case _ =>
+    }
     exitCode
   }
 
@@ -149,18 +155,18 @@ object Push {
     )
   }
 
-  def pushCountsToString(pushCounts: PushCounts): String =
+  def pushCountsToString(pushCounts: PushCounts)(implicit pushMode: PushMode): String =
     pushCounts match {
       case PushCounts(updates, newFiles, failures, redirects, deletes)
         if updates == 0 && newFiles == 0 && failures == 0 && redirects == 0 && deletes == 0 =>
-          "There was nothing to push."
+          PushNothing.renderVerb
       case PushCounts(updates, newFiles, failures, redirects, deletes) =>
         val reportClauses: scala.collection.mutable.ArrayBuffer[String] = ArrayBuffer()
-        if (updates > 0)   reportClauses += s"Updated ${updates ofType "file"}."
-        if (newFiles > 0)  reportClauses += s"Created ${newFiles ofType "file"}."
+        if (updates > 0)   reportClauses += s"${Updated.renderVerb} ${updates ofType "file"}."
+        if (newFiles > 0)  reportClauses += s"${Created.renderVerb} ${newFiles ofType "file"}."
         if (failures > 0)  reportClauses += s"${failures ofType "operation"} failed." // This includes both failed uploads and deletes.
-        if (redirects > 0) reportClauses += s"Applied ${redirects ofType "redirect"}."
-        if (deletes > 0)   reportClauses += s"Deleted ${deletes ofType "file"}."
+        if (redirects > 0) reportClauses += s"${Applied.renderVerb} ${redirects ofType "redirect"}."
+        if (deletes > 0)   reportClauses += s"${Deleted.renderVerb} ${deletes ofType "file"}."
         reportClauses.mkString(" ")
     }
 
@@ -182,20 +188,24 @@ object Push {
     @Option def site: String
     @Option(longName = Array("config-dir")) def configDir: String
     @Option def verbose: Boolean
+    @Option(longName = Array("dry-run")) def dryRun: Boolean
   }
 
   def main(args: Array[String]) {
     val cliArgs = CliFactory.parseArguments(classOf[CliArgs], args:_*)
-    implicit val s3Settings = S3Settings()
-    implicit val cloudFrontSettings = CloudFrontSettings()
+    implicit val s3Settings = S3Setting()
+    implicit val cloudFrontSettings = CloudFrontSetting()
     implicit val logger: Logger = new Logger(cliArgs.verbose)
+    implicit val pushMode = new PushMode {
+      def dryRun = cliArgs.dryRun
+    }
     val errorOrPushStatus = push(siteInDirectory = cliArgs.site, withConfigDirectory = cliArgs.configDir)
     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, logger: Logger) =
+          (implicit s3Settings: S3Setting, cloudFrontSettings: CloudFrontSetting, logger: Logger, pushMode: PushMode) =
     loadSite(withConfigDirectory + "/s3_website.yml", siteInDirectory)
       .right
       .map {

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

@@ -14,15 +14,15 @@ import s3.website.S3.SuccessfulDelete
 import s3.website.S3.FailedUpload
 import scala.Some
 import s3.website.S3.FailedDelete
-import s3.website.S3.S3Settings
+import s3.website.S3.S3Setting
 
-class S3(implicit s3Settings: S3Settings, executor: ExecutionContextExecutor) {
+class S3(implicit s3Settings: S3Setting, pushMode: PushMode, executor: ExecutionContextExecutor) {
 
   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
+      if (!pushMode.dryRun) s3Settings.s3Client(config) putObject putObjectRequest
       val report = SuccessfulUpload(upload, putObjectRequest)
       logger.info(report)
       Right(report)
@@ -34,7 +34,7 @@ class S3(implicit s3Settings: S3Settings, executor: ExecutionContextExecutor) {
   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)
+      if (!pushMode.dryRun) s3Settings.s3Client(config) deleteObject(config.s3_bucket, s3Key)
       val report = SuccessfulDelete(s3Key)
       logger.info(report)
       Right(report)
@@ -84,7 +84,7 @@ 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, logger: Logger):
+                              (implicit config: Config, s3Settings: S3Setting, ec: ExecutionContextExecutor, logger: Logger, pushMode: PushMode):
   ErrorOrS3FilesAndUpdates = Future {
     logger.debug(nextMarker.fold
       ("Querying S3 files")
@@ -97,12 +97,12 @@ object S3 {
       req
     })
     val summaryIndex = objects.getObjectSummaries.map { summary => (summary.getETag, summary.getKey) }.toSet // Index to avoid O(n^2) lookups 
-    def isUpdate(lf: LocalFile) =
+    def shouldUpdate(lf: LocalFile) =
       summaryIndex.exists((md5AndS3Key) => 
         md5AndS3Key._1 != lf.md5 && md5AndS3Key._2 == lf.s3Key
       )
     val updateFutures: UpdateFutures = localFiles.collect {
-      case lf: LocalFile if isUpdate(lf) =>
+      case lf: LocalFile if shouldUpdate(lf) =>
         val errorOrUpdate = LocalFile
           .toUpload(lf)
           .right
@@ -138,7 +138,8 @@ object S3 {
     def s3Key: String
   }
 
-  case class SuccessfulUpload(upload: Upload with UploadTypeResolved, putObjectRequest: PutObjectRequest) extends PushSuccessReport {
+  case class SuccessfulUpload(upload: Upload with UploadTypeResolved, putObjectRequest: PutObjectRequest)
+                             (implicit pushMode: PushMode) extends PushSuccessReport {
     val metadata = putObjectRequest.getMetadata
     def metadataReport =
       (metadata.getCacheControl :: metadata.getContentType :: metadata.getContentEncoding :: putObjectRequest.getStorageClass :: Nil)
@@ -147,16 +148,16 @@ object S3 {
 
     def reportMessage =
       upload.uploadType match {
-        case NewFile  => s"Created ${upload.s3Key} ($metadataReport)"
-        case Update   => s"Updated ${upload.s3Key} ($metadataReport)"
-        case Redirect => s"Redirected ${upload.essence.left.get.key} to ${upload.essence.left.get.redirectTarget}"
+        case NewFile  => s"${Created.renderVerb} ${upload.s3Key} ($metadataReport)"
+        case Update   => s"${Updated.renderVerb} ${upload.s3Key} ($metadataReport)"
+        case Redirect => s"${Redirected.renderVerb} ${upload.essence.left.get.key} to ${upload.essence.left.get.redirectTarget}"
       }
 
     def s3Key = upload.s3Key
   }
 
-  case class SuccessfulDelete(s3Key: String) extends PushSuccessReport {
-    def reportMessage = s"Deleted $s3Key"
+  case class SuccessfulDelete(s3Key: String)(implicit pushMode: PushMode) extends PushSuccessReport {
+    def reportMessage = s"${Deleted.renderVerb} $s3Key"
   }
 
   case class FailedUpload(s3Key: String, error: Throwable) extends PushFailureReport {
@@ -169,8 +170,8 @@ object S3 {
 
   type S3ClientProvider = (Config) => AmazonS3
 
-  case class S3Settings(
+  case class S3Setting(
     s3Client: S3ClientProvider = S3.awsS3Client,
     retryTimeUnit: TimeUnit = SECONDS
-  ) extends RetrySettings
+  ) extends RetrySetting
 }

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

@@ -18,14 +18,39 @@ object Utils {
 
 class Logger(verboseOutput: Boolean, logMessage: (String) => Unit = println) {
   import Rainbow._
-  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 debug(msg: String) = if (verboseOutput) log(Debug, msg)
+  def info(msg: String) = log(Info, msg)
+  def fail(msg: String) = log(Failure, msg)
 
-  def info(report: SuccessReport) = logMessage(s"[${"succ".green}] ${report.reportMessage}")
+  def info(report: SuccessReport) = log(Success, report.reportMessage)
   def info(report: FailureReport) = fail(report.reportMessage)
 
-  def pending(msg: String) = logMessage(s"[${"wait".yellow}] $msg")
+  def pending(msg: String) = log(Wait, msg)
+
+  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
+    logMessage(s"[$logType] $msg")
+  }
+
+  sealed trait LogType {
+    val prefix: String
+    override def toString = prefix
+  }
+  case object Debug extends LogType {
+    val prefix = "debg".cyan
+  }
+  case object Info extends LogType {
+    val prefix = "info".blue
+  }
+  case object Success extends LogType {
+    val prefix = "succ".green
+  }
+  case object Failure extends LogType {
+    val prefix = "fail".red
+  }
+  case object Wait extends LogType {
+    val prefix = "wait".yellow
+  }
 }
 
 /**

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

@@ -166,9 +166,6 @@ object LocalFile {
   }
 }
 
-case class OverrideExisting()
-case class CreateNew()
-
 case class Redirect(key: String, redirectTarget: String)
 
 object Redirect extends UploadType {

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

@@ -17,9 +17,43 @@ package object website {
 
   trait ErrorReport extends Report
 
-  trait RetrySettings {
+  trait RetrySetting {
     def retryTimeUnit: TimeUnit
   }
+  
+  trait PushMode {
+    def dryRun: Boolean
+  }
+
+  trait PushAction {
+    def actionName = getClass.getSimpleName.replace("$", "") // case object class names contain the '$' char
+
+    def renderVerb(implicit pushMode: PushMode): String =
+      if (pushMode.dryRun)
+        s"Would have ${actionName.toLowerCase}"
+      else
+        s"$actionName"
+  }
+  case object Created     extends PushAction
+  case object Updated     extends PushAction
+  case object Redirected  extends PushAction
+  case object Deleted     extends PushAction
+  case object Invalidated extends PushAction
+  case object Applied     extends PushAction
+  case object PushNothing extends PushAction {
+    override def renderVerb(implicit pushMode: PushMode) =
+      if (pushMode.dryRun)
+        s"Would have pushed nothing"
+      else
+        s"There was nothing to push"
+  }
+  case object Deploy      extends PushAction {
+    override def renderVerb(implicit pushMode: PushMode) =
+      if (pushMode.dryRun)
+        s"Simulating the deployment of"
+      else
+        s"Deploying"
+  }
 
   type PushErrorOrSuccess = Either[PushFailureReport, PushSuccessReport]
 
@@ -27,7 +61,7 @@ package object website {
 
   def retry[L <: Report, R](attempt: Attempt)
                            (createFailureReport: (Throwable) => L, retryAction: (Attempt) => Future[Either[L, R]])
-                           (implicit retrySettings: RetrySettings, ec: ExecutionContextExecutor, logger: Logger):
+                           (implicit retrySetting: RetrySetting, ec: ExecutionContextExecutor, logger: Logger):
   PartialFunction[Throwable, Future[Either[L, R]]] = {
     case error: Throwable if attempt == 6 || isIrrecoverable(error) =>
       val failureReport = createFailureReport(error)
@@ -35,7 +69,7 @@ package object website {
       Future(Left(failureReport))
     case error: Throwable =>
       val failureReport = createFailureReport(error)
-      val sleepDuration = Duration(fibs.drop(attempt + 1).head, retrySettings.retryTimeUnit)
+      val sleepDuration = Duration(fibs.drop(attempt + 1).head, retrySetting.retryTimeUnit)
       logger.pending(s"${failureReport.reportMessage}. Trying again in $sleepDuration.")
       Thread.sleep(sleepDuration.toMillis)
       retryAction(attempt + 1)

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

@@ -11,14 +11,12 @@ import org.mockito.Mockito._
 import com.amazonaws.services.s3.AmazonS3
 import com.amazonaws.services.s3.model._
 import scala.concurrent.ExecutionContext.Implicits.global
-import scala.concurrent.Await
 import scala.concurrent.duration._
-import s3.website.S3.S3Settings
+import s3.website.S3.S3Setting
 import scala.collection.JavaConversions._
-import s3.website.model.NewFile
 import com.amazonaws.AmazonServiceException
 import org.apache.commons.codec.digest.DigestUtils.md5Hex
-import s3.website.CloudFront.CloudFrontSettings
+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
@@ -30,7 +28,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 VerboseLogger with MockAWS {
+    "update a gzipped S3 object if the contents has changed" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       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 +36,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 VerboseLogger with MockAWS {
+    "not update a gzipped S3 object if the contents has not changed" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       config = "gzip: true"
       setLocalFileWithContent(("styles.css", "<h1>hi</h1>"))
       setS3Files(S3File("styles.css", "1c5117e5839ad8fc00ce3c41296255a1" /* md5 of the gzip of the file contents */))
@@ -51,7 +49,7 @@ class S3WebsiteSpec extends Specification {
     gzip:
       - .xml
   """ should {
-    "update a gzipped S3 object if the contents has changed" in new EmptySite with VerboseLogger with MockAWS {
+    "update a gzipped S3 object if the contents has changed" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       config = """
         |gzip:
         |  - .xml
@@ -64,40 +62,40 @@ class S3WebsiteSpec extends Specification {
   }
 
   "push" should {
-    "not upload a file if it has not changed" in new EmptySite with VerboseLogger with MockAWS {
+    "not upload a file if it has not changed" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       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 VerboseLogger with MockAWS {
+    "update a file if it has changed" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       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 VerboseLogger with MockAWS {
+    "create a file if does not exist on S3" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       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 VerboseLogger with MockAWS {
+    "delete files that are on S3 but not on local file system" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       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 VerboseLogger with MockAWS {
+    "try again if the upload fails" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       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 VerboseLogger with MockAWS {
+    "not try again if the upload fails on because of invalid credentials" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       setLocalFile("index.html")
       when(amazonS3Client.putObject(Matchers.any(classOf[PutObjectRequest]))).thenThrow {
         val e = new AmazonServiceException("your credentials are incorrect")
@@ -108,14 +106,14 @@ class S3WebsiteSpec extends Specification {
       verify(amazonS3Client, times(1)).putObject(Matchers.any(classOf[PutObjectRequest]))
     }
 
-    "try again if the delete fails" in new EmptySite with VerboseLogger with MockAWS {
+    "try again if the delete fails" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       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 VerboseLogger with MockAWS {
+    "try again if the object listing fails" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       setS3Files(S3File("old.html", md5Hex("<h1>old text</h1>")))
       objectListingFailsAndThenSucceeds(howManyFailures = 5)
       Push.pushSite
@@ -124,7 +122,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "push with CloudFront" should {
-    "invalidate the updated CloudFront items" in new EmptySite with VerboseLogger with MockAWS {
+    "invalidate the updated CloudFront items" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFiles("css/test.css", "articles/index.html")
       setOutdatedS3Keys("css/test.css", "articles/index.html")
@@ -132,14 +130,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 VerboseLogger with MockAWS {
+    "not send CloudFront invalidation requests on new objects"  in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       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 VerboseLogger with MockAWS {
+    "not send CloudFront invalidation requests on redirect objects" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       config = """
         |cloudfront_distribution_id: EGM1J2JJX9Z
         |redirects:
@@ -149,7 +147,7 @@ class S3WebsiteSpec extends Specification {
       noInvalidationsOccurred must beTrue
     }
 
-    "retry CloudFront responds with TooManyInvalidationsInProgressException" in new EmptySite with VerboseLogger with MockAWS {
+    "retry CloudFront responds with TooManyInvalidationsInProgressException" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       setTooManyInvalidationsInProgress(4)
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("test.css")
@@ -158,7 +156,7 @@ class S3WebsiteSpec extends Specification {
       sentInvalidationRequests.length must equalTo(4)
     }
 
-    "retry if CloudFront is temporarily unreachable" in new EmptySite with VerboseLogger with MockAWS {
+    "retry if CloudFront is temporarily unreachable" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       invalidationsFailAndThenSucceed(5)
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("test.css")
@@ -167,7 +165,7 @@ class S3WebsiteSpec extends Specification {
       sentInvalidationRequests.length must equalTo(6)
     }
 
-    "encode unsafe characters in the keys" in new EmptySite with VerboseLogger with MockAWS {
+    "encode unsafe characters in the keys" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("articles/arnold's file.html")
       setOutdatedS3Keys("articles/arnold's file.html")
@@ -175,11 +173,7 @@ class S3WebsiteSpec extends Specification {
       sentInvalidationRequest.getInvalidationBatch.getPaths.getItems.toSeq.sorted must equalTo(("/articles/arnold's%20file.html" :: Nil).sorted)
     }
 
-    /*
-     * 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 VerboseLogger with MockAWS {
+    "invalidate the root object '/' if a top-level object is updated or deleted" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("maybe-index.html")
       setOutdatedS3Keys("maybe-index.html")
@@ -189,7 +183,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "cloudfront_invalidate_root: true" should {
-    "convert CloudFront invalidation paths with the '/index.html' suffix into '/'"  in new EmptySite with VerboseLogger with MockAWS {
+    "convert CloudFront invalidation paths with the '/index.html' suffix into '/'"  in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       config = """
         |cloudfront_distribution_id: EGM1J2JJX9Z
         |cloudfront_invalidate_root: true
@@ -202,7 +196,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 VerboseLogger with MockAWS {
+    "split the CloudFront invalidation requests into batches of 1000 items" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       val files = (1 to 1002).map { i => s"lots-of-files/file-$i"}
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFiles(files:_*)
@@ -215,18 +209,18 @@ class S3WebsiteSpec extends Specification {
   }
 
   "push exit status" should {
-    "be 0 all uploads succeed" in new EmptySite with VerboseLogger with MockAWS {
+    "be 0 all uploads succeed" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       setLocalFiles("file.txt")
       Push.pushSite must equalTo(0)
     }
 
-    "be 1 if any of the uploads fails" in new EmptySite with VerboseLogger with MockAWS {
+    "be 1 if any of the uploads fails" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       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 VerboseLogger with MockAWS {
+    "be 1 if any of the redirects fails" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       config = """
         |redirects:
         |  index.php: /index.html
@@ -235,14 +229,14 @@ class S3WebsiteSpec extends Specification {
       Push.pushSite must equalTo(1)
     }
 
-    "be 0 if CloudFront invalidations and uploads succeed"in new EmptySite with VerboseLogger with MockAWS {
+    "be 0 if CloudFront invalidations and uploads succeed"in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       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 VerboseLogger with MockAWS {
+    "be 1 if CloudFront is unreachable or broken"in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       setCloudFrontAsInternallyBroken()
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("test.css")
@@ -250,19 +244,19 @@ class S3WebsiteSpec extends Specification {
       Push.pushSite must equalTo(1)
     }
 
-    "be 0 if upload retry succeeds" in new EmptySite with VerboseLogger with MockAWS {
+    "be 0 if upload retry succeeds" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       setLocalFile("index.html")
       uploadFailsAndThenSucceeds(howManyFailures = 1)
       Push.pushSite must equalTo(0)
     }
 
-    "be 1 if delete retry fails" in new EmptySite with VerboseLogger with MockAWS {
+    "be 1 if delete retry fails" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       setLocalFile("index.html")
       uploadFailsAndThenSucceeds(howManyFailures = 6)
       Push.pushSite must equalTo(1)
     }
 
-    "be 1 if an object listing fails" in new EmptySite with VerboseLogger with MockAWS {
+    "be 1 if an object listing fails" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       setS3Files(S3File("old.html", md5Hex("<h1>old text</h1>")))
       objectListingFailsAndThenSucceeds(howManyFailures = 6)
       Push.pushSite must equalTo(1)
@@ -270,7 +264,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "s3_website.yml file" should {
-    "never be uploaded" in new EmptySite with VerboseLogger with MockAWS {
+    "never be uploaded" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       setLocalFile("s3_website.yml")
       Push.pushSite
       noUploadsOccurred must beTrue
@@ -278,7 +272,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "exclude_from_upload: string" should {
-    "result in matching files not being uploaded" in new EmptySite with VerboseLogger with MockAWS {
+    "result in matching files not being uploaded" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       config = "exclude_from_upload: .DS_.*?"
       setLocalFile(".DS_Store")
       Push.pushSite
@@ -291,7 +285,7 @@ class S3WebsiteSpec extends Specification {
        - regex
        - another_exclusion
   """ should {
-    "result in matching files not being uploaded" in new EmptySite with VerboseLogger with MockAWS {
+    "result in matching files not being uploaded" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       config = """
         |exclude_from_upload:
         |  - .DS_.*?
@@ -304,7 +298,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "ignore_on_server: value" should {
-    "not delete the S3 objects that match the ignore value" in new EmptySite with VerboseLogger with MockAWS {
+    "not delete the S3 objects that match the ignore value" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       config = "ignore_on_server: logs"
       setS3Files(S3File("logs/log.txt", ""))
       Push.pushSite
@@ -317,7 +311,7 @@ class S3WebsiteSpec extends Specification {
        - regex
        - another_ignore
   """ should {
-    "not delete the S3 objects that match the ignore value" in new EmptySite with VerboseLogger with MockAWS {
+    "not delete the S3 objects that match the ignore value" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       config = """
         |ignore_on_server:
         |  - .*txt
@@ -329,14 +323,14 @@ class S3WebsiteSpec extends Specification {
   }
 
   "max-age in config" can {
-    "be applied to all files" in new EmptySite with VerboseLogger with MockAWS {
+    "be applied to all files" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       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 VerboseLogger with MockAWS {
+    "be applied to files that match the glob" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       config = """
         |max_age:
         |  "*.html": 90
@@ -346,7 +340,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 VerboseLogger with MockAWS {
+    "be applied to directories that match the glob" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       config = """
         |max_age:
         |  "assets/**/*.js": 90
@@ -356,7 +350,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 VerboseLogger with MockAWS {
+    "not be applied if the glob doesn't match" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       config = """
         |max_age:
         |  "*.js": 90
@@ -366,7 +360,7 @@ class S3WebsiteSpec extends Specification {
       sentPutObjectRequest.getMetadata.getCacheControl must beNull
     }
 
-    "be used to disable caching" in new EmptySite with VerboseLogger with MockAWS {
+    "be used to disable caching" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       config = "max_age: 0"
       setLocalFile("index.html")
       Push.pushSite
@@ -375,7 +369,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "max-age in config" should {
-    "respect the more specific glob" in new EmptySite with VerboseLogger with MockAWS {
+    "respect the more specific glob" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       config = """
         |max_age:
         |  "assets/*": 150
@@ -389,7 +383,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "s3_reduced_redundancy: true in config" should {
-    "result in uploads being marked with reduced redundancy" in new EmptySite with VerboseLogger with MockAWS {
+    "result in uploads being marked with reduced redundancy" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       config = "s3_reduced_redundancy: true"
       setLocalFile("file.exe")
       Push.pushSite
@@ -398,7 +392,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 VerboseLogger with MockAWS {
+    "result in uploads being marked with the default storage class" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       config = "s3_reduced_redundancy: false"
       setLocalFile("file.exe")
       Push.pushSite
@@ -407,7 +401,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "redirect in config" should {
-    "result in a redirect instruction that is sent to AWS" in new EmptySite with VerboseLogger with MockAWS {
+    "result in a redirect instruction that is sent to AWS" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       config = """
         |redirects:
         |  index.php: /index.html
@@ -416,7 +410,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 VerboseLogger with MockAWS {
+    "result in max-age=0 Cache-Control header on the object" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       config = """
         |redirects:
         |  index.php: /index.html
@@ -427,7 +421,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 VerboseLogger with MockAWS {
+    "not result in the S3 object being deleted" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       config = """
         |redirects:
         |  index.php: /index.html
@@ -440,7 +434,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "dotfiles" should {
-    "be included in the pushed files" in new EmptySite with VerboseLogger with MockAWS {
+    "be included in the pushed files" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       setLocalFile(".vimrc")
       Push.pushSite
       sentPutObjectRequest.getKey must equalTo(".vimrc")
@@ -448,25 +442,25 @@ class S3WebsiteSpec extends Specification {
   }
 
   "content type inference" should {
-    "add charset=utf-8 to all html documents" in new EmptySite with VerboseLogger with MockAWS {
+    "add charset=utf-8 to all html documents" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       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 VerboseLogger with MockAWS {
+    "add charset=utf-8 to all text documents" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       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 VerboseLogger with MockAWS {
+    "add charset=utf-8 to all json documents" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       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 VerboseLogger with MockAWS {
+    "resolve the content type from file contents" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       setLocalFileWithContent(("index", "<html><body><h1>hi</h1></body></html>"))
       Push.pushSite
       sentPutObjectRequest.getMetadata.getContentType must equalTo("text/html; charset=utf-8")
@@ -474,7 +468,7 @@ class S3WebsiteSpec extends Specification {
   }
 
   "ERB in config file" should {
-    "be evaluated"  in new EmptySite with VerboseLogger with MockAWS {
+    "be evaluated"  in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       config = """
         |redirects:
         |<%= ('a'..'f').to_a.map do |t| '  '+t+ ': /'+t+'.html' end.join('\n')%>
@@ -486,17 +480,67 @@ class S3WebsiteSpec extends Specification {
   }
 
   "logging" should {
-    "print the debug messages when --verbose is defined" in new EmptySite with VerboseLogger with MockAWS {
+    "print the debug messages when --verbose is defined" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
       Push.pushSite
       logEntries must contain("[debg] Querying S3 files")
     }
 
-    "not print the debug messages by default" in new EmptySite with NonVerboseLogger with MockAWS {
+    "not print the debug messages by default" in new EmptySite with NonVerboseLogger with MockAWS with DefaultRunMode {
       Push.pushSite
       logEntries.forall(_.contains("[debg]")) must beFalse
     }
   }
   
+  "dry run" should {
+    "not push updates" in new EmptySite with VerboseLogger with MockAWS with DryRunMode {
+      setLocalFileWithContent(("index.html", "<div>new</div>"))
+      setS3Files(S3File("index.html", md5Hex("<div>old</div>")))
+      Push.pushSite
+      noUploadsOccurred must beTrue
+    }
+
+    "not push redirects" in new EmptySite with VerboseLogger with MockAWS with DryRunMode {
+      config =
+        """
+          |redirects:
+          |  index.php: /index.html
+        """.stripMargin
+      Push.pushSite
+      noUploadsOccurred must beTrue
+    }
+
+    "not push deletes" in new EmptySite with VerboseLogger with MockAWS with DryRunMode {
+      setS3Files(S3File("index.html", md5Hex("<div>old</div>")))
+      Push.pushSite
+      noUploadsOccurred must beTrue
+    }
+
+    "not push new files" in new EmptySite with VerboseLogger with MockAWS with DryRunMode {
+      setLocalFile("index.html")
+      Push.pushSite
+      noUploadsOccurred must beTrue
+    }
+    
+    "not invalidate files" in new EmptySite with VerboseLogger with MockAWS with DryRunMode {
+      config = "cloudfront_invalidation_id: AABBCC"
+      setS3Files(S3File("index.html", md5Hex("<div>old</div>")))
+      Push.pushSite
+      noInvalidationsOccurred must beTrue
+    }
+  }
+
+  trait DefaultRunMode {
+    implicit def pushMode: PushMode = new PushMode {
+      def dryRun = false
+    }
+  }
+
+  trait DryRunMode {
+    implicit def pushMode: PushMode = new PushMode {
+      def dryRun = true
+    }
+  }
+
   trait MockAWS extends MockS3 with MockCloudFront with Scope
 
   trait VerboseLogger extends LogCapturer {
@@ -518,7 +562,7 @@ class S3WebsiteSpec extends Specification {
   
   trait MockCloudFront extends MockAWSHelper {
     val amazonCloudFrontClient = mock(classOf[AmazonCloudFront])
-    implicit val cfSettings: CloudFrontSettings = CloudFrontSettings(
+    implicit val cfSettings: CloudFrontSetting = CloudFrontSetting(
       cfClient = _ => amazonCloudFrontClient,
       retryTimeUnit = MICROSECONDS
     )
@@ -564,7 +608,7 @@ class S3WebsiteSpec extends Specification {
   
   trait MockS3 extends MockAWSHelper {
     val amazonS3Client = mock(classOf[AmazonS3])
-    implicit val s3Settings: S3Settings = S3Settings(
+    implicit val s3Settings: S3Setting = S3Setting(
       s3Client = _ => amazonS3Client,
       retryTimeUnit = MICROSECONDS
     )
@@ -590,8 +634,6 @@ class S3WebsiteSpec extends Specification {
       }
     }
 
-    val s3 = new S3()
-
     def uploadFailsAndThenSucceeds(implicit howManyFailures: Int, callCount: AtomicInteger = new AtomicInteger(0)) {
       doAnswer(temporaryFailure(classOf[PutObjectResult]))
         .when(amazonS3Client)
@@ -611,7 +653,6 @@ class S3WebsiteSpec extends Specification {
     }
 
     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())
       req.getValue

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_website_monadic
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
 platform: ruby
 authors:
 - Lauri Lehmijoki