right_aws 1.5.0 → 1.6.0

data/History.txt

@@ -110,3 +110,25 @@ Initial release.
   * 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).
+
+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
+
+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
+
+

data/Manifest.txt

@@ -12,6 +12,8 @@ lib/s3/right_s3_interface.rb
 lib/sdb/right_sdb_interface.rb
 lib/sqs/right_sqs.rb
 lib/sqs/right_sqs_interface.rb
+lib/sqs/right_sqs_gen2.rb
+lib/sqs/right_sqs_gen2_interface.rb
 test/ec2/test_helper.rb
 test/ec2/test_right_ec2.rb
 test/s3/test_helper.rb
@@ -21,6 +23,7 @@ test/sdb/test_right_sdb.rb
 test/sdb/test_helper.rb
 test/sqs/test_helper.rb
 test/sqs/test_right_sqs.rb
+test/sqs/test_right_sqs_gen2.rb
 test/ts_right_aws.rb
 test/test_credentials.rb
 test/http_connection.rb

data/README.txt

@@ -9,7 +9,8 @@ The RightScale AWS gems have been designed to provide a robust, fast, and secure
 
 - RightAws::Ec2 -- interface to Amazon EC2 (Elastic Compute Cloud)
 - RightAws::S3 and RightAws::S3Interface -- interface to Amazon S3 (Simple Storage Service)
-- RightAws::Sqs and RightAws::SqsInterface -- interface to Amazon SQS (Simple Queue Service)
+- RightAws::Sqs and RightAws::SqsInterface -- interface to first-generation Amazon SQS (Simple Queue Service) (API version 2007-05-01)
+- RightAws::SqsGen2 and RightAws::SqsGen2Interface -- interface to second-generation Amazon SQS (Simple Queue Service) (API version 2008-01-01)
 - RightAws::SdbInterface -- interface to Amazon SDB (SimpleDB)
 
 == FEATURES:
@@ -31,6 +32,8 @@ The RightScale AWS gems have been designed to provide a robust, fast, and secure
 - Support for streaming GETs from S3, and streaming PUTs to S3 if the data source is a file.
 - Support for single-threaded usage, multithreaded usage, as well as usage with multiple
   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.
 - Test suite (requires AWS account to do "live" testing).
 
 == THREADING:
@@ -66,8 +69,14 @@ multithreaded mode.
   http://developer.amazonwebservices.com/connect/kbcategory.jspa?categoryID=87
 * For S3 read RightAws::S3 and consult the Amazon S3 API documentation at
   http://developer.amazonwebservices.com/connect/kbcategory.jspa?categoryID=48
-* For SQS read RightAws::Sqs and consult the Amazon SQS API documentation at
+* For first generation SQS read RightAws::Sqs and consult the Amazon SQS API documentation at
   http://developer.amazonwebservices.com/connect/kbcategory.jspa?categoryID=31
+* For second generation SQS read RightAws::SqsGen2, RightAws::SqsGen2Interface and consult the Amazon SQS API documentation at
+  http://developer.amazonwebservices.com/connect/entry.jspa?externalID=1214&categoryID=31 
+
+  Amazon's Migration Guide for moving from first to second generation SQS is
+  avalable at:
+  http://developer.amazonwebservices.com/connect/entry.jspa?externalID=1148
 * For SDB read RightAws::Sdb and consult the Amazon SDB API documentation at
   http://developer.amazonwebservices.com/connect/kbcategory.jspa?categoryID=141
 

data/Rakefile

@@ -9,6 +9,18 @@ require 'lib/right_aws.rb'
 
 testglobs =     ["test/ts_right_aws.rb"]
 
+
+# Suppress Hoe's self-inclusion as a dependency for our Gem.  This also keeps
+# Rake & rubyforge out of the dependency list.  Users must manually install
+# these gems to run tests, etc.
+class Hoe
+  def extra_deps
+    @extra_deps.reject do |x|
+      Array(x).first == 'hoe'
+    end
+  end
+end
+
 Hoe.new('right_aws', RightAws::VERSION::STRING) do |p|
   p.rubyforge_name = 'rightaws'
   p.author = 'RightScale, Inc.'
@@ -36,6 +48,14 @@ task :testsqs do
   require 'test/sqs/test_right_sqs.rb'
 end
 
+desc "Test just the second generation SQS interface"
+task :testsqs2 do
+  require 'test/test_credentials'
+  require 'test/http_connection'
+  TestCredentials.get_credentials
+  require 'test/sqs/test_right_sqs_gen2.rb'
+end
+
 desc "Test just the S3 interface"
 task :tests3 do
   require 'test/test_credentials'

data/lib/awsbase/right_awsbase.rb

@@ -30,6 +30,20 @@ module RightAws
       Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new("sha1"), aws_secret_access_key, auth_string)).strip
     end
 
+    # From Amazon's SQS Dev Guide, a brief description of how to escape:
+    # "URL encode the computed signature and other query parameters as specified in 
+    # RFC1738, section 2.2. In addition, because the + character is interpreted as a blank space 
+    # by Sun Java classes that perform URL decoding, make sure to encode the + character 
+    # although it is not required by RFC1738."
+    # Avoid using CGI::escape to escape URIs. 
+    # CGI::escape will escape characters in the protocol, host, and port
+    # sections of the URI.  Only target chars in the query
+    # string should be escaped.
+    def self.URLencode(raw)
+      e = URI.escape(raw)
+      e.gsub(/\+/, "%2b")
+    end
+
   end
 
   class AwsBenchmarkingBlock #:nodoc:

data/lib/right_aws.rb

@@ -43,13 +43,15 @@ require 's3/right_s3_interface'
 require 's3/right_s3'
 require 'sqs/right_sqs_interface'
 require 'sqs/right_sqs'
+require 'sqs/right_sqs_gen2_interface'
+require 'sqs/right_sqs_gen2'
 require 'sdb/right_sdb_interface'
 
 
 module RightAws #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 5
