aws 1.11.38 → 2.1.0

data/test/test_credentials.rb

@@ -1,44 +1,56 @@
 class TestCredentials
 
-  @@aws_access_key_id = nil 
-  @@aws_secret_access_key = nil 
-  @@account_number = nil
-
-  def self.aws_access_key_id
-    @@aws_access_key_id
-  end
-  def self.aws_access_key_id=(newval)
-    @@aws_access_key_id = newval
-  end
-  def self.account_number
-    @@account_number
-  end
-  def self.account_number=(newval)
-    @@account_number = newval
-  end
-  def self.aws_secret_access_key
-    @@aws_secret_access_key
-  end
-  def self.aws_secret_access_key=(newval)
-    @@aws_secret_access_key = newval
-  end
-
-  require 'yaml'
-  def self.get_credentials
-    #Dir.chdir do
-      begin
-          puts Dir.chdir
-        Dir.chdir('.amazon') do
-          credentials = YAML::load(File.open("testcredentials.yml"))
-          puts credentials.inspect
-            self.aws_access_key_id = credentials["access_key"]
-            self.aws_secret_access_key = credentials["secret_key"]
-            puts 'akey=' + self.aws_access_key_id
+    @@aws_access_key_id = nil
+    @@aws_secret_access_key = nil
+    @@account_number = nil
+    @@config = nil
+
+    def self.config
+        @@config
+    end
+
+    def self.aws_access_key_id
+        @@aws_access_key_id
+    end
+
+    def self.aws_access_key_id=(newval)
+        @@aws_access_key_id = newval
+    end
+
+    def self.account_number
+        @@account_number
+    end
+
+    def self.account_number=(newval)
+        @@account_number = newval
+    end
+
+    def self.aws_secret_access_key
+        @@aws_secret_access_key
+    end
+
+    def self.aws_secret_access_key=(newval)
+        @@aws_secret_access_key = newval
+    end
+
+    require 'yaml'
+
+    def self.get_credentials
+        #Dir.chdir do
+        begin
+
+            Dir.chdir(File.expand_path("~/.test-configs")) do
+                credentials = YAML::load(File.open("aws.yml"))
+                @@config = credentials
+                puts 'creds=' + credentials.inspect
+                self.aws_access_key_id = credentials["amazon"]["access_key"]
+                self.aws_secret_access_key = credentials["amazon"]["secret_key"]
+                puts 'akey=' + self.aws_access_key_id
+            end
+        rescue Exception => e
+            puts "#{e.message}"
+            raise e
         end
-      rescue Exception => e
-        puts "Couldn't chdir to ~/.amazon: #{e.message}"
-          raise e
-      end
-    #end
-  end
+        #end
+    end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aws
 version: !ruby/object:Gem::Version 
-  version: 1.11.38
+  version: 2.1.0
 platform: ruby
 authors: 
 - Travis Reeder
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-12 00:00:00 -07:00
+date: 2009-10-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,6 +44,7 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - lib/acf/right_acf_interface.rb
+- lib/aws.rb
 - lib/awsbase/benchmark_fix.rb
 - lib/awsbase/right_awsbase.rb
 - lib/awsbase/support.rb
@@ -90,6 +91,7 @@ test_files:
 - test/acf/test_helper.rb
 - test/acf/test_right_acf.rb
 - test/ec2/test_helper.rb
+- test/ec2/test_mon.rb
 - test/ec2/test_right_ec2.rb
 - test/http_connection.rb
 - test/s3/test_helper.rb
@@ -100,6 +102,5 @@ test_files:
 - 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

data/test/sqs/test_right_sqs_gen2.rb

@@ -1,209 +0,0 @@
-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
-
-  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
-      sqs.list_queues
-    end
-    # check that the request has correct signature version
-    assert sqs.last_request.path.include?('SignatureVersion=0')
-  end
-  
-end