redaranj-right_aws 1.10.5 → 1.11

data/lib/right_aws.rb

@@ -39,6 +39,12 @@ require 'awsbase/benchmark_fix'
 require 'awsbase/support'
 require 'awsbase/right_awsbase'
 require 'ec2/right_ec2'
+require 'ec2/right_ec2_images'
+require 'ec2/right_ec2_instances'
+require 'ec2/right_ec2_ebs'
+require 'ec2/right_ec2_reserved_instances'
+require 'ec2/right_ec2_vpc'
+require 'ec2/right_ec2_monitoring'
 require 'elb/right_elb_interface'
 require 'acw/right_acw_interface'
 require 'as/right_as_interface'
@@ -50,13 +56,14 @@ require 'sqs/right_sqs_gen2_interface'
 require 'sqs/right_sqs_gen2'
 require 'sdb/right_sdb_interface'
 require 'acf/right_acf_interface'
+require 'rds/right_rds_interface'
 
 
 module RightAws #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 10
-    TINY  = 99 #0
+    MINOR = 11
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/s3/right_s3.rb

@@ -761,9 +761,9 @@ module RightAws
         @name  = name
         @perms = perms.to_a
         case action
-          when :apply:             apply
-          when :refresh:           refresh
-          when :apply_and_refresh: apply; refresh
+          when :apply             then apply
+          when :refresh           then refresh
+          when :apply_and_refresh then apply; refresh
         end
       end
       
@@ -775,9 +775,13 @@ module RightAws
         false
       end
       
-        # Return Grantee type (+String+): "Group" or "CanonicalUser".
+        # Return Grantee type (+String+): "Group", "AmazonCustomerByEmail" or "CanonicalUser".
       def type
-        @id[/^http:/] ? "Group" : "CanonicalUser"
+        case @id
+        when /^http:/ then "Group"
+        when /@/      then "AmazonCustomerByEmail"
+        else               "CanonicalUser"
+        end
       end
  
         # Return a name or an id.
@@ -872,7 +876,11 @@ module RightAws
       end
 
       def to_xml   # :nodoc:
-        id_str = @id[/^http/] ? "<URI>#{@id}</URI>" : "<ID>#{@id}</ID>"
+        id_str = case @id
+                 when /^http/ then "<URI>#{@id}</URI>"
+                 when /@/     then "<EmailAddress>#{@id}</EmailAddress>"
+                 else              "<ID>#{@id}</ID>"
+                 end
         grants = ''
         @perms.each do |perm|
           grants << "<Grant>"    +

data/lib/s3/right_s3_interface.rb

@@ -204,8 +204,14 @@ module RightAws
       #
     def create_bucket(bucket, headers={})
       data = nil
-      unless headers[:location].blank?
-        data = "<CreateBucketConfiguration><LocationConstraint>#{headers[:location].to_s.upcase}</LocationConstraint></CreateBucketConfiguration>"
+      location = case headers[:location].to_s
+                 when 'us','US' then ''
+                 when 'eu'      then 'EU'
+                 else                headers[:location].to_s
+                 end
+      
+      unless location.blank?
+        data = "<CreateBucketConfiguration><LocationConstraint>#{location}</LocationConstraint></CreateBucketConfiguration>"
       end
       req_hash = generate_rest_request('PUT', headers.merge(:url=>bucket, :data => data))
       request_info(req_hash, RightHttp2xxParser.new)
@@ -988,11 +994,11 @@ module RightAws
       end
       def tagend(name)
         case name
-          when 'ID'          ; @owner[:owner_id]               = @text
-          when 'DisplayName' ; @owner[:owner_display_name]     = @text
-          when 'Name'        ; @current_bucket[:name]          = @text
-          when 'CreationDate'; @current_bucket[:creation_date] = @text
-          when 'Bucket'      ; @result << @current_bucket.merge(@owner)
+          when 'ID'          then @owner[:owner_id]               = @text
+          when 'DisplayName' then @owner[:owner_display_name]     = @text
+          when 'Name'        then @current_bucket[:name]          = @text
+          when 'CreationDate'then @current_bucket[:creation_date] = @text
+          when 'Bucket'      then @result << @current_bucket.merge(@owner)
         end
       end
     end
@@ -1009,21 +1015,23 @@ module RightAws
       def tagend(name)
         case name
             # service info
-          when 'Name'        ; @service['name']         = @text
-          when 'Prefix'      ; @service['prefix']       = @text
-          when 'Marker'      ; @service['marker']       = @text
-          when 'MaxKeys'     ; @service['max-keys']     = @text
-          when 'Delimiter'   ; @service['delimiter']    = @text
-          when 'IsTruncated' ; @service['is_truncated'] = (@text =~ /false/ ? false : true)
+          when 'Name'        then @service['name']         = @text
+          when 'Prefix'      then @service['prefix']       = @text
+          when 'Marker'      then @service['marker']       = @text
+          when 'MaxKeys'     then @service['max-keys']     = @text
+          when 'Delimiter'   then @service['delimiter']    = @text
+          when 'IsTruncated' then @service['is_truncated'] = (@text =~ /false/ ? false : true)
             # key data
