cap-ec2 0.0.10 → 0.0.11

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Cap-EC2 changelog
 
+## 0.0.11
+
+* Allow instances to have multiple projects deployed to them. [@rsslldnphy](https://github.com/rsslldnphy)
+* Fix the way instance tag matching works; the previous regex was not sufficient to ensure 
+  absolute matching of a given tag. [@rsslldnphy](https://github.com/rsslldnphy)
+
 ## 0.0.10
 
 * Allow configurable setting of the EC2 contact point [@christianblunden](https://github.com/christianblunden)

data/README.md

@@ -167,6 +167,13 @@ role would apply to `server-3`.
 
 In the "staging" stage, all roles would apply *only* to `server-4`.
 
+### Servers belonging to multiple projects
+
+If you require your servers to have multiple projects deployed to them, you can simply specify
+all the project names you want to the server to be part of in the 'Projects' tag, separated
+by commas. For example, you could place a server in the `testapp` and `myapp` projects by
+setting the 'Projects' tag to `testapp,myapp`.
+
 ### Servers in multiple stages
 
 If your use-case requires servers to be in multiple stages, simply specify all the stages you want

data/lib/cap-ec2/ec2-handler.rb

@@ -42,7 +42,7 @@ module CapEC2
     end
 
     def defined_roles
-      Capistrano::Configuration.env.send(:servers).send(:available_roles)
+      Capistrano::Configuration.env.send(:servers).send(:available_roles).sort
     end
 
     def stage
@@ -61,14 +61,21 @@ module CapEC2
       servers = []
       @ec2.each do |_, ec2|
         instances = ec2.instances
-          .filter(tag(project_tag), application)
+          .filter(tag(project_tag), "*#{application}*")
           .filter('instance-state-code', '16')
         servers << instances.select do |i|
-          i.tags[roles_tag] =~ /,{0,1}#{role}(,|$)/ && i.tags[stages_tag] =~ /,{0,1}#{stage}(,|$)/
+          instance_has_tag?(i, roles_tag, role) &&
+            instance_has_tag?(i, stages_tag, stage) &&
+            instance_has_tag?(i, project_tag, application)
         end
       end
-      servers.flatten
+      servers.flatten.sort_by {|s| s.tags["Name"]}
     end
 
+    private
+
+    def instance_has_tag?(instance, key, value)
+      instance.tags[key].split(',').map(&:strip).include?(value.to_s)
+    end
   end
 end

data/lib/cap-ec2/version.rb

@@ -1,3 +1,3 @@
 module CapEC2
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cap-ec2
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2648474451787322254
+      hash: 179278271654884480
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2648474451787322254
+      hash: 179278271654884480
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23