capistrano-autoscale 1.0.7 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5c7732b1d396283510095f0c1ba38794986abc24
-  data.tar.gz: 743dec410ce8a0606b45ebe16d19e06639ff3e5f
+SHA256:
+  metadata.gz: 2d4e27d5c31d079de33330294545cd0fcf8d42dca2a7a3153e3de87756c613c8
+  data.tar.gz: bfaa3180fac48455b78f04c8798ef52e836eda71bd8395204044622a5ffc5efc
 SHA512:
-  metadata.gz: ca2810a7a78e5d9524961c5c43c22794245fd71f2d5eea165b477e3742df215b1420042e2f98baf94ca45c7533deb74f8ac2020473899a327d23a79d9c8b4d33
-  data.tar.gz: b88d0b552a7e9e8578132ac91d4ac373855b57ce7be16ad82cc33225db5f736a5e559b6658a010872da69b9dd0eb49d9e5694ff033c53c7fd26ca92d000a7c26
+  metadata.gz: 6a20ec872161752e1f8cb8a245fbdce7d8a8e8a5765d6e71c4e946e02fe5776edc2c805c056572a5bb9069c08ebf1688f9411d2053b4c52b00afc69ac6bfb7ef
+  data.tar.gz: '078363011a66a90fee4e8533db90663e8c2423ab7d9a739dcefa9af1532d47f8dcbc13ff3a1bea2de798c9a461e2283a6b8da083d1d3d560e4abddd1b6fbe980'

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016 Clinch Technology, Ltd.
+Copyright (c) 2021 Clinch Technology, Ltd.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -15,16 +15,23 @@ Add this statement to your Capfile:
 
 ## Configuration
 
-Below are the Capistrano configuration options with their defaults:
+Below are the Capistrano configuration options with their defaults (session_token is optional):
 
 ```
 set :aws_access_key_id,     ENV['AWS_ACCESS_KEY_ID']
 set :aws_secret_access_key, ENV['AWS_SECRET_ACCESS_KEY']
+set :aws_session_token,     ENV['AWS_SESSION_TOKEN']
 set :aws_region,            ENV['AWS_REGION']
 ```
 
-And set the autoscale group:
+And set the autoscale group using IP Address:
 
 ```
-autoscale [<array of auto-scale-group-names>], user: '<deployment user>', roles: [<array of cap roles>]
-```
+autoscale [<array of auto-scale-group-names>], :ip_address, user: '<deployment user>', roles: [<array of cap roles>]
+```
+
+Or, set the autoscale group using EC2 Instance Id:
+
+```
+autoscale [<array of auto-scale-group-names>], :instance_id, user: '<deployment user>', roles: [<array of cap roles>]
+```

data/capistrano-autoscale.gemspec

@@ -19,10 +19,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "webmock"
+  spec.add_development_dependency "webmock", "~> 3"
 
-  spec.add_dependency 'aws-sdk', '~> 2'
+  spec.add_dependency 'aws-sdk-core', '~> 3'
+  spec.add_dependency 'aws-sdk-ec2', '~> 1'
+  spec.add_dependency 'aws-sdk-autoscaling', '~> 1'
   spec.add_runtime_dependency 'capistrano', '~> 3.0', '> 3.0.0'
 end

data/lib/capistrano/autoscale.rb

@@ -1,4 +1,4 @@
-require 'aws-sdk'
+require 'aws-sdk-core'
 
 require 'capistrano/all'
 require 'capistrano/dsl'
@@ -12,7 +12,7 @@ module Capistrano
   end
 end
 
-def autoscale(groupnames, *args)
+def autoscale(groupnames, identifier_type, *args)
   include Capistrano::DSL
   include Capistrano::Autoscale::Aws::AutoscalingGroup
   include Capistrano::Autoscale::Aws::EC2
@@ -30,11 +30,17 @@ def autoscale(groupnames, *args)
     end
 
     instances.each do |instance|
-      hostname = ec2_instance(instance.instance_id).private_ip_address
-      p "Autoscale deploying to: #{hostname}"
-      server(hostname, *args)
+      host = host_by_identifier(instance, identifier_type)
+      p "Autoscale deploying to: #{host}"
+      server(host, *args)
     end
   else
     p "Error: No #{groupnames} autoscale group found."
   end
+end
+
+private
+
+def host_by_identifier(instance, identifier_type)
+  identifier_type == :ip_address ? ec2_instance(instance.instance_id).private_ip_address : instance.instance_id
 end

data/lib/capistrano/autoscale/aws/{credentials.rb → autoscaling_credentials.rb}

@@ -1,14 +1,15 @@
 module Capistrano
   module Autoscale
     module Aws
-      module Credentials
+      module AutoscalingCredentials
         include Capistrano::DSL
 
-        def credentials
+        def autoscaling_credentials
           credentials = {
               access_key_id: fetch(:aws_access_key_id, ENV['AWS_ACCESS_KEY_ID']),
               secret_access_key: fetch(:aws_secret_access_key, ENV['AWS_SECRET_ACCESS_KEY'])
           }
+          credentials.merge! session_token: fetch(:aws_session_token, ENV['AWS_SESSION_TOKEN']) if fetch(:aws_session_token, ENV['AWS_SESSION_TOKEN'])
           credentials.merge! region: fetch(:aws_region) if fetch(:aws_region)
           credentials
         end

data/lib/capistrano/autoscale/aws/autoscaling_group.rb

@@ -1,15 +1,15 @@
-require 'aws-sdk'
-require 'capistrano/autoscale/aws/credentials'
+require 'aws-sdk-autoscaling'
+require 'capistrano/autoscale/aws/autoscaling_credentials'
 
 module Capistrano
   module Autoscale
     module Aws
       module AutoscalingGroup
-        include Capistrano::Autoscale::Aws::Credentials
+        include Capistrano::Autoscale::Aws::AutoscalingCredentials
         include Capistrano::DSL
 
         def autoscale_groups
-          @autoscale_groups ||= ::Aws::AutoScaling::Client.new(credentials).describe_auto_scaling_groups({auto_scaling_group_names: [autoscale_group_names].flatten}).auto_scaling_groups
+          @autoscale_groups ||= ::Aws::AutoScaling::Client.new(autoscaling_credentials).describe_auto_scaling_groups({auto_scaling_group_names: [autoscale_group_names].flatten}).auto_scaling_groups
         end
 
         def autoscale_group_names

data/lib/capistrano/autoscale/aws/ec2.rb

@@ -1,14 +1,14 @@
-require 'aws-sdk'
-require 'capistrano/autoscale/aws/credentials'
+require 'aws-sdk-ec2'
+require 'capistrano/autoscale/aws/autoscaling_credentials'
 
 module Capistrano
   module Autoscale
     module Aws
       module EC2
-        include Capistrano::Autoscale::Aws::Credentials
+        include Capistrano::Autoscale::Aws::AutoscalingCredentials
 
         def ec2_client
-          @ec2_client ||= ::Aws::EC2::Client.new(credentials)
+          @ec2_client ||= ::Aws::EC2::Client.new(autoscaling_credentials)
         end
 
         def ec2_instance(instance_id)

data/lib/capistrano/autoscale/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Autoscale
-    VERSION = '1.0.7'
+    VERSION = '1.0.12'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-autoscale
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.12
 platform: ruby
 authors:
 - Damien Glancy
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-12-04 00:00:00.000000000 Z
+date: 2021-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     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: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -56,30 +56,58 @@ dependencies:
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-ec2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-autoscaling
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
@@ -114,15 +142,15 @@ files:
 - Rakefile
 - capistrano-autoscale.gemspec
 - lib/capistrano/autoscale.rb
+- lib/capistrano/autoscale/aws/autoscaling_credentials.rb
 - lib/capistrano/autoscale/aws/autoscaling_group.rb
-- lib/capistrano/autoscale/aws/credentials.rb
 - lib/capistrano/autoscale/aws/ec2.rb
 - lib/capistrano/autoscale/version.rb
 homepage: https://github.com/ClinchIO/capistrano-autoscale
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -137,9 +165,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Capistrano plugin for deploying to AWS AutoScale groups.
 test_files: []