capistrano-s3 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b0c3935d05258b33d19639d14d0fb32a37319db
-  data.tar.gz: ab9319e9b78510f2e5aab8a265c24e877dc36b80
+  metadata.gz: f5218a88b280adaa259766a5e7a319e06c278956
+  data.tar.gz: 35bf3e49a5cab9ece24767916d0e97e33a146ff8
 SHA512:
-  metadata.gz: 47e1998a7b7360a52d0bb34b2b20cbe16e35dc58a3a092b7b5215665cf1c2fdf9edb25db46b5caef55ce07489a243a7a9aa527dbd777e6d7228ab5dd91d97531
-  data.tar.gz: abcb8607f6fe7724328d20c7adad16737cedd42c9a66f1cf6221fb1ac5a2c7d67cfb43ccec33932da64101b3e249750ad33ed796d9c9e3ecfbcfc94c0dd3fff6
+  metadata.gz: 73feab08d5b0c5c914a02b2c5db47403d44205b49c334a80639365c3a1eb1e6f363380a410ff1f94bf278459299684a7278e1b3b17f211465c680d6520cec4f0
+  data.tar.gz: 7b6c516974ed73332988faf8ecde09ee8aff8706d0bdabc2822bf506701cd5a62d5492262221c9b632545645907f3661af5339aacbf634fc4033eda44d28616a

data.tar.gz.sig

@@ -1,2 +1 @@
-���Y=�&s���Zo���V2p�vu]s��(`L���>���"EEkBV�39��BA9�"MEQCJ(����С����tmv_x�2�������B�ݖI��O�V
-�T4��hE
{�`�o�=�W�CM��_��P��q"EBob��L�T{���Sc
+1.�z�5�F<�ݳ���p�����]�}#�	�o"����]$�u����28z�͵�qg���|7	�Y��hЕl�d4����9�o,�뇱ԕ��m9n�56����j�v�MΩzT�_e�����|��:����ߛ����.��5��G�v��O���_�5"إ7IO{�a�Q��7���o���
�wYt!9��4c`z5H�1�л��q�?a���(��C�0aF���tQ�׭���$��

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## v2.2.0
+
+Feature : Allow to deploy to multiple stages and buckets (#41)
+Fix : issue with new target_path feature (#40)
+
 ## v2.1.1
 
 Update : removed locked & old net-ssh dependency for Ruby 1.9
@@ -11,7 +16,7 @@ Change : Relax mime-types version requirement (#36)
 
 ## v2.0.0
 
-Major change : AWS SDK dependency was upgragred to 2.6, see migration guide at bottom of README to upgrade from v1.
+Major change : AWS SDK dependency was upgraded to 2.6, see migration guide at bottom of README to upgrade from v1.
 Feature : Add wait_for_invalidation task (#32) @exoszajzbuk
 Improvement : Simpler way to set deployment_path (#33) @j15e
 

data/lib/capistrano/s3/publisher.rb

@@ -8,14 +8,14 @@ module Capistrano
       LAST_PUBLISHED_FILE = '.last_published'
       LAST_INVALIDATION_FILE = '.last_invalidation'
 
-      def self.publish!(region, key, secret, bucket, deployment_path, target_path, distribution_id, invalidations, exclusions, only_gzip, extra_options)
+      def self.publish!(region, key, secret, bucket, deployment_path, target_path, distribution_id, invalidations, exclusions, only_gzip, extra_options, stage = 'default')
         deployment_path_absolute = File.expand_path(deployment_path, Dir.pwd)
         s3 = self.establish_s3_client_connection!(region, key, secret)
         updated = false
 
         self.files(deployment_path_absolute, exclusions).each do |file|
           if !File.directory?(file)
-            next if self.published?(file)
+            next if self.published?(file, bucket, stage)
             next if only_gzip && self.has_gzipped_version?(file)
 
             path = self.base_file_path(deployment_path_absolute, file)
@@ -34,7 +34,9 @@ module Capistrano
             :invalidation_batch => {
               :paths => {
                 :quantity => invalidations.count,
-                :items => invalidations.map { |path| File.join('/', target_path, path) }
+                :items => invalidations.map do |path|
+                  File.join('/', self.add_prefix(path, prefix: target_path))
+                end
               },
               :caller_reference => SecureRandom.hex
             }
@@ -45,18 +47,18 @@ module Capistrano
           end
         end
 
-        FileUtils.touch(LAST_PUBLISHED_FILE)
+        self.published_to!(bucket, stage)
       end
 
-      def self.clear!(region, key, secret, bucket)
+      def self.clear!(region, key, secret, bucket, stage = 'default')
         s3 = self.establish_s3_connection!(region, key, secret)
         s3.buckets[bucket].clear!
 
-        FileUtils.rm(LAST_PUBLISHED_FILE)
+        self.clear_published!(bucket, stage)
         FileUtils.rm(LAST_INVALIDATION_FILE)
       end
 
-      def self.check_invalidation(region, key, secret, distribution_id)
+      def self.check_invalidation(region, key, secret, distribution_id, stage = 'default')
         last_invalidation_id = File.read(LAST_INVALIDATION_FILE).strip
 
         cf = self.establish_cf_client_connection!(region, key, secret)
@@ -100,9 +102,29 @@ module Capistrano
           Dir.glob("#{deployment_path}/**/*") - Dir.glob(exclusions.map { |e| "#{deployment_path}/#{e}" })
         end
 
-        def self.published?(file)
-          return false unless File.exists? LAST_PUBLISHED_FILE
-          File.mtime(file) < File.mtime(LAST_PUBLISHED_FILE)
+        def self.last_published
+          if File.exists? LAST_PUBLISHED_FILE
+            YAML.load_file(LAST_PUBLISHED_FILE) || {}
+          else
+            {}
+          end
+        end
+
+        def self.published_to!(bucket, stage)
+          current_publish = self.last_published
+          current_publish["#{bucket}::#{stage}"] = Time.now.iso8601
+          File.write(LAST_PUBLISHED_FILE, current_publish.to_yaml)
+        end
+
+        def self.clear_published!(bucket, stage)
+          current_publish = self.last_published
+          current_publish["#{bucket}::#{stage}"] = nil
+          File.write(LAST_PUBLISHED_FILE, current_publish.to_yaml)
+        end
+
+        def self.published?(file, bucket, stage)
+          return false unless last_publish_time = self.last_published["#{bucket}::#{stage}"]
+          File.mtime(file) < Time.parse(last_publish_time)
         end
 
         def self.put_object(s3, bucket, target_path, path, file, only_gzip, extra_options)
@@ -110,7 +132,7 @@ module Capistrano
           mime_type = mime_type_for_file(base_name)
           options   = {
             :bucket => bucket,
-            :key    => File.join(target_path, path),
+            :key    => self.add_prefix(path, prefix: target_path),
             :body   => open(file),
             :acl    => 'public-read',
           }
@@ -126,7 +148,7 @@ module Capistrano
               options.merge!(build_gzip_content_type_hash(file, mime_type))
 
               # upload as original file name
-              options.merge!(key: File.join(target_path, self.orig_name(path))) if only_gzip
+              options.merge!(key: self.add_prefix(self.orig_name(path), prefix: target_path)) if only_gzip
             end
           end
 
@@ -172,6 +194,14 @@ module Capistrano
         def self.orig_name(file)
           file.sub(/\.gz$/, "")
         end
+
+        def self.add_prefix(path, prefix:)
+          if prefix.empty?
+            path
+          else
+            File.join(prefix, path)
+          end
+        end
     end
   end
 end

data/lib/capistrano/s3/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module S3
-    VERSION = "2.1.1"
+    VERSION = "2.2.0"
   end
 end

data/lib/capistrano/tasks/capistrano_3.rb

@@ -8,19 +8,19 @@ namespace :deploy do
   namespace :s3 do
     desc "Empties bucket of all files. Caution when using this command, as it cannot be undone!"
     task :empty do
-      Capistrano::S3::Publisher.clear!(fetch(:region), fetch(:access_key_id), fetch(:secret_access_key), fetch(:bucket))
+      Capistrano::S3::Publisher.clear!(fetch(:region), fetch(:access_key_id), fetch(:secret_access_key), fetch(:bucket), fetch(:stage))
     end
 
     desc "Waits until the last CloudFront invalidation batch is completed"
     task :wait_for_invalidation do
-      Capistrano::S3::Publisher.check_invalidation(fetch(:region), fetch(:access_key_id), fetch(:secret_access_key), fetch(:distribution_id))
+      Capistrano::S3::Publisher.check_invalidation(fetch(:region), fetch(:access_key_id), fetch(:secret_access_key), fetch(:distribution_id), fetch(:stage))
     end
 
     desc "Upload files to the bucket in the current state"
     task :upload_files do
       extra_options = { :write => fetch(:bucket_write_options), :redirect => fetch(:redirect_options) }
       Capistrano::S3::Publisher.publish!(fetch(:region), fetch(:access_key_id), fetch(:secret_access_key),
-                             fetch(:bucket), fetch(:deployment_path), fetch(:target_path), fetch(:distribution_id), fetch(:invalidations), fetch(:exclusions), fetch(:only_gzip), extra_options)
+                             fetch(:bucket), fetch(:deployment_path), fetch(:target_path), fetch(:distribution_id), fetch(:invalidations), fetch(:exclusions), fetch(:only_gzip), extra_options, fetch(:stage))
     end
   end
 

data/spec/publisher_spec.rb

@@ -10,12 +10,12 @@ describe Capistrano::S3::Publisher do
   context "on publish!" do
     it "publish all files" do
       Aws::S3::Client.any_instance.expects(:put_object).times(8)
-      Capistrano::S3::Publisher.publish!('s3.amazonaws.com', 'abc', '123', 'mybucket.amazonaws.com', 'spec/sample', '', 'cf123', [], [], false, {})
+      Capistrano::S3::Publisher.publish!('s3.amazonaws.com', 'abc', '123', 'mybucket.amazonaws.com', 'spec/sample', '', 'cf123', [], [], false, {}, 'staging')
     end
 
     it "publish only gzip files when option is enabled" do
       Aws::S3::Client.any_instance.expects(:put_object).times(4)
-      Capistrano::S3::Publisher.publish!('s3.amazonaws.com', 'abc', '123', 'mybucket.amazonaws.com', 'spec/sample', '', 'cf123', [], [], true, {})
+      Capistrano::S3::Publisher.publish!('s3.amazonaws.com', 'abc', '123', 'mybucket.amazonaws.com', 'spec/sample', '', 'cf123', [], [], true, {}, 'staging')
     end
 
     context "invalidations" do
@@ -23,14 +23,14 @@ describe Capistrano::S3::Publisher do
         Aws::S3::Client.any_instance.expects(:put_object).times(8)
         Aws::CloudFront::Client.any_instance.expects(:create_invalidation).once
 
-        Capistrano::S3::Publisher.publish!('s3.amazonaws.com', 'abc', '123', 'mybucket.amazonaws.com', 'spec/sample', '', 'cf123', ['*'], [], false, {})
+        Capistrano::S3::Publisher.publish!('s3.amazonaws.com', 'abc', '123', 'mybucket.amazonaws.com', 'spec/sample', '', 'cf123', ['*'], [], false, {}, 'staging')
       end
 
       it "publish all files without invalidations" do
         Aws::S3::Client.any_instance.expects(:put_object).times(8)
         Aws::CloudFront::Client.any_instance.expects(:create_invalidation).never
 
-        Capistrano::S3::Publisher.publish!('s3.amazonaws.com', 'abc', '123', 'mybucket.amazonaws.com', 'spec/sample', '', 'cf123', [], [], false, {})
+        Capistrano::S3::Publisher.publish!('s3.amazonaws.com', 'abc', '123', 'mybucket.amazonaws.com', 'spec/sample', '', 'cf123', [], [], false, {}, 'staging')
       end
     end
 
@@ -39,21 +39,21 @@ describe Capistrano::S3::Publisher do
         Aws::S3::Client.any_instance.expects(:put_object).times(7)
 
         exclude_paths = ['fonts/cantarell-regular-webfont.svg']
-        Capistrano::S3::Publisher.publish!('s3.amazonaws.com', 'abc', '123', 'mybucket.amazonaws.com', 'spec/sample', '', 'cf123', [], exclude_paths, false, {})
+        Capistrano::S3::Publisher.publish!('s3.amazonaws.com', 'abc', '123', 'mybucket.amazonaws.com', 'spec/sample', '', 'cf123', [], exclude_paths, false, {}, 'staging')
       end
 
       it "exclude multiple files" do
         Aws::S3::Client.any_instance.expects(:put_object).times(6)
 
         exclude_paths = ['fonts/cantarell-regular-webfont.svg', 'fonts/cantarell-regular-webfont.svg.gz']
-        Capistrano::S3::Publisher.publish!('s3.amazonaws.com', 'abc', '123', 'mybucket.amazonaws.com', 'spec/sample', '', 'cf123', [], exclude_paths, false, {})
+        Capistrano::S3::Publisher.publish!('s3.amazonaws.com', 'abc', '123', 'mybucket.amazonaws.com', 'spec/sample', '', 'cf123', [], exclude_paths, false, {}, 'staging')
       end
 
       it "exclude directory" do
         Aws::S3::Client.any_instance.expects(:put_object).times(0)
 
         exclude_paths = ['fonts/**/*']
-        Capistrano::S3::Publisher.publish!('s3.amazonaws.com', 'abc', '123', 'mybucket.amazonaws.com', 'spec/sample', '', 'cf123', [], exclude_paths, false, {})
+        Capistrano::S3::Publisher.publish!('s3.amazonaws.com', 'abc', '123', 'mybucket.amazonaws.com', 'spec/sample', '', 'cf123', [], exclude_paths, false, {}, 'staging')
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-s3
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Jean-Philippe Doyle
@@ -36,7 +36,7 @@ cert_chain:
   t/JsZnAlWYkJIees2SFV5X/t34oeMu04yY2u9y2YBqKovR97m5YF7zqgx0JODV0x
   ytwUJvEjznBnJV4OoDE=
   -----END CERTIFICATE-----
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Build and deploy a static website to Amazon S3

metadata.gz.sig

@@ -1,3 +1,3 @@
-�늌�/����l�N�z�Pw'-���i^E���0�����K���N�b���J��Yi�R��3�<�E�5q��0
-�D��<�՛���z�L��r�����!nh#l��a~ַ�e��c,%Tg�n�kʇ6CCVY�(*@s�*�l�p�<H�������d��e���1/Q�f
-
+���mW�%�Z�?E�v��l�ę_�@
[G@���!,b�S��I?7�p�|���+EQz�ҁ�RGaV�
g��W���	�z���)� ��P�ˣ�f�4��W4X��q�mXE%w�E�"*ș	wg/�#
+�Yt����j��Y�yMF�h�����1��1���'RqK�g{0��}2���xa�9����?�f��1g��*���-Z~�e�}�Y
+�g�8!�C��:�6�f����0}�Q'�v����D��M�ƒ_�5