capify-ec2 1.2.6.pre → 1.2.6.pre.2

data/Changelog.md

@@ -1,4 +1,4 @@
-## 1.2.6 (Jan 29, 2012)
+## 1.2.6 (Mar 06, 2012)
 
 Notes:
 

data/lib/capify-ec2.rb

@@ -9,8 +9,16 @@ class CapifyEc2
   attr_accessor :load_balancer, :instances
   SLEEP_COUNT = 5
   
-  def initialize()
-    @ec2_config = YAML.load(File.new("config/ec2.yml"))
+  def initialize(ec2_config = "config/ec2.yml")
+    case ec2_config
+    when Hash
+      @ec2_config = ec2_config
+    when String
+      @ec2_config = YAML.load_file ec2_config
+    else
+      raise ArgumentError, "Invalid ec2_config: #{ec2_config.inspect}"
+    end
+
     regions = determine_regions()
     
     @instances = []
@@ -29,10 +37,11 @@ class CapifyEc2
   
   def display_instances
     desired_instances.each_with_index do |instance, i|
-      puts sprintf "%-11s:   %-40s %-20s %-20s %-62s %-20s (%s)",
+      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
-    end
+        instance.contact_point.blue, instance.availability_zone.green, (instance.tags["Roles"] || "").yellow,
+        (instance.tags["Options"] || "").yellow
+      end
   end
 
   def server_names
@@ -48,7 +57,7 @@ class CapifyEc2
   end
  
   def get_instances_by_role(role)
-    desired_instances.select {|instance| instance.tags['Roles'].split(%r{\W+}).include?(role.to_s) rescue false}
+    desired_instances.select {|instance| instance.tags['Roles'].split(%r{[, ]+}).include?(role.to_s) rescue false}
   end
   
   def get_instances_by_region(roles, region)
@@ -121,4 +130,4 @@ class CapifyEc2
       STDERR.puts "#{instance.name}: tests timed out after #{time_elapsed} seconds."
     end
   end
-end
+end

data/lib/capify-ec2/capistrano.rb

@@ -2,24 +2,28 @@ require File.join(File.dirname(__FILE__), '../capify-ec2')
 require 'colored'
 
 Capistrano::Configuration.instance(:must_exist).load do  
+  def capify_ec2
+    @capify_ec2 ||= CapifyEc2.new(fetch(:ec2_config, 'config/ec2.yml'))
+  end
+
   namespace :ec2 do
     
     desc "Prints out all ec2 instances. index, name, instance_id, size, DNS/IP, region, tags"
     task :status do
-      CapifyEc2.new.display_instances
+      capify_ec2.display_instances
     end
 
     desc "Deregisters instance from its ELB"
     task :deregister_instance do
       instance_name = variables[:logger].instance_variable_get("@options")[:actions].first
-      CapifyEc2.new.deregister_instance_from_elb(instance_name)
+      capify_ec2.deregister_instance_from_elb(instance_name)
     end
 
     desc "Registers an instance with an ELB."
     task :register_instance do
       instance_name = variables[:logger].instance_variable_get("@options")[:actions].first
       load_balancer_name = variables[:logger].instance_variable_get("@options")[:vars][:loadbalancer]
-      CapifyEc2.new.register_instance_in_elb(instance_name, load_balancer_name)
+      capify_ec2.register_instance_in_elb(instance_name, load_balancer_name)
     end
 
     task :date do
@@ -28,13 +32,13 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     desc "Prints list of ec2 server names"
     task :server_names do
-      puts CapifyEc2.new.server_names.sort
+      puts capify_ec2.server_names.sort
     end
     
     desc "Allows ssh to instance by id. cap ssh <INSTANCE NAME>"
     task :ssh 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)
+      instance = numeric?(server) ? capify_ec2.desired_instances[server.to_i] : capify_ec2.get_instance_by_name(server)
       port = ssh_options[:port] || 22 
       command = "ssh -p #{port} #{user}@#{instance.contact_point}"
       puts "Running `#{command}`"
@@ -49,9 +53,8 @@ Capistrano::Configuration.instance(:must_exist).load do
   end
     
   def ec2_roles(*roles)
-    @capify_ec2 = CapifyEc2.new
     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)
+    named_instance = capify_ec2.get_instance_by_name(server_name)
     
     task named_instance.name.to_sym do
       remove_default_roles
@@ -68,13 +71,13 @@ Capistrano::Configuration.instance(:must_exist).load do
     role = role_name_or_hash.is_a?(Hash) ? role_name_or_hash : {:name => role_name_or_hash,:options => {}}
     @roles[role[:name]]
     
-    instances = @capify_ec2.get_instances_by_role(role[:name])
+    instances = capify_ec2.get_instances_by_role(role[:name])
     if role[:options].delete(:default)
       instances.each do |instance|
         define_role(role, instance)
       end
     end    
-    regions = @capify_ec2.determine_regions
+    regions = capify_ec2.determine_regions
     regions.each do |region|
       define_regions(region, role)
     end unless regions.nil?
@@ -87,7 +90,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   def define_regions(region, role)
     instances = []
     @roles.each do |role_name, junk|
-      region_instances = @capify_ec2.get_instances_by_region(role_name, region)
+      region_instances = capify_ec2.get_instances_by_region(role_name, region)
       region_instances.each {|instance| instances << instance} unless region_instances.nil?
     end
     task region.to_sym do
@@ -120,7 +123,7 @@ 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.tags["Options"].split(%r{\W+}).each { |option| new_options[option.to_sym] = true} rescue false
+    instance.tags["Options"].split(%r{[, ]+}).each { |option| new_options[option.to_sym] = true} rescue false
 
     if new_options
       role role[:name].to_sym, instance.contact_point, new_options 
@@ -138,4 +141,4 @@ Capistrano::Configuration.instance(:must_exist).load do
   end
   
 
-end
+end

data/lib/capify-ec2/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capify-ec2
 version: !ruby/object:Gem::Version
-  version: 1.2.6.pre
+  version: 1.2.6.pre.2
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-29 00:00:00.000000000Z
+date: 2012-03-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &2153339760 !ruby/object:Gem::Requirement
+  requirement: &2156458380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -22,10 +22,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153339760
+  version_requirements: *2156458380
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &2153339220 !ruby/object:Gem::Requirement
+  requirement: &2156513440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -33,10 +33,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2153339220
+  version_requirements: *2156513440
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2153338840 !ruby/object:Gem::Requirement
+  requirement: &2156513060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153338840
+  version_requirements: *2156513060
 description: Grabs roles from ec2's tags and autogenerates capistrano tasks
 email:
 - noah.cantor@forward.co.uk