s3_website 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d95afa1639efb9bbe1fc15486b146f42788a8146
-  data.tar.gz: 4c257d8a83e28029d63b566ff03ea9a280423698
+  metadata.gz: b26682cbb78c10aa527d65993f265c3b97af2450
+  data.tar.gz: 3bd33a3a6440de3a8f83b257828bc815e0e4e439
 SHA512:
-  metadata.gz: 80562c01d0a390e0538d65ac64686c8e01131da2b1d3a144eb5eb96459837f336652d5007889ae6783f84d8fc8aa3c6b9bfc410611a1dcfc59e4572df73cb1f6
-  data.tar.gz: b1ed8d37b875262f75041b57d27dbb2ad2702dc8b54724b728032857b29dda84091f9ebab2deb1846a197d7cf9df8c886176df2af9b2a4415f564a1f8a795cb2
+  metadata.gz: c102eab9efbb9d438329a32456c5ee55a11f096fe18e25767eb7029055d76c3176c1b7bd0c085fe1df8fcf19f54708fe30c8261bec947df8a299548e27dfedde
+  data.tar.gz: 89fc0705033813863965ea64abec0ee1e3137f70bcf5fdfe3bda40380aeb062cd5d9a6c79a3d535ae1cd4ce4ba579388abc595239a1bdec83cf2c923c8259f8c

data/README.md

@@ -169,6 +169,9 @@ ignore_on_server:
   - file_managed_by_somebody_else
 ```
 
+If you add the magic word `ignore_on_server: _DELETE_NOTHING_ON_THE_S3_BUCKET_`,
+`s3_website push` will never delete any objects on the bucket.
+
 ### Excluding files from upload
 
 You can instruct `s3_website` not to push certain files:

data/changelog.md

@@ -2,6 +2,12 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 2.4.0
+
+* Add `ignore_on_server: _DELETE_NOTHING_ON_THE_S3_BUCKET_` for the sake of convenience
+
+  See https://github.com/laurilehmijoki/s3_website/issues/121 for discussion.
+
 ## 2.3.1
 
 * Add Windows support

data/lib/s3_website/version.rb

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

data/resources/s3_website.jar.md5

@@ -1 +1 @@
-15aaf120b5c2233ae3302f570baccd4a
+d4b00c407f92dde48e4937d61c7be20d

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

@@ -39,23 +39,29 @@ object Diff {
     }
 
   def resolveDeletes(s3Files: Future[Either[ErrorReport, Seq[S3File]]], redirects: Seq[Redirect])
-                    (implicit site: Site, logger: Logger, executor: ExecutionContextExecutor): Future[Either[ErrorReport, Seq[S3Key]]] = {
-    val localS3Keys = Files.listSiteFiles.map(site resolveS3Key)
-
-    s3Files map { s3Files: Either[ErrorReport, Seq[S3File]] =>
-      for {
-        remoteS3Keys <- s3Files.right.map(_ map (_.s3Key)).right
-      } yield {
-        val keysToRetain = (localS3Keys ++ (redirects map { _.s3Key })).toSet
-        remoteS3Keys filterNot { s3Key =>
-          val ignoreOnServer = site.config.ignore_on_server.exists(_.fold(
-            (ignoreRegex: String) => rubyRegexMatches(s3Key, ignoreRegex),
-            (ignoreRegexes: Seq[String]) => ignoreRegexes.exists(rubyRegexMatches(s3Key, _))
-          ))
-          if (ignoreOnServer) logger.debug(s"Ignoring $s3Key on server")
-          (keysToRetain contains s3Key) || ignoreOnServer
+                    (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)
+
+      s3Files map { s3Files: Either[ErrorReport, Seq[S3File]] =>
+        for {
+          remoteS3Keys <- s3Files.right.map(_ map (_.s3Key)).right
+        } yield {
+          val keysToRetain = (localS3Keys ++ (redirects map { _.s3Key })).toSet
+          remoteS3Keys filterNot { s3Key =>
+            val ignoreOnServer = site.config.ignore_on_server.exists(_.fold(
+              (ignoreRegex: String) => rubyRegexMatches(s3Key, ignoreRegex),
+              (ignoreRegexes: Seq[String]) => ignoreRegexes.exists(rubyRegexMatches(s3Key, _))
+            ))
+            if (ignoreOnServer) logger.debug(s"Ignoring $s3Key on server")
+            (keysToRetain contains s3Key) || ignoreOnServer
+          }
         }
       }
     }
-  }
+
+  val DELETE_NOTHING_MAGIC_WORD = "_DELETE_NOTHING_ON_THE_S3_BUCKET_"
 }

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

@@ -18,6 +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.Push.{CliArgs}
 import s3.website.S3.S3Setting
 import s3.website.model.Config.S3_website_yml
@@ -344,6 +345,17 @@ class S3WebsiteSpec extends Specification {
     }
   }
 
+  "ignore_on_server: _DELETE_NOTHING_ON_THE_S3_BUCKET_" should {
+    "result in no files being deleted on the S3 bucket" in new BasicSetup {
+      config = s"""
+        |ignore_on_server: $DELETE_NOTHING_MAGIC_WORD
+      """.stripMargin
+      setS3Files(S3File("file.txt", ""))
+      push
+      noDeletesOccurred
+    }
+  }
+
   """
      ignore_on_server:
        - regex

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor