right_aws 2.0.0 → 2.1.0

data/lib/sqs/right_sqs_interface.rb

@@ -49,13 +49,12 @@ module RightAws
 
       # Creates a new SqsInterface instance.
       #
-      #  sqs = RightAws::SqsInterface.new('1E3GDYEOGFJPIT75KDT40','hgTHt68JY07JKUY08ftHYtERkjgtfERn57DFE379', {:multi_thread => true, :logger => Logger.new('/tmp/x.log')}) 
+      #  sqs = RightAws::SqsInterface.new('1E3GDYEOGFJPIT75KDT40','hgTHt68JY07JKUY08ftHYtERkjgtfERn57DFE379', {: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)
       #     :signature_version => '0'              # The signature version : '0', '1' or '2'(default)
       #     :logger       => Logger Object}        # Logger instance: logs to STDOUT if omitted }
       #
@@ -104,8 +103,8 @@ module RightAws
       param.each{ |key, value| param.delete(key) if (value.nil? || key.is_a?(Symbol)) }
         # created request
       param_to_str = param.to_a.collect{|key,val| key.to_s + "=" + CGI::escape(val.to_s) }.join("&")
-      param_to_str = "?#{param_to_str}" unless param_to_str.blank?
-      request = "Net::HTTP::#{method.capitalize}".constantize.new("#{queue_uri}#{param_to_str}")
+      param_to_str = "?#{param_to_str}" unless param_to_str.right_blank?
+      request = "Net::HTTP::#{method.capitalize}".right_constantize.new("#{queue_uri}#{param_to_str}")
       request.body = message if message
         # set main headers
       request['content-md5']  = ''
@@ -311,7 +310,7 @@ module RightAws
     def peek_message(queue_url, message_id)
       req_hash = generate_rest_request('GET', :queue_url => "#{queue_url}/#{CGI::escape message_id}" )
       messages = request_info(req_hash, SqsReceiveMessagesParser.new(:logger => @logger))
-      messages.blank? ? nil : messages[0]
+      messages.right_blank? ? nil : messages[0]
     rescue
       on_exception
     end
@@ -452,7 +451,7 @@ module RightAws
       #
     def receive_message(queue_url, visibility_timeout=nil)
       result = receive_messages(queue_url, 1, visibility_timeout)
-      result.blank? ? nil : result[0]
+      result.right_blank? ? nil : result[0]
     rescue
       on_exception
     end
@@ -482,7 +481,7 @@ module RightAws
       #
     def pop_message(queue_url)
       messages = pop_messages(queue_url)
-      messages.blank? ? nil : messages[0]
+      messages.right_blank? ? nil : messages[0]
     rescue
       on_exception
     end

data/right_aws.gemspec

@@ -0,0 +1,91 @@
+#--  -*- mode: ruby; encoding: utf-8 -*-
+# Copyright: Copyright (c) 2010 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.
+#++
+
+require 'rubygems'
+require File.expand_path(File.join(File.dirname(__FILE__), "lib", "awsbase", "version"))
+
+Gem::Specification.new do |spec|
+  spec.name = 'right_aws'
+  spec.rubyforge_project = 'rightaws'
+  spec.version = RightAws::VERSION::STRING
+  spec.authors = ['RightScale, Inc.']
+  spec.email = 'support@rightscale.com'
+  spec.summary = 'Interface classes for the Amazon EC2, SQS, and S3 Web Services'
+  spec.has_rdoc = true
+  spec.rdoc_options = ['--main', 'README.txt', '--title', '']
+  spec.extra_rdoc_files = ['README.txt']
+  spec.required_ruby_version = '>= 1.8.7'
+  spec.require_path = 'lib'
+
+  spec.add_dependency('right_http_connection', '>= 1.2.5')
+  #spec.requirements << "uuidtools >= 1.0.7 if you want to use ActiveSdb"
+  spec.requirements << "libxml-ruby >= 0.5.2.0 is encouraged"
+
+  spec.add_development_dependency('rake')
+  spec.add_development_dependency('rcov')
+
+  spec.description = <<-EOF
+== DESCRIPTION:
+
+The RightScale AWS gems have been designed to provide a robust, fast, and secure interface to Amazon EC2, EBS, S3, SQS, SDB, and CloudFront.
+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) and the
+  associated EBS (Elastic Block Store)
+- 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 and RightAws::ActiveSdb -- interface to Amazon SDB (SimpleDB)
+- RightAws::AcfInterface -- interface to Amazon CloudFront, a content distribution service
+
+== FEATURES:
+
+- Full programmmatic access to EC2, EBS, S3, SQS, SDB, and CloudFront.
+- Complete error handling: all operations check for errors and report complete
+  error information by raising an AwsError.
+- Persistent HTTP connections with robust network-level retry layer using
+  RightHttpConnection).  This includes socket timeouts and retries.
+- Robust HTTP-level retry layer.  Certain (user-adjustable) HTTP errors returned
+  by Amazon's services are classified as temporary errors.
+  These errors are automaticallly retried using exponentially increasing intervals.
+  The number of retries is user-configurable.
+- Fast REXML-based parsing of responses (as fast as a pure Ruby solution allows).
+- Uses libxml (if available) for faster response parsing.
+- Support for large S3 list operations.  Buckets and key subfolders containing
+  many (> 1000) keys are listed in entirety.  Operations based on list (like
+  bucket clear) work on arbitrary numbers of keys.
+- 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.
+- 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).
+EOF
+
+  candidates = Dir.glob('{lib,test}/**/*') + ['History.txt', 'Manifest.txt', 'README.txt', 'Rakefile', 'right_aws.gemspec']
+  spec.files = candidates.sort
+  spec.test_files = Dir.glob('test/**/*')
+end

