capistrano3-autoscaling-deploy 1.4 → 1.5

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YWZhMjdkNjIxNzZhM2E2ZmU5MjEyYmU4MmQzZWUwZDE5OWE5YTU3Zg==
-  data.tar.gz: !binary |-
-    YTNhMDI4MjliZjNlYWI3ZWQ3MTQxODE2ZTdiOTM0MmIyMGM0MDgxZA==
+SHA1:
+  metadata.gz: f87af3626f5137512f2622a61c6af16474b486c0
+  data.tar.gz: 3af50b11040713f646b126a13094a8f4a5ff4a7b
 SHA512:
-  metadata.gz: !binary |-
-    OTlhNTI4OTQ3NTQ1Y2VlNDQyODAyOTk3ZDllMjQzZmYyMTRhMDQxN2YwMTcx
-    OWIwMDI3NjU1OWExZTIzZWM1OTVmMDdkMjdiODI2OTZkYjA4YTE4NjBmOTk1
-    MjY0MWVhMzI2ZTRkMGNiYjllMGIzNDc0ZWEyNjc5NDQ0YzVjZmI=
-  data.tar.gz: !binary |-
-    MjBkNjlkNjIxYjZjNDBiY2UxMTVlM2E4MzQ0MTg2NmQ2YjM4NWYyNmY5MDcw
-    MmM3MGYzMGU5Y2MxYmY5ZDdiNWMzOTM5OTRiM2U5Yzg3ZDkyNzY0NmNiODJl
-    OWIyZmVmMDhhZTcyMzBhNzNhOTUzODZlMGQ3YTA4YWJhMzhhY2I=
+  metadata.gz: e509d0c05b01bdcc4fd751d130dbbc965aaaa7f637ccae83afab008fccdb7ad88e3a6290cf56dcc966647be8b50bee2c0b7efe5ae95317adeafbd034aa336751
+  data.tar.gz: 84223df370b1e5ab3f16f8685e4077e8890c4bfd90915ad8a64633eb4d148ae79bc01430109191f31d00ad0641dd66567f4beee5329134699af8718b0fd3925c

data/README.md

@@ -46,6 +46,10 @@ set :aws_secret_access_key, 'YOUR AWS SECRET KEY'
 set :aws_autoscaling_group_name, 'YOUR NAME OF AUTO SCALING GROUP NAME'
 set :aws_deploy_roles, [:app, :web, :db]
 set :aws_deploy_user, 'USER FOR SSH CONNECTION'
+ 
+# optional: defaults to 'public_dns_name'
+# select from ['public_ip', 'public_dns_name', 'private_ip_address', 'private_dns_name']
+set :aws_ip_type, 'public_dns_name'
 ```
 
 you can add more auto scaling configs to deploy to multiple auto scaling groups like a cluster

data/capistrano3-autoscaling-deploy.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'aws-sdk', '~> 2'
   spec.add_dependency 'capistrano', '~> 3'
-  spec.add_dependency 'capistrano-bundler', '~> 1.1.2'
+  spec.add_dependency 'capistrano-bundler', '~> 1.2.0'
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake'
-end
+end

data/lib/capistrano/autoscaling_deploy/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module AutoScalingDeploy
-    VERSION = '1.4'
+    VERSION = '1.5'
   end
-end
+end

data/lib/capistrano/helpers/aws_helper.rb

@@ -1,14 +1,16 @@
 require 'aws-sdk'
 
 module AwsHelper
-  def get_instances(aws_region, aws_access_key_id, aws_secret_access_key, aws_autoscaling_group_name)
+  IP_TYPES = %w(public_ip public_dns_name private_ip_address private_dns_name)
+
+  def get_instances(aws_region, aws_access_key_id, aws_secret_access_key, aws_autoscaling_group_name, aws_ip_type)
     aws_credentials = Aws::Credentials.new(aws_access_key_id, aws_secret_access_key)
-    retrieve_ec2_instances(aws_region, aws_autoscaling_group_name, aws_credentials)
+    retrieve_ec2_instances(aws_region, aws_autoscaling_group_name, aws_credentials, aws_ip_type)
   end
 
   private
 
-  def retrieve_ec2_instances(aws_region, autoscaling_group_name, aws_credentials)
+  def retrieve_ec2_instances(aws_region, autoscaling_group_name, aws_credentials, aws_ip_type)
     instances = fetch_autoscaling_group_instances(aws_region, autoscaling_group_name, aws_credentials)
 
     if instances.empty?
@@ -17,8 +19,10 @@ module AwsHelper
       instance_ids = instances.map(&:instance_id)
       ec2 = Aws::EC2::Resource.new(region: aws_region, credentials: aws_credentials)
       # info("Auto Scaling Group instances ids: #{instance_ids}")
+      aws_ip_type = 'public_dns_name' unless IP_TYPES.include? aws_ip_type
+        
       autoscaling_dns = instance_ids.map do |instance_id|
-        ec2.instance(instance_id).public_dns_name
+        ec2.instance(instance_id).send(aws_ip_type.to_sym)
       end
     end
 
@@ -41,4 +45,4 @@ module AwsHelper
     as_group.instances
   end
 
-end
+end

data/lib/capistrano/tasks/autoscaling.rake

@@ -6,6 +6,7 @@ namespace :load do
     set :aws_autoscaling, true
     set :aws_region, 'us-west-2'
     set :aws_deploy_roles, %w{web app db}
+    set :aws_ip_type, 'public_dns_name'
   end
 end
 
@@ -42,8 +43,9 @@ namespace :autoscaling_deploy do
     key = fetch(:aws_access_key_id)
     secret = fetch(:aws_secret_access_key)
     group_name = fetch(:aws_autoscaling_group_name)
+    ip_type = fetch(:aws_ip_type)
 
-    instances = get_instances(region, key, secret, group_name)
+    instances = get_instances(region, key, secret, group_name, ip_type)
 
     puts("Found #{instances.count} servers (#{instances.join(',')}) for Auto Scaling Group: #{group_name} ")
 

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-autoscaling-deploy
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: '1.5'
 platform: ruby
 authors:
 - Marcos Chicote
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: capistrano
   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: capistrano-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Get all instances in an AutoScaling group by AutoScaling EC2 Tag and
@@ -88,8 +88,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -114,12 +114,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []