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

data/Changelog.md

@@ -1,13 +1,13 @@
-## 1.2.6 (Mar 06, 2012)
+## 1.2.6 (May 16, 2012)
 
 Notes:
 
   - Minor refactoring to make the code clearer
+  - Updated code to allow commas and any amount of whitespace between options and roles (Thanks ennui2342)
+  - Updated documentation to reflect multiple correct formats.
   
 Bugfixes:
 
-  - Documentation showed whitespaces in Options and Roles, but they weren't supported in the code. (Thanks ennui2342)
-
 ## 1.2.5 (Jan 26, 2012)
 
 Features:

data/capify-ec2.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_dependency('fog', '=1.1.1')
+  s.add_dependency('fog', '=1.3.1')
   s.add_dependency('colored', '=1.2')
   s.add_dependency('capistrano')
 end

data/lib/capify-ec2.rb

@@ -53,11 +53,11 @@ class CapifyEc2
   end
   
   def desired_instances(region = nil)
-    instances = @ec2_config[:project_tag].nil? ? @instances : project_instances
+    @ec2_config[:project_tag].nil? ? @instances : project_instances
   end
  
   def get_instances_by_role(role)
-    desired_instances.select {|instance| instance.tags['Roles'].split(%r{[, ]+}).include?(role.to_s) rescue false}
+    desired_instances.select {|instance| instance.tags['Roles'].split(%r{,\s*}).include?(role.to_s) rescue false}
   end
   
   def get_instances_by_region(roles, region)

data/lib/capify-ec2/capistrano.rb

@@ -123,9 +123,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.tags["Options"].split(%r{[, ]+}).each { |option| new_options[option.to_sym] = true} rescue false
-
+    instance.tags["Options"].split(%r{,\s*}).each { |option| new_options[option.to_sym] = true} rescue false
+    
     if new_options
+      p new_options
       role role[:name].to_sym, instance.contact_point, new_options 
     else
       role role[:name].to_sym, instance.contact_point

data/lib/capify-ec2/version.rb

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

data/readme.md

@@ -5,9 +5,9 @@ capify-ec2 is used to generate capistrano namespaces using ec2 tags.
 
 eg: If you have three servers on amazon's ec2.
 
-    server-1 Tag: Roles => "web", Options => "cron,resque"
+    server-1 Tag: Roles => "web", Options => "cron,resque, db"
     server-2 Tag: Roles => "db"
-    server-3 Tag: Roles => "web,db"
+    server-3 Tag: Roles => "web,db, app"
 
 Installing
 
@@ -64,7 +64,7 @@ end
 Running
 
 ```ruby
-cap web date
+cap web ec2:date
 ```
 
 will run the date command on all server's tagged with the web role
@@ -72,7 +72,7 @@ will run the date command on all server's tagged with the web role
 Running
 
 ```ruby
-cap server-1 ec2: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
@@ -80,7 +80,7 @@ will register server-1 to be used by elb-1
 Running
 
 ```ruby
-cap server-1 ec2:deregister-instance
+cap server-1 ec2:deregister_instance
 ```
 
 will remove server-1 from whatever instance it is currently

metadata

@@ -1,58 +1,81 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: capify-ec2
-version: !ruby/object:Gem::Version
-  version: 1.2.6.pre.2
+version: !ruby/object:Gem::Version 
+  hash: 1118461980
   prerelease: 6
+  segments: 
+  - 1
+  - 2
+  - 7
+  - pre
+  version: 1.2.7.pre
 platform: ruby
-authors:
+authors: 
 - Noah Cantor
 - Siddharth Dawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-06 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-05-16 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: fog
-  requirement: &2156458380 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 1.1.1
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
+        version: 1.3.1
   type: :runtime
-  prerelease: false
-  version_requirements: *2156458380
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: colored
-  requirement: &2156513440 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: '1.2'
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
   type: :runtime
-  prerelease: false
-  version_requirements: *2156513440
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: capistrano
-  requirement: &2156513060 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2156513060
+  version_requirements: *id003
 description: Grabs roles from ec2's tags and autogenerates capistrano tasks
-email:
+email: 
 - noah.cantor@forward.co.uk
 - siddharth.dawara@forward.co.uk
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Changelog.md
 - Gemfile
@@ -64,28 +87,41 @@ files:
 - lib/capify-ec2/server.rb
 - lib/capify-ec2/version.rb
 - readme.md
+has_rdoc: true
 homepage: http://github.com/forward/capify-ec2
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: capify-ec2
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Grabs roles from ec2's tags and autogenerates capistrano tasks
 test_files: []
+