capistrano-s3 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02a173c70a3b3da2d285fed463f5e75b6252705d
-  data.tar.gz: 9423d2d35159919b6ccd274d142c258217fe0ad8
+  metadata.gz: 7181c1cd58ffcacd370bc1801a4a1de156b60490
+  data.tar.gz: 48c6ab3151aa29bc96df90bcbb50bbb66340f2f7
 SHA512:
-  metadata.gz: 540baac23fcd625598b9f3324e0a5c80360fc0b712cf482b067ca4bd2eb8b1334bf8e2fc65209cd85ceeb22c2f8dee1c9dbc174c48e4996be75a5cd151a4aed6
-  data.tar.gz: 09ec556aa3df667487e68d1c00b14a77a40b1a7e03c5305092d3eaf836a399431610779aaf8a3f17c6a7c056bb2432fe77433ba16c9ee4d5fc12d50b6c7d3b90
+  metadata.gz: df7c91285663a990bef6c758a9119b11fde17c6fc6e82b01b753c62925331f68f757d8132338aae56787d87e22b3377c8a566d4e5db2550228eeaab87986a21f
+  data.tar.gz: eb45abf3f729d1f3c92245c2e76bc505651ffd5eb94dc4ab2c6bb591a12511570cb870c9f97a78feb8918a862d40dd55bb507f4ce8fb38eb79a1cf4f12b48b71

data/.travis.yml

@@ -1,13 +1,14 @@
 language: ruby
+dist: trusty
 bundler_args: --without debug release
 before_install:
-  - gem install bundler
+  - ruby -v | (grep -v "rubinius" && gem install bundler) || echo 0
 rvm:
-  - 2.1.10
-  - 2.2.5
-  - 2.3.1
-  - rbx-2
-  - jruby-9.0.5.0
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
+  - rbx-3.69
+  - jruby-9.1.5.0
   - jruby-head
   - ruby-head
 matrix:

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## v1.1.0
+
+Feature : Add support for Cloudfront invalidations (#29) @exoszajzbuk
+
 ## v1.0.0
 
 Major change : drop support for ruby < 2.1 

data/README.md

@@ -130,6 +130,15 @@ Just add to your configuration:
 set :only_gzip, true
 ```
 
+### CloudFront invalidation
+
+If you set a CloudFront distribution ID (not the URL!) and an array of paths, capistrano-s3 will post an invalidation request. CloudFront supports wildcard invalidations. For example:
+
+```ruby
+set :distribution_id, "CHANGETHIS"
+set :invalidations, [ "/index.html", "/assets/*" ]
+```
+
 ## Example of usage
 
 Our Ruby stack for static websites:

data/lib/capistrano/s3/defaults.rb

@@ -6,7 +6,8 @@ module Capistrano
         :bucket_write_options => { :acl => :public_read },
         :s3_endpoint          => "s3.amazonaws.com",
         :redirect_options     => {},
-        :only_gzip            => false
+        :only_gzip            => false,
+        :invalidations        => []
       }
 
       def self.populate(context, set_method)

data/lib/capistrano/s3/publisher.rb

@@ -7,8 +7,9 @@ module Capistrano
     module Publisher
       LAST_PUBLISHED_FILE = '.last_published'
 
-      def self.publish!(s3_endpoint, key, secret, bucket, source, only_gzip, extra_options)
+      def self.publish!(s3_endpoint, key, secret, bucket, source, distribution_id, invalidations, only_gzip, extra_options)
         s3 = self.establish_s3_client_connection!(s3_endpoint, key, secret)
+        updated = false
 
         self.files(source).each do |file|
           if !File.directory?(file)
@@ -22,6 +23,22 @@ module Capistrano
           end
         end
 
+        # invalidate CloudFront distribution if needed
+        if distribution_id && !invalidations.empty?
+          cf = self.establish_cf_client_connection!(key, secret)
+
+          cf.create_invalidation({
+            :distribution_id => distribution_id,
+            :invalidation_batch => {
+              :paths => {
+                :quantity => invalidations.count,
+                :items => invalidations
+              },
+              :caller_reference => SecureRandom.hex
+            }
+          })
+        end
+
         FileUtils.touch(LAST_PUBLISHED_FILE)
       end
 
@@ -45,6 +62,10 @@ module Capistrano
           )
         end
 
+        def self.establish_cf_client_connection!(key, secret)
+          self.establish_connection!(AWS::CloudFront::Client, nil, key, secret)
+        end
+
         def self.establish_s3_client_connection!(s3_endpoint, key, secret)
           self.establish_connection!(AWS::S3::Client, s3_endpoint, key, secret)
         end

data/lib/capistrano/s3/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module S3
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/lib/capistrano/tasks/capistrano_2.rb

@@ -18,7 +18,7 @@ module Capistrano
         task :upload_files do
           extra_options = { :write => bucket_write_options, :redirect => redirect_options }
           S3::Publisher.publish!(s3_endpoint, access_key_id, secret_access_key,
-                             bucket, deployment_path, only_gzip, extra_options)
+                             bucket, deployment_path, distribution_id, invalidations, only_gzip, extra_options)
         end
       end
 

data/lib/capistrano/tasks/capistrano_3.rb

@@ -15,7 +15,7 @@ namespace :deploy do
     task :upload_files do
       extra_options = { :write => fetch(:bucket_write_options), :redirect => fetch(:redirect_options) }
       Capistrano::S3::Publisher.publish!(fetch(:s3_endpoint), fetch(:access_key_id), fetch(:secret_access_key),
-                             fetch(:bucket), fetch(:deployment_path), fetch(:only_gzip), extra_options)
+                             fetch(:bucket), fetch(:deployment_path), fetch(:distribution_id), fetch(:invalidations), fetch(:only_gzip), extra_options)
     end
   end
 

data/spec/publisher_spec.rb

@@ -10,16 +10,17 @@ describe Capistrano::S3::Publisher do
   context "on publish!" do
     it "publish all files" do
       AWS::S3::Client::V20060301.any_instance.expects(:put_object).times(8)
+      AWS::CloudFront::Client::V20141106.any_instance.expects(:create_invalidation).once
 
       path = File.join(@root, 'sample')
-      Capistrano::S3::Publisher.publish!('s3.amazonaws.com', 'abc', '123', 'mybucket.amazonaws.com', path, false, {})
+      Capistrano::S3::Publisher.publish!('s3.amazonaws.com', 'abc', '123', 'mybucket.amazonaws.com', path, 'cf123', ['*'], false, {})
     end
 
     it "publish only gzip files when option is enabled" do
       AWS::S3::Client::V20060301.any_instance.expects(:put_object).times(4)
 
       path = File.join(@root, 'sample')
-      Capistrano::S3::Publisher.publish!('s3.amazonaws.com', 'abc', '123', 'mybucket.amazonaws.com', path, true, {})
+      Capistrano::S3::Publisher.publish!('s3.amazonaws.com', 'abc', '123', 'mybucket.amazonaws.com', path, 'cf123', [], true, {})
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-s3
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jean-Philippe Doyle
@@ -36,7 +36,7 @@ cert_chain:
   t/JsZnAlWYkJIees2SFV5X/t34oeMu04yY2u9y2YBqKovR97m5YF7zqgx0JODV0x
   ytwUJvEjznBnJV4OoDE=
   -----END CERTIFICATE-----
-date: 2016-09-23 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -220,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Build and deploy a static website to Amazon S3

metadata.gz.sig

@@ -1,2 +1,3 @@
-�;օ8�ݓ�>�OÀ�\�g"�`����y�%g׊рKRo�o�l'ཏ��?h��ח��O	�ߩR�R0@J�,�ܜ>������3%��F�#�b	��ƾ��+�h
#��^jc+jGX2
1��0�г��3H�V��ĺw=�pl�g��S��EO�4�LPo�7�Vi5%��.��#�&\�V�r�]c�S%�9�B$ɥ����Is�Ic�.2���
-\8�+���ԛy��
+d�����$7k,���"y:B
+)Qҧ��V�G>�jE��*�T�*ǽ�#P=�"3��/�L��{���+؆����j�+x�� ]�%6�3|���N��wX�Z/���w
+�D0��T�P������1u%hR	9`����q���j���;`qՄ0�ݠ��V{�� �*:=����Ex5���
8������V�W�"��[Kz"I��7���T�ѩ���4cPcB��|k�>�C�OCa�h��ѽsU