+    MINOR = 6
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/lib/sqs/right_sqs_gen2.rb

@@ -0,0 +1,278 @@
+#
+# Copyright (c) 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.
+#
+
+module RightAws
+
+    #
+    # RightAws::SqsGen2 -- RightScale's Amazon SQS interface, API version
+    # 2008-01-01 and later.
+    # The RightAws::SqsGen2 class provides a complete interface to the second generation of Amazon's Simple
+    # Queue Service.
+    # For explanations of the semantics
+    # of each call, please refer to Amazon's documentation at
+    # http://developer.amazonwebservices.com/connect/kbcategory.jspa?categoryID=31
+    #
+    #
+    # RightAws::SqsGen2 is built atop RightAws::SqsGen2Interface, a lower-level
+    # procedural API that may be appropriate for certain programs.
+    #
+    # Error handling: all operations raise an RightAws::AwsError in case
+    # of problems. Note that transient errors are automatically retried.
+    #
+    #  sqs    = RightAws::SqsGen2.new(aws_access_key_id, aws_secret_access_key)
+    #  queue1 = sqs.queue('my_awesome_queue')
+    #   ...
+    #  queue2 = RightAws::SqsGen2::Queue.create(sqs, 'my_cool_queue', true)
+    #  puts queue2.size
+    #   ...
+    #  message1 = queue2.receive
+    #  message1.visibility = 0
+    #  puts message1
+    #   ...
+    #  queue2.clear(true)
+    #  queue2.send_message('Ola-la!')
+    #  message2 = queue2.pop
+    #   ...
+    #
+    # NB: Second-generation SQS has eliminated the entire access grant mechanism present in Gen 1.
+  class SqsGen2
+    attr_reader :interface
+    
+    def initialize(aws_access_key_id=nil, aws_secret_access_key=nil, params={})
+      @interface = SqsGen2Interface.new(aws_access_key_id, aws_secret_access_key, params)
+    end
+    
+      # Retrieves a list of queues. 
+      # Returns an +array+ of +Queue+ instances.
+      #
+      #  RightAws::Sqs.queues #=> array of queues
+      #
+    def queues(prefix=nil)
+      @interface.list_queues(prefix).map do |url|
+        Queue.new(self, url)
+      end
+    end
+    
+      # Returns Queue instance by queue name. 
+      # If the queue does not exist at Amazon SQS and +create+ is true, the method creates it.
+      #
+      #  RightAws::SqsGen2.queue('my_awesome_queue') #=> #<RightAws::SqsGen2::Queue:0xb7b626e4 ... >
+      #
+    def queue(queue_name, create=true, visibility=nil)
+      url = @interface.queue_url_by_name(queue_name)
+      url = (create ? @interface.create_queue(queue_name, visibility) : nil) unless url
+      url ? Queue.new(self, url) : nil
+    end
+  
+  
+    class Queue
+      attr_reader :name, :url, :sqs
+      
+        # Returns Queue instance by queue name. 
+        # If the queue does not exist at Amazon SQS and +create+ is true, the method creates it.
+        #
+        #  RightAws::SqsGen2::Queue.create(sqs, 'my_awesome_queue') #=> #<RightAws::SqsGen2::Queue:0xb7b626e4 ... >
+        #
+      def self.create(sqs, url_or_name, create=true, visibility=nil)
+        sqs.queue(url_or_name, create, visibility)
+      end
+      
+        # Creates new Queue instance. 
+        # Does not create a queue at Amazon.
+        #
+        #  queue = RightAws::SqsGen2::Queue.new(sqs, 'my_awesome_queue')
+        #
+      def initialize(sqs, url_or_name)
+        @sqs  = sqs
+        @url  = @sqs.interface.queue_url_by_name(url_or_name)
+        @name = @sqs.interface.queue_name_by_url(@url)
+      end
+      
+        # Retrieves queue size.
+        #
+        #  queue.size #=> 1
+        #
+      def size
+        @sqs.interface.get_queue_length(@url)
+      end
+      
+        # Clears queue, deleting only the visible messages.  Any message within its visibility
+        # timeout will not be deleted, and will re-appear in the queue in the
+        # future when the timeout expires.
+        #
+        # To delete all messages in a queue and eliminate the chance of any
+        # messages re-appearing in the future, it's best to delete the queue and
+        # re-create it as a new queue.  Note that doing this will take at least 60
+        # s since SQS does not allow re-creation of a queue within this interval.
+        #
+        #  queue.clear() #=> true
+        #
+      def clear()
+          @sqs.interface.clear_queue(@url)
+      end
+      
+        # Deletes queue.  Any messages in the queue will be permanently lost. 
+        # Returns +true+. 
+        #
+        # NB: Use with caution; severe data loss is possible!
+        #
+        # queue.delete(true) #=> true
+        #
+      def delete(force=false)
+        @sqs.interface.delete_queue(@url)
+      end
+
+        # Sends new message to queue. 
+        # Returns new Message instance that has been sent to queue.
+      def send_message(message)
+        message = message.to_s
+        res = @sqs.interface.send_message(@url, message)
+        msg = Message.new(self, res['MessageId'], nil, message)
+        msg.send_checksum = res['MD5OfMessageBody']
+        msg.sent_at = Time.now
+        msg
+      end
+      alias_method :push, :send_message
+
+        # Retrieves several messages from queue. 
+        # Returns an array of Message instances. 
+        #
+        #  queue.receive_messages(2,10) #=> array of messages
+        #
+      def receive_messages(number_of_messages=1, visibility=nil)
+        list = @sqs.interface.receive_message(@url, number_of_messages, visibility)
+        list.map! do |entry|
+          msg = Message.new(self, entry['MessageId'], entry['ReceiptHandle'],
+                            entry['Body'], visibility)
+          msg.received_at = Time.now 
+          msg.receive_checksum = entry['MD5OfBody']
+          msg
+        end
+      end
+      
+        # Retrieves first accessible message from queue. 
+        # Returns Message instance or +nil+ it the queue is empty.
+        #
+        #  queue.receive #=> #<RightAws::SqsGen2::Message:0xb7bf0884 ... >
+        #
+      def receive(visibility=nil)
+        list = receive_messages(1, visibility)
+        list.empty? ? nil : list[0]
+      end
+
+        # Pops (and deletes) first accessible message from queue. 
+        # Returns Message instance or +nil+ it the queue is empty.
+        #
+        #  queue.pop #=> #<RightAws::SqsGen2::Message:0xb7bf0884 ... >
+        #
+      def pop
+        list = @sqs.interface.pop_messages(@url, 1)
+        return nil if list == nil
+        entry = list[0]
+        msg = Message.new(self, entry['MessageId'], entry['ReceiptHandle'],
+                            entry['Body'], visibility)
+        msg.received_at = Time.now 
+        msg.receive_checksum = entry['MD5OfBody']
+        msg
+      end
+
+        # Retrieves +VisibilityTimeout+ value for the queue. 
+        # Returns new timeout value.
+        #
+        #  queue.visibility #=> 30
+        #
+      def visibility
+        @sqs.interface.get_queue_attributes(@url, 'VisibilityTimeout')['VisibilityTimeout']
+      end
+        
+        # Sets new +VisibilityTimeout+ for the queue. 
+        # Returns new timeout value. 
+        #
+        #  queue.visibility #=> 30
+        #  queue.visibility = 33
+        #  queue.visibility #=> 33
+        #
+      def visibility=(visibility_timeout)
+        @sqs.interface.set_queue_attributes(@url, 'VisibilityTimeout', visibility_timeout)
+        visibility_timeout
+      end
+        
+        # Sets new queue attribute value. 
+        # Not all attributes may be changed: +ApproximateNumberOfMessages+ (for example) is a read only attribute. 
+        # Returns a value to be assigned to attribute. 
+        # Currently, 'VisibilityTimeout' is the only settable queue attribute.
+        # Attempting to set non-existent attributes generates an indignant
+        # exception. 
+        #
+        # queue.set_attribute('VisibilityTimeout', '100')  #=> '100'
+        # queue.get_attribute('VisibilityTimeout')         #=> '100'
+        #
+      def set_attribute(attribute, value)
+        @sqs.interface.set_queue_attributes(@url, attribute, value)
+        value
+      end
+        
+        # Retrieves queue attributes. 
+        # At this moment Amazon supports +VisibilityTimeout+ and +ApproximateNumberOfMessages+ only. 
+        # If the name of attribute is set, returns its value. Otherwise, returns a hash of attributes.
+        #
+        # queue.get_attribute('VisibilityTimeout')  #=> {"VisibilityTimeout"=>"45"} 
+        #
+      def get_attribute(attribute='All')
+        attributes = @sqs.interface.get_queue_attributes(@url, attribute)
+        attribute=='All' ? attributes : attributes[attribute]
+      end
+    end
+        
+    class Message
+      attr_reader   :queue, :id, :body, :visibility, :receipt_handle
+      attr_accessor :sent_at, :received_at, :send_checksum, :receive_checksum
+      
+      def initialize(queue, id=nil, rh = nil, body=nil, visibility=nil)
+        @queue       = queue
+        @id          = id
+        @receipt_handle = rh 
+        @body        = body
+        @visibility  = visibility
+        @sent_at     = nil
+        @received_at = nil
+        @send_checksum = nil
+        @receive_checksum = nil
+      end
+      
+        # Returns +Message+ instance body.
+      def to_s
+        @body
+      end
+
+        # Removes message from queue. 
+        # Returns +true+.
+      def delete
+        @queue.sqs.interface.delete_message(@queue.url, @receipt_handle) if @receipt_handle
+      end
+
+    end
+
+
+  end
+end

data/lib/sqs/right_sqs_gen2_interface.rb

@@ -0,0 +1,449 @@
+#
+# 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.
+#
+
+module RightAws
+
+  #
+  # Right::Aws::SqsGen2Interface - RightScale's low-level Amazon SQS interface
+  # for API version 2008-01-01 and later.
+  # For explanations of the semantics
+  # of each call, please refer to Amazon's documentation at
+  # http://developer.amazonwebservices.com/connect/kbcategory.jspa?categoryID=31
+  #
+  # This class provides a procedural interface to SQS.  Conceptually it is
+  # mostly a pass-through interface to SQS and its API is very similar to the
+  # bare SQS API.  For a somewhat higher-level and object-oriented interface, see
+  # RightAws::SqsGen2. 
+
+  class SqsGen2Interface < RightAwsBase
+    include RightAwsBaseInterface
+    
+    SIGNATURE_VERSION = "1"
+    API_VERSION       = "2008-01-01"
+    DEFAULT_HOST      = "queue.amazonaws.com"
+    DEFAULT_PORT      = 443
+    DEFAULT_PROTOCOL  = 'https'
+    REQUEST_TTL       = 30
+    DEFAULT_VISIBILITY_TIMEOUT = 30
+
+
+    @@bench = AwsBenchmarkingBlock.new
+    def self.bench_xml
+      @@bench.xml
+    end
+    def self.bench_sqs
+      @@bench.service
+    end
+
+    @@api = API_VERSION
+    def self.api 
+      @@api
+    end
+
+    # Creates a new SqsInterface instance. This instance is limited to
+    # operations on SQS objects created with Amazon's 2008-01-01 API version.  This
+    # interface will not work on objects created with prior API versions.  See
+    # Amazon's article "Migrating to Amazon SQS API version 2008-01-01" at:
+    # http://developer.amazonwebservices.com/connect/entry.jspa?externalID=1148
+    #
+    #  sqs = RightAws::SqsGen2Interface.new('1E3GDYEOGFJPIT75KDT40','hgTHt68JY07JKUY08ftHYtERkjgtfERn57DFE379', {:multi_thread => true, :logger => Logger.new('/tmp/x.log')}) 
+    #  
+    # Params is a hash:
+    #
+    #    {:server       => 'queue.amazonaws.com' # Amazon service host: 'queue.amazonaws.com' (default)
+    #     :port         => 443                   # Amazon service port: 80 or 443 (default)
+    #     :multi_thread => true|false            # Multi-threaded (connection per each thread): true or false (default)
+    #     :logger       => Logger Object}        # Logger instance: logs to STDOUT if omitted }
+    #
+    def initialize(aws_access_key_id=nil, aws_secret_access_key=nil, params={})
+      init({ :name             => 'SQS', 
+             :default_host     => ENV['SQS_URL'] ? URI.parse(ENV['SQS_URL']).host   : DEFAULT_HOST, 
+             :default_port     => ENV['SQS_URL'] ? URI.parse(ENV['SQS_URL']).port   : DEFAULT_PORT, 
+             :default_protocol => ENV['SQS_URL'] ? URI.parse(ENV['SQS_URL']).scheme : DEFAULT_PROTOCOL }, 
+           aws_access_key_id     || ENV['AWS_ACCESS_KEY_ID'], 
+           aws_secret_access_key || ENV['AWS_SECRET_ACCESS_KEY'], 
+           params)
+    end
+
+
+  #-----------------------------------------------------------------
+  #      Requests
+  #-----------------------------------------------------------------
+
+    # Generates a request hash for the query API
+    def generate_request(action, param={})  # :nodoc:
+      # For operation requests on a queue, the queue URI will be a parameter,
+      # so we first extract it from the call parameters.  Next we remove any
+      # parameters with no value or with symbolic keys.  We add the header
+      # fields required in all requests, and then the headers passed in as
+      # params.  We sort the header fields alphabetically and then generate the
+      # signature before URL escaping the resulting query and sending it.
+      queue_uri = param[:queue_url] ? URI(param[:queue_url]).path : '/'
+      param.each{ |key, value| param.delete(key) if (value.nil? || key.is_a?(Symbol)) }
+      request_hash = { "Action"           => action,
+                       "Expires"          => (Time.now + REQUEST_TTL).utc.strftime("%Y-%m-%dT%H:%M:%SZ"),
+                       "AWSAccessKeyId"   => @aws_access_key_id,
+                       "Version"          => API_VERSION,
+                       "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['Signature'] = AwsUtils::sign(@aws_secret_access_key, request_data)
+      request_params = request_hash.to_a.collect{|key,val| key.to_s + "=" + val.to_s }.join("&")
+      request        = Net::HTTP::Get.new(AwsUtils.URLencode("#{queue_uri}?#{request_params}"))
+        # prepare output hash
+      { :request  => request, 
+        :server   => @params[:server],
+        :port     => @params[:port],
+        :protocol => @params[:protocol] }
+    end
+
+    def generate_post_request(action, param={})  # :nodoc:
+      queue_uri = param[:queue_url] ? URI(param[:queue_url]).path : '/'
+      message   = param[:message]                # extract message body if nesessary
+      param.each{ |key, value| param.delete(key) if (value.nil? || key.is_a?(Symbol)) }
+      request_hash = { "Action"           => action,
+                       "Expires"          => (Time.now + REQUEST_TTL).utc.strftime("%Y-%m-%dT%H:%M:%SZ"),
+                       "AWSAccessKeyId"   => @aws_access_key_id,
+                       "MessageBody"      => message,
+                       "Version"          => API_VERSION,
+                       "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['Signature'] = AwsUtils::sign(@aws_secret_access_key, request_data)
+      request_body = request_hash.to_a.collect{|key,val| key.to_s + "=" + val.to_s }.join("&")
+      request        = Net::HTTP::Post.new(AwsUtils.URLencode(queue_uri))
+      request['Content-Type'] = 'application/x-www-form-urlencoded' 
+      request.body = AwsUtils.URLencode(request_body)
+        # prepare output hash
+      { :request  => request, 
+        :server   => @params[:server],
+        :port     => @params[:port],
+        :protocol => @params[:protocol] }
+    end
+
+
+      # Sends request to Amazon and parses the response
+      # Raises AwsError if any banana happened
+    def request_info(request, parser) # :nodoc:
+      thread = @params[:multi_thread] ? Thread.current : Thread.main
+      thread[:sqs_connection] ||= Rightscale::HttpConnection.new(:exception => AwsError, :logger => @logger)
+      request_info_impl(thread[:sqs_connection], @@bench, request, parser)
+    end
+
+
+      # Creates a new queue, returning its URI.
+      #
+      #  sqs.create_queue('my_awesome_queue') #=> 'http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue'
+      #
+    def create_queue(queue_name, default_visibility_timeout=nil)
+      req_hash = generate_request('CreateQueue', 'QueueName' => queue_name,
+                                  'DefaultVisibilityTimeout' => default_visibility_timeout || DEFAULT_VISIBILITY_TIMEOUT )
+      request_info(req_hash, SqsCreateQueueParser.new(:logger => @logger))
+    rescue
+      on_exception
+    end
+
+     # Lists all queues owned by this user that have names beginning with +queue_name_prefix+. 
+     # If +queue_name_prefix+ is omitted then retrieves a list of all queues.
+     # Queue creation is an eventual operation and created queues may not show up in immediately subsequent list_queues calls.
+     #
+     #  sqs.create_queue('my_awesome_queue')
+     #  sqs.create_queue('my_awesome_queue_2')
+     #  sqs.list_queues('my_awesome') #=> ['http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue','http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue_2']
+     #
+    def list_queues(queue_name_prefix=nil)
+      req_hash = generate_request('ListQueues', 'QueueNamePrefix' => queue_name_prefix)
+      request_info(req_hash, SqsListQueuesParser.new(:logger => @logger))
+    rescue
+      on_exception
+    end
+      
+      # Deletes queue. Any messages in the queue are permanently lost. 
+      # Returns +true+ or an exception.
+      # Queue deletion can take up to 60 s to propagate through SQS.  Thus, after a deletion, subsequent list_queues calls
+      # may still show the deleted queue.  It is not unusual within the 60 s window to see the deleted queue absent from 
+      # one list_queues call but present in the subsequent one.  Deletion is eventual.
+      #
+      #  sqs.delete_queue('http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue_2') #=> true
+      # 
+      # 
+    def delete_queue(queue_url)
+      req_hash = generate_request('DeleteQueue', :queue_url      => queue_url)
+      request_info(req_hash, SqsStatusParser.new(:logger => @logger))
+    rescue
+      on_exception
+    end
+
+      # Retrieves the queue attribute(s). Returns a hash of attribute(s) or an exception.
+      #
+      #  sqs.get_queue_attributes('http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue') 
+      #  #=> {"ApproximateNumberOfMessages"=>"0", "VisibilityTimeout"=>"30"}
+      #
+    def get_queue_attributes(queue_url, attribute='All')
+      req_hash = generate_request('GetQueueAttributes', 'AttributeName' => attribute, :queue_url  => queue_url)
+      request_info(req_hash, SqsGetQueueAttributesParser.new(:logger => @logger))
+    rescue
+      on_exception
+    end
+
+      # Sets queue attribute. Returns +true+ or an exception.
+      #
+      #  sqs.set_queue_attributes('http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue', "VisibilityTimeout", 10) #=> true
+      #
+      # From the SQS Dev Guide:
+      # "Currently, you can set only the 
+      # VisibilityTimeout attribute for a queue... 
+      # When you change a queue's attributes, the change can take up to 60 seconds to propagate 
+      # throughout the SQS system."
+      #
+      # NB: Attribute values may not be immediately available to other queries
+      # for some time after an update. See the SQS documentation for
+      # semantics, but in general propagation can take up to 60 s.
+    def set_queue_attributes(queue_url, attribute, value)
+      req_hash = generate_request('SetQueueAttributes', 'Attribute.Name'  => attribute, 'Attribute.Value' => value, :queue_url  => queue_url)
+      request_info(req_hash, SqsStatusParser.new(:logger => @logger))
+    rescue
+      on_exception
+    end
+
+      # Retrieves a list of messages from queue. Returns an array of hashes in format: <tt>{:id=>'message_id', body=>'message_body'}</tt>
+      #
+      #   sqs.receive_message('http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue',10, 5) #=>
+      #    [{"ReceiptHandle"=>"Euvo62...kw==", "MD5OfBody"=>"16af2171b5b83cfa35ce254966ba81e3", 
+      #      "Body"=>"Goodbyte World!", "MessageId"=>"MUM4WlAyR...pYOTA="}, ..., {}]
+      #
+      # Normally this call returns fewer messages than the maximum specified,
+      # even if they are available.
+      #
+    def receive_message(queue_url, max_number_of_messages=1, visibility_timeout=nil)
+      return [] if max_number_of_messages == 0
+      req_hash = generate_post_request('ReceiveMessage', 'MaxNumberOfMessages'  => max_number_of_messages, 'VisibilityTimeout' => visibility_timeout,
+                                       :queue_url          => queue_url )
+      request_info(req_hash, SqsReceiveMessageParser.new(:logger => @logger))
+    rescue
+      on_exception
+    end
+    
+      # Sends a new message to a queue.  Message size is limited to 8 KB.
+      # If successful, this call returns a hash containing key/value pairs for
+      # "MessageId" and "MD5OfMessageBody":
+      #
+      #  sqs.send_message('http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue', 'message_1') #=> "1234567890...0987654321"
+      #  => {"MessageId"=>"MEs4M0JKNlRCRTBBSENaMjROTk58QVFRNzNEREhDVFlFOVJDQ1JKNjF8UTdBRllCUlJUMjhKMUI1WDJSWDE=", "MD5OfMessageBody"=>"16af2171b5b83cfa35ce254966ba81e3"}
+      #
+      # On failure, send_message raises an exception.
+      #
+      #
+    def send_message(queue_url, message)
+      req_hash = generate_post_request('SendMessage', :message  => message, :queue_url => queue_url)
+      request_info(req_hash, SqsSendMessagesParser.new(:logger => @logger))
+    rescue
+      on_exception
+    end
+
+      # Same as send_message
+    alias_method :push_message, :send_message
+    
+    
+      # Deletes message from queue. Returns +true+ or an exception.  Amazon
+      # returns +true+ on deletion of non-existent messages.  You must use the
+      # receipt handle for a message to delete it, not the message ID.  
+      #
+      # From the SQS Developer Guide:
+      # "It is possible you will receive a message even after you have deleted it. This might happen 
+      # on rare occasions if one of the servers storing a copy of the message is unavailable when 
+      # you request to delete the message. The copy remains on the server and might be returned to 
+      # you again on a subsequent receive request. You should create your system to be 
+      # idempotent so that receiving a particular message more than once is not a problem. "
+      #
+      #  sqs.delete_message('http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue', 'Euvo62/1nlIet...ao03hd9Sa0w==') #=> true
+      #
+    def delete_message(queue_url, receipt_handle)
+      req_hash = generate_request('DeleteMessage', 'ReceiptHandle' => receipt_handle, :queue_url  => queue_url)
+      request_info(req_hash, SqsStatusParser.new(:logger => @logger))
+    rescue
+      on_exception
+    end
+    
+      # Given the queue's short name, this call returns the queue URL or +nil+ if queue is not found
+      #  sqs.queue_url_by_name('my_awesome_queue') #=> 'http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue'
+      #
+    def queue_url_by_name(queue_name)
+      return queue_name if queue_name.include?('/')
+      queue_urls = list_queues(queue_name)
+      queue_urls.each do |queue_url|
+        return queue_url if queue_name_by_url(queue_url) == queue_name
+      end
+      nil
+    rescue
+      on_exception
+    end
+
+      # Returns short queue name by url.
+      #
+      #  RightSqs.queue_name_by_url('http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue') #=> 'my_awesome_queue'
+      #
+    def self.queue_name_by_url(queue_url)
+      queue_url[/[^\/]*$/]
+    rescue
+      on_exception
+    end
+    
+      # Returns short queue name by url.
+      #
+      #  sqs.queue_name_by_url('http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue') #=> 'my_awesome_queue'
+      #
+    def queue_name_by_url(queue_url)
+      self.class.queue_name_by_url(queue_url)
+    rescue
+      on_exception
+    end
+
+      # Returns approximate number of messages in queue.
+      #
+      #  sqs.get_queue_length('http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue') #=> 3
+      #
+    def get_queue_length(queue_url)
+      get_queue_attributes(queue_url)['ApproximateNumberOfMessages'].to_i
+    rescue
+      on_exception
+    end
+
+      # Removes all visible messages from queue. Return +true+ or an exception.
+      #
+      #  sqs.clear_queue('http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue') #=> true
+      #
+    def clear_queue(queue_url)
+      while (pop_messages(queue_url, 10).length > 0) ; end   # delete all messages in queue
+      true
+    rescue
+      on_exception
+    end
+
+      # Pops (retrieves and deletes) up to 'number_of_messages' from queue. Returns an array of retrieved messages in format: <tt>[{:id=>'message_id', :body=>'message_body'}]</tt>.
+      #
+      #   sqs.pop_messages('http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue', 3) #=>
+      #   [{"ReceiptHandle"=>"Euvo62/...+Zw==", "MD5OfBody"=>"16af2...81e3", "Body"=>"Goodbyte World!", 
+      #   "MessageId"=>"MEZI...JSWDE="}, {...}, ... , {...} ]
+      #
+    def pop_messages(queue_url, number_of_messages=1)
+      messages = receive_message(queue_url, number_of_messages)
+      messages.each do |message|
+        delete_message(queue_url, message['ReceiptHandle'])
+      end
+      messages
+    rescue
+      on_exception
+    end
+
+      # Pops (retrieves and  deletes) first accessible message from queue. Returns the message in format <tt>{:id=>'message_id', :body=>'message_body'}</tt> or +nil+.
+      #
+      #  sqs.pop_message('http://queue.amazonaws.com/ZZ7XXXYYYBINS/my_awesome_queue') #=>
+      #    {:id=>"12345678904GEZX9746N|0N9ED344VK5Z3SV1DTM0|1RVYH4X3TJ0987654321", :body=>"message_1"}
+      #
+    def pop_message(queue_url)
+      messages = pop_messages(queue_url)
+      messages.blank? ? nil : messages[0]
+    rescue
+      on_exception
+    end
+
+    #-----------------------------------------------------------------
+    #      PARSERS: Status Response Parser
+    #-----------------------------------------------------------------
+
+    class SqsStatusParser < RightAWSParser # :nodoc:
+      def tagend(name)
+        if name == 'ResponseMetadata'
+          @result = true
+        end
+      end
+    end
+
+    #-----------------------------------------------------------------
+    #      PARSERS: Queue
+    #-----------------------------------------------------------------
+
+    class SqsCreateQueueParser < RightAWSParser # :nodoc:
+      def tagend(name)
+        @result = @text if name == 'QueueUrl'
+      end
+    end
+
+    class SqsListQueuesParser < RightAWSParser # :nodoc:
+      def reset
+        @result = []
+      end
+      def tagend(name)
+        @result << @text if name == 'QueueUrl'
+      end
+    end
+
+    class SqsGetQueueAttributesParser < RightAWSParser # :nodoc:
+      def reset
+        @result = {}
+      end
+      def tagend(name)
+        case name 
+          when 'Name'      ; @current_attribute          = @text
+          when 'Value'     ; @result[@current_attribute] = @text
+        end
+      end
+    end
+
+    #-----------------------------------------------------------------
+    #      PARSERS: Messages
+    #-----------------------------------------------------------------
+
+    class SqsReceiveMessageParser < RightAWSParser # :nodoc:
+      def reset
+        @result = []
+      end
+      def tagstart(name, attributes)
+        @current_message = {} if name == 'Message'
+      end
+      def tagend(name)
+        case name
+          when 'MessageId'  ; @current_message['MessageId'] = @text
+          when 'ReceiptHandle' ; @current_message['ReceiptHandle'] = @text
+          when 'MD5OfBody' ; @current_message['MD5OfBody'] = @text
+          when 'Body'; @current_message['Body'] = @text; @result << @current_message
+        end
+      end
+    end
+
+    class SqsSendMessagesParser < RightAWSParser # :nodoc:
+      def reset
+        @result = {}
+      end
+      def tagend(name)
+        case name
+          when 'MessageId' ; @result['MessageId'] = @text
+          when 'MD5OfMessageBody' ; @result['MD5OfMessageBody'] = @text
+        end
+      end
+    end
+    
+  end
+
+end

data/lib/sqs/right_sqs_interface.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
@@ -50,7 +50,7 @@ module RightAws
 
       # Creates a new SqsInterface instance.
       #
-      #  sqs = RightAws::SqsInterface.new('1E3GDYEOGFJPIT75KDT40','hgTHt68JY07JKUY08ftHYtERkjgtfERn57DFE379', {:multi_thread => true, :logger => Logger.new('/tmp/x.log')}) #=> <RightSqs:0xb7af6264>
+      #  sqs = RightAws::SqsInterface.new('1E3GDYEOGFJPIT75KDT40','hgTHt68JY07JKUY08ftHYtERkjgtfERn57DFE379', {:multi_thread => true, :logger => Logger.new('/tmp/x.log')}) 
       #  
       # Params is a hash:
       #

data/test/sqs/test_right_sqs_gen2.rb

@@ -0,0 +1,200 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestSqsGen2 < Test::Unit::TestCase
+
+  GRANTEE_EMAIL_ADDRESS = 'fester@example.com'
+  RIGHT_MESSAGE_TEXT    = 'Right test message'
+
+  
+  def setup
+    @sqs = Rightscale::SqsGen2Interface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
+    @queue_name = 'right_sqs_test_gen2_queue'
+      # for classes
+    @s = Rightscale::SqsGen2.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
+  end
+  
+  # Wait for the queue to appear in the queues list.
+  # Amazon needs some time to after the queue creation to place
+  # it to the accessible queues list. If we dont want to get
+  # the additional faults then wait a bit...
+  def wait_for_queue_url(queue_name)
+    queue_url = nil
+    until queue_url
+      queue_url = @sqs.queue_url_by_name(queue_name)
+      unless queue_url
+        print '-' 
+        STDOUT.flush
+        sleep 1
+      end
+    end
+    queue_url
+  end
+  
+  
+  #---------------------------
+  # Rightscale::SqsInterface
+  #---------------------------
+
+  def test_01_create_queue
+    queue_url = @sqs.create_queue @queue_name
+    assert queue_url[/http.*#{@queue_name}/], 'New queue creation failed'
+  end
+
+  def test_02_list_queues
+    wait_for_queue_url(@queue_name)
+    queues = @sqs.list_queues('right_')
+    assert queues.size>0, 'Must more that 0 queues in list'
+  end
+
+  def test_03_set_and_get_queue_attributes
+    queue_url = @sqs.queue_url_by_name(@queue_name)
+    assert queue_url[/http.*#{@queue_name}/], "#{@queue_name} must exist!"
+    assert @sqs.set_queue_attributes(queue_url, 'VisibilityTimeout', 111), 'Set_queue_attributes fail'
+    sleep 20 # Amazon needs some time to change attribute
+    assert_equal '111', @sqs.get_queue_attributes(queue_url)['VisibilityTimeout'], 'New VisibilityTimeout must be equal to 111'
+  end
+  
+  def test_06_send_message
+    queue_url = @sqs.queue_url_by_name(@queue_name)
+      # send 5 messages for the tests below
+    assert @sqs.send_message(queue_url, RIGHT_MESSAGE_TEXT)
+    assert @sqs.send_message(queue_url, RIGHT_MESSAGE_TEXT)
+    assert @sqs.send_message(queue_url, RIGHT_MESSAGE_TEXT)
+    assert @sqs.send_message(queue_url, RIGHT_MESSAGE_TEXT)
+    assert @sqs.send_message(queue_url, RIGHT_MESSAGE_TEXT)
+  end
+  
+  def test_07_get_queue_length
+    queue_url = @sqs.queue_url_by_name(@queue_name)
+    assert_equal 5, @sqs.get_queue_length(queue_url), 'Queue must have 5 messages'
+  end
+
+  def test_08_receive_message
+    queue_url = @sqs.queue_url_by_name(@queue_name)
+    r_message = @sqs.receive_message(queue_url, 1)[0]
+    assert r_message, "Receive returned no message(s), but this is not necessarily incorrect"
+    assert_equal RIGHT_MESSAGE_TEXT, r_message['Body'], 'Receive message got wrong message text'
+  end
+  
+  def test_09_delete_message
+    queue_url = @sqs.queue_url_by_name(@queue_name)
+    message = @sqs.receive_message(queue_url)[0]
+    assert @sqs.delete_message(queue_url, message['ReceiptHandle']), 'Delete_message fail'
+    assert @sqs.pop_message(queue_url), 'Pop_message fail'
+  end
+  
+  def test_10_clear_and_delete_queue
+    queue_url = @sqs.queue_url_by_name(@queue_name)
+    assert @sqs.delete_queue(queue_url) 
+  end
+  
+  #---------------------------
+  # Rightscale::Sqs classes
+  #---------------------------
+
+  def test_20_sqs_create_delete_queue
+    assert @s, 'Rightscale::SqsGen2 must exist'
+      # get queues list
+    queues_size = @s.queues.size
+      # create new queue
+    queue  = @s.queue("#{@queue_name}_20", true)
+      # check that it is created
+    assert queue.is_a?(Rightscale::SqsGen2::Queue)
+    wait_for_queue_url(@queue_name)
+      # check that amount of queues has increased
+    assert_equal queues_size + 1, @s.queues.size
+      # delete queue
+    assert queue.delete
+  end
+  
+  def test_21_queue_create
+      # create new queue
+    queue = Rightscale::SqsGen2::Queue.create(@s, "#{@queue_name}_21", true)
+      # check that it is created
+    assert queue.is_a?(Rightscale::SqsGen2::Queue)
+    wait_for_queue_url(@queue_name)
+  end
+  
+  def test_22_queue_attributes
+    queue = Rightscale::SqsGen2::Queue.create(@s, "#{@queue_name}_21", false)
+      # get a list of attrinutes
+    attributes = queue.get_attribute
+    assert attributes.is_a?(Hash) && attributes.size>0
+      # get attribute value and increase it by 10
+    v = (queue.get_attribute('VisibilityTimeout').to_i + 10).to_s
+      # set attribute
+    assert queue.set_attribute('VisibilityTimeout', v)
+      # wait a bit
+    sleep 20
+      # check that attribute has changed
+    assert_equal v, queue.get_attribute('VisibilityTimeout')
+      # get queue visibility timeout
+    assert_equal v, queue.visibility
+      # change it 
+    queue.visibility = queue.visibility.to_i + 10
+      # make sure that it is changed
+    assert v.to_i + 10, queue.visibility
+  end
+  
+  def test_24_send_size
+    queue = Rightscale::SqsGen2::Queue.create(@s, "#{@queue_name}_24", true)
+      # send 5 messages
+    assert queue.push('a1')
+    assert queue.push('a2')
+    assert queue.push('a3')
+    assert queue.push('a4')
+    assert queue.push('a5')
+      # check queue size
+    assert_equal 5, queue.size
+      # send one more
+    assert queue.push('a6')
+      # check queue size again
+    assert_equal 6, queue.size
+  end
+  
+  def test_25_message_receive_pop_delete
+    queue = Rightscale::SqsGen2::Queue.create(@s, "#{@queue_name}_24", false)
+      # get queue size
+    size = queue.size
+      # get first message
+    m1 = queue.receive(10)
+    assert m1.is_a?(Rightscale::SqsGen2::Message)
+      # pop second message
+    m2 = queue.pop
+    assert m2.is_a?(Rightscale::SqsGen2::Message)
+      # make sure that queue size has decreased
+    assert_equal size-1, queue.size
+      # delete messsage
+    assert m1.delete
+      # make sure that queue size has decreased again
+    assert_equal size-2, queue.size
+  end
+ 
+  def test_26
+    queue = Rightscale::SqsGen2::Queue.create(@s, "#{@queue_name}_24", false)
+      # lock message 
+    queue.receive(100)
+      # clear queue
+    assert queue.clear 
+      # queue size is greater than zero
+    assert queue.size>0
+  end
+
+  def test_27_set_amazon_problems
+    original_problems = Rightscale::SqsGen2Interface.amazon_problems
+    assert(original_problems.length > 0)
+    Rightscale::SqsGen2Interface.amazon_problems= original_problems << "A New Problem"
+    new_problems = Rightscale::SqsGen2Interface.amazon_problems
+    assert_equal(new_problems, original_problems)
+
+    Rightscale::SqsGen2Interface.amazon_problems= nil
+    assert_nil(Rightscale::SqsGen2Interface.amazon_problems)
+  end
+
+  def test_28_check_threading_model
+    assert(!@sqs.multi_thread)
+    newsqs = Rightscale::SqsGen2Interface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key, {:multi_thread => true})
+    assert(newsqs.multi_thread)
+  end
+
+end

data/test/ts_right_aws.rb

@@ -9,4 +9,5 @@ require 'ec2/test_right_ec2.rb'
 require 's3/test_right_s3.rb'
 require 's3/test_right_s3_stubbed.rb'
 require 'sqs/test_right_sqs.rb'
+require 'sqs/test_right_sqs_gen2.rb'
 require 'sdb/test_right_sdb.rb'

metadata

@@ -3,15 +3,15 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: right_aws
 version: !ruby/object:Gem::Version 
-  version: 1.5.0
-date: 2008-02-11 00:00:00 -08:00
+  version: 1.6.0
+date: 2008-03-03 00:00:00 -08:00
 summary: Interface classes for the Amazon EC2, SQS, and S3 Web Services
 require_paths: 
 - lib
 email: support@rightscale.com
 homepage: 
 rubyforge_project: rightaws
-description: "== DESCRIPTION:  The RightScale AWS gems have been designed to provide a robust, fast, and secure interface to Amazon EC2, Amazon S3, Amazon SQS, and Amazon SDB. These gems have been used in production by RightScale since late 2006 and are being maintained to track enhancements made by Amazon. The RightScale AWS gems comprise:  - RightAws::Ec2 -- interface to Amazon EC2 (Elastic Compute Cloud) - RightAws::S3 and RightAws::S3Interface -- interface to Amazon S3 (Simple Storage Service) - RightAws::Sqs and RightAws::SqsInterface -- interface to Amazon SQS (Simple Queue Service) - RightAws::SdbInterface -- interface to Amazon SDB (SimpleDB)  == FEATURES:"
+description: "== DESCRIPTION:  The RightScale AWS gems have been designed to provide a robust, fast, and secure interface to Amazon EC2, Amazon S3, Amazon SQS, and Amazon SDB. These gems have been used in production by RightScale since late 2006 and are being maintained to track enhancements made by Amazon. The RightScale AWS gems comprise:  - RightAws::Ec2 -- interface to Amazon EC2 (Elastic Compute Cloud) - RightAws::S3 and RightAws::S3Interface -- interface to Amazon S3 (Simple Storage Service) - RightAws::Sqs and RightAws::SqsInterface -- interface to first-generation Amazon SQS (Simple Queue Service) (API version 2007-05-01) - RightAws::SqsGen2 and RightAws::SqsGen2Interface -- interface to second-generation Amazon SQS (Simple Queue Service) (API version 2008-01-01) - RightAws::SdbInterface -- interface to Amazon SDB (SimpleDB)  == FEATURES:"
 autorequire: 
 default_executable: 
 bindir: bin
@@ -43,6 +43,8 @@ files:
 - lib/sdb/right_sdb_interface.rb
 - lib/sqs/right_sqs.rb
 - lib/sqs/right_sqs_interface.rb
+- lib/sqs/right_sqs_gen2.rb
+- lib/sqs/right_sqs_gen2_interface.rb
 - test/ec2/test_helper.rb
 - test/ec2/test_right_ec2.rb
 - test/s3/test_helper.rb
@@ -52,6 +54,7 @@ files:
 - test/sdb/test_helper.rb
 - test/sqs/test_helper.rb
 - test/sqs/test_right_sqs.rb
+- test/sqs/test_right_sqs_gen2.rb
 - test/ts_right_aws.rb
 - test/test_credentials.rb
 - test/http_connection.rb
@@ -80,12 +83,3 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.1
     version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.3.0
-    version: