capify-ec2 1.1.12.pre → 1.1.12.pre.1

data/lib/capify-ec2.rb

@@ -53,21 +53,31 @@ class CapifyEc2
     elb.describe_instance_health(load_balancer.id, instance.id).body['DescribeInstanceHealthResult']['InstanceStates'][0]['State']
   end
   
-  def self.get_instances_by_role(role, server_type, region = nil)
-    selected_instances = running_instances(region).select do |instance|
+  def self.get_instances_by_role(role, server_type)
+    filter_instances_by_role(running_instances, role, server_type)
+  end
+  
+  def self.get_instances_by_region(role, region)
+    return unless region
+    region_instances = running_instances(region)
+    filter_instances_by_role(region_instances,role)
+  end 
+  
+  def self.filter_instances_by_role(instances, role, server_type = nil)
+    selected_instances = instances.select do |instance|
       server_roles = [instance.case_insensitive_tag("Role")] || []
       if (roles_tag = instance.case_insensitive_tag("Roles"))        
         server_roles += roles_tag.split(/\s*,\s*/)
       end
       server_type.nil? ? server_roles.member?(role.to_s) : (server_roles.member?(role.to_s) && server_type == role.to_s)
     end
-  end  
+  end 
   
   def self.get_instance_by_name(name)
     selected_instances = running_instances.select do |instance|
       value = instance.case_insensitive_tag("Name")
       value == name.to_s
-    end
+    end.first
   end
   
   def self.server_names

data/lib/capify-ec2/capistrano.rb

@@ -6,7 +6,6 @@ Capistrano::Configuration.instance(:must_exist).load do
     role = role_name_or_hash.is_a?(Hash) ? role_name_or_hash : {:name => role_name_or_hash,:options => {}}
     server_type = variables[:logger].instance_variable_get("@options")[:actions].first unless variables[:logger].instance_variable_get("@options")[:actions][1].nil?
     instances = CapifyEc2.get_instances_by_role(role[:name], server_type)
-
     if role[:options].delete(:default)
       instances.each do |instance|
         define_role(role, instance)
@@ -15,15 +14,18 @@ Capistrano::Configuration.instance(:must_exist).load do
     
     regions = CapifyEc2.ec2_config[:aws_params][:regions] || [CapifyEc2.ec2_config[:aws_params][:region]]
     regions.each do |region|
-      define_regions(region, role, server_type)
+      define_regions(region, role)
     end unless regions.nil?
     
     define_instance_roles(role, instances)    
     define_role_roles(role, instances)
+    
+    named_instance = CapifyEc2.get_instance_by_name(server_type)
+    define_instance_roles(role, [named_instance]) unless named_instance.nil?
   end  
 
-  def define_regions(region, role, server_type)
-    instances = CapifyEc2.get_instances_by_role(role[:name], server_type, region)
+  def define_regions(region, role)
+    instances = CapifyEc2.get_instances_by_region(role[:name], region)
     task region.to_sym do 
       instances.each do |instance|
         define_role(role, instance)

data/lib/capify-ec2/version.rb

@@ -1,5 +1,5 @@
 module Capify
   module Ec2
-    VERSION = "1.1.12.pre"
+    VERSION = "1.1.12.pre.1"
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: capify-ec2
 version: !ruby/object:Gem::Version 
-  hash: 961916012
+  hash: 1923832059
   prerelease: true
   segments: 
   - 1
   - 1
   - 12
   - pre
-  version: 1.1.12.pre
+  - 1
+  version: 1.1.12.pre.1
 platform: ruby
 authors: 
 - Noah Cantor