capify-ec2 1.1.15 → 1.1.16.pre

data/Changelog.md

@@ -1,3 +1,15 @@
+## 1.1.16 (Sep 23, 2011)
+
+Features:
+
+  - Added 'option' handling. Allows users to move cap options ('cron,' 'db,' 'resque,' etc.) to 'Option' field at AWS.
+
+## 1.1.15 (Sep 02, 2011)
+
+Bugfixes:
+
+  - Fixed problem with ec2:ssh task not terminating properly
+
 ## 1.1.14 (Aug 24, 2011)
 
 Bugfixes:

data/lib/capify-ec2.rb

@@ -40,6 +40,14 @@ class CapifyEc2
             end
             roles
           end
+          def options
+            option = case_insensitive_tag("Option")
+            options = option.nil? ? [] : [option]
+            if (options_tag = case_insensitive_tag("Options"))
+              options += case_insensitive_tag("Options").split(/\s*,\s*/)
+            end
+            options
+          end
         end
         instances << instance
       end

data/lib/capify-ec2/capistrano.rb

@@ -113,9 +113,10 @@ Capistrano::Configuration.instance(:must_exist).load do
   end
 
   def define_role(role, instance)
-    subroles = role[:options]
+    options = role[:options]
     new_options = {}
-    subroles.each {|key, value| new_options[key] = true if value.to_s == instance.name}
+    options.each {|key, value| new_options[key] = true if value.to_s == instance.name}
+    instance.options.each {|option| new_options[option.to_sym] = true}
 
     if new_options
       role role[:name].to_sym, instance.dns_name, new_options 
@@ -132,4 +133,5 @@ Capistrano::Configuration.instance(:must_exist).load do
     roles.reject! { true }
   end
   
+
 end

data/lib/capify-ec2/version.rb

@@ -1,5 +1,5 @@
 module Capify
   module Ec2
-    VERSION = "1.1.15"
+    VERSION = "1.1.16.pre"
   end
 end

data/readme.md

@@ -5,7 +5,7 @@ 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"
+    server-1 Tag: Role => "web", Options => "cron, resque"
     server-2 Tag: Role => "db"
     server-3 Tag: Roles => "web, db"
 
@@ -15,74 +15,91 @@ Installing
 
 In your deploy.rb:
 
-    require "capify-ec2/capistrano"
-    ec2_roles :web
+```ruby
+require "capify-ec2/capistrano"
+ec2_roles :web
+```
 
 Will generate
 
-    task :server-1 do
-      role :web, {server-1 public dns fetched from Amazon}
-    end
+```ruby
+task :server-1 do
+  role :web, {server-1 public dns fetched from Amazon}, :cron=>true, :resque=>true
+end
 
-    task :server-3 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}
-    end
+task :web do
+  role :web, {server-1 public dns fetched from Amazon}, :cron=>true, :resque=>true
+  role :web, {server-3 public dns fetched from Amazon}
+end
+```
 
 Additionally
 
-    require "capify-ec2/capistrano"
-    ec2_roles :db
+```ruby
+require "capify-ec2/capistrano"
+ec2_roles :db
+```
 
 Will generate
 
-    task :server-2 do
-      role :db, {server-2 public dns fetched from Amazon}
-    end
+```ruby
+task :server-2 do
+  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 :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}
-      role :db, {server-3 public dns fetched from Amazon}
-    end
+task :db do
+  role :db, {server-2 public dns fetched from Amazon}
+  role :db, {server-3 public dns fetched from Amazon}
+end
+```
 
 Running
 
-    cap web date
+```ruby
+cap web date
+```
 
 will run the date command on all server's tagged with the web role
 
 Running
 
-  cap server-1 ec2:register-instance -s loadbalancer=elb-1
+```ruby
+cap server-1 ec2:register-instance -s loadbalancer=elb-1
+```
 
 will register server-1 to be used by elb-1
 
 Running
 
-  cap server-1 ec2:deregister-instance
+```ruby
+cap server-1 ec2:deregister-instance
+```
 
 will remove server-1 from whatever instance it is currently
 registered against.
 
 Running
-  
-  cap ec2:status
 
+```ruby
+cap ec2:status
+```
 
 will list the currently running servers and their associated details
 (public dns, instance id, roles etc)
 
 Running
 
-  cap ec2:ssh #
+```ruby
+cap ec2:ssh #
+```
 
 will launch ssh using the user and port specified in your configuration.
 The # argument is the index of the server to ssh into. Use the 'ec2:status'
@@ -91,37 +108,47 @@ command to see the list of servers with their indices.
 More options
 ====================================================
 
-    ec2_roles {:name=>"web", :options=>{:cron=>"server-1"}}
+In addition to specifying options (e.g. 'cron') at the server level, it is also possible to specify it at the project level.
+Use with caution! This does not work with autoscaling.
+
+```ruby
+ec2_roles {:name=>"web", :options=>{:cron=>"server-1"}}
+```
 
 Will generate
 
-    task :server-1 do
-      role :web, {server-1 public dns fetched from Amazon}, :cron=>true
-    end
+```ruby
+task :server-1 do
+  role :web, {server-1 public dns fetched from Amazon}, :cron=>true
+end
 
-    task :server-3 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}, :cron=>true
-      role :web, {server-3 public dns fetched from Amazon}
-    end
+task :web do
+  role :web, {server-1 public dns fetched from Amazon}, :cron=>true
+  role :web, {server-3 public dns fetched from Amazon}
+end
+```
 
 Which is cool if you want a task like this in deploy.rb
 
-    task :update_cron => :web, :only=>{:cron} do
-      Do something to a server with cron on it
-    end
-
+```ruby
+task :update_cron => :web, :only=>{:cron} do
+  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:
 
+```ruby
 ec2_roles :name=>:web, :options=>{ :default => true }
 ec2_roles :name=>:app, :options=>{ :default => true }
+```
 
 would be the equivalent of 'cap app web deploy'
 
@@ -131,12 +158,14 @@ 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"
+```ruby
+: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

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: capify-ec2
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
+  hash: 961915932
+  prerelease: true
   segments: 
   - 1
   - 1
-  - 15
-  version: 1.1.15
+  - 16
+  - pre
+  version: 1.1.16.pre
 platform: ruby
 authors: 
 - Noah Cantor
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-02 00:00:00 +01:00
+date: 2011-09-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -108,12 +109,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