capistrano-aws-autodiscover 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c11063d1134ca7606a74185cb350632db469411
-  data.tar.gz: c694f743462e694b1718d7eb8b219129931748cd
+  metadata.gz: 3261ee5368775cf105306c88706a65034f543598
+  data.tar.gz: b2fbf30821e56c4060d0becd759653aacdb11526
 SHA512:
-  metadata.gz: 3f556bf87d21157ef6ed8b17c5df51fbe264377161dc040c8b23a6967602edd95f0d76359a6f301192246a9a18bf34cd59332878facea105f0794a8a2880f3fc
-  data.tar.gz: 7af3577d5e0ba04ef9af861b27181143a11205fb636bd7924b0fc8aa51faa5b0a10522d1b9b17062dcc2015db27523423b611c445e11a8e3827d90c6d2621012
+  metadata.gz: ceb27bf3dcd8dc2819a3902577dddd02208f119a125e56912899bc8005f32f29e3c9c92faf228bfc0b41ff64701dad4e86460e0a6b3e76f2dccaf6369304bb63
+  data.tar.gz: c1c37a6a996540ae9c8123975d3b376b0b0f1073ca0f74212341b1ec3fac77a0634a43714dd72cb09832d4047ca6902c1f69dcef9b8e232657b6048d524a8cd9

data/lib/capistrano-aws-autodiscover.rb

@@ -1,14 +1,16 @@
 require "capistrano-aws-autodiscover/version"
 require 'aws-sdk-core'
 
-Capistrano::Configuration.instance(:must_exist).load do
-  def define_servers
+class CapistranoAwsAutodiscover
+
+  Instance = Struct.new(:dns, :roles)
+
+  def self.define_servers
     instances = CapistranoAwsAutodiscover.new(fetch(:aws_key_id), fetch(:secret_access_key), fetch(:aws_region), fetch(:ec2_project), fetch(:ec2_env)).execute
-    instances.each {|s| server *s}
+    instances.each do |s| 
+      server s.dns, roles: s.roles, user: fetch(:user)
+    end
   end
-end
-
-class CapistranoAwsAutodiscover
 
   def initialize(key, secret, aws_region, project, environment)
     @key = key
@@ -57,10 +59,9 @@ class CapistranoAwsAutodiscover
   end
 
   def make_args(instance)
-    public_dns = instance.public_dns_name
+    dns = instance.public_dns_name
     roles_tag = instance.tags.find {|t| t.key == "Roles"}.value
     roles = roles_tag.split(/,|;/)
-    [public_dns, roles].flatten
+    Instance.new(dns, roles)
   end
-
 end

data/lib/capistrano-aws-autodiscover/version.rb

@@ -1,3 +1,3 @@
 class CapistranoAwsAutodiscover
-  VERSION = "2.0.0"
+  VERSION = "3.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-aws-autodiscover
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Erez Rabih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-14 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler