right_aws 1.7.1 → 1.7.2

data/History.txt

@@ -89,104 +89,84 @@ Initial release.
     (The Ec2 functions are being cached: describe_images, describe_instances, 
     describe_security_groups and describe_key_pairs)
 
-== 1.4.5
-== 1.4.6
-*r 2619, konstantin, 01-17-08 16:18:36  +0300
+== 1.4.5 - 1.4.6
+* r 2619, konstantin, 01-17-08 16:18:36  +0300
   * S3 Location constraints support added.
   * Fixed bug with trailing '/' in the bucket name for 'EU' located buckets
   * Added: S3Interface#bucket_location, S3::Bucket#location
 
 == 1.4.7
-*r 2622, konstantin, 01-18-08 13:52:20  +0300
+* r 2622, konstantin, 01-18-08 13:52:20  +0300
   * Virtual domains doc added
   * S3 Query API fixed to support virtual domains.
 
 == 1.4.8
-*r 2650, konstantin, 01-24-08 11:12:00  +0300
+* r 2650, konstantin, 01-24-08 11:12:00  +0300
   * net_fix.rb moved to right_http_connection
 
 == 1.5.0
-*r 2688, konstantin, 02-30-08 15:42:00  +0300
+* r 2688, konstantin, 02-30-08 15:42:00  +0300
   * SDB support added.
   * RightAws::S3::bucket and RightAws::S3::Bucket.create methods behaviour 
     changed: param +create+ is set to +false+ by default.
 
 == 1.6.0
 
-r2780 | todd | 2008-02-11 11:41:07 -0800 (Mon, 11 Feb 2008) | 4 lines
-Some doc updates & tweaks: we now support ultra-large PUTs to S3, small SDB
-cleanups, add SDB to the list of interfaces in RightAws, update some copyrights,
-warn about loading attachment_fu AFTER right_aws (big no-no).
+* r2780, todd, 2008-02-11 11:41:07 -0800 (Mon, 11 Feb 2008), 4 lines
+  * Some doc updates & tweaks: we now support ultra-large PUTs to S3, small SDB
+    cleanups, add SDB to the list of interfaces in RightAws, update some copyrights,
+    warn about loading attachment_fu AFTER right_aws (big no-no).
 
-r2784 | todd | 2008-02-11 13:46:47 -0800 (Mon, 11 Feb 2008) | 2 lines
-One final clarification: you may get a Net::HTTP bad monkey patch exception
+* r2784, todd, 2008-02-11 13:46:47 -0800 (Mon, 11 Feb 2008), 2 lines
+  * One final clarification: you may get a Net::HTTP bad monkey patch exception
 
-r2880 | todd | 2008-02-25 18:06:22 -0800 (Mon, 25 Feb 2008) | 2 lines
-Add SQS 'Gen 2' interface implementation
+* r2880, todd, 2008-02-25 18:06:22 -0800 (Mon, 25 Feb 2008), 2 lines
+  * Add SQS 'Gen 2' interface implementation
 
-r2913 | todd | 2008-02-29 16:57:07 -0800 (Fri, 29 Feb 2008) | 3 lines
-SqsGen2 (object interface), unit tests for both interfaces, documentation
-updates.
+* r2913, todd, 2008-02-29 16:57:07 -0800 (Fri, 29 Feb 2008), 3 lines
+  * SqsGen2 (object interface), unit tests for both interfaces, documentation updates.
 
-r2922 | todd | 2008-03-03 15:26:42 -0800 (Mon, 03 Mar 2008) | 2 lines
-couple of documentation tweaks in prep for 1.6.0
+* r2922, todd, 2008-03-03 15:26:42 -0800 (Mon, 03 Mar 2008), 2 lines
+  * couple of documentation tweaks in prep for 1.6.0
 
-== 1.6.1 2008-03-14
+== 1.6.1
 
-------------------------------------------------------------------------
-r2963 | todd | 2008-03-06 19:10:23 -0800 (Thu, 06 Mar 2008) | 3 lines
-
-(#950) Many minor fixes in incrementally_list_bucket to prevent a death loop
-in
-certain rare conditions
+* r2963, todd, 2008-03-06 19:10:23 -0800 (Thu, 06 Mar 2008), 3 lines
+  * (#950) Many minor fixes in incrementally_list_bucket to prevent a death loop
+    in certain rare conditions
 
 == 1.7.0
 
-r3051 | konstantin | 2008-03-14 21:26:12 +0300 (Fri, 14 Mar 2008) | 1 line
-#897, ActiveSdb alpha release
-
-<<<<<<< .mine
-#897, ActiveSdb alpha release
-
-------------------------------------------------------------------------
-r3204 | todd | 2008-03-26 17:50:45 -0700 (Wed, 26 Mar 2008) | 4 lines
-
-Do not autoload right_sdb with the rest of the modules; it requires uuidtools.
-We want the user to explicly request ActiveSdb, at least as long as it is
-alpha/beta.
-
-------------------------------------------------------------------------
-r3220 | konstantin | 2008-03-26 23:03:51 -0700 (Wed, 26 Mar 2008) | 1 line
-
-mark ActiveSdb release as alpha,(port to 1.7.0)
-------------------------------------------------------------------------
-r3229 | konstantin | 2008-03-27 03:43:17 -0700 (Thu, 27 Mar 2008) | 1 line
+* r3051, konstantin, 2008-03-14 21:26:12 +0300 (Fri, 14 Mar 2008), 1 line
+  * #897, ActiveSdb alpha release
 
-aws pcode fix (release 2.5)
-------------------------------------------------------------------------
-r3243 | todd | 2008-03-27 12:10:49 -0700 (Thu, 27 Mar 2008) | 1 line
+== 1.7.1
 
-(#991) Bring SqsGen2::Queue.pop fix into 1.7.0.  Also bring removal of
-uuidtools dependency.
-------------------------------------------------------------------------
-r3249 | todd | 2008-03-27 17:59:14 -0700 (Thu, 27 Mar 2008) | 1 line
+  Do not autoload right_sdb with the rest of the modules; it requires uuidtools.
+    We want the user to explicly request ActiveSdb, at least as long as it is
+    alpha/beta.
 
-(#991) Print an informational message if the require of uuidtools fails for
-ActiveSdb.  Update RDoc to show how to include ActiveSdb class.  Update README
-to point to ActiveSdb RDoc.
-------------------------------------------------------------------------
-r3250 | todd | 2008-03-27 18:03:09 -0700 (Thu, 27 Mar 2008) | 2 lines
+  Fix escaping problem in SqsGen2Interface: POST bodies did not properly escape the '&' character
 
-(#991) Change manifest entry from right_sdb to active_sdb
+== 1.7.2
 
-------------------------------------------------------------------------
-r3251 | todd | 2008-03-27 18:03:33 -0700 (Thu, 27 Mar 2008) | 1 line
+  Release Notes:
+  
+  RightAws includes some new features, including:
+  - Support in RightAws::S3 and RightAws::S3Interface for S3 key copy, move, and rename
+  - Support for signature version 0 request authentication to EC2, SQS, and SDB
+  - Enhanced S3 object meta-header read and update
+  - Interoperability with clouds running Eucalyptus (http://eucalyptus.cs.ucsb.edu)
+    [ Contributed by the Eucalyptus group ]
+  - Support for c1.medium and c1.xlarge instance types
 
-(#991) Rename file from right_sdb to active_sdb.
-------------------------------------------------------------------------
-r3286 | konstantin | 2008-03-31 06:45:19 -0700 (Mon, 31 Mar 2008) | 4 lines
+  Bug fixes include:
+  - Corrected the failure, under certain conditions, of retries of streaming PUTs to S3.
+    We now reset the seek pointer of the streaming IO object to its initial position.
+  - Removal of an accidental dependency on ActiveSupport in RightAws::S3Interface.get_link().
+  - Monkey-patch of the Ruby File class on Windows platforms to correct a problem in lstat.
+    The lstat bug was causing failure of very large file uploads on Windows [ Contributed by Benjamin Allfree ] 
+  - Fixed parsing of the ETag field for S3 objects
+  
 
-right_aws 1.7.0
-1. remove code duplication on the methods being cached
-2. add describe_availability_zones to cached methods
 

data/Manifest.txt

@@ -3,6 +3,7 @@ Manifest.txt
 README.txt
 Rakefile
 lib/awsbase/benchmark_fix.rb
+lib/awsbase/file_fix.rb
 lib/awsbase/right_awsbase.rb
 lib/awsbase/support.rb
 lib/ec2/right_ec2.rb

data/README.txt

@@ -34,6 +34,8 @@ The RightScale AWS gems have been designed to provide a robust, fast, and secure
   AWS accounts.
 - Support for both first- and second-generation SQS (API versions 2007-05-01
   and 2008-01-01).  These versions of SQS are not compatible.
+- Support for signature versions 0 and 1 on SQS, SDB, and EC2.
+- Interoperability with any cloud running Eucalyptus (http://eucalyptus.cs.ucsb.edu)
 - Test suite (requires AWS account to do "live" testing).
 
 == THREADING:
@@ -82,6 +84,11 @@ multithreaded mode.
 
 == KNOWN ISSUES:
 
+- Attempting to use the Gibberish plugin (used by the Beast forum app) 
+  will break right_aws as well as lots of other code.  Gibberish
+  changes the semantics of core Ruby (specifically, the String class) and thus presents a reliability
+  problem for most Ruby programs.
+
 - 2/11/08: If you use RightAws in conjunction with attachment_fu, the
   right_aws gem must be included (using the require statement) AFTER
   attachment_fu.  If right_aws is loaded before attachment_fu, you'll
@@ -113,7 +120,7 @@ REXML parsing.
 
 == INSTALL:
 
-sudo gem install
+sudo gem install right_aws
 
 == LICENSE:
 

data/lib/awsbase/benchmark_fix.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007 RightScale Inc
+# Copyright (c) 2007-2008 RightScale Inc
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/awsbase/file_fix.rb

@@ -0,0 +1,33 @@
+#
+# Copyright (c) 2007-2008 RightScale Inc
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+
+# File.lstat.size doesn't report large sizes correctly in Ruby 1.8 (Windows).
+if RUBY_PLATFORM[/mswin|mingw|bccwin|wince/i]
+  require 'win32/file'
+  class File
+    def lstat
+      self.stat
+    end
+  end
+end

data/lib/awsbase/right_awsbase.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007 RightScale Inc
+# Copyright (c) 2007-2008 RightScale Inc
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -26,8 +26,9 @@ module RightAws
   require 'md5'
   
   class AwsUtils #:nodoc:
+    @@digest = OpenSSL::Digest::Digest.new("sha1")
     def self.sign(aws_secret_access_key, auth_string)
-      Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new("sha1"), aws_secret_access_key, auth_string)).strip
+      Base64.encode64(OpenSSL::HMAC.digest(@@digest, aws_secret_access_key, auth_string)).strip
     end
 
     # From Amazon's SQS Dev Guide, a brief description of how to escape:
@@ -92,6 +93,8 @@ module RightAws
   end
 
   module RightAwsBaseInterface
+    DEFAULT_SIGNATURE_VERSION = '1'
+    
     @@caching = false
     def self.caching
       @@caching
@@ -118,6 +121,8 @@ module RightAws
     attr_reader :connection
       # Cache
     attr_reader :cache
+      # Signature version (all services except s3)
+    attr_reader :signature_version
 
     def init(service_info, aws_access_key_id, aws_secret_access_key, params={}) #:nodoc:
       @params = params
@@ -127,6 +132,7 @@ module RightAws
       @aws_secret_access_key = aws_secret_access_key
       @params[:server]       ||= service_info[:default_host]
       @params[:port]         ||= service_info[:default_port]
+      @params[:service]      ||= service_info[:default_service]
       @params[:protocol]     ||= service_info[:default_protocol]
       @params[:multi_thread] ||= defined?(AWS_DAEMON)
       @logger = @params[:logger]
@@ -135,6 +141,7 @@ module RightAws
       @logger.info "New #{self.class.name} using #{@params[:multi_thread] ? 'multi' : 'single'}-threaded mode"
       @error_handler = nil
       @cache = {}
+      @signature_version = (params[:signature_version] || DEFAULT_SIGNATURE_VERSION).to_s
     end
 
     # Returns +true+ if the describe_xxx responses are being cached 
@@ -451,6 +458,17 @@ module RightAws
             @aws.logger.warn("##### Retry ##{@retries} is being performed. Sleeping for #{@reiteration_delay} sec. Whole time: #{Time.now-@started_at} sec ####")
             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
@@ -463,7 +481,7 @@ module RightAws
         # Is this a 5xx error ? 
         if @aws.last_response.code.to_s[/^5\d\d$/] 
           @aws.connection.finish "#{self.class.name}: code: #{@aws.last_response.code}: '#{@aws.last_response.message}'" 
-        # Is this a 4xxx error ? 
+        # Is this a 4xx error ? 
         elsif @aws.last_response.code.to_s[/^4\d\d$/] && @close_on_4xx_probability > rand(100) 
           @aws.connection.finish "#{self.class.name}: code: #{@aws.last_response.code}: '#{@aws.last_response.message}', " + 
                                  "probability: #{@close_on_4xx_probability}%"           
@@ -537,7 +555,7 @@ module RightAws
       tagend(name)
     end
     def text(text)
-      @text = text
+      @text += text
       tagtext(text)
     end
       # Parser method.
@@ -639,3 +657,4 @@ module RightAws
   end
 
 end
+

data/lib/ec2/right_ec2.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007 RightScale Inc
+# Copyright (c) 2007-2008 RightScale Inc
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -66,10 +66,10 @@ module RightAws
   class Ec2 < RightAwsBase
     include RightAwsBaseInterface
     
-    SIGNATURE_VERSION = "1"
     # Amazon EC2 API version being used
     API_VERSION       = "2008-02-01"
     DEFAULT_HOST      = "ec2.amazonaws.com"
+    DEFAULT_PATH      = '/'
     DEFAULT_PROTOCOL  = 'https'
     DEFAULT_PORT      = 443
     
@@ -77,9 +77,10 @@ module RightAws
     DEFAULT_ADDRESSING_TYPE =  'public'
     DNS_ADDRESSING_SET      = ['public','direct']
     
+    # 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          = ['m1.small','m1.large','m1.xlarge'] 
+    INSTANCE_TYPES          = ['m1.small','c1.medium','m1.large','m1.xlarge','c1.xlarge']
     
     @@bench = AwsBenchmarkingBlock.new
     def self.bench_xml
@@ -103,11 +104,13 @@ module RightAws
     # * <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>:signature_version</tt>:  The signature version : '0' or '1'(default)
     #
     def initialize(aws_access_key_id=nil, aws_secret_access_key=nil, params={})
       init({ :name             => 'EC2', 
              :default_host     => ENV['EC2_URL'] ? URI.parse(ENV['EC2_URL']).host   : DEFAULT_HOST, 
-             :default_port     => ENV['EC2_URL'] ? URI.parse(ENV['EC2_URL']).port   : DEFAULT_PORT, 
+             :default_port     => ENV['EC2_URL'] ? URI.parse(ENV['EC2_URL']).port   : DEFAULT_PORT,
+             :default_service  => ENV['EC2_URL'] ? URI.parse(ENV['EC2_URL']).path   : DEFAULT_PATH,             
              :default_protocol => ENV['EC2_URL'] ? URI.parse(ENV['EC2_URL']).scheme : DEFAULT_PROTOCOL }, 
            aws_access_key_id    || ENV['AWS_ACCESS_KEY_ID'] , 
            aws_secret_access_key|| ENV['AWS_SECRET_ACCESS_KEY'],
@@ -115,18 +118,21 @@ module RightAws
     end
 
 
-    def generate_request(action, param={}) #:nodoc:
-      timestamp    = ( Time::now ).utc.strftime("%Y-%m-%dT%H:%M:%S.000Z")
-      request_hash = {"Action"            => action,
+    def generate_request(action, params={}) #:nodoc:
+      service_hash = {"Action"            => action,
                       "AWSAccessKeyId"    => @aws_access_key_id,
                       "Version"           => @@api,
-                      "Timestamp"         => timestamp,
-                      "SignatureVersion"  => SIGNATURE_VERSION }
-      request_hash.update(param)
-      request_data   = request_hash.sort{|a,b| (a[0].to_s.downcase)<=>(b[0].to_s.downcase)}.to_s
-      request_hash.update('Signature' =>  AwsUtils::sign(@aws_secret_access_key, request_data))
-      request_params = request_hash.to_a.collect{|key,val| key + "=" + CGI::escape(val) }.join("&")
-      request        = Net::HTTP::Get.new("/?#{request_params}")
+                      "Timestamp"         => Time.now.utc.strftime("%Y-%m-%dT%H:%M:%S.000Z"),
+                      "SignatureVersion"  => signature_version }
+      service_hash.update(params)
+      # prepare string to sight
+      string_to_sign = case signature_version
+                       when '0' then service_hash["Action"] + service_hash["Timestamp"]
+                       when '1' then service_hash.sort{|a,b| (a[0].to_s.downcase)<=>(b[0].to_s.downcase)}.to_s
+                       end
+      service_hash.update('Signature' =>  AwsUtils::sign(@aws_secret_access_key, string_to_sign))
+      request_params = service_hash.to_a.collect{|key,val| key + "=" + CGI::escape(val) }.join("&")
+      request        = Net::HTTP::Get.new("#{@params[:service]}?#{request_params}")
         # prepare output hash
       { :request  => request, 
         :server   => @params[:server],
@@ -157,7 +163,7 @@ module RightAws
       update_cache(method.to_sym, :parsed => result) if use_cache
       result
     end
-    
+
     def hash_params(prefix, list) #:nodoc:
       groups = {}
       list.each_index{|i| groups.update("#{prefix}.#{i+1}"=>list[i])} if list
@@ -165,7 +171,7 @@ module RightAws
     end
 
   #-----------------------------------------------------------------
-  #-----------------------------------------------------------------
+  #      Images
   #-----------------------------------------------------------------
 
     def ec2_describe_images(list, list_by='ImageId', image_type=nil) #:nodoc:
@@ -345,6 +351,10 @@ module RightAws
       modify_image_attribute(image_id, 'productCodes', nil, :product_code => product_code.to_a)
     end
 
+  #-----------------------------------------------------------------
+  #      Instances
+  #-----------------------------------------------------------------
+    
     def get_desc_instances(instances)  # :nodoc:
       result = []
       instances.each do |reservation|
@@ -562,6 +572,10 @@ module RightAws
     rescue Exception
       on_exception
     end
+    
+  #-----------------------------------------------------------------
+  #      Security groups
+  #-----------------------------------------------------------------
 
       # Retrieve Security Group information. If +list+ is omitted the returns the whole list of groups.
       #
@@ -706,6 +720,10 @@ module RightAws
       on_exception
     end
 
+  #-----------------------------------------------------------------
+  #      Keys
+  #-----------------------------------------------------------------
+  
       # Retrieve a list of SSH keys. Returns an array of keys or an exception. Each key is
       # represented as a two-element hash.
       #
@@ -840,19 +858,18 @@ module RightAws
     rescue Exception
       on_exception
     end
-    
-  #- Internal stuff from here on down...
-
 
+  
+    
   #-----------------------------------------------------------------
   #      PARSERS: Boolean Response Parser
   #-----------------------------------------------------------------
     
-  class RightBoolResponseParser < RightAWSParser #:nodoc:
-    def tagend(name)
-      @result = @text=='true' ? true : false if name == 'return'
+    class RightBoolResponseParser < RightAWSParser #:nodoc:
+      def tagend(name)
+        @result = @text=='true' ? true : false if name == 'return'
+      end
     end
-  end
 
   #-----------------------------------------------------------------
   #      PARSERS: Key Pair
@@ -864,9 +881,9 @@ module RightAws
       end
       def tagend(name)
         case name 
-          when 'keyName'       : @item[:aws_key_name]    = @text
-          when 'keyFingerprint': @item[:aws_fingerprint] = @text
-          when 'item'          : @result                << @item
+          when 'keyName'        then @item[:aws_key_name]    = @text
+          when 'keyFingerprint' then @item[:aws_fingerprint] = @text
+          when 'item'           then @result                << @item
         end
       end
       def reset
@@ -880,9 +897,9 @@ module RightAws
       end
       def tagend(name)
         case name 
-          when 'keyName'       : @result[:aws_key_name]    = @text
-          when 'keyFingerprint': @result[:aws_fingerprint] = @text
-          when 'keyMaterial'   : @result[:aws_material]    = @text
+          when 'keyName'        then @result[:aws_key_name]    = @text
+          when 'keyFingerprint' then @result[:aws_fingerprint] = @text
+          when 'keyMaterial'    then @result[:aws_material]    = @text
         end
       end
     end
@@ -930,19 +947,19 @@ module RightAws
       end
       def tagend(name)
         case name
-          when 'ownerId'          ; @group.ownerId   = @text
-          when 'groupDescription' ; @group.groupDescription = @text
+          when 'ownerId'          then @group.ownerId   = @text
+          when 'groupDescription' then @group.groupDescription = @text
           when 'groupName'
             if @xmlpath=='DescribeSecurityGroupsResponse/securityGroupInfo/item'
               @group.groupName  = @text 
             elsif @xmlpath=='DescribeSecurityGroupsResponse/securityGroupInfo/item/ipPermissions/item/groups/item'
               @sgroup.groupName = @text 
             end
-          when 'ipProtocol'       ; @perm.ipProtocol = @text
-          when 'fromPort'         ; @perm.fromPort   = @text
-          when 'toPort'           ; @perm.toPort     = @text
-          when 'userId'           ; @sgroup.userId   = @text
-          when 'cidrIp'           ; @perm.ipRanges  << @text
+          when 'ipProtocol'       then @perm.ipProtocol = @text
+          when 'fromPort'         then @perm.fromPort   = @text
+          when 'toPort'           then @perm.toPort     = @text
+          when 'userId'           then @sgroup.userId   = @text
+          when 'cidrIp'           then @perm.ipRanges  << @text
           when 'item'
             if @xmlpath=='DescribeSecurityGroupsResponse/securityGroupInfo/item/ipPermissions/item/groups'
               @perm.groups << @sgroup
@@ -970,17 +987,17 @@ module RightAws
       end
       def tagend(name)
         case name
-          when 'imageId'       ; @image[:aws_id]       = @text
-          when 'imageLocation' ; @image[:aws_location] = @text
-          when 'imageState'    ; @image[:aws_state]    = @text
-          when 'imageOwnerId'  ; @image[:aws_owner]    = @text
-          when 'isPublic'      ; @image[:aws_is_public]= @text == 'true' ? true : false
-          when 'productCode'   ;(@image[:aws_product_codes] ||= []) << @text
-          when 'architecture'  ; @image[:aws_architecture] = @text
-          when 'imageType'     ; @image[:aws_image_type] = @text
-          when 'kernelId'      ; @image[:aws_kernel_id]  = @text
-          when 'ramdiskId'     ; @image[:aws_ramdisk_id] = @text
-          when 'item'          ; @result << @image if @xmlpath[%r{.*/imagesSet$}]
+          when 'imageId'       then @image[:aws_id]       = @text
+          when 'imageLocation' then @image[:aws_location] = @text
+          when 'imageState'    then @image[:aws_state]    = @text
+          when 'imageOwnerId'  then @image[:aws_owner]    = @text
+          when 'isPublic'      then @image[:aws_is_public]= @text == 'true' ? true : false
+          when 'productCode'   then (@image[:aws_product_codes] ||= []) << @text
+          when 'architecture'  then @image[:aws_architecture] = @text
+          when 'imageType'     then @image[:aws_image_type] = @text
+          when 'kernelId'      then @image[:aws_kernel_id]  = @text
+          when 'ramdiskId'     then @image[:aws_ramdisk_id] = @text
+          when 'item'          then @result << @image if @xmlpath[%r{.*/imagesSet$}]
         end
       end
       def reset
@@ -1013,13 +1030,13 @@ module RightAws
           # But nobody know what will they xml later as attribute. That is why we 
           # check for 'group' and 'userId' inside of 'launchPermission/item'
         case name
-          when 'imageId'            : @result[:aws_id] = @text
-          when 'group'              : @result[:groups] << @text if @xmlpath == 'DescribeImageAttributeResponse/launchPermission/item'
-          when 'userId'             : @result[:users]  << @text if @xmlpath == 'DescribeImageAttributeResponse/launchPermission/item'
-          when 'productCode'        : @result[:aws_product_codes] << @text
-          when 'kernel'             : @result[:aws_kernel]  = @text
-          when 'ramdisk'            : @result[:aws_ramdisk] = @text
-          when 'blockDeviceMapping' : @result[:block_device_mapping] = @text
+          when 'imageId'            then @result[:aws_id] = @text
+          when 'group'              then @result[:groups] << @text if @xmlpath == 'DescribeImageAttributeResponse/launchPermission/item'
+          when 'userId'             then @result[:users]  << @text if @xmlpath == 'DescribeImageAttributeResponse/launchPermission/item'
+          when 'productCode'        then @result[:aws_product_codes] << @text
+          when 'kernel'             then @result[:aws_kernel]  = @text
+          when 'ramdisk'            then @result[:aws_ramdisk] = @text
+          when 'blockDeviceMapping' then @result[:block_device_mapping] = @text
         end
       end
       def reset
@@ -1046,37 +1063,37 @@ module RightAws
                # RunInstances property
                 @xmlpath=='RunInstancesResponse/instancesSet' )
               # the optional params (sometimes are missing and we dont want them to be nil) 
-            @instance = { :aws_reason        => '',
-                          :dns_name          => '',
-                          :private_dns_name  => '',
-                          :ami_launch_index  => '',
-                          :ssh_key_name      => '',
-                          :aws_state         => '',
+            @instance = { :aws_reason       => '',
+                          :dns_name         => '',
+                          :private_dns_name => '',
+                          :ami_launch_index => '',
+                          :ssh_key_name     => '',
+                          :aws_state        => '',
                           :aws_product_codes => [] }
         end
       end
       def tagend(name)
         case name 
           # reservation
-          when 'reservationId'   : @reservation[:aws_reservation_id] = @text
-          when 'ownerId'         : @reservation[:aws_owner]          = @text
-          when 'groupId'         : @reservation[:aws_groups]        << @text
+          when 'reservationId'    then @reservation[:aws_reservation_id] = @text
+          when 'ownerId'          then @reservation[:aws_owner]          = @text
+          when 'groupId'          then @reservation[:aws_groups]        << @text
           # instance  
-          when 'instanceId'      : @instance[:aws_instance_id]    = @text
-          when 'imageId'         : @instance[:aws_image_id]       = @text
-          when 'dnsName'         : @instance[:dns_name]           = @text
-          when 'privateDnsName'  : @instance[:private_dns_name]   = @text
-          when 'reason'          : @instance[:aws_reason]         = @text
-          when 'keyName'         : @instance[:ssh_key_name]       = @text
-          when 'amiLaunchIndex'  : @instance[:ami_launch_index]   = @text
-          when 'code'            : @instance[:aws_state_code]     = @text
-          when 'name'            : @instance[:aws_state]          = @text
-          when 'productCode'     : @instance[:aws_product_codes] << @text
-          when 'instanceType'    : @instance[:aws_instance_type]  = @text
-          when 'launchTime'      : @instance[:aws_launch_time]    = @text
-          when 'kernelId'        : @instance[:aws_kernel_id]      = @text
-          when 'ramdiskId'       : @instance[:aws_ramdisk_id]     = @text
-          when 'availabilityZone': @instance[:aws_availability_zone] = @text
+          when 'instanceId'       then @instance[:aws_instance_id]    = @text
+          when 'imageId'          then @instance[:aws_image_id]       = @text
+          when 'dnsName'          then @instance[:dns_name]           = @text
+          when 'privateDnsName'   then @instance[:private_dns_name]   = @text
+          when 'reason'           then @instance[:aws_reason]         = @text
+          when 'keyName'          then @instance[:ssh_key_name]       = @text
+          when 'amiLaunchIndex'   then @instance[:ami_launch_index]   = @text
+          when 'code'             then @instance[:aws_state_code]     = @text
+          when 'name'             then @instance[:aws_state]          = @text
+          when 'productCode'      then @instance[:aws_product_codes] << @text
+          when 'instanceType'     then @instance[:aws_instance_type]  = @text
+          when 'launchTime'       then @instance[:aws_launch_time]    = @text
+          when 'kernelId'         then @instance[:aws_kernel_id]      = @text
+          when 'ramdiskId'        then @instance[:aws_ramdisk_id]     = @text
+          when 'availabilityZone' then @instance[:aws_availability_zone] = @text
           when 'item'
             if @xmlpath == 'DescribeInstancesResponse/reservationSet/item/instancesSet' || # DescribeInstances property
                @xmlpath == 'RunInstancesResponse/instancesSet'            # RunInstances property
@@ -1084,7 +1101,7 @@ module RightAws
             elsif @xmlpath=='DescribeInstancesResponse/reservationSet'    # DescribeInstances property
               @result << @reservation
             end
-          when 'RunInstancesResponse': @result << @reservation            # RunInstances property
+          when 'RunInstancesResponse' then @result << @reservation            # RunInstances property
         end
       end
       def reset
@@ -1104,7 +1121,7 @@ module RightAws
       end
       def tagend(name)
         case name
-        when 'instanceId' : @instance[:aws_instance_id] = @text
+        when 'instanceId' then @instance[:aws_instance_id] = @text
         when 'code'
           if @xmlpath == 'TerminateInstancesResponse/instancesSet/item/shutdownState'
                @instance[:aws_shutdown_state_code] = @text.to_i
@@ -1113,7 +1130,7 @@ module RightAws
           if @xmlpath == 'TerminateInstancesResponse/instancesSet/item/shutdownState'
                @instance[:aws_shutdown_state] = @text
           else @instance[:aws_prev_state]     = @text end
-        when 'item'       : @result << @instance
+        when 'item'       then @result << @instance
         end
       end
       def reset
@@ -1125,14 +1142,13 @@ module RightAws
   #      PARSERS: Console
   #-----------------------------------------------------------------
 
-
     class QEc2GetConsoleOutputParser < RightAWSParser #:nodoc:
       def tagend(name)
         case name
-        when 'instanceId' : @result[:aws_instance_id] = @text
-        when 'timestamp'  : @result[:aws_timestamp]   = @text
-                            @result[:timestamp]       = (Time.parse(@text)).utc
-        when 'output'     : @result[:aws_output]      = Base64.decode64(@text)
+        when 'instanceId' then @result[:aws_instance_id] = @text
+        when 'timestamp'  then @result[:aws_timestamp]   = @text
+                               @result[:timestamp]       = (Time.parse(@text)).utc
+        when 'output'     then @result[:aws_output]      = Base64.decode64(@text)
         end
       end
       def reset
@@ -1140,8 +1156,6 @@ module RightAws
       end
     end
 
-  end
-
   #-----------------------------------------------------------------
   #      PARSERS: Fake
   #-----------------------------------------------------------------
@@ -1171,9 +1185,9 @@ module RightAws
       end
       def tagend(name)
         case name
-        when 'instanceId' ; @address[:instance_id] = @text.blank? ? nil : @text 
-        when 'publicIp'   ; @address[:public_ip]   = @text
-        when 'item'       ; @result << @address
+        when 'instanceId' then @address[:instance_id] = @text.blank? ? nil : @text 
+        when 'publicIp'   then @address[:public_ip]   = @text
+        when 'item'       then @result << @address
         end
       end
       def reset
@@ -1191,14 +1205,18 @@ module RightAws
       end
       def tagend(name)
         case name
-        when 'zoneName'  ; @zone[:zone_name]  = @text
-        when 'zoneState' ; @zone[:zone_state] = @text
-        when 'item'      ; @result << @zone
+        when 'zoneName'  then @zone[:zone_name]  = @text
+        when 'zoneState' then @zone[:zone_state] = @text
+        when 'item'      then @result << @zone
         end
       end
       def reset
         @result = []
       end
     end
+
+ 
     
+  end
+      
 end