capify-ec2 1.2.9 → 1.3

data/lib/capify-ec2.rb

@@ -15,6 +15,12 @@ class CapifyEc2
       @ec2_config = ec2_config
     when String
       @ec2_config = YAML.load_file ec2_config
+      
+      # Maintain backward compatibility with previous config format
+      @ec2_config[:project_tags] ||= []
+      # User can change the Roles tag string
+      @ec2_config[:aws_roles_tag] ||= "Roles"
+      @ec2_config[:project_tags] << @ec2_config[:project_tag] if @ec2_config[:project_tag]
     else
       raise ArgumentError, "Invalid ec2_config: #{ec2_config.inspect}"
     end
@@ -39,7 +45,7 @@ class CapifyEc2
     desired_instances.each_with_index do |instance, i|
       puts sprintf "%02d:  %-40s  %-20s  %-20s  %-62s  %-20s  (%s)  (%s)",
         i, (instance.name || "").green, instance.id.red, instance.flavor_id.cyan,
-        instance.contact_point.blue, instance.availability_zone.magenta, (instance.tags["Roles"] || "").yellow,
+        instance.contact_point.blue, instance.availability_zone.magenta, (instance.tags[@ec2_config[:aws_roles_tag]] || "").yellow,
         (instance.tags["Options"] || "").yellow
       end
   end
@@ -49,15 +55,15 @@ class CapifyEc2
   end
     
   def project_instances
-    @instances.select {|instance| instance.tags["Project"] == @ec2_config[:project_tag]}
+    @instances.select {|instance| @ec2_config[:project_tags].include?(instance.tags["Project"])}
   end
   
   def desired_instances(region = nil)
-    @ec2_config[:project_tag].nil? ? @instances : project_instances
+    @ec2_config[:project_tags].empty? ? @instances : project_instances
   end
  
   def get_instances_by_role(role)
-    desired_instances.select {|instance| instance.tags['Roles'].split(%r{,\s*}).include?(role.to_s) rescue false}
+    desired_instances.select {|instance| instance.tags[@ec2_config[:aws_roles_tag]].split(%r{,\s*}).include?(role.to_s) rescue false}
   end
   
   def get_instances_by_region(roles, region)

data/lib/capify-ec2/capistrano.rb

@@ -61,7 +61,14 @@ Capistrano::Configuration.instance(:must_exist).load do
       task named_instance.name.to_sym do
         remove_default_roles
         server_address = named_instance.contact_point
-        named_instance.roles.each do |role|
+
+        if named_instance.respond_to?(:roles)
+          roles = named_instance.roles
+        else
+          roles = [named_instance.tags["Roles"]].flatten
+        end    
+        
+        roles.each do |role|
           define_role({:name => role, :options => {:on_no_matching_servers => :continue}}, named_instance)
         end
       end unless named_instance.nil?
@@ -142,5 +149,4 @@ Capistrano::Configuration.instance(:must_exist).load do
     roles.reject! { true }
   end
   
-
-end
+end

data/lib/capify-ec2/version.rb

@@ -1,5 +1,6 @@
 module Capify
   module Ec2
-    VERSION = "1.2.9"
+    VERSION = "1.3"
   end
 end
+

data/readme.md

@@ -1,3 +1,8 @@
+Capify Ec2 is no longer being maintained. It has been superseded by capify-cloud, which adds Brightbox integration.
+You may continue to use this as long as you like, but active development and gems will now be found under the capify-cloud moniker.
+https://github.com/forward/capify-cloud
+
+
 Capify Ec2
 ====================================================
 
@@ -175,7 +180,13 @@ health.
 
 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".
+"YOUR APP NAME". It is also possible to apply commands to multiple projects using the :project_tags parameter, like so: 
+
+```ruby
+:project_tags: 
+ - "YOUR APP NAME"
+ - "YOUR OTHER APP NAME"
+```
 
 ## Development
 

metadata

@@ -1,79 +1,73 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: capify-ec2
-version: !ruby/object:Gem::Version 
-  hash: 13
+version: !ruby/object:Gem::Version
+  version: '1.3'
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 9
-  version: 1.2.9
 platform: ruby
-authors: 
+authors:
 - Noah Cantor
 - Siddharth Dawara
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-29 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fog
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 3
-        - 1
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.3.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: colored
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: colored
+  requirement: !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: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: capistrano
+  requirement: !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: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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
@@ -87,36 +81,26 @@ files:
 - readme.md
 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: '0'
 requirements: []
-
 rubyforge_project: capify-ec2
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Grabs roles from ec2's tags and autogenerates capistrano tasks
 test_files: []
-