capistrano-s3_archive 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af4eb25b90c60b6a5ef6f072ff01024706128c1924e051424191f3d1f535ff50
-  data.tar.gz: 523ba94440f350ae342fd2b73b45f0d9b593cbf7e9d3935c4e239c100649d03b
+  metadata.gz: 1210ac80b01f28cf4cd2c22deeabf5cf35f66e9c68b5867f2b1be67fddca7346
+  data.tar.gz: 285abded5a2e47063f3517811cdd19b12bc181f80e1ffdd60eedd099e1f057be
 SHA512:
-  metadata.gz: cfe3e1ac51a0dac8ef600e2a313feb4e3a665120c3ee1df0e46292e6e455c8ea428e50cdec7c8d5437c9bdc699259bbd5cc232b909cc4e0a4d5bec02cdda2a80
-  data.tar.gz: 7c2bb15d6493e9e2f82704c5d0e544679f27ea69c920501b81f5e1701d9a4b7c88dec4180a096b192675decf6bdde70fe7e20ce74f996281f2bb4c0c8fdc0dcd
+  metadata.gz: 6d6b6e0ac4c0a7d75e76fecb5c4735d76e49ab4523010e5ffb2162f33a95552073ced675544611cea57d39976900d194398ba2a1157807fa71a0bff3020c6b88
+  data.tar.gz: 07056ae9a786875a197e2a0cd1a323a255d654e962e75b35d411735ddc8cd97c86115c50a91c36a13af888777bda058aaf9cb020e79ce2b559133ef2224d5182

data/lib/capistrano/s3_archive/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module S3Archive
-    VERSION = "1.0.0".freeze
+    VERSION = "1.0.2".freeze
   end
 end

data/lib/capistrano/scm/s3_archive/local_cache.rb

@@ -47,11 +47,13 @@ module Capistrano
         end
 
         def cleanup(keep: 0)
-          downloaded_files = Dir.glob(download_dir).sort_by(&File.method(:mtime))
+          downloaded_files = Dir.glob(File.join(download_dir, '*')).sort_by(&File.method(:mtime))
           return if downloaded_files.count <= keep
 
-          to_be_removes = (downloaded_files - downloaded_files.last(keep)).flat_map { |f| [f, ".#{f}.etag"] }
-          remove(to_be_removes, force: true)
+          remove_keys = (downloaded_files - downloaded_files.last(keep)).map { |f| File.basename(f, '.*') }.flat_map { |f| ["#{f}*", ".#{f}*"] }
+          to_be_removes = Dir.glob(remove_keys, base: download_dir)
+
+          remove(to_be_removes, force: true, verbose: true)
         end
 
         def target_file

data/lib/capistrano/scm/s3_archive/remote_cache.rb

@@ -11,7 +11,6 @@ module Capistrano
         end
 
         def download
-          tmp_file = "#{target_file}.part"
           etag_file = File.join(download_dir, ".#{archive_object.key_basename}.etag")
           if backend.test("[ -f #{target_file} -a -f #{etag_file} ]") &&
              backend.capture(:cat, etag_file) == archive_object.etag
@@ -19,8 +18,8 @@ module Capistrano
           else
             backend.info "Download s3://#{archive_object.bucket}/#{archive_object.key} to #{target_file}"
             backend.execute(:mkdir, "-p", download_dir)
-            backend.execute(:aws, *['s3api', 'get-object', "--bucket #{archive_object.bucket}", "--key #{archive_object.key}", archive_object.version_id ? "--version-id #{archive_object.version_id}" : nil, tmp_file].compact)
-            backend.execute(:mv, tmp_file, target_file)
+            backend.execute(:aws, *['s3api', 'get-object', "--bucket #{archive_object.bucket}", "--key #{archive_object.key}", archive_object.version_id ? "--version-id #{archive_object.version_id}" : nil, target_file].compact)
+
             backend.execute(:echo, "-n", "'#{archive_object.etag}'", "|tee", etag_file)
           end
         end
@@ -36,7 +35,7 @@ module Capistrano
         end
 
         def target_file
-          basename = [archive_object.key_basename, archive_object.version_id].join('?')
+          basename = [archive_object.key_basename, archive_object.version_id].join('__')
           File.join(download_dir, basename)
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-s3_archive
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Takuto Komazaki
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2023-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -146,7 +146,6 @@ files:
 - example/config/deploy.rb
 - example/config/deploy/localtest.rb
 - example/config/deploy/production.rb
-- example/config/deploy/staging.rb
 - img/s3_archive-direct.png
 - img/s3_archive-repo-branch.png
 - img/s3_archive-rsync.png
@@ -163,7 +162,7 @@ files:
 homepage: https://github.com/komazarari/capistrano-s3_archive
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -178,8 +177,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Capistrano deployment from an archive on Amazon S3.
 test_files: []

data/example/config/deploy/staging.rb

@@ -1,65 +0,0 @@
-server 'koma-bionic.dev-inf.gree-dev.net', roles: [:app]
-
-set :deploy_to, '/var/tmp/testmyapp'
-
-# server-based syntax
-# ======================
-# Defines a single server with a list of roles and multiple properties.
-# You can define all roles on a single server, or split them:
-
-# server "example.com", user: "deploy", roles: %w{app db web}, my_property: :my_value
-# server "example.com", user: "deploy", roles: %w{app web}, other_property: :other_value
-# server "db.example.com", user: "deploy", roles: %w{db}
-
-
-
-# role-based syntax
-# ==================
-
-# Defines a role with one or multiple servers. The primary server in each
-# group is considered to be the first unless any hosts have the primary
-# property set. Specify the username and a domain or IP for the server.
-# Don't use `:all`, it's a meta role.
-
-# role :app, %w{deploy@example.com}, my_property: :my_value
-# role :web, %w{user1@primary.com user2@additional.com}, other_property: :other_value
-# role :db,  %w{deploy@example.com}
-
-
-
-# Configuration
-# =============
-# You can set any configuration variable like in config/deploy.rb
-# These variables are then only loaded and set in this stage.
-# For available Capistrano configuration variables see the documentation page.
-# http://capistranorb.com/documentation/getting-started/configuration/
-# Feel free to add new variables to customise your setup.
-
-
-
-# Custom SSH Options
-# ==================
-# You may pass any option but keep in mind that net/ssh understands a
-# limited set of options, consult the Net::SSH documentation.
-# http://net-ssh.github.io/net-ssh/classes/Net/SSH.html#method-c-start
-#
-# Global options
-# --------------
-#  set :ssh_options, {
-#    keys: %w(/home/rlisowski/.ssh/id_rsa),
-#    forward_agent: false,
-#    auth_methods: %w(password)
-#  }
-#
-# The server-based syntax can be used to override options:
-# ------------------------------------
-# server "example.com",
-#   user: "user_name",
-#   roles: %w{web app},
-#   ssh_options: {
-#     user: "user_name", # overrides user setting above
-#     keys: %w(/home/user_name/.ssh/id_rsa),
-#     forward_agent: false,
-#     auth_methods: %w(publickey password)
-#     # password: "please use keys"
-#   }