right_aws 3.0.3 → 3.0.4

data/History.txt

@@ -339,3 +339,10 @@ the source key.
   - Fixed:
     - S3 Content-Type not set in Ruby 1.9.2
     - error in rds_interface describe_db_snapshots in Ruby 1.9.2
+
+
+=== 3.0.4
+  Release Notes:
+  - Fixed:
+    - #125 - fixes redirect bug in file PUT requests (Cary)
+    - some other minor fixes

data/lib/awsbase/right_awsbase.rb

@@ -1101,19 +1101,21 @@ module RightAws
             sleep @reiteration_delay 
             @reiteration_delay *= 2
 
-            # Always make sure that the fp is set to point to the beginning(?)
-            # of the File/IO. TODO: it assumes that offset is 0, which is bad.
-            if(request[:request].body_stream && request[:request].body_stream.respond_to?(:pos))
-              begin
-                request[:request].body_stream.pos = 0
-              rescue Exception => e
-                @logger.warn("Retry may fail due to unable to reset the file pointer" +
-                             " -- #{self.class.name} : #{e.inspect}")
-              end
-            end
           else
             @aws.logger.info("##### Retry ##{@retries} is being performed due to a redirect.  ####")
           end
+
+          # Always make sure that the fp is set to point to the beginning(?)
+          # of the File/IO. TODO: it assumes that offset is 0, which is bad.
+          if(request[:request].body_stream && request[:request].body_stream.respond_to?(:pos))
+            begin
+              request[:request].body_stream.pos = 0
+            rescue Exception => e
+              @logger.warn("Retry may fail due to unable to reset the file pointer" +
+                           " -- #{self.class.name} : #{e.inspect}")
+            end
+          end
+
           result = @aws.request_info(request, @parser)
         else
           @aws.logger.warn("##### Ooops, time is over... ####")

data/lib/awsbase/version.rb

@@ -2,7 +2,7 @@ module RightAws #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 3  unless defined?(MAJOR)
     MINOR = 0  unless defined?(MINOR)
-    TINY  = 3  unless defined?(TINY)
+    TINY  = 4  unless defined?(TINY)
 
     STRING = [MAJOR, MINOR, TINY].join('.') unless defined?(STRING)
   end

data/lib/ec2/right_ec2.rb

@@ -81,9 +81,19 @@ module RightAws
     # Amazon EC2 Instance Types : http://www.amazon.com/b?ie=UTF8&node=370375011
     # Default EC2 instance type (platform) 
     DEFAULT_INSTANCE_TYPE   =  'm1.small' 
-    INSTANCE_TYPES          = ['t1.micro','m1.small','c1.medium','m1.large','m1.xlarge',
-                               'c1.xlarge', 'm2.xlarge', 'm2.2xlarge', 'm2.4xlarge',
-                               'cc1.4xlarge', 'cg1.4xlarge']
+    INSTANCE_TYPES          = [  't1.micro'  ,
+                                 'm1.small'  ,
+                                 'm1.medium' ,
+                                 'm1.large'  ,
+                                 'm1.xlarge' ,
+                                 'c1.medium' ,
+                                 'c1.xlarge' ,
+                                 'm2.xlarge' ,
+                                 'm2.2xlarge',
+                                 'm2.4xlarge',
+                                'cc1.4xlarge',
+                                'cg1.4xlarge',
+                                'cc2.8xlarge']
     
     @@bench = AwsBenchmarkingBlock.new
     def self.bench_xml

data/lib/ec2/right_ec2_security_groups.rb

@@ -377,10 +377,15 @@ module RightAws
       when :revoke, :remove   then action = "RevokeSecurityGroupIngress"
       else raise "Unknown action #{action.inspect}!"
       end
-      hash['GroupName']                  = group_name
-      hash['SourceSecurityGroupName']    = params[:source_group]                         unless params[:source_group].right_blank?
-      hash['SourceSecurityGroupOwnerId'] = params[:source_group_owner].to_s.gsub(/-/,'') unless params[:source_group_owner].right_blank?
-      hash['IpProtocol']                 = params[:protocol]                             unless params[:protocol].right_blank?
+      hash['GroupName']               = group_name
+      hash['SourceSecurityGroupName'] = params[:source_group] unless params[:source_group].right_blank?
+      hash['IpProtocol']              = params[:protocol]     unless params[:protocol].right_blank?
+      unless params[:source_group_owner].right_blank?
+        # Do remove dashes only if the source owner is in format of "7011-0219-8268"
+        source_group_owner = params[:source_group_owner].to_s
+        source_group_owner.gsub!(/-/,'') if source_group_owner[/^\d{4}-\d{4}-\d{4}$/]
+        hash['SourceSecurityGroupOwnerId'] = source_group_owner
+      end
       unless params[:port].right_blank?
         hash['FromPort'] = params[:port]
         hash['ToPort']   = params[:port]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_aws
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: 
   segments: 
   - 3
   - 0
-  - 3
-  version: 3.0.3
+  - 4
+  version: 3.0.4
 platform: ruby
 authors: 
 - RightScale, Inc.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-08 00:00:00 Z
+date: 2012-04-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: right_http_connection