capistrano-autoscale 1.0.6 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 853dcec2afc2538d0d9e556915c6942c96be8424
-  data.tar.gz: b9fc913b9f76d3353bfa2f192e039f89d4d461c9
+SHA256:
+  metadata.gz: 485d9a4e14927e747e353d34d6cb2d930a67098457402530266d6835efcb4efc
+  data.tar.gz: b1366f63f2ae456d89bc50a9b73b999f10320d7588d5aa266ff6400c5fd7916c
 SHA512:
-  metadata.gz: d56f4cf7a2d171a25010f44f9b126173314ebbf686547e038f0df049f9da5546ed0d09b1fbcbc57a9d7bc0b3544afb93c85ec5f91f7a88e924ca55c55a00655e
-  data.tar.gz: 7a8875238a8edae4b3eb988e659e9618562c4767dc09aa25ad315c449ced3125af84921b3a31adcb03935fa4ba53a0cfc0ed6d1a8054739d3a8f6769c627b8ef
+  metadata.gz: 51e3a5214491bd0bbbe5f839b7aaaa54c30fef3b17ee8fa52f44f8e4df9d82356761721f03d4f4b4d21e5b3ffcfbd14cbf7b64ac3b33a27233ed5b7ed91b210a
+  data.tar.gz: ac1c64879ca4ccd709920d17e117ec64c960c076f081eba84c483b9956cfb7b6b1f7586dcfacd1e9e6e04d00e45cac95861397dbcc9fb3da3feb155bcb148360

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/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,10 +1,10 @@
 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'])

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

@@ -1,19 +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
-          @autoscaling ||= ::Aws::AutoScaling::Client.new(credentials)
-        end
-
         def autoscale_groups
-          @autoscale_groups ||= autoscale.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.6'
+    VERSION = '1.0.11'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-autoscale
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.11
 platform: ruby
 authors:
 - Damien Glancy
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-12-04 00:00:00.000000000 Z
+date: 2021-03-15 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.4
+signing_key:
 specification_version: 4
 summary: Capistrano plugin for deploying to AWS AutoScale groups.
 test_files: []