capify-ec2 1.1.14.pre.1 → 1.1.14

data/Changelog.md

@@ -3,6 +3,7 @@
 Bugfixes:
 
   - Fixed chaining of tasks
+  - Fixed handling of defaults and their interactions with specified tasks (particularly across regions)
   
 Features:
 

data/lib/capify-ec2.rb

@@ -12,9 +12,7 @@ class CapifyEc2
   end  
   
   def self.determine_regions(region = nil)
-    regions = ec2_config[:aws_params][:regions] || [ec2_config[:aws_params][:region]]
-    regions = [region] if region
-    regions
+    region.nil? ? (ec2_config[:aws_params][:regions] || [ec2_config[:aws_params][:region]]) : region
   end
   
   def self.running_instances(region = nil)

data/lib/capify-ec2/capistrano.rb

@@ -55,6 +55,8 @@ Capistrano::Configuration.instance(:must_exist).load do
     server_name = variables[:logger].instance_variable_get("@options")[:actions].first unless variables[:logger].instance_variable_get("@options")[:actions][1].nil?
     named_instance = CapifyEc2.get_instance_by_name(server_name)
     task named_instance.name.to_sym do
+      remove_default_roles
+      server_address = named_instance.dns_name
       named_instance.roles.each do |role|
         define_role({:name => role, :options => {}}, named_instance)
       end
@@ -64,25 +66,28 @@ 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])
     if role[:options].delete(:default)
       instances.each do |instance|
         define_role(role, instance)
       end
-    end  
-    define_role_roles(role, instances)
-  
+    end
+        
     regions = CapifyEc2.ec2_config[:aws_params][:regions] || [CapifyEc2.ec2_config[:aws_params][:region]]
     regions.each do |region|
       define_regions(region, role)
     end unless regions.nil?
-  
+    
+    define_role_roles(role, instances)
     define_instance_roles(role, instances)    
+
   end  
 
   def define_regions(region, role)
     instances = CapifyEc2.get_instances_by_region(role[:name], region)
-    task region.to_sym do 
+    task region.to_sym do
+      remove_default_roles
       instances.each do |instance|
         define_role(role, instance)
       end
@@ -92,6 +97,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   def define_instance_roles(role, instances)
     instances.each do |instance|
       task instance.name.to_sym do
+        remove_default_roles
         define_role(role, instance)
       end
     end
@@ -99,6 +105,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   def define_role_roles(role, instances)
     task role[:name].to_sym do
+      remove_default_roles
       instances.each do |instance|
         define_role(role, instance)
       end
@@ -120,4 +127,9 @@ Capistrano::Configuration.instance(:must_exist).load do
   def numeric?(object)
     true if Float(object) rescue false
   end
+  
+  def remove_default_roles	 	
+    roles.reject! { true }
+  end
+  
 end

data/lib/capify-ec2/version.rb

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

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capify-ec2
 version: !ruby/object:Gem::Version 
-  hash: 1923832043
-  prerelease: true
+  hash: 15
+  prerelease: false
   segments: 
   - 1
   - 1
   - 14
-  - pre
-  - 1
-  version: 1.1.14.pre.1
+  version: 1.1.14
 platform: ruby
 authors: 
 - Noah Cantor
@@ -18,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-25 00:00:00 +01:00
+date: 2011-09-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -110,14 +108,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: capify-ec2