capify-ec2 1.2.4 → 1.2.5

data/Changelog.md

@@ -1,3 +1,9 @@
+## 1.2.5 (Jan 26, 2011)
+
+Features:
+
+  - Added ability to connect to VPC instances. Very basic functionality.
+
 ## 1.2.4 (Jan 24, 2011)
 
 Features:

data/lib/capify-ec2.rb

@@ -31,9 +31,13 @@ class CapifyEc2
     desired_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,
-        instance.dns_name.blue, instance.availability_zone.green, (instance.roles rescue "").yellow
+        instance.contact_point.blue, instance.availability_zone.green, (instance.tags["Roles"] || "").yellow
     end
   end
+
+  def server_names
+    desired_instances.map {|instance| instance.name}
+  end
     
   def project_instances
     @instances.select {|instance| instance.tags["Project"] == @ec2_config[:project_tag]}
@@ -42,9 +46,9 @@ class CapifyEc2
   def desired_instances(region = nil)
     instances = @ec2_config[:project_tag].nil? ? @instances : project_instances
   end
-  
+ 
   def get_instances_by_role(role)
-    desired_instances.select {|instance| instance.roles.split(',').include?(role.to_s) rescue false}
+    desired_instances.select {|instance| instance.tags['Roles'].split(',').include?(role.to_s) rescue false}
   end
   
   def get_instances_by_region(roles, region)
@@ -59,11 +63,7 @@ class CapifyEc2
   def instance_health(load_balancer, instance)
     elb.describe_instance_health(load_balancer.id, instance.id).body['DescribeInstanceHealthResult']['InstanceStates'][0]['State']
   end
-  
-  def server_names
-    desired_instances.map {|instance| instance.name}
-  end
-  
+    
   def elb
     Fog::AWS::ELB.new(:aws_access_key_id => @ec2_config[:aws_access_key_id], :aws_secret_access_key => @ec2_config[:aws_secret_access_key], :region => @ec2_config[:aws_params][:region])
   end 

data/lib/capify-ec2/capistrano.rb

@@ -4,7 +4,7 @@ require 'colored'
 Capistrano::Configuration.instance(:must_exist).load do  
   namespace :ec2 do
     
-    desc "Prints out all ec2 instances. index, name, instance_id, size, dns_name, region, tags"
+    desc "Prints out all ec2 instances. index, name, instance_id, size, DNS/IP, region, tags"
     task :status do
       CapifyEc2.new.display_instances
     end
@@ -36,7 +36,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       server = variables[:logger].instance_variable_get("@options")[:actions][1]
       instance = numeric?(server) ? CapifyEc2.new.desired_instances[server.to_i] : CapifyEc2.new.get_instance_by_name(server)
       port = ssh_options[:port] || 22 
-      command = "ssh -p #{port} #{user}@#{instance.dns_name}"
+      command = "ssh -p #{port} #{user}@#{instance.contact_point}"
       puts "Running `#{command}`"
       exec(command)
     end
@@ -55,7 +55,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     
     task named_instance.name.to_sym do
       remove_default_roles
-      server_address = named_instance.dns_name
+      server_address = named_instance.contact_point
       named_instance.roles.each do |role|
         define_role({:name => role, :options => {:on_no_matching_servers => :continue}}, named_instance)
       end
@@ -120,15 +120,15 @@ Capistrano::Configuration.instance(:must_exist).load do
     options = role[:options]
     new_options = {}
     options.each {|key, value| new_options[key] = true if value.to_s == instance.name}
-    instance.options.each do |option| 
+    instance.tags["Options"].each do |option| 
       results = option.split(',')
       results.each {|result| new_options[result.to_sym] = true }
     end rescue false
 
     if new_options
-      role role[:name].to_sym, instance.dns_name, new_options 
+      role role[:name].to_sym, instance.contact_point, new_options 
     else
-      role role[:name].to_sym, instance.dns_name
+      role role[:name].to_sym, instance.contact_point
     end
   end
   

data/lib/capify-ec2/server.rb

@@ -5,20 +5,12 @@ module Fog
   module Compute
     class AWS
       class Server
-        def method_missing(method_sym, *arguments, &block)
-          tags.each do |key, value|
-            tag = key.downcase.gsub(/\W/, '')
-            return value if method_sym.to_s == tag
-          end if tags
-          super
+        def contact_point
+          dns_name || public_ip_address || private_ip_address
         end
         
-        def respond_to?(method_sym, include_private = false)
-          tags.each do |key, value|
-            tag = key.downcase.gsub(/\W/, '')
-            return true if method_sym.to_s == tag
-          end if tags
-          super
+        def name
+          tags["Name"]
         end
       end
     end

data/lib/capify-ec2/version.rb

@@ -1,5 +1,5 @@
 module Capify
   module Ec2
-    VERSION = "1.2.4"
+    VERSION = "1.2.5"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capify-ec2
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 2
-  - 4
-  version: 1.2.4
+  - 5
+  version: 1.2.5
 platform: ruby
 authors: 
 - Noah Cantor
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-25 00:00:00 +00:00
+date: 2012-01-27 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency