capify-ec2 1.2.5 → 1.2.6.pre

data/Changelog.md

@@ -1,10 +1,20 @@
-## 1.2.5 (Jan 26, 2011)
+## 1.2.6 (Jan 29, 2012)
+
+Notes:
+
+  - Minor refactoring to make the code clearer
+  
+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:
 
   - Added ability to connect to VPC instances. Very basic functionality.
 
-## 1.2.4 (Jan 24, 2011)
+## 1.2.4 (Jan 24, 2012)
 
 Features:
 

data/lib/capify-ec2.rb

@@ -48,7 +48,7 @@ class CapifyEc2
   end
  
   def get_instances_by_role(role)
-    desired_instances.select {|instance| instance.tags['Roles'].split(',').include?(role.to_s) rescue false}
+    desired_instances.select {|instance| instance.tags['Roles'].split(%r{\W+}).include?(role.to_s) rescue false}
   end
   
   def get_instances_by_region(roles, region)

data/lib/capify-ec2/capistrano.rb

@@ -120,10 +120,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"].each do |option| 
-      results = option.split(',')
-      results.each {|result| new_options[result.to_sym] = true }
-    end rescue false
+    instance.tags["Options"].split(%r{\W+}).each { |option| new_options[option.to_sym] = true} rescue false
 
     if new_options
       role role[:name].to_sym, instance.contact_point, new_options 

data/lib/capify-ec2/version.rb

@@ -1,5 +1,5 @@
 module Capify
   module Ec2
-    VERSION = "1.2.5"
+    VERSION = "1.2.6.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"
     server-2 Tag: Roles => "db"
-    server-3 Tag: Roles => "web, db"
+    server-3 Tag: Roles => "web,db"
 
 Installing
 

metadata

@@ -1,80 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: capify-ec2
-version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  - 5
-  version: 1.2.5
+version: !ruby/object:Gem::Version
+  version: 1.2.6.pre
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Noah Cantor
 - Siddharth Dawara
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-27 00:00:00 +00:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-29 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fog
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153339760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 1
-        - 1
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.1.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: colored
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153339760
+- !ruby/object:Gem::Dependency
+  name: colored
+  requirement: &2153339220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: capistrano
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153339220
+- !ruby/object:Gem::Dependency
+  name: capistrano
+  requirement: &2153338840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *2153338840
 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
@@ -86,39 +64,28 @@ 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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: capify-ec2
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Grabs roles from ec2's tags and autogenerates capistrano tasks
 test_files: []
-