capistrano-ec2 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9d49bd03dc7164feac8b3857fc6aefd82c845aa0
-  data.tar.gz: 96ae1cca4d6c6330dc9e5469f7e204d8ccd07e83
+SHA256:
+  metadata.gz: b222df552df15569ef0071f8a71172ce9d9e799b5a8b01246d248bdda72d27ce
+  data.tar.gz: bdf09ac3c2af7d067a6a9a2e541c5145c01ceef7859dbd8bfc96aa417df0dbc8
 SHA512:
-  metadata.gz: '0292e3718d4f1afd8e2c3e57fa59bd66f4d55f542f5d215d43f33d9d3bdfc37ceffe33bf75485426fc9846d3835156577205d780162d8d8618f1049620f9b2bd'
-  data.tar.gz: c5e233c40c7324e753e02dad5d862231f1006dcca57c1c7b0734ff1ac6b561333fd8c93021326a44b17dc6649a01b764582d68096dc61579fc70ef7ba5048cc7
+  metadata.gz: c28fcc0ec1a49060f3c7c7ea4f630bbd96c7016d0a248a585d56de559b15bac8947fe3ead0a010edb6192be42bd7cf2e9d0065b25b0c9f6d8f49635ad7608fe2
+  data.tar.gz: 84707d796f9a3b637a918d3f0351ccbe3210d38ee23ee8a4f83fe3226cea7924dd1dcbb5a7335bb6f12c094174ccdec778f8767fb814e69e871d5aee2c95fb85

data/capistrano-ec2.gemspec

@@ -27,10 +27,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "capistrano", "~> 3.0"
-  spec.add_dependency "fog-aws", "~> 0.13.0"
+  spec.add_dependency "capistrano", "~> 3.15"
+  spec.add_dependency "fog-aws", "~> 3.6"
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "bundler", "~> 2.4"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rspec", "~> 3.10"
 end

data/lib/capistrano/ec2/capistrano_monkey_patch.rb

@@ -1,17 +1,13 @@
 require 'fog/aws'
+require 'forwardable'
 
 module Capistrano
   class Configuration
     def for_each_ec2_server(ec2_env:, ec2_role:, &block)
-      ec2 = Fog::Compute.new \
-        provider: 'AWS',
-        region: fetch(:region),
-        use_iam_profile: fetch(:use_iam_profile, false)
-
-      filters = { 
-        "tag:ec2_env" => ec2_env, 
-        "tag:role" => ec2_role, 
-        'instance-state-name': 'running' 
+      filters = {
+        'tag:ec2_env' => ec2_env,
+        'tag:role' => ec2_role,
+        'instance-state-name': 'running'
       }
 
       ec2.servers.all(filters).map.with_index do |ec2_server, index|
@@ -20,10 +16,50 @@ module Capistrano
         yield ec2_server, index
       end
     end
+
+    private
+
+    def ec2
+      @ec2 ||= Fog::Compute.new(fog_arguments)
+    end
+
+    def fog_arguments
+      default_options = {
+        provider: 'AWS',
+        region: region,
+      }
+
+      if use_iam_profile
+        default_options.merge(iam_profile_options)
+      else
+        default_options.merge(access_key_options)
+      end
+    end
+
+    def region
+      fetch(:region)
+    end
+
+    def use_iam_profile
+      fetch(:use_iam_profile, false)
+    end
+
+    def iam_profile_options
+      { use_iam_profile: true }
+    end
+
+    def access_key_options
+      {
+        aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'],
+        aws_secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
+        aws_session_token: ENV['AWS_SESSION_TOKEN'],
+      }
+    end
   end
 
   module DSL
     module Env
+      extend Forwardable
       def_delegators :env, :for_each_ec2_server
     end
   end

data/lib/capistrano/ec2/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Ec2
-    VERSION = "0.1.4"
+    VERSION = "0.1.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-ec2
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Tom de Vries
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-08-14 00:00:00.000000000 Z
+date: 2023-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.15'
 - !ruby/object:Gem::Dependency
   name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.10'
 description: A Capistrano patch to simplify deployment to Amazon EC2.
 email:
 - tom@hackerone.com
@@ -106,7 +106,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -121,9 +121,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.3
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: A Capistrano patch to simplify deployment to Amazon EC2.
 test_files: []