-          when 'Key'         ; @current_key[:key]                = @text
-          when 'LastModified'; @current_key[:last_modified]      = @text
-          when 'ETag'        ; @current_key[:e_tag]              = @text
-          when 'Size'        ; @current_key[:size]               = @text.to_i
-          when 'StorageClass'; @current_key[:storage_class]      = @text
-          when 'ID'          ; @current_key[:owner_id]           = @text
-          when 'DisplayName' ; @current_key[:owner_display_name] = @text
-          when 'Contents'    ; @current_key[:service]            = @service;  @result << @current_key
+          when 'Key'         then @current_key[:key]                = @text
+          when 'LastModified'then @current_key[:last_modified]      = @text
+          when 'ETag'        then @current_key[:e_tag]              = @text
+          when 'Size'        then @current_key[:size]               = @text.to_i
+          when 'StorageClass'then @current_key[:storage_class]      = @text
+          when 'ID'          then @current_key[:owner_id]           = @text
+          when 'DisplayName' then @current_key[:owner_display_name] = @text
+          when 'Contents'
+            @current_key[:service] = @service
+            @result << @current_key
         end
       end
     end
@@ -1045,27 +1053,29 @@ module RightAws
       def tagend(name)
         case name
             # service info
-          when 'Name'        ; @result[:name]         = @text
+          when 'Name'        then @result[:name]         = @text
           # Amazon uses the same tag for the search prefix and for the entries
             # in common prefix...so use our simple flag to see which element
             # we are parsing
-          when 'Prefix'      ; @in_common_prefixes ? @common_prefixes << @text : @result[:prefix] = @text
-          when 'Marker'      ; @result[:marker]       = @text
-          when 'MaxKeys'     ; @result[:max_keys]     = @text
-          when 'Delimiter'   ; @result[:delimiter]    = @text
-          when 'IsTruncated' ; @result[:is_truncated] = (@text =~ /false/ ? false : true)
-          when 'NextMarker'  ; @result[:next_marker]  = @text
+          when 'Prefix'      then @in_common_prefixes ? @common_prefixes << @text : @result[:prefix] = @text
+          when 'Marker'      then @result[:marker]       = @text
+          when 'MaxKeys'     then @result[:max_keys]     = @text
+          when 'Delimiter'   then @result[:delimiter]    = @text
+          when 'IsTruncated' then @result[:is_truncated] = (@text =~ /false/ ? false : true)
+          when 'NextMarker'  then @result[:next_marker]  = @text
             # key data
-          when 'Key'         ; @current_key[:key]                = @text
-          when 'LastModified'; @current_key[:last_modified]      = @text
-          when 'ETag'        ; @current_key[:e_tag]              = @text
-          when 'Size'        ; @current_key[:size]               = @text.to_i
-          when 'StorageClass'; @current_key[:storage_class]      = @text
-          when 'ID'          ; @current_key[:owner_id]           = @text
-          when 'DisplayName' ; @current_key[:owner_display_name] = @text
-          when 'Contents'    ; @result[:contents] << @current_key
+          when 'Key'         then @current_key[:key]                = @text
+          when 'LastModified'then @current_key[:last_modified]      = @text
+          when 'ETag'        then @current_key[:e_tag]              = @text
+          when 'Size'        then @current_key[:size]               = @text.to_i
+          when 'StorageClass'then @current_key[:storage_class]      = @text
+          when 'ID'          then @current_key[:owner_id]           = @text
+          when 'DisplayName' then @current_key[:owner_display_name] = @text
+          when 'Contents'    then @result[:contents] << @current_key
             # Common Prefix stuff
-          when 'CommonPrefixes' ; @result[:common_prefixes] = @common_prefixes; @in_common_prefixes = false
+          when 'CommonPrefixes' 
+            @result[:common_prefixes] = @common_prefixes
+            @in_common_prefixes = false
         end
       end
     end
@@ -1140,8 +1150,8 @@ module RightAws
       end
       def tagend(name)
         case name
-        when 'LastModified' : @result[:last_modified] = @text
-        when 'ETag'         : @result[:e_tag]         = @text
+        when 'LastModified' then @result[:last_modified] = @text
+        when 'ETag'         then @result[:e_tag]         = @text
         end
       end
     end

data/lib/sdb/active_sdb.rb

@@ -364,7 +364,7 @@ module RightAws
         end
 
         def generate_id # :nodoc:
-          UUID.timestamp_create().to_s
+          UUIDTools::UUID.timestamp_create().to_s
         end
 
       protected
@@ -927,4 +927,4 @@ module RightAws
       end
     end
   end
-end
+end

data/lib/sqs/right_sqs_gen2_interface.rb

@@ -127,7 +127,7 @@ module RightAws
       #
       service_params = signed_service_params(@aws_secret_access_key, service_hash, :post, @params[:server], service)
       request        = Net::HTTP::Post.new(AwsUtils::URLencode(service))
-      request['Content-Type'] = 'application/x-www-form-urlencoded' 
+      request['Content-Type'] = 'application/x-www-form-urlencoded; charset=utf-8' 
       request.body = service_params
         # prepare output hash
       { :request  => request, 
@@ -387,7 +387,9 @@ module RightAws
       #  sqs.get_queue_length('https://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue') #=> 3
       #
     def get_queue_length(queue_url)
-      get_queue_attributes(queue_url)['ApproximateNumberOfMessages'].to_i
+      attrs = get_queue_attributes(queue_url)
+      attrs['ApproximateNumberOfMessages'].to_i +
+      attrs['ApproximateNumberOfMessagesNotVisible'].to_i
     rescue
       on_exception
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: redaranj-right_aws
 version: !ruby/object:Gem::Version 
-  version: 1.10.5
+  version: "1.11"
 platform: ruby
 authors: 
 - RightScale, Inc.
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-06 00:00:00 -07:00
+date: 2009-04-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,6 +73,8 @@ files:
 - test/acf/test_right_acf.rb
 has_rdoc: true
 homepage: 
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -94,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rightscale
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Interface classes for the Amazon EC2/EBS, SQS, S3, SDB, and ACF Web Services