capistrano-autoscale 1.0.9 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa25db298d32e210d08f652c69c6a63d5ee8f5ac92be54edee6c90fe557b9110
-  data.tar.gz: fb4f792c88cbb931baa04ef6f2a6f932893004453a5a0464e9e495b3baed341d
+  metadata.gz: a5def3fa92d9a4cdf8599627cc47eb0c341653f4dbc4d77db5dba1c78f128ef4
+  data.tar.gz: 3232e53a8cd79407bbdd8e4ff3346507c25dd60428c298176f012bacdb5adaae
 SHA512:
-  metadata.gz: 3cb01ac4f28155d2300598ee27d3bc81ef0ad902a3889954f88102d3ba1f315dcfe9ce68530e4c1ccbe51d772f2472e0660df9e27514e32370428b9640d31cc2
-  data.tar.gz: 56158a941cee184e6ed472939f735ffc7c3a6ef1261c9049a58251a53dfd021d956fef9412b938e0aece12780c0212bd3d5a31ef9aab8864c3434918debc96da
+  metadata.gz: 54ae430172f9996392bfdbe73dd29e27b0e4c449777b8937982ba0a58fb17c45bad0b58a9c58133c7f09f64482d4cf777775b05b4b39e50773cac1bf354f4c75
+  data.tar.gz: dcdf49e14be2bf290d1e84abbac568525036260a56f11b27942e3bf81ed4fa23cb9847899f06b266ddae603718b06826046a442a66aed9e04ac4844f4414984c

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,7 +19,7 @@ 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", "~> 3"
 

data/lib/capistrano/autoscale.rb

@@ -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/autoscaling_credentials.rb

@@ -9,6 +9,7 @@ module Capistrano
               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,5 +1,5 @@
 require 'aws-sdk-autoscaling'
-require 'capistrano/autoscale/aws/credentials'
+require 'capistrano/autoscale/aws/autoscaling_credentials'
 
 module Capistrano
   module Autoscale
@@ -9,7 +9,7 @@ module Capistrano
         include Capistrano::DSL
 
         def autoscale_groups
-          @autoscale_groups ||= ::Aws::AutoScaling::Client.new(autoscaling_credentials).describe_auto_scaling_groups({auto_scaling_group_names: [autoscale_group_names].flatten}).auto_scaling_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,5 +1,5 @@
 require 'aws-sdk-ec2'
-require 'capistrano/autoscale/aws/credentials'
+require 'capistrano/autoscale/aws/autoscaling_credentials'
 
 module Capistrano
   module Autoscale

data/lib/capistrano/autoscale/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Autoscale
-    VERSION = '1.0.9'
+    VERSION = '1.0.13'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-autoscale
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.13
 platform: ruby
 authors:
 - Damien Glancy
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-29 00:00:00.000000000 Z
+date: 2021-07-22 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
@@ -150,7 +150,7 @@ homepage: https://github.com/ClinchIO/capistrano-autoscale
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -165,9 +165,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Capistrano plugin for deploying to AWS AutoScale groups.
 test_files: []