data/test/awsbase/test_helper.rb

@@ -0,0 +1,2 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../lib/right_aws'

data/test/awsbase/test_right_awsbase.rb

@@ -0,0 +1,12 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+require 'pp'
+
+class TestAwsbase < Test::Unit::TestCase
+
+  def setup
+  end
+  
+  def test_01_create_describe_key_pairs
+  end
+  
+end

data/test/s3/test_right_s3.rb

@@ -264,7 +264,7 @@ class TestS3 < Test::Unit::TestCase
     # create a key
     key = bucket.key('test/copy/30')
     key.put(RIGHT_OBJECT_TEXT)
-    assert key.meta_headers.blank?
+    assert key.meta_headers.right_blank?
     # store some meta keys
     meta = {'family' => 'oops','race' => 'troll'}
     assert_equal meta, key.save_meta(meta)

data/test/sdb/test_active_sdb.rb

@@ -77,7 +77,7 @@ class TestSdb < Test::Unit::TestCase
   def test_02_create_items
     # check that DB is empty
     clients = Client.find(:all)
-    assert clients.blank?
+    assert clients.right_blank?
     # put some clients there
     @clients.each do |client|
       Client.create client

data/test/sdb/test_batch_put_attributes.rb

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestSdb < Test::Unit::TestCase
+
+  def setup
+    STDOUT.sync  = true
+    @domain = 'right_sdb_awesome_test_domain'
+    @attributes = {
+      'a' => { 'foo' => '123' },
+      'b' => { 'bar' => '456' }
+    }
+    # Interface instance
+    @sdb = Rightscale::SdbInterface.new
+    @sdb.delete_domain(@domain)
+    wait(SDB_DELAY, "after removing domain")
+    @sdb.create_domain(@domain)
+    wait(SDB_DELAY, "after recreating domain")
+  end
+
+  SDB_DELAY = 2
+  
+  def wait(delay, msg='')
+    print "waiting #{delay} seconds #{msg}"
+    while delay>0 do
+      delay -= 1
+      print '.'
+      sleep 1
+    end
+    puts
+  end
+
+  def test_batch_put_attributes
+    @sdb.batch_put_attributes(@domain, @attributes)
+    wait(SDB_DELAY, "after putting attributes")
+    a = @sdb.get_attributes(@domain, 'a')[:attributes]
+    b = @sdb.get_attributes(@domain, 'b')[:attributes]
+    assert_equal( {'foo' => ['123']}, a)
+    assert_equal( {'bar' => ['456']}, b)
+    
+    # Replace = false
+    @sdb.batch_put_attributes(@domain, { 'a' => {'foo' => ['789']}})
+    wait(SDB_DELAY, "after putting attributes") 
+    a = @sdb.get_attributes(@domain, 'a')[:attributes]
+    assert_equal ['123', '789'], a['foo'].sort
+
+    # Replace = true
+    @sdb.batch_put_attributes(@domain, {'b' => {'bar' => ['789']}}, true)
+    wait(SDB_DELAY, "after putting attributes") 
+    b = @sdb.get_attributes(@domain, 'b')[:attributes]
+    assert_equal ['789'], b['bar'].sort
+
+  end
+end

data/test/sqs/test_right_sqs.rb

