capify-ec2 1.1.5 → 1.1.6.pre

data/capify-ec2.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.add_dependency('activesupport', '>= 3.0.0')
   s.add_dependency('fog')
+  s.add_dependency('colored')
 end

data/lib/capify-ec2.rb

@@ -12,7 +12,8 @@ class CapifyEc2
 
   def self.running_instances
     ec2 = Fog::Compute.new(:provider => 'AWS', :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])
-    running_instances = ec2.servers.select {|instance| instance.state == "running"}
+    project_tag = ec2_config[:project_tag]
+    running_instances = ec2.servers.select {|instance| instance.state == "running" && (project_tag.nil? || instance.tags["Project"] == project_tag) }
     running_instances.each do |instance|
       instance.instance_eval do
         def case_insensitive_tag(key)
@@ -22,6 +23,15 @@ class CapifyEc2
         def name
           case_insensitive_tag("Name").split('-').reject {|portion| portion.include?(".")}.join("-")
         end
+        
+        def roles
+          role = case_insensitive_tag("Role")
+          roles = role.nil? ? [] : [role]
+          if (roles_tag = case_insensitive_tag("Roles"))
+            roles += case_insensitive_tag("Roles").split(/\s*,\s*/)
+          end
+          roles
+        end
       end
     end
   end
@@ -31,9 +41,12 @@ class CapifyEc2
   end
   
   def self.get_instances_by_role(role)
-    selected_instances = running_instances.select do |instance| 
-      value = instance.case_insensitive_tag("Role")
-      value == role.to_s
+    selected_instances = running_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_roles.member?(role.to_s)
     end
   end  
   

data/lib/capify-ec2/capistrano.rb

@@ -4,28 +4,42 @@ Capistrano::Configuration.instance(:must_exist).load do
   def ec2_role(role_to_define)
     defined_role = role_to_define.is_a?(Hash) ? role_to_define[:name] : role_to_define
     instances = CapifyEc2.get_instances_by_role(defined_role)
-    subroles = role_to_define.is_a?(Hash) ? role_to_define[:options] : {}
     
+    define_instance_roles(defined_role, instances)
+    define_role_roles(defined_role, instances)
+  end  
+
+  def define_instance_roles(role_to_define, instances)
     instances.each do |instance|
       task instance.name.to_sym do
         set :server_address, instance.dns_name
-        role :web, *server_address
-        role :app, *server_address
+        server instance.dns_name, role_to_define.to_sym
       end
     end
-    
-    task defined_role.to_sym do
+  end
+
+  def define_role_roles(role_to_define, instances)
+    task role_to_define.to_sym do
       instances.each do |instance|
-        new_options = {}
-        subroles.each {|key, value| new_options[key] = true if value.to_s == instance.name}
-        if new_options
-          role defined_role.to_sym, instance.dns_name, new_options
-        else
-          role defined_role.to_sym, instance.dns_name
-        end    
-      end        
+        define_role(role_to_define, instance.dns_name)
+      end
     end 
-  end  
+  end
+
+  def define_role(role_to_define, dns_names)
+    dns_names = [dns_names] if dns_names.is_a?(String)
+    subroles = role_to_define.is_a?(Hash) ? role_to_define[:options] : {}
+    new_options = {}
+    subroles.each {|key, value| new_options[key] = true if value.to_s == instance.name}
+
+    dns_names.each do |dns_name|
+      if new_options
+        role role_to_define.to_sym, dns_name, new_options
+      else
+        role role_to_define.to_sym, dns_name
+      end
+    end
+  end
   
   def ec2_roles(*roles)
     roles.each {|role| ec2_role(role)}
@@ -50,6 +64,14 @@ Capistrano::Configuration.instance(:must_exist).load do
     puts CapifyEc2.server_names.sort
   end
   
+  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,
+        instance.dns_name.blue, instance.availability_zone.green, instance.roles.join(", ").yellow
+    end
+  end
+  
   namespace :deploy do
     before "deploy", "deregister_instance"
     after "deploy", "register_instance"

data/lib/capify-ec2/version.rb

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

data/readme.md

@@ -7,7 +7,7 @@ eg: If you have three servers on amazon's ec2.
 
     server-1 Tag: Role => "web"
     server-2 Tag: Role => "db"
-    server-3 Tag: Role => "web"
+    server-3 Tag: Roles => "web, db"
 
 Installing
 
@@ -41,12 +41,17 @@ Additionally
 Will generate
 
     task :server-2 do
-      role :web, {server-2 public dns fetched from Amazon}
+      role :db, {server-2 public dns fetched from Amazon}
     end
-    
+
+    task :server-3 do
+      role :db, {server-3 public dns fetched from Amazon}
+    end
+
     task :db do
       role :db, {server-2 public dns fetched from Amazon}
-    end
+      role :db, {server-3 public dns fetched from Amazon}
+    end    
 
 Running
 
@@ -67,6 +72,13 @@ Running
 will remove server-1 from whatever instance it is currently
 registered against.
 
+Running
+  
+  cap ec2_status
+
+will list the currently running servers and their associated details 
+(public dns, instance id, roles etc)
+
 More options
 ====================================================
 
@@ -104,11 +116,15 @@ The yml file needs to look something like this:
     	:aws_params:
     	  :region: 'eu-west-1'
 		  :load_balanced: true
+		  :project_name: "YOUR APP NAME"
 
 The :aws_params are optional.
 If :load_balanced is set to true, the gem uses pre and post-deploy
 hooks to deregister the instance, reregister it, and validate its
 health.
-:load_balanced only works for individual instances, not
-for roles.
-====================================================
+:load_balanced only works for individual instances, not for roles.
+
+The :project_name parameter is optional. It will limit any commands to 
+running against those instances with a "Project" tag set to the value 
+"YOUR APP NAME".
+

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: capify-ec2
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 961915972
+  prerelease: true
   segments: 
   - 1
   - 1
-  - 5
-  version: 1.1.5
+  - 6
+  - pre
+  version: 1.1.6.pre
 platform: ruby
 authors: 
 - Noah Cantor
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 +01:00
+date: 2011-06-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,6 +50,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: colored
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: Grabs roles from ec2's tags and autogenerates capistrano tasks
 email: 
 - noah.cantor@forward.co.uk
@@ -89,12 +104,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: capify-ec2