capify-ec2 1.1.13 → 1.1.14.pre.1

data/{Changelog → Changelog.md}

@@ -1,3 +1,25 @@
+## 1.1.14 (Aug 24, 2011)
+
+Bugfixes:
+
+  - Fixed chaining of tasks
+  
+Features:
+
+  - Moved the following to ec2 namespace to make it clearer what's part of the gem
+    - status (formerly ec2_status)
+    - register_instance
+    - deregister_instance
+    - date
+    - server_names
+
+
+## 1.1.13 (Aug 10, 2011)
+
+Bugfixes:
+
+  - Obscure bug fixed. Multiple roles where some instances weren't in all roles would throw an error if you tried to tell a task to only fire when particular roles were deployed to. This bug only fired if you performed your action on a single instance (cap server deploy).
+
 ## 1.1.12 (Aug 09, 2011)
 
 Features:
@@ -11,7 +33,7 @@ Features:
   - Fix gem dependencies for cap ec2_status
   - Allows registering and deregistering of instances with an ELB
   - Servers can have Role or Roles on ec2
-  
+
 
 Bugfixes:
 

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2011 Forward
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/capify-ec2.rb

@@ -53,8 +53,8 @@ class CapifyEc2
     elb.describe_instance_health(load_balancer.id, instance.id).body['DescribeInstanceHealthResult']['InstanceStates'][0]['State']
   end
   
-  def self.get_instances_by_role(role, server_type)
-    filter_instances_by_role(running_instances, role, server_type)
+  def self.get_instances_by_role(role)
+    filter_instances_by_role(running_instances, role)
   end
   
   def self.get_instances_by_region(role, region)
@@ -63,13 +63,13 @@ class CapifyEc2
     filter_instances_by_role(region_instances,role)
   end 
   
-  def self.filter_instances_by_role(instances, role, server_type = nil)
+  def self.filter_instances_by_role(instances, role)
     selected_instances = 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_type.nil? ? server_roles.member?(role.to_s) : (server_roles.member?(role.to_s) && server_type == role.to_s)
+      server_roles.member?(role.to_s)
     end
   end 
   

data/lib/capify-ec2/capistrano.rb

@@ -2,34 +2,82 @@ require File.join(File.dirname(__FILE__), '../capify-ec2')
 require 'colored'
 
 Capistrano::Configuration.instance(:must_exist).load do
-  def ec2_roles(*roles)
-    server_type = variables[:logger].instance_variable_get("@options")[:actions].first unless variables[:logger].instance_variable_get("@options")[:actions][1].nil?
+  namespace :ec2 do
+    desc "Prints out all ec2 instances. index, name, instance_id, size, dns_name, region, tags"
+    task :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.case_insensitive_tag("Name"), instance.id.red, instance.flavor_id.cyan,
+          instance.dns_name.blue, instance.availability_zone.green, instance.roles.join(", ").yellow
+      end
+    end
+    desc "Deregisters instance from its ELB"
+    task :deregister_instance do
+      instance_name = variables[:logger].instance_variable_get("@options")[:actions].first
+      CapifyEc2.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.register_instance_in_elb(instance_name, load_balancer_name)
+    end
+
+    task :date do
+      run "date"
+    end
+
+    desc "Prints list of ec2 server names"
+    task :server_names do
+      puts CapifyEc2.server_names.sort
+    end
     
-    named_instance = CapifyEc2.get_instance_by_name(server_type)
+    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.running_instances[server.to_i] : CapifyEc2.get_instance_by_name(server)
+      port = ssh_options[:port] || 22 
+      command = "ssh -p #{port} #{user}@#{instance.dns_name}"
+      puts "Running `#{command}`"
+      system(command)
+    end
+
+  end
+  
+  namespace :deploy do
+    before "deploy", "ec2:deregister_instance"
+    after "deploy", "ec2:register_instance"
+    after "deploy:rollback", "ec2:register_instance"
+  end
+  
+  def ec2_roles(*roles)
+    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
       named_instance.roles.each do |role|
         define_role({:name => role, :options => {}}, named_instance)
       end
     end unless named_instance.nil?
-    roles.each {|role| ec2_role(role, server_type)}
+    roles.each {|role| ec2_role(role)}
   end
   
-  def ec2_role(role_name_or_hash, server_type)
+  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], server_type)
+    instances = CapifyEc2.get_instances_by_role(role[:name])
     if role[:options].delete(:default)
       instances.each do |instance|
         define_role(role, instance)
       end
-    end
-    
+    end  
+    define_role_roles(role, instances)
+  
     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)
@@ -68,56 +116,8 @@ Capistrano::Configuration.instance(:must_exist).load do
       role role[:name].to_sym, instance.dns_name
     end
   end
-    
+  
   def numeric?(object)
     true if Float(object) rescue false
   end
-  
-  desc "Deregisters instance from its ELB"
-  task :deregister_instance do
-    servers = variables[:logger].instance_variable_get("@options")[:actions].first
-    CapifyEc2.deregister_instance_from_elb(servers)
-  end
-  
-  desc "Registers an instance with an ELB."
-  task :register_instance do
-    servers = variables[:logger].instance_variable_get("@options")[:actions].first
-    load_balancer_name = variables[:logger].instance_variable_get("@options")[:vars][:loadbalancer]
-    CapifyEc2.register_instance_in_elb(servers, load_balancer_name)
-  end
-  
-  task :date do
-    run "date"
-  end
-  
-  desc "Prints list of ec2 server names"
-  task :server_names do
-    puts CapifyEc2.server_names.sort
-  end
-  
-  desc "Prints out all ec2 instances. index, name, instance_id, size, dns_name, region, tags"
-  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.case_insensitive_tag("Name"), instance.id.red, instance.flavor_id.cyan,
-        instance.dns_name.blue, instance.availability_zone.green, instance.roles.join(", ").yellow
-    end
-  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.running_instances[server.to_i] : CapifyEc2.get_instance_by_name(server)
-    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.13"
+    VERSION = "1.1.14.pre.1"
   end
 end

data/readme.md

@@ -1,7 +1,7 @@
 Capify Ec2
 ====================================================
 
-capify-ec2 is used to generate capistrano namespaces using ec2 tags. 
+capify-ec2 is used to generate capistrano namespaces using ec2 tags.
 
 eg: If you have three servers on amazon's ec2.
 
@@ -23,11 +23,11 @@ Will generate
     task :server-1 do
       role :web, {server-1 public dns fetched from Amazon}
     end
-    
+
     task :server-3 do
       role :web, {server-1 public dns fetched from Amazon}
     end
-    
+
     task :web do
       role :web, {server-1 public dns fetched from Amazon}
       role :web, {server-3 public dns fetched from Amazon}
@@ -51,7 +51,7 @@ Will generate
     task :db do
       role :db, {server-2 public dns fetched from Amazon}
       role :db, {server-3 public dns fetched from Amazon}
-    end    
+    end
 
 Running
 
@@ -61,27 +61,28 @@ will run the date command on all server's tagged with the web role
 
 Running
 
-  cap server-1 register-instance -s loadbalancer=elb-1
+  cap server-1 ec2:register-instance -s loadbalancer=elb-1
 
 will register server-1 to be used by elb-1
 
 Running
-  
-  cap server-1 deregister-instance
+
+  cap server-1 ec2:deregister-instance
 
 will remove server-1 from whatever instance it is currently
 registered against.
 
 Running
   
-  cap ec2_status
+  cap ec2:status
+
 
-will list the currently running servers and their associated details 
+will list the currently running servers and their associated details
 (public dns, instance id, roles etc)
 
 Running
-  
-  cap ssh -s i=1
+
+  cap ec2: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'
@@ -92,7 +93,7 @@ More options
 ====================================================
 
     ec2_roles {:name=>"web", :options=>{:cron=>"server-1"}}
-  
+
 Will generate
 
     task :server-1 do
@@ -117,8 +118,8 @@ Which is cool if you want a task like this in deploy.rb
 
 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: 
+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 }
@@ -131,12 +132,12 @@ Ec2 config
 This gem requires 'config/ec2.yml' in your project.
 The yml file needs to look something like this:
 
-    	:aws_access_key_id: "YOUR ACCESS KEY"
-    	:aws_secret_access_key: "YOUR SECRET"
-    	:aws_params:
-    	  :region: 'eu-west-1'
-		  :load_balanced: true
-		  :project_tag: "YOUR APP NAME"
+      :aws_access_key_id: "YOUR ACCESS KEY"
+      :aws_secret_access_key: "YOUR SECRET"
+      :aws_params:
+        :region: 'eu-west-1'
+      :load_balanced: true
+      :project_tag: "YOUR APP NAME"
 
 The :aws_params are optional.
 If :load_balanced is set to true, the gem uses pre and post-deploy
@@ -144,7 +145,25 @@ hooks to deregister the instance, reregister it, and validate its
 health.
 :load_balanced only works for individual instances, not for roles.
 
-The :project_tag parameter is optional. It will limit any commands to 
-running against those instances with a "Project" tag set to the value 
+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".
 
+## Development
+
+Source hosted at [GitHub](http://github.com/forward/capify-ec2).
+Report Issues/Feature requests on [GitHub Issues](http://github.com/forward/capify-ec2/issues).
+
+### Note on Patches/Pull Requests
+
+ * Fork the project.
+ * Make your feature addition or bug fix.
+ * Add tests for it. This is important so I don't break it in a
+   future version unintentionally.
+ * Commit, do not mess with rakefile, version, or history.
+   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+ * Send me a pull request. Bonus points for topic branches.
+
+## Copyright
+
+Copyright (c) 2011 Forward. See [LICENSE](https://github.com/forward/capify-ec2/blob/master/LICENSE) for details.

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: capify-ec2
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
+  hash: 1923832043
+  prerelease: true
   segments: 
   - 1
   - 1
-  - 13
-  version: 1.1.13
+  - 14
+  - pre
+  - 1
+  version: 1.1.14.pre.1
 platform: ruby
 authors: 
 - Noah Cantor
@@ -16,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-10 00:00:00 +01:00
+date: 2011-08-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,8 +80,9 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
-- Changelog
+- Changelog.md
 - Gemfile
+- LICENSE
 - Rakefile
 - capify-ec2.gemspec
 - lib/capify-ec2.rb
@@ -107,12 +110,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