@@ -273,12 +273,6 @@ class TestSqs < Test::Unit::TestCase
     assert_nil(Rightscale::SqsInterface.amazon_problems)
   end
 
-  def test_28_check_threading_model
-    assert(!@sqs.multi_thread)
-    newsqs = Rightscale::SqsInterface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key, {:multi_thread => true})
-    assert(newsqs.multi_thread)
-  end
-
   def test_29_signature_version_0
     sqs = Rightscale::SqsInterface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key, :signature_version => '0')
     assert_nothing_raised do

data/test/sqs/test_right_sqs_gen2.rb

@@ -94,7 +94,7 @@ class TestSqsGen2 < Test::Unit::TestCase
   def test_06_test_permissions
     queue_url = @sqs.queue_url_by_name(@queue_name)
     permissions = @sqs.get_queue_attributes(queue_url, 'Policy')
-    assert !permissions.blank?
+    assert !permissions.right_blank?
   end
 
   def test_07_revoke_permissions

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_aws
 version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: false
   segments: 
   - 2
+  - 1
   - 0
-  - 0
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors: 
 - RightScale, Inc.
@@ -14,115 +15,137 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 -07:00
+date: 2011-03-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: right_http_connection
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 2
-        - 1
-        version: 1.2.1
+        - 5
+        version: 1.2.5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: rake
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
-        - 2
         - 0
-        - 4
-        version: 2.0.4
+        version: "0"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: gemcutter
+  name: rcov
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        - 5
-        - 0
-        version: 0.5.0
+        version: "0"
   type: :development
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 5
-        - 0
-        version: 2.5.0
-  type: :development
-  version_requirements: *id004
-description: |-
+description: |
   == DESCRIPTION:
   
-  The RightScale AWS gems have been designed to provide a robust, fast, and secure interface to Amazon EC2, EBS, S3, SQS, SDB, and CloudFront. 
-  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 have been designed to provide a robust, fast, and secure interface to Amazon EC2, EBS, S3, SQS, SDB, and CloudFront.
+  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), VPC (Virtual Private Cloud) and the associated EBS (Elastic Block Store)
+  - RightAws::Ec2 -- interface to Amazon EC2 (Elastic Compute Cloud) and the
+    associated EBS (Elastic Block Store)
   - 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)
-  - RightAws::SqsGen2 and RightAws::SqsGen2Interface -- interface to second-generation 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 and RightAws::ActiveSdb -- interface to Amazon SDB (SimpleDB)
   - RightAws::AcfInterface -- interface to Amazon CloudFront, a content distribution service
-  - RightAws::AsInterface  -- interface to Amazon Auto Scaling
-  - RightAws::AcwInterface -- interface to Amazon Cloud Watch
-  - RightAws::ElbInterface -- interface to Amazon Elastic Load Balancer
-  - RightAws::RdsInterface -- interface to Amazon RDS instances
   
   == FEATURES:
+  
+  - Full programmmatic access to EC2, EBS, S3, SQS, SDB, and CloudFront.
+  - Complete error handling: all operations check for errors and report complete
+    error information by raising an AwsError.
+  - Persistent HTTP connections with robust network-level retry layer using
+    RightHttpConnection).  This includes socket timeouts and retries.
+  - Robust HTTP-level retry layer.  Certain (user-adjustable) HTTP errors returned
+    by Amazon's services are classified as temporary errors.
+    These errors are automaticallly retried using exponentially increasing intervals.
+    The number of retries is user-configurable.
+  - Fast REXML-based parsing of responses (as fast as a pure Ruby solution allows).
+  - Uses libxml (if available) for faster response parsing.
+  - Support for large S3 list operations.  Buckets and key subfolders containing
+    many (> 1000) keys are listed in entirety.  Operations based on list (like
+    bucket clear) work on arbitrary numbers of keys.
+  - 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.
+  - 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).
+
 email: support@rightscale.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- Manifest.txt
 - README.txt
 files: 
 - History.txt
 - Manifest.txt
 - README.txt
 - Rakefile
+- lib/acf/right_acf_interface.rb
+- lib/acf/right_acf_invalidations.rb
+- lib/acf/right_acf_origin_access_identities.rb
+- lib/acf/right_acf_streaming_interface.rb
+- lib/acw/right_acw_interface.rb
+- lib/as/right_as_interface.rb
 - lib/awsbase/benchmark_fix.rb
 - lib/awsbase/right_awsbase.rb
 - lib/awsbase/support.rb
+- lib/awsbase/version.rb
 - lib/ec2/right_ec2.rb
+- lib/ec2/right_ec2_ebs.rb
 - lib/ec2/right_ec2_images.rb
 - lib/ec2/right_ec2_instances.rb
+- lib/ec2/right_ec2_monitoring.rb
+- lib/ec2/right_ec2_placement_groups.rb
+- lib/ec2/right_ec2_reserved_instances.rb
 - lib/ec2/right_ec2_security_groups.rb
 - lib/ec2/right_ec2_spot_instances.rb
-- lib/ec2/right_ec2_ebs.rb
-- lib/ec2/right_ec2_reserved_instances.rb
+- lib/ec2/right_ec2_tags.rb
 - lib/ec2/right_ec2_vpc.rb
-- lib/ec2/right_ec2_monitoring.rb
+- lib/ec2/right_ec2_windows_mobility.rb
+- lib/elb/right_elb_interface.rb
+- lib/iam/right_iam_access_keys.rb
+- lib/iam/right_iam_groups.rb
+- lib/iam/right_iam_interface.rb
+- lib/iam/right_iam_mfa_devices.rb
+- lib/iam/right_iam_users.rb
+- lib/rds/right_rds_interface.rb
 - lib/right_aws.rb
+- lib/route_53/right_route_53_interface.rb
 - lib/s3/right_s3.rb
-- lib/acw/right_acw_interface.rb
-- lib/elb/right_elb_interface.rb
-- lib/as/right_as_interface.rb
 - lib/s3/right_s3_interface.rb
 - lib/sdb/active_sdb.rb
 - lib/sdb/right_sdb_interface.rb
@@ -130,17 +153,21 @@ files:
 - lib/sqs/right_sqs_gen2.rb
 - lib/sqs/right_sqs_gen2_interface.rb
 - lib/sqs/right_sqs_interface.rb
-- lib/acf/right_acf_interface.rb
-- lib/acf/right_acf_streaming_interface.rb
-- lib/acf/right_acf_origin_access_identities.rb
-- lib/rds/right_rds_interface.rb
+- right_aws.gemspec
+- test/acf/test_helper.rb
+- test/acf/test_right_acf.rb
+- test/awsbase/test_helper.rb
+- test/awsbase/test_right_awsbase.rb
 - test/ec2/test_helper.rb
 - test/ec2/test_right_ec2.rb
 - test/http_connection.rb
+- test/rds/test_helper.rb
+- test/rds/test_right_rds.rb
 - test/s3/test_helper.rb
 - test/s3/test_right_s3.rb
 - test/s3/test_right_s3_stubbed.rb
 - test/sdb/test_active_sdb.rb
+- test/sdb/test_batch_put_attributes.rb
 - test/sdb/test_helper.rb
 - test/sdb/test_right_sdb.rb
 - test/sqs/test_helper.rb
@@ -148,10 +175,6 @@ files:
 - test/sqs/test_right_sqs_gen2.rb
 - test/test_credentials.rb
 - test/ts_right_aws.rb
-- test/acf/test_helper.rb
-- test/acf/test_right_acf.rb
-- test/rds/test_helper.rb
-- test/rds/test_right_rds.rb
 has_rdoc: true
 homepage: 
 licenses: []
@@ -160,28 +183,56 @@ post_install_message:
 rdoc_options: 
 - --main
 - README.txt
+- --title
+- ""
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
-requirements: []
-
+requirements: 
+- libxml-ruby >= 0.5.2.0 is encouraged
 rubyforge_project: rightaws
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Interface classes for the Amazon EC2, SQS, and S3 Web Services
 test_files: 
+- test/acf/test_helper.rb
+- test/acf/test_right_acf.rb
+- test/awsbase/test_helper.rb
+- test/awsbase/test_right_awsbase.rb
+- test/ec2/test_helper.rb
+- test/ec2/test_right_ec2.rb
+- test/http_connection.rb
+- test/rds/test_helper.rb
+- test/rds/test_right_rds.rb
+- test/s3/test_helper.rb
+- test/s3/test_right_s3.rb
+- test/s3/test_right_s3_stubbed.rb
+- test/sdb/test_active_sdb.rb
+- test/sdb/test_batch_put_attributes.rb
+- test/sdb/test_helper.rb
+- test/sdb/test_right_sdb.rb
+- test/sqs/test_helper.rb
+- test/sqs/test_right_sqs.rb
+- test/sqs/test_right_sqs_gen2.rb
+- test/test_credentials.rb
 - test/ts_right_aws.rb