capify-ec2 1.2.0.pre.3 → 1.2.3

data/Changelog.md

@@ -1,3 +1,32 @@
+## 1.2.3 (Jan 24, 2011)
+
+Features:
+
+  - Remove handling of singular 'role.' It was causing unnecessary difficulties.
+
+Bugfixes:
+
+  - Options flag not properly recognized.
+
+## 1.2.2 (Dec 05, 2011)
+
+Bugfixes:
+
+  - Mismatch between ec2:status and ec2:ssh lead to connecting to the wrong server.
+
+## 1.2.1 (Dec 02, 2011)
+
+Bugfixes:
+
+  - Regression bug fixed. Projects weren't being filtered properly.
+  
+## 1.2.0 (Dec 02, 2011)
+
+Features:
+
+  - Much improved performance
+  - US-West-1 now available (fog upgrade)
+  
 ## 1.1.16 (Sep 23, 2011)
 
 Features:

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Forward
+Copyright (c) 2012 Forward
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/capify-ec2/capistrano.rb

@@ -34,7 +34,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     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.instances[server.to_i] : CapifyEc2.new.get_instance_by_name(server)
+      instance = numeric?(server) ? CapifyEc2.new.desired_instances[server.to_i] : CapifyEc2.new.get_instance_by_name(server)
       port = ssh_options[:port] || 22 
       command = "ssh -p #{port} #{user}@#{instance.dns_name}"
       puts "Running `#{command}`"
@@ -120,7 +120,10 @@ 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.option.each { |option| new_options[option.to_sym] = true } rescue false
+    instance.options.each do |option| 
+      results = option.split(',')
+      results.each {|result| new_options[result.to_sym] = true }
+    end rescue false
 
     if new_options
       role role[:name].to_sym, instance.dns_name, new_options 

data/lib/capify-ec2/server.rb

@@ -7,7 +7,7 @@ module Fog
       class Server
         def method_missing(method_sym, *arguments, &block)
           tags.each do |key, value|
-            tag = key.downcase.gsub(/\W/, '').chomp('s')
+            tag = key.downcase.gsub(/\W/, '')
             return value if method_sym.to_s == tag
           end if tags
           super
@@ -15,7 +15,7 @@ module Fog
         
         def respond_to?(method_sym, include_private = false)
           tags.each do |key, value|
-            tag = key.downcase.gsub(/\W/, '').chomp('s')
+            tag = key.downcase.gsub(/\W/, '')
             return true if method_sym.to_s == tag
           end if tags
           super

data/lib/capify-ec2/version.rb

@@ -1,5 +1,5 @@
 module Capify
   module Ec2
-    VERSION = "1.2.0.pre.3"
+    VERSION = "1.2.3"
   end
 end

data/lib/capify-ec2.rb

@@ -28,32 +28,32 @@ class CapifyEc2
   end
   
   def display_instances
-    @instances.each_with_index do |instance, i|
+    desired_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.role rescue "").yellow
     end
   end
     
-  def project_instances(project_tag)
-    @instances.select {|instance| instance.tags["Project"] == project_tag}
+  def project_instances
+    @instances.select {|instance| instance.tags["Project"] == @ec2_config[:project_tag]}
   end
   
-  def running_instances(region = nil)
-    instances = @ec2_config[:project_tag].nil? ? @instances : project_instances(@ec2_config[:project_tag])
+  def desired_instances(region = nil)
+    instances = @ec2_config[:project_tag].nil? ? @instances : project_instances
   end
   
-  def get_instances_by_role(role)
-    @instances.select {|instance| instance.role == role.to_s rescue false}
+  def get_instances_by_role(roles)
+    desired_instances.select {|instance| instance.roles == roles.to_s rescue false}
   end
   
-  def get_instances_by_region(role, region)
+  def get_instances_by_region(roles, region)
     return unless region
-    @instances.select {|instance| instance.availability_zone.match(region) && instance.role == role.to_s rescue false}
+    desired_instances.select {|instance| instance.availability_zone.match(region) && instance.roles == roles.to_s rescue false}
   end 
   
   def get_instance_by_name(name)
-    @instances.select {|instance| instance.name == name}.first
+    desired_instances.select {|instance| instance.name == name}.first
   end
     
   def instance_health(load_balancer, instance)
@@ -61,7 +61,7 @@ class CapifyEc2
   end
   
   def server_names
-    @instances.map {|instance| instance.name}
+    desired_instances.map {|instance| instance.name}
   end
   
   def elb

data/readme.md

@@ -5,8 +5,8 @@ capify-ec2 is used to generate capistrano namespaces using ec2 tags.
 
 eg: If you have three servers on amazon's ec2.
 
-    server-1 Tag: Role => "web", Options => "cron, resque"
-    server-2 Tag: Role => "db"
+    server-1 Tag: Roles => "web", Options => "cron, resque"
+    server-2 Tag: Roles => "db"
     server-3 Tag: Roles => "web, db"
 
 Installing
@@ -194,4 +194,4 @@ Report Issues/Feature requests on [GitHub Issues](http://github.com/forward/capi
 
 ## Copyright
 
-Copyright (c) 2011 Forward. See [LICENSE](https://github.com/forward/capify-ec2/blob/master/LICENSE) for details.
+Copyright (c) 2012 Forward. See [LICENSE](https://github.com/forward/capify-ec2/blob/master/LICENSE) for details.

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capify-ec2
 version: !ruby/object:Gem::Version 
-  hash: 1923831983
-  prerelease: true
+  hash: 25
+  prerelease: false
   segments: 
   - 1
   - 2
-  - 0
-  - pre
   - 3
-  version: 1.2.0.pre.3
+  version: 1.2.3
 platform: ruby
 authors: 
 - Noah Cantor
@@ -18,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-02 00:00:00 +00:00
+date: 2012-01-24 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,14 +107,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