capify-ec2 1.2.8 → 1.2.9

data/Changelog.md

@@ -1,4 +1,10 @@
-## 1.2.6 (May 16, 2012)
+## 1.2.9 (June 29, 2012)
+
+Bugfixes:
+
+  - No longer throws an error when a server has no name.
+
+## 1.2.8 (May 16, 2012)
 
 Notes:
 

data/lib/capify-ec2.rb

@@ -34,12 +34,12 @@ class CapifyEc2
   def determine_regions()
     @ec2_config[:aws_params][:regions] || [@ec2_config[:aws_params][:region]]
   end
-  
+    
   def display_instances
     desired_instances.each_with_index do |instance, i|
-      puts sprintf "%-11s:   %-40s %-20s %-20s %-62s %-20s (%s) (%s)",
-        i.to_s.magenta, instance.name, instance.id.red, instance.flavor_id.cyan,
-        instance.contact_point.blue, instance.availability_zone.green, (instance.tags["Roles"] || "").yellow,
+      puts sprintf "%02d:  %-40s  %-20s  %-20s  %-62s  %-20s  (%s)  (%s)",
+        i, (instance.name || "").green, instance.id.red, instance.flavor_id.cyan,
+        instance.contact_point.blue, instance.availability_zone.magenta, (instance.tags["Roles"] || "").yellow,
         (instance.tags["Options"] || "").yellow
       end
   end

data/lib/capify-ec2/capistrano.rb

@@ -54,16 +54,18 @@ Capistrano::Configuration.instance(:must_exist).load do
     
   def ec2_roles(*roles)
     server_name = variables[:logger].instance_variable_get("@options")[:actions].first unless variables[:logger].instance_variable_get("@options")[:actions][1].nil?
-    named_instance = capify_ec2.get_instance_by_name(server_name)
-    
-    task named_instance.name.to_sym do
-      remove_default_roles
-      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
-    end unless named_instance.nil?
     
+    if !server_name.nil?
+      named_instance = capify_ec2.get_instance_by_name(server_name)
+  
+      task named_instance.name.to_sym do
+        remove_default_roles
+        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
+      end unless named_instance.nil?
+    end
     roles.each {|role| ec2_role(role)}
   end
   

data/lib/capify-ec2/version.rb

@@ -1,5 +1,5 @@
 module Capify
   module Ec2
-    VERSION = "1.2.8"
+    VERSION = "1.2.9"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capify-ec2
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 1
   - 2
-  - 8
-  version: 1.2.8
+  - 9
+  version: 1.2.9
 platform: ruby
 authors: 
 - Noah Cantor
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-16 00:00:00 +01:00
-default_executable: 
+date: 2012-06-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fog
@@ -86,7 +85,6 @@ files:
 - lib/capify-ec2/server.rb
 - lib/capify-ec2/version.rb
 - readme.md
-has_rdoc: true
 homepage: http://github.com/forward/capify-ec2
 licenses: []
 
@@ -116,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: capify-ec2
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Grabs roles from ec2's tags and autogenerates capistrano tasks