capify-ec2 1.1.8.pre → 1.1.12.pre

data/lib/capify-ec2.rb

@@ -53,13 +53,13 @@ class CapifyEc2
     elb.describe_instance_health(load_balancer.id, instance.id).body['DescribeInstanceHealthResult']['InstanceStates'][0]['State']
   end
   
-  def self.get_instances_by_role(role, region = nil)
+  def self.get_instances_by_role(role, server_type, region = nil)
     selected_instances = running_instances(region).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_roles.member?(role.to_s)
+      server_type.nil? ? server_roles.member?(role.to_s) : (server_roles.member?(role.to_s) && server_type == role.to_s)
     end
   end  
   
@@ -71,7 +71,7 @@ class CapifyEc2
   end
   
   def self.server_names
-    running_instances.map {|instance| instance.name}
+    running_instances.map {|instance| instance.case_insensitive_tag("Name")}
   end
   
   def self.elb

data/lib/capify-ec2/capistrano.rb

@@ -4,10 +4,9 @@ require 'colored'
 Capistrano::Configuration.instance(:must_exist).load do
   def ec2_role(role_name_or_hash)
     role = role_name_or_hash.is_a?(Hash) ? role_name_or_hash : {:name => role_name_or_hash,:options => {}}
-    instances = CapifyEc2.get_instances_by_role(role[:name])
-    
-    set :specified_roles, []
-    
+    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)
@@ -16,17 +15,16 @@ 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)
+      define_regions(region, role, server_type)
     end unless regions.nil?
     
-    define_instance_roles(role, instances)
+    define_instance_roles(role, instances)    
     define_role_roles(role, instances)
   end  
 
-  def define_regions(region, role)
-    instances = CapifyEc2.get_instances_by_role(role[:name], region)
+  def define_regions(region, role, server_type)
+    instances = CapifyEc2.get_instances_by_role(role[:name], server_type, region)
     task region.to_sym do 
-      remove_default_roles
       instances.each do |instance|
         define_role(role, instance)
       end
@@ -36,8 +34,6 @@ Capistrano::Configuration.instance(:must_exist).load do
   def define_instance_roles(role, instances)
     instances.each do |instance|
       task instance.name.to_sym do
-        specified_roles << role[:name]
-        remove_default_roles
         define_role(role, instance)
       end
     end
@@ -45,18 +41,12 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   def define_role_roles(role, instances)
     task role[:name].to_sym do
-      specified_roles << role[:name]
       instances.each do |instance|
-        remove_default_roles
         define_role(role, instance)
       end
     end 
   end
 
-  def remove_default_roles
-    roles.reject! { |role_name, v| !specified_roles.member?(role_name) }
-  end
-
   def define_role(role, instance)
     subroles = role[:options]
     new_options = {}
@@ -73,6 +63,10 @@ Capistrano::Configuration.instance(:must_exist).load do
     roles.each {|role| ec2_role(role)}
   end
   
+  def numeric?(object)
+    true if Float(object) rescue false
+  end
+  
   desc "Deregisters instance from its ELB"
   task :deregister_instance do
     servers = variables[:logger].instance_variable_get("@options")[:actions].first
@@ -99,15 +93,15 @@ Capistrano::Configuration.instance(:must_exist).load do
   task :ec2_status do
     CapifyEc2.running_instances.each_with_index do |instance, i|
       puts sprintf "%-11s:   %-40s %-20s %-20s %-62s %-20s (%s)",
-        i.to_s.magenta, instance.name, instance.id.red, instance.flavor_id.cyan,
+        i.to_s.magenta, instance.case_insensitive_tag("Name"), instance.id.red, instance.flavor_id.cyan,
         instance.dns_name.blue, instance.availability_zone.green, instance.roles.join(", ").yellow
     end
   end
   
-  desc "Allows ssh to instance by id. cap ssh -s i=INDEX"
+  desc "Allows ssh to instance by id. cap ssh <INSTANCE NAME>"
   task :ssh do
-    instances = CapifyEc2.running_instances
-    instance = respond_to?(:i) ? instances[i.to_i] : instances.first
+    server = variables[:logger].instance_variable_get("@options")[:actions][1]
+    instance = numeric?(server) ? CapifyEc2.running_instances[server.to_i] : CapifyEc2.get_instance_by_name(server).first
     port = ssh_options[:port] || 22 
     command = "ssh -p #{port} #{user}@#{instance.dns_name}"
     puts "Running `#{command}`"

data/lib/capify-ec2/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: capify-ec2
 version: !ruby/object:Gem::Version 
-  hash: 961916028
+  hash: 961916012
   prerelease: true
   segments: 
   - 1
   - 1
-  - 8
+  - 12
   - pre
-  version: 1.1.8.pre
+  version: 1.1.12.pre
 platform: ruby
 authors: 
 - Noah Cantor
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-03 00:00:00 +01:00
+date: 2011-08-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency