amazon-ec2 0.9.7 → 0.9.8

data/.gitignore

@@ -6,4 +6,3 @@ doc
 .yardoc
 pkg
 .idea
-

data/README_dev.rdoc

@@ -6,5 +6,6 @@ Publishing the gem using Jeweler:
 
 Push the gem to gemcutter:
 
+  rake build
   gem push pkg/amazon-ec2-X.Y.Z.gem
 

data/VERSION

@@ -1 +1 @@
-0.9.7
+0.9.8

data/amazon-ec2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amazon-ec2}
-  s.version = "0.9.7"
+  s.version = "0.9.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Glenn Rempe"]
-  s.date = %q{2010-03-14}
+  s.date = %q{2010-03-18}
   s.description = %q{A Ruby library for accessing the Amazon Web Services EC2, ELB, RDS, Cloudwatch, and Autoscaling APIs.}
   s.email = %q{glenn@rempe.us}
   s.executables = ["ec2-gem-example.rb", "ec2-gem-profile.rb", "ec2sh", "setup.rb"]

data/lib/AWS.rb

@@ -8,7 +8,7 @@
 # Home::      http://github.com/grempe/amazon-ec2/tree/master
 #++
 
-%w[ base64 cgi openssl digest/sha1 net/https rexml/document time ostruct ].each { |f| require f }
+%w[ base64 cgi openssl digest/sha1 net/https net/http rexml/document time ostruct ].each { |f| require f }
 
 begin
   require 'xmlsimple' unless defined? XmlSimple

data/lib/AWS/EC2/instances.rb

@@ -228,7 +228,43 @@ module AWS
       end
 
 
+
+    end
+
+    #
+    # A set of methods for querying amazon's ec2 meta-data service.
+    # Note : This can ONLY be run on an actual running EC2 instance.
+    #
+    # Example Class Method Usage :
+    # instance_id = AWS::EC2::Instance.local_instance_id
+    #
+    module Instance
+
+      EC2_META_URL_BASE = 'http://169.254.169.254/latest/meta-data/'
+
+      #
+      # Returns the current instance-id when called from a host within EC2.
+      #
+      def self.local_instance_id
+        Net::HTTP.get URI.parse(EC2_META_URL_BASE + 'instance-id')
+      end
+
+      #
+      # Returns a hash of all available instance meta data.
+      #
+      def self.local_instance_meta_data
+        meta_data = {}
+
+        Net::HTTP.get(URI.parse(EC2_META_URL_BASE)).split("\n").each do |meta_type|
+          meta_data.merge!({meta_type => Net::HTTP.get(URI.parse(EC2_META_URL_BASE + meta_type)) })
+        end
+
+        return meta_data
+      end
+
     end
+
+
   end
 end
 

data/lib/AWS/RDS/rds.rb

@@ -462,25 +462,35 @@ module AWS
       # DB Snapshot was created.
       #
       # @option options [String] :source_db_instance_identifier the identifier of the source DB Instance from which to restore.
+      # @option options [optional, Boolean] :use_latest_restorable_time specifies that the db be restored to the latest restored time. Conditional, cannot be specified if :restore_time parameter is provided.
+      # @option options [optional, Date] :restore_time specifies the date and time to restore from. Conditional, cannot be specified if :use_latest_restorable_time parameter is true.
       # @option options [String] :target_db_instance_identifier is the name of the new database instance to be created.
-      # @option options [String] :use_latest_restorable_time specifies that the db be restored to the latest restored time
-      # @option options [String] :restore_time specifies the date and time to restore from
-      # @option options [String] :db_instance_class specifies the class of the compute and memory of the EC2 instance
-      # @option options [String] :port is the port which the db can accept connections on
-      # @option options [String] :availability_zone is the EC2 zone which the db instance will be created
+      # @option options [optional, String] :db_instance_class specifies the class of the compute and memory of the EC2 instance, Options : db.m1.small | db.m1.large | db.m1.xlarge | db.m2.2xlarge | db.m2.4xlarge
+      # @option options [optional, Integer] :port is the port which the db can accept connections on. Constraints: Value must be 1115-65535
+      # @option options [optional, String] :availability_zone is the EC2 zone which the db instance will be created
       #
       def restore_db_instance_to_point_in_time( options = {} )
-        raise ArgumentError, "No :db_snapshot_identifier provided" if options.does_not_have?(:db_snapshot_identifier)
-        raise ArgumentError, "No :db_instance_identifier provided" if options.does_not_have?(:db_instance_identifier)
-        raise ArgumentError, "No :db_instance_class provided" if options.does_not_have?(:db_instance_class)
+        raise ArgumentError, "No :source_db_instance_identifier provided" if options.does_not_have?(:source_db_instance_identifier)
+        raise ArgumentError, "No :target_db_instance_identifier provided" if options.does_not_have?(:target_db_instance_identifier)
 
         params = {}
         params['SourceDBInstanceIdentifier'] = options[:source_db_instance_identifier]
         params['TargetDBInstanceIdentifier'] = options[:target_db_instance_identifier]
 
-        if options[:use_latest_restorable_time]
-          params['UseLatestRestorableTime'] = options[:use_latest_restorable_time]
-        elsif options[:restore_time]
+        if options.has?(:use_latest_restorable_time) && options.has?(:restore_time)
+          raise ArgumentError, "You cannot provide both :use_latest_restorable_time and :restore_time"
+        elsif options.has?(:use_latest_restorable_time)
+          params['UseLatestRestorableTime'] = case options[:use_latest_restorable_time]
+                                              when 'true', 'false'
+                                                options[:use_latest_restorable_time]
+                                              when true
+                                                'true'
+                                              when false
+                                                'false'
+                                              else
+                                                raise ArgumentError, "Invalid value provided for :use_latest_restorable_time.  Expected boolean."
+                                              end
+        elsif options.has?(:restore_time)
           params['RestoreTime'] = options[:restore_time]
         end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 7
-  version: 0.9.7
+  - 8
+  version: 0.9.8
 platform: ruby
 authors: 
 - Glenn Rempe
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-14 00:00:00 -08:00
+date: 2010-03-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency