capistrano-s3_archive 0.3.11 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a49f8480afd231cdfe4bac38768bc52bf2c26272
-  data.tar.gz: e3f447a3ea8494617815af4c0fe8c52bf366cd7b
+  metadata.gz: 8a39563c25ae86411a943e19dd385a89ebee8af8
+  data.tar.gz: 80dbefa17168b54970c6dbd6855e160c00f611f3
 SHA512:
-  metadata.gz: cea57ff86b65d9dd28aa4343afb3488480f2ef7e7f3d2a6e41c5ffabb4e7e95f9263effa2677111c699a7ea037b520123fdb51f1dfbe724e5989545bf5fd2932
-  data.tar.gz: 3c902a57556f774144c60fb2f22708e8e7ff68bb61273e81893ed04230fef96c868aa7a6ef61260aace0970ea89dc3194f4e7caab1b37618c19708da3c71243b
+  metadata.gz: ac00224eca008d5ea8e22f22b89f55b1667b3d6245d7f7c7eeee08a0437d12efc221df4ff7c094617c87b4aef53f0869c4b20779afb78755d9af90d3dbf44b82
+  data.tar.gz: ed74bca574e0a3f3b2d418074abc5bd9f80b39a1594fc5a0cf0a988477b919c4f0f000f85260ba7ef01c1f0aac24889ca88973b49163415e31e984b50ea9f9bb

data/README.md

@@ -61,6 +61,7 @@ Set parameters with `set :key, value`.
 Key           | Default | Description
 --------------|---------|------------
 branch        | `latest` | The S3 Object basename to download. Support `:latest` or such as `'201506011500.zip'`.
+version_id    | nil      | Version ID of version-controlled S3 object. It should use with `:branch`. e.g. `set :branch, 'myapp.zip'; set :version_id, 'qawsedrftgyhujikolq'`
 sort_proc     | `->(a,b) { b.key <=> a.key }` | Sort algorithm used to detect `:latest` object basename. It should be proc object for `a,b` as `Aws::S3::Object` comparing.
 rsync_options | `['-az']` | Options used to rsync.
 local_cache   | `tmp/deploy` | Path where to extruct your archive on local for staging and rsyncing. Can be both relative or absolute.

data/Vagrantfile

@@ -17,5 +17,6 @@ Vagrant.configure(2) do |config|
     if ! grep "`ssh-keygen -y -f .ssh/insecure_key`" /home/vagrant/.ssh/authorized_keys ;then
       ssh-keygen -y -f .ssh/insecure_key >> .ssh/authorized_keys
     fi
+    apt-get install git zip -y
   SHELL
 end

data/lib/capistrano/s3_archive/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module S3Archive
-    VERSION = "0.3.11"
+    VERSION = "0.4.0"
   end
 end

data/lib/capistrano/s3_archive.rb

@@ -25,7 +25,17 @@ module Capistrano
       end
 
       def get_object(target)
-        s3_client.get_object({ bucket: bucket, key: archive_object_key }, target: target)
+        opts = { bucket: bucket, key: archive_object_key }
+        opts[:version_id] = fetch(:version_id) if fetch(:version_id)
+        s3_client.get_object(opts, target: target)
+      end
+
+      def get_object_metadata
+        s3_client.list_object_versions(bucket: bucket, prefix: archive_object_key).versions.find do |v|
+          if fetch(:version_id) then v.version_id == fetch(:version_id)
+          else v.is_latest
+          end
+        end
       end
 
       def list_objects(all_page = true)
@@ -80,17 +90,23 @@ module Capistrano
 
         def stage
           stage_lock do
-            archive_file = File.join(fetch(:s3_archive), fetch(:stage).to_s, File.basename(archive_object_key))
+            archive_dir = File.join(fetch(:s3_archive), fetch(:stage).to_s)
+            archive_file = File.join(archive_dir, File.basename(archive_object_key))
             tmp_file = "#{archive_file}.part"
+            etag_file = File.join(archive_dir, ".#{File.basename(archive_object_key)}.etag")
             fail "#{tmp_file} is found. Another process is running?" if File.exist?(tmp_file)
-            if not File.exist?(archive_file)
+
+            etag = get_object_metadata.tap { |it| fail "No such object: #{current_revision}" if it.nil? }.etag
+            if [archive_file, etag_file].all? { |f| File.exist?(f) } && File.read(etag_file) == etag
+              context.info "#{archive_file} (etag:#{etag}) is found. download skipped."
+            else
+              context.info "Download #{current_revision} to #{archive_file}"
               mkdir_p(File.dirname(archive_file))
               File.open(tmp_file, 'w') do |f|
                 get_object(f)
               end
               move(tmp_file, archive_file)
-            else
-              context.info "#{archive_file} is found."
+              File.write(etag_file, etag)
             end
 
             remove_entry_secure(fetch(:local_cache_dir)) if File.exist? fetch(:local_cache_dir)
@@ -161,7 +177,7 @@ module Capistrano
         end
 
         def current_revision
-          archive_object_key
+          fetch(:version_id) ? "#{archive_object_key}?versionid=#{fetch(:version_id)}" : archive_object_key
         end
 
         def ssh_key_for(host)
@@ -169,7 +185,7 @@ module Capistrano
             host.keys.first
           elsif host.ssh_options && host.ssh_options.has_key?(:keys)
             Array(host.ssh_options[:keys]).first
-          else fetch(:ssh_options, nil) && fetch(:ssh_options).has_key?(:keys)
+          elsif fetch(:ssh_options, nil) && fetch(:ssh_options).has_key?(:keys)
             fetch(:ssh_options)[:keys].first
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-s3_archive
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.4.0
 platform: ruby
 authors:
 - Takuto Komazaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano