capify-ec2 1.1.6 → 1.1.7.pre.5

data/lib/capify-ec2.rb

@@ -1,47 +1,60 @@
 require 'rubygems'
 require 'fog'
+require 'colored'
 
 class CapifyEc2
 
   attr_accessor :load_balancer
   SLEEP_COUNT = 5
-  
+
   def self.ec2_config
     YAML.load(File.new("config/ec2.yml"))
   end  
-
-  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])
-    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)
-          tags[key] || tags[key.downcase]
-        end
+  
+  def self.determine_regions(region = nil)
+    regions = ec2_config[:aws_params][:regions] || [ec2_config[:aws_params][:region]]
+    regions = [region] if region
+    regions
+  end
+  
+  def self.running_instances(region = nil)
+    regions = determine_regions(region)
+    instances = []
+    regions.each do |region|
+      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 => region)
+      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)
+            tags[key] || tags[key.downcase]
+          end
         
-        def name
-          case_insensitive_tag("Name").split('-').reject {|portion| portion.include?(".")}.join("-")
-        end
+          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*/)
+          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
-          roles
         end
+        instances << instance
       end
     end
+    instances
   end
   
   def self.instance_health(load_balancer, instance)
     elb.describe_instance_health(load_balancer.id, instance.id).body['DescribeInstanceHealthResult']['InstanceStates'][0]['State']
   end
   
-  def self.get_instances_by_role(role)
-    selected_instances = running_instances.select do |instance|
+  def self.get_instances_by_role(role, 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*/)

data/lib/capify-ec2/capistrano.rb

@@ -1,40 +1,69 @@
 require File.join(File.dirname(__FILE__), '../capify-ec2')
+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, []
+    
+    if role[:options].delete(:default)
+      instances.each do |instance|
+        define_role(role, instance)
+      end
+    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_instance_roles(role, instances)
     define_role_roles(role, instances)
   end  
 
+  def define_regions(region, role)
+    instances = CapifyEc2.get_instances_by_role(role[:name], region)
+    task region.to_sym do 
+      remove_default_roles
+      instances.each do |instance|
+        define_role(role, instance)
+      end
+    end
+  end
+
   def define_instance_roles(role, instances)
     instances.each do |instance|
       task instance.name.to_sym do
-        set :server_address, instance.dns_name
+        specified_roles << role[:name]
+        remove_default_roles
         define_role(role, instance)
       end
     end
   end
 
   def define_role_roles(role, instances)
-    defined_role =
     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)
-    dns_names = [dns_names] if dns_names.is_a?(String)
     subroles = role[:options]
     new_options = {}
     subroles.each {|key, value| new_options[key] = true if value.to_s == instance.name}
 
     if new_options
-      role role[:name].to_sym, instance.dns_name, new_options
+      role role[:name].to_sym, instance.dns_name, new_options 
     else
       role role[:name].to_sym, instance.dns_name
     end
@@ -71,9 +100,19 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
   end
   
+  task :ssh do
+    instances = CapifyEc2.running_instances
+    instance = respond_to?(:i) ? instances[i.to_i] : instances.first
+    port = ssh_options[:port] || 22 
+    command = "ssh -p #{port} #{user}@#{instance.dns_name}"
+    puts "Running `#{command}`"
+    system(command)
+  end
+  
   namespace :deploy do
     before "deploy", "deregister_instance"
     after "deploy", "register_instance"
     after "deploy:rollback", "register_instance"
   end
+  
 end

data/lib/capify-ec2/version.rb

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

data/readme.md

@@ -79,6 +79,15 @@ Running
 will list the currently running servers and their associated details 
 (public dns, instance id, roles etc)
 
+Running
+  
+  cap ssh -s i=1
+
+will launch ssh using the user and port specified in your configuration.
+The 'i' argument is the index of the server to ssh into. Use the 'ec2_status'
+command to see the list of servers with their indices. If the 'i' argument
+is omitted then the first instance will be used.
+
 More options
 ====================================================
 
@@ -105,6 +114,17 @@ Which is cool if you want a task like this in deploy.rb
       Do something to a server with cron on it
     end
 
+
+ec2_roles :name=>:web, :options=>{ :default => true }
+
+Will make :web the default role so you can just type 'cap deploy'. 
+Multiple roles can be defaults so: 
+
+ec2_roles :name=>:web, :options=>{ :default => true }
+ec2_roles :name=>:app, :options=>{ :default => true }
+
+would be the equivalent of 'cap app web deploy'
+
 Ec2 config
 ====================================================
 
@@ -116,7 +136,7 @@ The yml file needs to look something like this:
     	:aws_params:
     	  :region: 'eu-west-1'
 		  :load_balanced: true
-		  :project_name: "YOUR APP NAME"
+		  :project_tag: "YOUR APP NAME"
 
 The :aws_params are optional.
 If :load_balanced is set to true, the gem uses pre and post-deploy
@@ -124,7 +144,7 @@ hooks to deregister the instance, reregister it, and validate its
 health.
 :load_balanced only works for individual instances, not for roles.
 
-The :project_name parameter is optional. It will limit any commands to 
+The :project_tag 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,15 @@
 --- !ruby/object:Gem::Specification 
 name: capify-ec2
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
+  hash: 1923831979
+  prerelease: true
   segments: 
   - 1
   - 1
-  - 6
-  version: 1.1.6
+  - 7
+  - pre
+  - 5
+  version: 1.1.7.pre.5
 platform: ruby
 authors: 
 - Noah Cantor
@@ -16,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-10 00:00:00 +01:00
+date: 2011-06-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -103,12 +105,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