ec2-instance 0.0.4 → 0.0.5

data/lib/ec2-instance.rb

@@ -2,6 +2,7 @@
 # All methods added to AWS::EC2::Base return values and initiate actions for the machine
 #   on which the process is running.
 #
+Dir[File.join(File.dirname(__FILE__), '*.rb')].each { |lib| require lib }
 
 module AWS
   module EC2
@@ -10,14 +11,12 @@ module AWS
       #
       # Returns an array of instance ids which have a running or pending status
       #
-			def active_instance_id_list
+			def active_instances
  				instances = []
 
 				parse_instance_set(self.describe_instances).each do |instance|
-      		status = instance["instancesSet"]["item"].first["instanceState"]["name"]
-     		
- 					if status == "running" || status == "pending"
-        		instances.push instance["instancesSet"]["item"].first["instanceId"]
+      		if instance.status == "running" || instance.status == "pending"
+        		instances.push instance
         	end
         end 
         
@@ -28,24 +27,37 @@ module AWS
       # Return the launch time of this machine.
       #
       def launch_time
-        instance_data = parse_instance_set(self.describe_instances).detect do |inst|
-          inst.to_s.include? AWS::EC2::Instance.local_instance_id
+        local_instance = parse_instance_set(self.describe_instances).detect do |inst|
+          inst.instance_id.eql? AWS::EC2::Instance.local_instance_id
         end
 
-        launched_time = Time.parse(parse_launch_time(instance_data)).localtime
-        return launched_time
+        return local_instance.launch_time
       end
 
       private
 
       def parse_instance_set(ec2_response_hash)
-        ec2_response_hash["reservationSet"]["item"]
+        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)})
+          end
+			  end
+				return instances
       end
 
       def parse_launch_time(instance_hash)
-        instance_hash["instancesSet"]["item"].first["launchTime"]
+        instance_hash["launchTime"]
       end
 
+			def parse_instance_id(instance_hash)
+				instance_hash["instanceId"]
+			end
+
+			def parse_status(instance_hash)
+				instance_hash["instanceState"]["name"]
+			end
+
     end
   end
 end

data/lib/instance.rb

@@ -0,0 +1,18 @@
+module AWS
+	module EC2
+    # TODO change to instance once upstream namespace resolved  
+		class Instancex
+			
+			attr_accessor :instance_id, :launch_time, :status
+
+			def initialize(init_hash = {})
+				init_hash.each do |k, v|
+					self.send(k.to_s + "=", v.to_s) unless !self.respond_to?(k.to_s + "=")
+				end
+			end
+
+		end
+
+	end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ec2-instance
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Robert Berry
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-11 00:00:00 -07:00
+date: 2010-10-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,7 @@ extra_rdoc_files: []
 
 files: 
 - lib/ec2-instance.rb
+- lib/instance.rb
 - README
 has_rdoc: true
 homepage: http://github.com/bdigital/ec2-instance