aws 2.3.9 → 2.3.12

data/lib/acf/right_acf_interface.rb

@@ -97,7 +97,7 @@ module Aws
     # * <tt>:port</tt>: CloudFront service port, default: DEFAULT_PORT
     # * <tt>:protocol</tt>: 'http' or 'https', default: DEFAULT_PROTOCOL
     # * <tt>:multi_thread</tt>: true=HTTP connection per thread, false=per process
-    # * <tt>:logger</tt>: for log messages, default: RAILS_DEFAULT_LOGGER else STDOUT
+    # * <tt>:logger</tt>: for log messages, default: Rails.logger else STDOUT
     # * <tt>:cache</tt>: true/false: caching for list_distributions method, default: false.
     #
     #  acf = Aws::AcfInterface.new('1E3GDYEOGFJPIT7XXXXXX','hgTHt68JY07JKUY08ftHYtERkjgtfERn57XXXXXX',

data/lib/awsbase/right_awsbase.rb

@@ -343,6 +343,7 @@ module Aws
             @params[:connection_mode] ||= :default
             @params[:connection_mode] = :per_request if @params[:connection_mode] == :default
             @logger = @params[:logger]
+            @logger = Rails.logger if !@logger && defined?(Rails) && defined?(Rails.logger)
             @logger = RAILS_DEFAULT_LOGGER if !@logger && defined?(RAILS_DEFAULT_LOGGER)
             @logger = Logger.new(STDOUT) if !@logger
             @logger.info "New #{self.class.name} using #{@params[:connection_mode].to_s}-connection mode"

data/lib/ec2/right_ec2.rb

@@ -106,7 +106,7 @@ module Aws
     # * <tt>:port</tt>: EC2 service port, default: DEFAULT_PORT
     # * <tt>:protocol</tt>: 'http' or 'https', default: DEFAULT_PROTOCOL
     # * <tt>:multi_thread</tt>: true=HTTP connection per thread, false=per process
-    # * <tt>:logger</tt>: for log messages, default: RAILS_DEFAULT_LOGGER else STDOUT
+    # * <tt>:logger</tt>: for log messages, default: Rails.logger else STDOUT
     # * <tt>:signature_version</tt>:  The signature version : '0' or '1'(default)
     # * <tt>:cache</tt>: true/false: caching for: ec2_describe_images, describe_instances,
     # describe_images_by_owner, describe_images_by_executable_by, describe_availability_zones,
@@ -433,6 +433,8 @@ module Aws
       request_info(link, QEc2ConfirmProductInstanceParser.new(:logger => @logger))
     end
 
+      # DEPRECATED, USE launch_instances instead.
+      #
       # Launch new EC2 instances. Returns a list of launched instances or an exception.
       #
       #  ec2.run_instances('ami-e444444d',1,1,['my_awesome_group'],'my_awesome_key', 'Woohoo!!!', 'public') #=>
@@ -514,30 +516,34 @@ module Aws
       #     :aws_availability_zone => "us-east-1c"
       #     }]
       #
-    def launch_instances(image_id, lparams={})
+    def launch_instances(image_id, options={})
       @logger.info("Launching instance of image #{image_id} for #{@aws_access_key_id}, " +
-                   "key: #{lparams[:key_name]}, groups: #{(lparams[:group_ids]).to_a.join(',')}")
+                   "key: #{options[:key_name]}, groups: #{(options[:group_ids]).to_a.join(',')}")
       # careful: keyName and securityGroups may be nil
-      params = hash_params('SecurityGroup', lparams[:group_ids].to_a)
+      params = hash_params('SecurityGroup', options[:group_ids].to_a)
       params.update( {'ImageId'        => image_id,
-                      'MinCount'       => (lparams[:min_count] || 1).to_s,
-                      'MaxCount'       => (lparams[:max_count] || 1).to_s,
-                      'AddressingType' => lparams[:addressing_type] || DEFAULT_ADDRESSING_TYPE,
-                      'InstanceType'   => lparams[:instance_type]   || DEFAULT_INSTANCE_TYPE })
+                      'MinCount'       => (options[:min_count] || 1).to_s,
+                      'MaxCount'       => (options[:max_count] || 1).to_s,
+                      'AddressingType' => options[:addressing_type] || DEFAULT_ADDRESSING_TYPE,
+                      'InstanceType'   => options[:instance_type]   || DEFAULT_INSTANCE_TYPE })
       # optional params
-      params['KeyName']                    = lparams[:key_name]              unless lparams[:key_name].blank?
-      params['KernelId']                   = lparams[:kernel_id]             unless lparams[:kernel_id].blank?
-      params['RamdiskId']                  = lparams[:ramdisk_id]            unless lparams[:ramdisk_id].blank?
-      params['Placement.AvailabilityZone'] = lparams[:availability_zone]     unless lparams[:availability_zone].blank?
-      params['BlockDeviceMappings']        = lparams[:block_device_mappings] unless lparams[:block_device_mappings].blank?
-      params['Monitoring.Enabled']         = lparams[:monitoring_enabled]    unless lparams[:monitoring_enabled].blank?
-      unless lparams[:user_data].blank?
-        lparams[:user_data].strip!
+      params['KeyName']                    = options[:key_name]              unless options[:key_name].blank?
+      params['KernelId']                   = options[:kernel_id]             unless options[:kernel_id].blank?
+      params['RamdiskId']                  = options[:ramdisk_id]            unless options[:ramdisk_id].blank?
+      params['Placement.AvailabilityZone'] = options[:availability_zone]     unless options[:availability_zone].blank?
+      params['BlockDeviceMappings']        = options[:block_device_mappings] unless options[:block_device_mappings].blank?
+      params['Monitoring.Enabled']         = options[:monitoring_enabled]    unless options[:monitoring_enabled].blank?
+      params['SubnetId']                          = options[:subnet_id]                            unless options[:subnet_id].blank?
+      params['AdditionalInfo']                    = options[:additional_info]                      unless options[:additional_info].blank?
+      params['DisableApiTermination']             = options[:disable_api_termination].to_s         unless options[:disable_api_termination].nil?
+      params['InstanceInitiatedShutdownBehavior'] = options[:instance_initiated_shutdown_behavior] unless options[:instance_initiated_shutdown_behavior].blank?
+      unless options[:user_data].blank?
+        options[:user_data].strip!
           # Do not use CGI::escape(encode64(...)) as it is done in Amazons EC2 library.
           # Amazon 169.254.169.254 does not like escaped symbols!
           # And it doesn't like "\n" inside of encoded string! Grrr....
           # Otherwise, some of UserData symbols will be lost...
-        params['UserData'] = Base64.encode64(lparams[:user_data]).delete("\n").strip unless lparams[:user_data].blank?
+        params['UserData'] = Base64.encode64(options[:user_data]).delete("\n").strip unless options[:user_data].blank?
       end
       link = generate_request("RunInstances", params)
         #debugger

data/lib/sdb/active_sdb.rb

@@ -260,14 +260,35 @@ module Aws
                 #
                 def find(*args)
                       options = args.last.is_a?(Hash) ? args.pop : {}
-#           puts 'first=' + args.first.to_s
+                    case args.first
+                        when nil then
+                            raise "Invalid parameters passed to find: nil."
+                        when :all then
+                            sql_select(options)[:items]
+                        when :first then
+                            sql_select(options.merge(:limit => 1))[:items].first
+                        when :count then
+                            res = sql_select(options.merge(:count => true))[:count]
+                            res
+                        else
+                            res = select_from_ids(args, options)
+                            return res[:single] if res[:single]
+                            return res[:items]
+                    end
+                end
+
+                #
+                # Same as find, but will return SimpleDB metadata like :request_id and :box_usage
+                #
+                def find_with_metadata(*args)
+                      options = args.last.is_a?(Hash) ? args.pop : {}
                     case args.first
                         when nil then
                             raise "Invalid parameters passed to find: nil."
                         when :all   then
                             sql_select(options)
                         when :first then
-                            sql_select(options.merge(:limit => 1)).first
+                            sql_select(options.merge(:limit => 1))
                         when :count then
                             res = sql_select(options.merge(:count => true))
                             res
@@ -349,24 +370,27 @@ module Aws
                     options[:conditions] = build_conditions(options[:conditions])
                     # join ids condition and user defined conditions
                     options[:conditions] = options[:conditions].blank? ? ids_cond : "(#{options[:conditions]}) AND #{ids_cond}"
+                    puts 'options=' + options.inspect
                     result = sql_select(options)
+                    puts 'select_from_ids result=' + result.inspect
                     # if one record was requested then return it
                     unless bunch_of_records_requested
-                        record = result.first
+                        record = result[:items].first
                         # railse if nothing was found
                         raise ActiveSdbError.new("Couldn't find #{name} with ID #{args}") unless record
-                        record
+                        result[:single] = record
                     else
                         # if a bunch of records was requested then return check that we found all of them
                         # and return as an array
-                        unless args.size == result.size
+                        unless args.size == result[:items].size
                             # todo: might make sense to return the array but with nil values in the slots where an item wasn't found?
                             id_list = args.map{|i| "'#{i}'"}.join(',')
-                            raise ActiveSdbError.new("Couldn't find all #{name} with IDs (#{id_list}) (found #{result.size} results, but was looking for #{args.size})")
+                            raise ActiveSdbError.new("Couldn't find all #{name} with IDs (#{id_list}) (found #{result[:items].size} results, but was looking for #{args.size})")
                         else
                             result
                         end
                     end
+                    result
                 end
 
                 def sql_select(options) # :nodoc:
@@ -376,19 +400,24 @@ module Aws
                     select_expression = build_select(options)
                     # request items
                     query_result = self.connection.select(select_expression, @next_token)
-                    #puts 'QR=' + query_result.inspect
+                    # puts 'QR=' + query_result.inspect
+                    ret = {}
                     if count
-                        return query_result[:items][0]["Domain"]["Count"][0].to_i
+                        ret[:count] = query_result.delete(:items)[0]["Domain"]["Count"][0].to_i
+                        ret.merge!(query_result)
+                        return ret
                     end
                     @next_token = query_result[:next_token]
-                    items = query_result[:items].map do |hash|
+                    items = query_result.delete(:items).map do |hash|
                         id, attributes = hash.shift
                         new_item = self.new( )
                         new_item.initialize_from_db(attributes.merge({ 'id' => id }))
                         new_item.mark_as_old
                         new_item
                     end
-                    items
+                    ret[:items] = items
+                    ret.merge!(query_result)
+                    ret
                 end
 
                 # select_by helpers

data/test/sdb/test_active_sdb.rb

@@ -121,7 +121,7 @@ class TestSdb < Test::Unit::TestCase
 
   def test_04b_find_all_dashed
     # retrieve all the DB, make sure all are in place
-    clients = DashedClient.find(:all)
+    clients = DashClient.find(:all)
     ids = clients.map{|client| client.id }[0..1]
     assert_equal @clients.size + 1, clients.size
     # retrieve all presidents (must find: Bush, Putin, Medvedev)
@@ -156,11 +156,11 @@ class TestSdb < Test::Unit::TestCase
     # find any record
     assert Client.find(:first)
     # find any president
-    assert Client.find(:first, :conditions => ["[?=?]",'post','president'])
+    assert Client.find(:first, :conditions => ["post=? and country=?",'president','Russia'])
     # find any rissian president
-    assert Client.find(:first, :conditions => ["['post'=?] intersection ['country'=?]",'president','Russia'])
+    assert_nil Client.find(:first, :conditions => ["post=? and country=?",'president','Rwanda'])
     # find any unexistent record
-    assert_nil Client.find(:first, :conditions => ["['post'=?] intersection ['country'=?]",'president','Rwanda'])
+    assert Client.find(:first, :conditions => ["?=?",'post','president'])
   end
 
   def test_06_find_all_by_helpers

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aws
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 27
   prerelease: false
   segments: 
   - 2
   - 3
-  - 9
-  version: 2.3.9
+  - 12
+  version: 2.3.12
 platform: ruby
 authors: 
 - Travis Reeder
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-04 00:00:00 -07:00
+date: 2010-06-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency