s3_website 2.13.0 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dec2f3091bddd92472b85e2baaf3ce226674a00
-  data.tar.gz: 8f71d51ea20ef0c95d1ff19fd6fc92a3db04a63c
+  metadata.gz: ed60d795c8498eaa376cf3db07a1d150e664fb94
+  data.tar.gz: eb092f1524a34883201452b5ed013a864901d866
 SHA512:
-  metadata.gz: 4235de618b6457b7aed3a44bc4675a7c1669b1b95b0cfe406977602bcf144df7d5e2e134af52e68f928666fc03760e99c1bcbd6484f7a60aa370cc5a52f05650
-  data.tar.gz: 7781edee58ccbe08c88c5b57a57ca45adfa6a0361ab19f51c354dc6382307019700d8375d7d2d05510d983ce590593be810689f34459fddcb943ca56cd93c574
+  metadata.gz: 08ec5fdda103891fef1dd85b5319cd5572fd021048cceb1aae4fee438800462e072b6bcac45408fa8110f8dc59845cc98ed9eaa42a0229d0eec2ce8936dcd806
+  data.tar.gz: aab6bd5d66dafc38a200756c26a5da9e5334a35ec26f2947c1db1f6fc08dd91ed3054afc86057e126136adb63da34d673ee9dbe05da20f23ffeb06812909e3d7

data/.travis.yml

@@ -2,6 +2,4 @@ language: scala
 scala:
    2.11.2
 jdk:
-  - openjdk6
-  - openjdk7
   - oraclejdk8

data/README.md

@@ -277,6 +277,16 @@ cloudfront_distribution_config:
 Once you've saved the configuration into `s3_website.yml`, you can apply them by
 running `s3_website cfg apply`.
 
+#### Invalidating all CloudFront resources (wildcard invalidation)
+
+The following setting is recommended for most users:
+
+```yaml
+cloudfront_wildcard_invalidation: true
+```
+
+Over time, it can reduce your AWS bill significantly. For more information, see <http://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/Invalidation.html>.
+
 #### Invalidating root resources instead of index.htmls
 
 By default, `s3_website push` calls the CloudFront invalidation API with the
@@ -476,6 +486,11 @@ If you are not sure how to test your pull request, you can ask the [gem owners
 However, by including proper tests, you increase the chances of your pull
 request being incorporated into future releases.
 
+## Alternatives
+
+* <https://pages.github.com/>
+* <https://pages.gitlab.io/>
+
 ## License
 
 MIT. See the LICENSE file for more information.
@@ -524,6 +539,10 @@ Contributors (in alphabetical order)
 * Trevor Fitzgerald
 * Zee Spencer
 
+## Community articles
+
+* [Deploying websites to FTP or Amazon S3 with BitBucket Pipelines](https://www.savjee.be/2016/06/Deploying-website-to-ftp-or-amazon-s3-with-BitBucket-Pipelines/)
+
 ## Donations
 
 [![Support via Gittip](https://rawgithub.com/twolfson/gittip-badge/0.2.0/dist/gittip.png)](https://www.gittip.com/laurilehmijoki/)

data/additional-docs/setting-up-aws-credentials.md

@@ -26,7 +26,7 @@ Here is the IAM Policy Document of the above setup:
 
 ```json
 {
-  "Version": "2008-10-17",
+  "Version":"2012-10-17",
   "Statement": [
     {
       "Action": [

data/changelog.md

@@ -2,6 +2,12 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 2.14.0
+
+* Add support for CloudFront wildcard invalidations
+
+  Introduced a new setting, `cloudfront_wildcard_invalidation: (true|false)`
+
 ## 2.13.0
 
 * Add support for `dnf`, a Linux package manager

data/lib/s3_website/version.rb

@@ -1,3 +1,3 @@
 module S3Website
-  VERSION = '2.13.0'
+  VERSION = '2.14.0'
 end

data/resources/configuration_file_template.yml

@@ -43,6 +43,8 @@ s3_bucket: your.blog.bucket.com
 
 # cloudfront_invalidate_root: true
 
+cloudfront_wildcard_invalidation: true
+
 # concurrency_level: 5
 
 # redirects:

data/resources/s3_website.jar.md5

@@ -1 +1 @@
-e92233dd53c6a57ba3af62377698e206
+6736177c885c454c20caadf2396980f0

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

@@ -68,6 +68,10 @@ object CloudFront {
   def awsCloudFrontClient(config: Config) = new AmazonCloudFrontClient(awsCredentials(config))
 
   def toInvalidationBatches(pushSuccessReports: Seq[PushSuccessReport])(implicit config: Config): Seq[InvalidationBatch] = {
+    def callerReference = s"s3_website gem ${System.currentTimeMillis()}"
+    if (config.cloudfront_wildcard_invalidation.contains(true) && pushSuccessReports.exists(needsInvalidation)) {
+      return Seq(new InvalidationBatch withPaths(new Paths withItems "/*" withQuantity 1) withCallerReference callerReference)
+    }
     def defaultPath(paths: Seq[String]): Option[String] = {
       // This is how we support the Default Root Object @ CloudFront (http://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/DefaultRootObject.html)
       // We could do this more accurately by fetching the distribution config (http://docs.aws.amazon.com/AmazonCloudFront/latest/APIReference/GetConfig.html)
@@ -102,8 +106,7 @@ object CloudFront {
       .grouped(1000) // CloudFront supports max 1000 invalidations in one request (http://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/Invalidation.html#InvalidationLimits)
       .map { batchKeys =>
         new InvalidationBatch() withPaths
-          (new Paths() withItems batchKeys withQuantity batchKeys.size) withCallerReference
-          s"s3_website gem ${System.currentTimeMillis()}"
+          (new Paths() withItems batchKeys withQuantity batchKeys.size) withCallerReference callerReference
       }
       .toSeq
   }

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

@@ -11,23 +11,24 @@ import s3.website._
 import com.amazonaws.auth.{AWSCredentialsProvider, BasicAWSCredentials, DefaultAWSCredentialsProviderChain}
 
 case class Config(
-  s3_id:                      Option[String], // If undefined, use IAM Roles (http://docs.aws.amazon.com/AWSSdkDocsJava/latest/DeveloperGuide/java-dg-roles.html)
-  s3_secret:                  Option[String], // If undefined, use IAM Roles (http://docs.aws.amazon.com/AWSSdkDocsJava/latest/DeveloperGuide/java-dg-roles.html)
-  s3_bucket:                  String,
-  s3_endpoint:                S3Endpoint,
-  site:                       Option[String],
-  max_age:                    Option[Either[Int, S3KeyGlob[Int]]],
-  cache_control:              Option[Either[String, S3KeyGlob[String]]],
-  gzip:                       Option[Either[Boolean, Seq[String]]],
-  gzip_zopfli:                Option[Boolean],
-  s3_key_prefix:              Option[String],
-  ignore_on_server:           Option[S3KeyRegexes],
-  exclude_from_upload:        Option[S3KeyRegexes],
-  s3_reduced_redundancy:      Option[Boolean],
-  cloudfront_distribution_id: Option[String],
-  cloudfront_invalidate_root: Option[Boolean],
-  redirects:                  Option[Map[S3Key, String]],
-  concurrency_level:          Int,
+  s3_id:                                  Option[String], // If undefined, use IAM Roles (http://docs.aws.amazon.com/AWSSdkDocsJava/latest/DeveloperGuide/java-dg-roles.html)
+  s3_secret:                              Option[String], // If undefined, use IAM Roles (http://docs.aws.amazon.com/AWSSdkDocsJava/latest/DeveloperGuide/java-dg-roles.html)
+  s3_bucket:                              String,
+  s3_endpoint:                            S3Endpoint,
+  site:                                   Option[String],
+  max_age:                                Option[Either[Int, S3KeyGlob[Int]]],
+  cache_control:                          Option[Either[String, S3KeyGlob[String]]],
+  gzip:                                   Option[Either[Boolean, Seq[String]]],
+  gzip_zopfli:                            Option[Boolean],
+  s3_key_prefix:                          Option[String],
+  ignore_on_server:                       Option[S3KeyRegexes],
+  exclude_from_upload:                    Option[S3KeyRegexes],
+  s3_reduced_redundancy:                  Option[Boolean],
+  cloudfront_distribution_id:             Option[String],
+  cloudfront_invalidate_root:             Option[Boolean],
+  redirects:                              Option[Map[S3Key, String]],
+  concurrency_level:                      Int,
+  cloudfront_wildcard_invalidation:       Option[Boolean],
   treat_zero_length_objects_as_redirects: Option[Boolean]
 )
 

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

@@ -50,6 +50,7 @@ object Site {
           cloudfront_distribution_id <- loadOptionalString("cloudfront_distribution_id").right
           cloudfront_invalidate_root <- loadOptionalBoolean("cloudfront_invalidate_root").right
           concurrency_level <- loadOptionalInt("concurrency_level").right
+          cloudfront_wildcard_invalidation <- loadOptionalBoolean("cloudfront_wildcard_invalidation").right
           redirects <- loadRedirects(s3_key_prefix).right
           treat_zero_length_objects_as_redirects <- loadOptionalBoolean("treat_zero_length_objects_as_redirects").right
         } yield {
@@ -78,6 +79,7 @@ object Site {
             cloudfront_invalidate_root,
             redirects,
             concurrency_level.fold(20)(_ max 20),
+            cloudfront_wildcard_invalidation,
             treat_zero_length_objects_as_redirects
           )
         }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.14.0
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor