s3_website 2.8.1 → 2.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40e97e64d528ad59e6a9ad089fffa120f34b0b1f
-  data.tar.gz: 9cd5ff6a0b7f0eebeb1c87bbb4e8bfd001195d1a
+  metadata.gz: 3ef96125c6a73593af5f5fad43964ec7f968511f
+  data.tar.gz: 883d27f9ee3ae528c4d3e76478740c66f56734c5
 SHA512:
-  metadata.gz: 13ab5e5f2a72f7beec238e78133a40d9d5986bf1faec79d83253e48fc1bb34f43f0ee07296083ba122abbb105092fde24249117cd4ab2b6e1f1bb9ea3dfdf1a4
-  data.tar.gz: 166b6375523dec9e3a642d20516676291488c149bd1a7eb48fffbd19d3a75e644fbfef19e4c7a73778cdacb5e5558a08076bd29e296c6083fbfb789f0d7e32b3
+  metadata.gz: 183d2e3a0644fc60ca90b045bd74101601e5e6b182a348e5e55b68d3df6090ed81671cf921126e97659ee6fc81b6f384bd861cd160f4d9b1b82403d1e6b220e5
+  data.tar.gz: 2580cfc91f7a99ec584d826b1677b87afcb2f90407074a318b02568ae7ed55153849d35d554bb981fba4ea6fdc6ad04d0600cda235753ba7157da8e4af7f11ba

data/changelog.md

@@ -2,6 +2,13 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 2.8.3
+
+* Fix bug where the setting `cloudfront_invalidate_root: true` resulted in a
+  CloudFront invalidation even if there were no changes to push.
+
+  See <https://github.com/laurilehmijoki/s3_website/issues/149> for discussion.
+
 ## 2.8.1
 
 * Change CloudFront `OriginProtocolPolicy` to `http-only`

data/lib/s3_website/version.rb

@@ -1,3 +1,3 @@
 module S3Website
-  VERSION = '2.8.1'
+  VERSION = '2.8.3'
 end

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

@@ -81,9 +81,11 @@ object CloudFront {
           )
         if (containsPotentialDefaultRootObject) paths :+ "/" else paths
       }
-      def withIndexPathIfNeeded(paths: Seq[String]) = {
-        if (config.cloudfront_invalidate_root.contains(true)) paths :+ "/index.html" else paths
-      }
+      def withIndexPathIfNeeded(paths: Seq[String]) =
+        if (config.cloudfront_invalidate_root.contains(true) && pushSuccessReports.nonEmpty)
+          paths :+ "/index.html"
+        else
+          paths
       val paths = pushSuccessReports
         .filter(needsInvalidation) // Assume that redirect objects are never cached.
         .map(toInvalidationPath)

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

@@ -238,6 +238,15 @@ class S3WebsiteSpec extends Specification {
       push()
       sentInvalidationRequest.getInvalidationBatch.getPaths.getItems.toSeq must contain("/index.html")
     }
+
+    "not invalidate anything if there was nothing to push" in new BasicSetup {
+      config = """
+        |cloudfront_distribution_id: EGM1J2JJX9Z
+        |cloudfront_invalidate_root: true
+      """.stripMargin
+      push()
+      noInvalidationsOccurred
+    }
   }
 
   "a site with over 1000 items" should {

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.3
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
 - !ruby/object:Gem::Dependency
@@ -56,14 +56,14 @@ dependencies:
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
@@ -103,8 +103,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -153,17 +153,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Manage your S3 website