s3_website 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b26682cbb78c10aa527d65993f265c3b97af2450
-  data.tar.gz: 3bd33a3a6440de3a8f83b257828bc815e0e4e439
+  metadata.gz: d0ae62a6f1d23ff2c577665bf70c0f0ab7a4eb56
+  data.tar.gz: 012d1764cf766d1b166647c9fe109186622d92a0
 SHA512:
-  metadata.gz: c102eab9efbb9d438329a32456c5ee55a11f096fe18e25767eb7029055d76c3176c1b7bd0c085fe1df8fcf19f54708fe30c8261bec947df8a299548e27dfedde
-  data.tar.gz: 89fc0705033813863965ea64abec0ee1e3137f70bcf5fdfe3bda40380aeb062cd5d9a6c79a3d535ae1cd4ce4ba579388abc595239a1bdec83cf2c923c8259f8c
+  metadata.gz: 9801caa38458f53ca30095735cd051eed8e302370a4026d97980d09f3b2a90370ac0a21d5c8fe5c2717f6c57df5eb9f88e851d0ac106adcf34d2ee234719cf04
+  data.tar.gz: 3cf7599615e920cf6000ef4d2525013f74421b5ca759add184012df9d44ef4facdb3657d73c0d9a3c4526e3293e25fdd34869514edaeaaf730156142add4fdcf

data/.travis.yml

@@ -1,3 +1,7 @@
 language: scala
 scala:
-   2.11.1
+   2.11.2
+jdk:
+  - openjdk6
+  - openjdk7
+  - oraclejdk8

data/README.md

@@ -110,6 +110,9 @@ max_age:
 
 Place the configuration into the file `s3_website.yml`.
 
+After changing the `max_age` setting, push with the `--force` option.
+Force-pushing allows you to update the S3 object metadata of existing files.
+
 ### Gzip Compression
 
 If you choose, you can use compress certain file types before uploading them to
@@ -136,6 +139,8 @@ gzip:
 Remember that the extensions here are referring to the *compiled* extensions,
 not the pre-processed extensions.
 
+After changing the `gzip` setting, push with the `--force` option.
+
 ### Using non-standard AWS regions
 
 By default, `s3_website` uses the US Standard Region. You can upload your
@@ -196,6 +201,9 @@ You can reduce the cost of hosting your blog on S3 by using Reduced Redundancy S
   * All objects uploaded after this change will use the Reduced Redundancy Storage.
   * If you want to change all of the files in the bucket, you can change them through the AWS console, or update the timestamp on the files before running `s3_website` again
 
+After changing the `s3_reduced_redundancy` setting, push with the `--force`
+option.
+
 ### How to use Cloudfront to deliver your blog
 
 It is easy to deliver your S3-based web site via Cloudfront, the CDN of Amazon.

data/bin/s3_website

@@ -78,6 +78,12 @@ class Cli < Thor
     :default => false,
     :desc => "Print verbose output"
   )
+  option(
+    :force,
+    :type => :boolean,
+    :default => false,
+    :desc => "Skip diff calculation and push all the files. This option is useful when you need to update metadata on the S3 objects."
+  )
   option(
     :dry_run,
     :type => :boolean,

data/changelog.md

@@ -2,6 +2,13 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 2.5.0
+
+* Add `push --force` option
+
+  When the user pushes with force, s3_website skips the diff. This is helpful for the
+  users who wish to update the S3 object metadata.
+
 ## 2.4.0
 
 * Add `ignore_on_server: _DELETE_NOTHING_ON_THE_S3_BUCKET_` for the sake of convenience

data/lib/s3_website/version.rb

@@ -1,3 +1,3 @@
 module S3Website
-  VERSION = '2.4.0'
+  VERSION = '2.5.0'
 end

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

@@ -14,9 +14,9 @@ import s3.website.model.Config.awsCredentials
 
 object CloudFront {
   def invalidate(invalidationBatch: InvalidationBatch, distributionId: String, attempt: Attempt = 1)
-                (implicit ec: ExecutionContextExecutor, cloudFrontSettings: CloudFrontSetting, config: Config, logger: Logger, pushMode: PushMode): InvalidationResult =
+                (implicit ec: ExecutionContextExecutor, cloudFrontSettings: CloudFrontSetting, config: Config, logger: Logger, pushOptions: PushOptions): InvalidationResult =
     Future {
-      if (!pushMode.dryRun) cloudFront createInvalidation new CreateInvalidationRequest(distributionId, invalidationBatch)
+      if (!pushOptions.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)
@@ -27,7 +27,7 @@ object CloudFront {
     ))
 
   def tooManyInvalidationsRetry(invalidationBatch: InvalidationBatch, distributionId: String, attempt: Attempt)
-                               (implicit ec: ExecutionContextExecutor, logger: Logger, cloudFrontSettings: CloudFrontSetting, config: Config, pushMode: PushMode):
+                               (implicit ec: ExecutionContextExecutor, logger: Logger, cloudFrontSettings: CloudFrontSetting, config: Config, pushOptions: PushOptions):
   PartialFunction[Throwable, InvalidationResult] = {
     case e: TooManyInvalidationsInProgressException =>
       val duration: Duration = Duration(
@@ -57,7 +57,7 @@ object CloudFront {
 
   type CloudFrontClientProvider = (Config) => AmazonCloudFront
 
-  case class SuccessfulInvalidation(invalidatedItemsCount: Int)(implicit pushMode: PushMode) extends SuccessReport {
+  case class SuccessfulInvalidation(invalidatedItemsCount: Int)(implicit pushOptions: PushOptions) extends SuccessReport {
     def reportMessage = s"${Invalidated.renderVerb} ${invalidatedItemsCount ofType "item"} on CloudFront"
   }
 

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

@@ -5,7 +5,7 @@ import s3.website.model.Site._
 import scala.concurrent.{ExecutionContextExecutor, Future, Await}
 import scala.concurrent.duration._
 import scala.language.postfixOps
-import s3.website.Diff.{resolveDeletes, resolveDiff}
+import s3.website.UploadHelper.{resolveDeletes, resolveUploads}
 import s3.website.S3._
 import scala.concurrent.ExecutionContext.fromExecutor
 import java.util.concurrent.Executors.newFixedThreadPool
@@ -44,12 +44,14 @@ object Push {
     @Option(longName = Array("config-dir"), defaultToNull = true) def configDir: String
     @Option def verbose: Boolean
     @Option(longName = Array("dry-run")) def dryRun: Boolean
+    @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)
-    implicit val pushMode = new PushMode {
+    implicit val pushOptions = new PushOptions {
       def dryRun = cliArgs.dryRun
+      def force  = cliArgs.force
     }
 
     implicit val yamlConfig = S3_website_yml(new File(Option(cliArgs.configDir).getOrElse(workingDirectory.getPath) + "/s3_website.yml"))
@@ -75,7 +77,7 @@ object Push {
                 s3Settings: S3Setting,
                 cloudFrontSettings: CloudFrontSetting,
                 logger: Logger,
-                pushMode: PushMode
+                pushOptions: PushOptions
                 ): ExitCode = {
     logger.info(s"${Deploy.renderVerb} ${site.rootDirectory}/* to ${site.config.s3_bucket}")
     val redirects = Redirect.resolveRedirects
@@ -83,7 +85,7 @@ object Push {
     val redirectReports: PushReports = redirects.map(S3 uploadRedirect _) map (Right(_))
 
     val pushReports: Future[PushReports] = for {
-      errorOrUploads: Either[ErrorReport, Seq[Upload]] <- resolveDiff(s3FilesFuture)
+      errorOrUploads: Either[ErrorReport, Seq[Upload]] <- resolveUploads(s3FilesFuture)
     } yield {
       val uploadReports: PushReports = errorOrUploads.fold(
         error => Left(error) :: Nil,
@@ -108,7 +110,7 @@ object Push {
   
   def invalidateCloudFrontItems
     (finishedPushOperations: FinishedPushOperations)
-    (implicit config: Config, cloudFrontSettings: CloudFrontSetting, ec: ExecutionContextExecutor, logger: Logger, pushMode: PushMode):
+    (implicit config: Config, cloudFrontSettings: CloudFrontSetting, ec: ExecutionContextExecutor, logger: Logger, pushOptions: PushOptions):
   Option[InvalidationSucceeded] =
     config.cloudfront_distribution_id.map { distributionId =>
       val pushSuccessReports = 
@@ -141,7 +143,7 @@ object Push {
   type InvalidationSucceeded = Boolean
 
   def afterPushFinished(finishedPushOps: FinishedPushOperations, invalidationSucceeded: Option[Boolean])
-                       (implicit config: Config, logger: Logger, pushMode: PushMode): ExitCode = {
+                       (implicit config: Config, logger: Logger, pushOptions: PushOptions): ExitCode = {
     val pushCounts = resolvePushCounts(finishedPushOps)
     logger.info(s"Summary: ${pushCountsToString(pushCounts)}")
     val pushOpExitCode = finishedPushOps.foldLeft(0) { (memo, finishedUpload) =>
@@ -158,7 +160,7 @@ object Push {
     val exitCode = (pushOpExitCode + cloudFrontInvalidationExitCode) min 1
 
     exitCode match {
-      case 0 if !pushMode.dryRun && pushCounts.thereWasSomethingToPush =>
+      case 0 if !pushOptions.dryRun && pushCounts.thereWasSomethingToPush =>
         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}")
@@ -191,7 +193,7 @@ object Push {
       )
   }
 
-  def pushCountsToString(pushCounts: PushCounts)(implicit pushMode: PushMode): String =
+  def pushCountsToString(pushCounts: PushCounts)(implicit pushOptions: PushOptions): String =
     pushCounts match {
       case PushCounts(updates, newFiles, failures, redirects, deletes, _, _)
         if updates == 0 && newFiles == 0 && failures == 0 && redirects == 0 && deletes == 0 =>

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

@@ -18,20 +18,20 @@ import scala.util.Try
 object S3 {
 
   def uploadRedirect(redirect: Redirect, a: Attempt = 1)
-            (implicit config: Config, s3Settings: S3Setting, pushMode: PushMode, executor: ExecutionContextExecutor, logger: Logger) =
+            (implicit config: Config, s3Settings: S3Setting, pushOptions: PushOptions, executor: ExecutionContextExecutor, logger: Logger) =
     uploadToS3(Right(redirect))
 
   def uploadFile(up: Upload, a: Attempt = 1)
-                    (implicit config: Config, s3Settings: S3Setting, pushMode: PushMode, executor: ExecutionContextExecutor, logger: Logger) =
+                    (implicit config: Config, s3Settings: S3Setting, pushOptions: PushOptions, executor: ExecutionContextExecutor, logger: Logger) =
     uploadToS3(Left(up))
 
   def uploadToS3(source: Either[Upload, Redirect], a: Attempt = 1)
-            (implicit config: Config, s3Settings: S3Setting, pushMode: PushMode, executor: ExecutionContextExecutor, logger: Logger):
+            (implicit config: Config, s3Settings: S3Setting, pushOptions: PushOptions, executor: ExecutionContextExecutor, logger: Logger):
   Future[Either[FailedUpload, SuccessfulUpload]] =
     Future {
       val putObjectRequest = toPutObjectRequest(source).get
       val uploadDuration =
-        if (pushMode.dryRun) None
+        if (pushOptions.dryRun) None
         else Some(recordUploadDuration(putObjectRequest, s3Settings.s3Client(config) putObject putObjectRequest))
       val report = SuccessfulUpload(
         source.fold(_.s3Key, _.s3Key),
@@ -49,10 +49,10 @@ object S3 {
     )
 
   def delete(s3Key: S3Key,  a: Attempt = 1)
-            (implicit config: Config, s3Settings: S3Setting, pushMode: PushMode, executor: ExecutionContextExecutor, logger: Logger):
+            (implicit config: Config, s3Settings: S3Setting, pushOptions: PushOptions, executor: ExecutionContextExecutor, logger: Logger):
   Future[Either[FailedDelete, SuccessfulDelete]] =
     Future {
-      if (!pushMode.dryRun) s3Settings.s3Client(config) deleteObject(config.s3_bucket, s3Key)
+      if (!pushOptions.dryRun) s3Settings.s3Client(config) deleteObject(config.s3_bucket, s3Key)
       val report = SuccessfulDelete(s3Key)
       logger.info(report)
       Right(report)
@@ -110,7 +110,7 @@ object S3 {
   def awsS3Client(config: Config) = new AmazonS3Client(awsCredentials(config))
 
   def resolveS3Files(nextMarker: Option[String] = None, alreadyResolved: Seq[S3File] = Nil,  attempt: Attempt = 1)
-                              (implicit config: Config, s3Settings: S3Setting, ec: ExecutionContextExecutor, logger: Logger, pushMode: PushMode):
+                              (implicit config: Config, s3Settings: S3Setting, ec: ExecutionContextExecutor, logger: Logger, pushOptions: PushOptions):
   Future[Either[ErrorReport, Seq[S3File]]] = Future {
     logger.debug(nextMarker.fold
       ("Querying S3 files")
@@ -152,7 +152,7 @@ object S3 {
   case class SuccessfulUpload(s3Key: S3Key,
                               details: Either[SuccessfulNewOrCreatedDetails, SuccessfulRedirectDetails],
                               putObjectRequest: PutObjectRequest)
-                             (implicit pushMode: PushMode, logger: Logger) extends PushSuccessReport {
+                             (implicit pushOptions: PushOptions, logger: Logger) extends PushSuccessReport {
     def reportMessage =
       details.fold(
         newOrCreatedDetails => s"${newOrCreatedDetails.uploadType.pushAction} $s3Key ($reportDetails)",
@@ -205,7 +205,7 @@ object S3 {
     }
   }
 
-  case class SuccessfulDelete(s3Key: String)(implicit pushMode: PushMode) extends PushSuccessReport {
+  case class SuccessfulDelete(s3Key: String)(implicit pushOptions: PushOptions) extends PushSuccessReport {
     def reportMessage = s"${Deleted.renderVerb} $s3Key"
   }
 

data/src/main/scala/s3/website/{Diff.scala → UploadHelper.scala}

@@ -1,27 +1,31 @@
 package s3.website
 
+import s3.website.model.Files.listSiteFiles
 import s3.website.model._
 import s3.website.Ruby.rubyRegexMatches
 import scala.concurrent.{ExecutionContextExecutor, Future}
 import scala.util.{Failure, Success, Try}
 import java.io.File
 
-object Diff {
+object UploadHelper {
 
   type FutureUploads = Future[Either[ErrorReport, Seq[Upload]]]
 
-  def resolveDiff(s3FilesFuture: Future[Either[ErrorReport, Seq[S3File]]])
-                 (implicit site: Site, logger: Logger, executor: ExecutionContextExecutor): FutureUploads =
-    resolveDiffAgainstGetBucketResponse(s3FilesFuture)
+  def resolveUploads(s3FilesFuture: Future[Either[ErrorReport, Seq[S3File]]])
+                 (implicit site: Site, pushOptions: PushOptions, logger: Logger, executor: ExecutionContextExecutor): FutureUploads =
+    resolveUploadsAgainstGetBucketResponse(s3FilesFuture)
 
-  private def resolveDiffAgainstGetBucketResponse(s3FilesFuture: Future[Either[ErrorReport, Seq[S3File]]])
-                                                 (implicit site: Site, logger: Logger, executor: ExecutionContextExecutor): FutureUploads =
+  private def resolveUploadsAgainstGetBucketResponse(s3FilesFuture: Future[Either[ErrorReport, Seq[S3File]]])
+                                                    (implicit site: Site,
+                                                     pushOptions: PushOptions,
+                                                     logger: Logger,
+                                                     executor: ExecutionContextExecutor): FutureUploads =
     s3FilesFuture.map { errorOrS3Files =>
       errorOrS3Files.right.flatMap { s3Files =>
         Try {
           val s3KeyIndex = s3Files.map(_.s3Key).toSet
           val s3Md5Index = s3Files.map(_.md5).toSet
-          val siteFiles = Files.listSiteFiles
+          val siteFiles = listSiteFiles
           val existsOnS3 = (f: File) => s3KeyIndex contains site.resolveS3Key(f)
           val isChangedOnS3 = (upload: Upload) => !(s3Md5Index contains upload.md5.get)
           val newUploads = siteFiles collect {
@@ -29,7 +33,7 @@ object Diff {
           }
           val changedUploads = siteFiles collect {
             case file if existsOnS3(file) => Upload(file, FileUpdate)
-          } filter isChangedOnS3
+          } filter (if (pushOptions.force) selectAllFiles else isChangedOnS3)
           newUploads ++ changedUploads
         } match {
           case Success(ok) => Right(ok)
@@ -38,13 +42,15 @@ object Diff {
       }
     }
 
+  val selectAllFiles = (upload: Upload) => true
+
   def resolveDeletes(s3Files: Future[Either[ErrorReport, Seq[S3File]]], redirects: Seq[Redirect])
                     (implicit site: Site, logger: Logger, executor: ExecutionContextExecutor): Future[Either[ErrorReport, Seq[S3Key]]] =
     if (site.config.ignore_on_server.contains(Left(DELETE_NOTHING_MAGIC_WORD))) {
       logger.debug(s"Ignoring all files on the bucket, since the setting $DELETE_NOTHING_MAGIC_WORD is on.")
       Future(Right(Nil))
     } else {
-      val localS3Keys = Files.listSiteFiles.map(site resolveS3Key)
+      val localS3Keys = listSiteFiles.map(site resolveS3Key)
 
       s3Files map { s3Files: Either[ErrorReport, Seq[S3File]] =>
         for {

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

@@ -40,8 +40,16 @@ package object website {
     def retryTimeUnit: TimeUnit
   }
   
-  trait PushMode {
+  trait PushOptions {
+    /**
+     * @return true if the CLI option --dry-run is on
+     */
     def dryRun: Boolean
+
+    /**
+     * @return true if the CLI option --force is on
+     */
+    def force: Boolean
   }
 
   type S3Key = String
@@ -51,8 +59,8 @@ package object website {
   trait PushAction {
     def actionName = getClass.getSimpleName.replace("$", "") // case object class names contain the '$' char
 
-    def renderVerb(implicit pushMode: PushMode): String =
-      if (pushMode.dryRun)
+    def renderVerb(implicit pushOptions: PushOptions): String =
+      if (pushOptions.dryRun)
         s"Would have ${actionName.toLowerCase}"
       else
         s"$actionName"
@@ -65,15 +73,15 @@ package object website {
   case object Invalidated extends PushAction
   case object Applied     extends PushAction
   case object PushNothing extends PushAction {
-    override def renderVerb(implicit pushMode: PushMode) =
-      if (pushMode.dryRun)
+    override def renderVerb(implicit pushOptions: PushOptions) =
+      if (pushOptions.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)
+    override def renderVerb(implicit pushOptions: PushOptions) =
+      if (pushOptions.dryRun)
         s"Simulating the deployment of"
       else
         s"Deploying"

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

@@ -18,7 +18,7 @@ import org.mockito.{ArgumentCaptor, Matchers, Mockito}
 import org.specs2.mutable.{BeforeAfter, Specification}
 import org.specs2.specification.Scope
 import s3.website.CloudFront.CloudFrontSetting
-import s3.website.Diff.DELETE_NOTHING_MAGIC_WORD
+import s3.website.UploadHelper.DELETE_NOTHING_MAGIC_WORD
 import s3.website.Push.{CliArgs}
 import s3.website.S3.S3Setting
 import s3.website.model.Config.S3_website_yml
@@ -611,15 +611,24 @@ class S3WebsiteSpec extends Specification {
     }
   }
 
+  "push --force" should {
+    "push all the files whether they have changed or not" in new ForcePush {
+      setLocalFileWithContent(("index.html", "<h1>hi</h1>"))
+      setS3Files(S3File("index.html", "1c5117e5839ad8fc00ce3c41296255a1" /* md5 of the gzip of the file contents */))
+      push
+      sentPutObjectRequest.getKey must equalTo("index.html")
+    }
+  }
+
   "dry run" should {
-    "not push updates" in new SiteLocationFromCliArg with EmptySite with MockAWS with DryRunMode {
+    "not push updates" in new DryRun {
       setLocalFileWithContent(("index.html", "<div>new</div>"))
       setS3Files(S3File("index.html", md5Hex("<div>old</div>")))
       push
       noUploadsOccurred must beTrue
     }
 
-    "not push redirects" in new SiteLocationFromCliArg with EmptySite with MockAWS with DryRunMode {
+    "not push redirects" in new DryRun {
       config =
         """
           |redirects:
@@ -629,19 +638,19 @@ class S3WebsiteSpec extends Specification {
       noUploadsOccurred must beTrue
     }
 
-    "not push deletes" in new SiteLocationFromCliArg with EmptySite with MockAWS with DryRunMode {
+    "not push deletes" in new DryRun {
       setS3Files(S3File("index.html", md5Hex("<div>old</div>")))
       push
       noUploadsOccurred must beTrue
     }
 
-    "not push new files" in new SiteLocationFromCliArg with EmptySite with MockAWS with DryRunMode {
+    "not push new files" in new DryRun {
       setLocalFile("index.html")
       push
       noUploadsOccurred must beTrue
     }
 
-    "not invalidate files" in new SiteLocationFromCliArg with EmptySite with MockAWS with DryRunMode {
+    "not invalidate files" in new DryRun {
       config = "cloudfront_invalidation_id: AABBCC"
       setS3Files(S3File("index.html", md5Hex("<div>old</div>")))
       push
@@ -667,18 +676,32 @@ class S3WebsiteSpec extends Specification {
   
   trait BasicSetup extends SiteLocationFromCliArg with EmptySite with MockAWS with DefaultRunMode
 
+  trait ForcePush extends SiteLocationFromCliArg with EmptySite with MockAWS with ForcePushMode
+  
+  trait DryRun extends SiteLocationFromCliArg with EmptySite with MockAWS with DryRunMode
+
   trait DefaultRunMode {
-    implicit def pushMode: PushMode = new PushMode {
+    implicit def pushOptions: PushOptions = new PushOptions {
       def dryRun = false
+      def force = false
     }
   }
 
   trait DryRunMode {
-    implicit def pushMode: PushMode = new PushMode {
+    implicit def pushOptions: PushOptions = new PushOptions {
       def dryRun = true
+      def force = false
     }
   }
 
+  trait ForcePushMode {
+    implicit def pushOptions: PushOptions = new PushOptions {
+      def dryRun = false
+      def force = true
+    }
+  }
+
+
   trait MockAWS extends MockS3 with MockCloudFront with Scope
 
   trait MockCloudFront extends MockAWSHelper {
@@ -884,17 +907,19 @@ class S3WebsiteSpec extends Specification {
         """.stripMargin
       )
 
-    def pushMode: PushMode // Represents the --dry-run switch
+    def pushOptions: PushOptions
 
     implicit def cliArgs: CliArgs =
       new CliArgs {
         def verbose = true
 
-        def dryRun = pushMode.dryRun
+        def dryRun = pushOptions.dryRun
 
         def site = if (siteDirFromCLIArg) siteDirectory.getAbsolutePath else null
 
         def configDir = configDirectory.getAbsolutePath
+
+        def force = pushOptions.force
       }
   }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -129,11 +129,11 @@ files:
 - src/main/resources/log4j.properties
 - src/main/scala/s3/website/ByteHelper.scala
 - src/main/scala/s3/website/CloudFront.scala
-- src/main/scala/s3/website/Diff.scala
 - src/main/scala/s3/website/Logger.scala
 - src/main/scala/s3/website/Push.scala
 - src/main/scala/s3/website/Ruby.scala
 - src/main/scala/s3/website/S3.scala
+- src/main/scala/s3/website/UploadHelper.scala
 - src/main/scala/s3/website/model/Config.scala
 - src/main/scala/s3/website/model/S3Endpoint.scala
 - src/main/scala/s3/website/model/Site.scala