zzdeploy 0.1.3 → 0.1.4

data/lib/commands/multi_ssh_instance.rb

@@ -8,6 +8,8 @@ module Commands
     # you can set any initial defaults here
     def options
       @options ||= {
+          :roles => [],
+          :instances => []
       }
     end
 
@@ -26,8 +28,12 @@ module Commands
         options[:instances] = v
       end
 
-      opts.on('-r', "--role role", MetaOptions.roles, "Role to look for.") do |v|
-        options[:role] = v
+      opts.on('-r', "--role role1,role2", Array,  "Roles to use.") do |v|
+        valid_roles = MetaOptions.roles
+        v.each do |r|
+          raise "Not a valid role: #{r}" if !valid_roles.include?(r.to_sym)
+        end
+        options[:roles] = v
       end
 
       opts.on('-g', "--group deploy_group", "Required: Group to look for.") do |v|
@@ -62,16 +68,16 @@ module Commands
       group_config = deploy_group.config
 
       user_instances = options[:instances]
-      if user_instances.nil?
-        instances = amazon.find_and_sort_named_instances(options[:group], options[:role])
-      else
-        instances = []  # build the instances wanted here
-        server_instances = amazon.find_and_sort_named_instances(nil, nil, false)
-        server_instances.each do |server_instance|
-          server_instance_id = server_instance[:resource_id]
-          if user_instances.include?(server_instance_id)
-            instances << server_instance
-          end
+      roles = options[:roles]
+      filters_off = roles.empty? && user_instances.empty?
+      instances = []  # build the instances wanted here
+      server_instances = amazon.find_and_sort_named_instances(options[:group], nil, false)
+      server_instances.each do |server_instance|
+        server_instance_id = server_instance[:resource_id]
+        server_instance_role = server_instance[:role]
+        if filters_off || roles.include?(server_instance_role) || user_instances.include?(server_instance_id)
+          # include this instance in the result set
+          instances << server_instance
         end
       end
 

data/lib/info.rb

@@ -1,5 +1,5 @@
 class Info
   def self.version
-    "0.1.3"
+    "0.1.4"
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: zzdeploy
 version: !ruby/object:Gem::Version 
-  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Greg Seitz
@@ -15,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-11 00:00:00 -07:00
+date: 2011-08-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: subcommand
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
@@ -38,11 +35,9 @@ dependencies:
   name: right_aws
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 1
         - 3
@@ -54,11 +49,9 @@ dependencies:
   name: json
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 5
@@ -70,11 +63,9 @@ dependencies:
   name: net-ssh-multi
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 1
@@ -85,11 +76,9 @@ dependencies:
   name: highline
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 1
         - 6
@@ -101,11 +90,9 @@ dependencies:
   name: zzsharedlib
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 0
         - 0
@@ -117,11 +104,9 @@ dependencies:
   name: rake
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
         segments: 
         - 0
         - 9
@@ -133,11 +118,9 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 2
         - 4
@@ -178,7 +161,6 @@ files:
 - Rakefile
 - LICENSE
 - README.rdoc
-- spec/spec_helper.rb
 has_rdoc: true
 homepage: 
 licenses: []
@@ -190,21 +172,17 @@ require_paths:
 - lib
 - lib/commands
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 31
       segments: 
       - 1
       - 8
       version: "1.8"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 9
       segments: 
       - 1
       - 3
@@ -212,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: ZangZing Amazon Deploy tools