ec2-instance 0.0.10 → 0.0.11

data/lib/ec2-instance.rb

@@ -35,14 +35,21 @@ module AWS
       end
 
       #
-      # Return the launch time of this machine.
+      # Return an instance object for this machine.
       #
-      def launch_time
+      def identity_instance
         local_instance = parse_instance_set(self.describe_instances).detect do |inst|
           inst.instance_id.eql? AWS::EC2::Instance.local_instance_id
         end
+        return local_instance
+      end
 
-        return local_instance.launch_time
+      #
+      # Deprecated.  Will be removed in the next couple versions.
+      #   Please use identity_instance.launch_time
+      #
+      def launch_time
+        identity_instance.launch_time
       end
 
       private
@@ -51,7 +58,7 @@ module AWS
         instances = []
         ec2_response_hash["reservationSet"]["item"].each do |res|
           res["instancesSet"]["item"].each do |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), :dns => parse_dns(i)})
+            instances.push AWS::EC2::Instance.new({:connection => self, :instance_id => parse_instance_id(i), :status => parse_status(i), :launch_time => parse_launch_time(i), :tags => parse_tags(i), :dns => parse_dns(i)})
           end
         end
         return instances

data/lib/instance.rb

@@ -2,6 +2,7 @@ module AWS
   module EC2
     class Instance
 
+      attr_accessor :connection
       attr_accessor :instance_id, :launch_time, :status, :tags, :dns
 
       def initialize(init_hash = {})
@@ -12,7 +13,16 @@ module AWS
 
       def match?(tag)
         self.tags.detect {|h| h.detect { |k, v| v.to_s.match /#{tag}/ } }
-      end  
+      end
+
+      #
+      # If connection available, terminate self.
+      #
+      def self_destruct
+        raise "No Connection Associated With This Instance." unless !@connection.nil?
+        @connection.terminate_instances(:instance_id => self.instance_id)
+        # Have a Nice Day.
+      end
 
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Robert Berry
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-16 00:00:00 -08:00
+date: 2011-01-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency