ec2-instance 0.0.6 → 0.0.7

data/lib/ec2-instance.rb

@@ -23,6 +23,17 @@ module AWS
         return instances
       end
 
+      #
+      # Return a list of active instances which have a tag value which regexp matches.
+      #
+      def instances_active_with_tag(tag)
+        matches = []
+        active_instances.each do |ai|
+          matches.push ai unless !ai.match?(tag)
+        end
+        return matches
+      end
+
       #
       # Return the launch time of this machine.
       #
@@ -40,7 +51,7 @@ module AWS
         instances = []
         ec2_response_hash["reservationSet"]["item"].each do |res|
           res["instancesSet"]["item"].each do |i|
-            instances.push AWS::EC2::Instancex.new({:instance_id => parse_instance_id(i), :status => parse_status(i), :launch_time => parse_launch_time(i)})
+            instances.push AWS::EC2::Instance.new({:instance_id => parse_instance_id(i), :status => parse_status(i), :launch_time => parse_launch_time(i), :tags => parse_tags(i)})
           end
         end
         return instances
@@ -57,6 +68,11 @@ module AWS
       def parse_status(instance_hash)
         instance_hash["instanceState"]["name"]
       end
+  
+      def parse_tags(instance_hash)
+        return [] unless !instance_hash["tagSet"].nil?
+        instance_hash["tagSet"]["item"]
+      end
 
     end
   end

data/lib/instance.rb

@@ -1,9 +1,8 @@
 module AWS
   module EC2
-    # TODO change to instance once upstream namespace resolved  
-    class Instancex
+    class Instance
 
-      attr_accessor :instance_id, :launch_time, :status
+      attr_accessor :instance_id, :launch_time, :status, :tags
 
       def initialize(init_hash = {})
         init_hash.each do |k, v|
@@ -11,8 +10,11 @@ module AWS
         end
       end
 
-    end
+      def match?(tag)
+        self.tags.detect { |k, v| v.to_s.match /#{tag}/ }
+      end  
 
+    end
   end
 end
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ec2-instance
 version: !ruby/object:Gem::Version 
-  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Robert Berry
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 -07:00
+date: 2011-01-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -44,7 +42,7 @@ files:
 - lib/ec2-instance.rb
 - lib/instance.rb
 - README
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/bdigital/ec2-instance
 licenses: []
 
@@ -58,7 +56,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -67,7 +64,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"