SQS 0.1.6 → 0.1.7

data/CHANGELOG

@@ -1,3 +1,10 @@
+0.1.7
+2008-02-21
+* You can now call SQS.conf_file = 'some_file.yml' to set access_key_id and
+secret_access_key.  SQS assumes this file is YAML.  This way, you don't have to
+store your AWS credentials in your code (and I don't run the risk of committing
+my credentials to SVN every time I do a commit!).
+
 0.1.6
 2008-02-19
 * Maintenance release to keep up with Amazon SQS API changes. All but one test should be

data/lib/sqs.rb

@@ -8,6 +8,7 @@ require 'erb'
 require 'net/http'
 require 'openssl'
 require 'rexml/document'
+require 'yaml'
 #include Digest
 include ERB::Util
 
@@ -48,6 +49,23 @@ class SQS
   def self.secret_access_key
     @@secret_access_key
   end
+
+  # Expects YAML
+  def self.conf_file=( path )
+    @@conf_file = File.expand_path( path )
+    settings = YAML.load_file( @@conf_file  )
+    %w{ access_key_id secret_access_key }.each do |attr|
+      self.send( "#{attr}=", settings[attr] )
+    end
+  rescue
+    # Warn, but continue operation
+    warn "\n\nWARNING:\n#{$!.message}\n(Check #{caller[0]})"
+  end
+  
+  def self.conf_file
+    @@conf_file
+  end
+  
   def self.url_for_auery=( u )
     @@url_for_query = u
   end
@@ -208,6 +226,7 @@ class SQS
   protected
   @@retry_attempts = 10;
   @@counter = 0;
+  @@conf_file = ''
   @@secret_access_key = 'Replace this with your secret access key'
   @@access_key_id = 'Replace this with your access key id'
   @@url_for_query = 'http://queue.amazonaws.com/'

data/test/unit/sqs_queue_test.rb

@@ -115,12 +115,14 @@ class SQS_QueueTest < Test::Unit::TestCase
         @q.delete!
       end
 
-      begin
-        q = SQS.get_queue( @queue_prefix )
-      rescue
-        assert_equal 'SQS::UnavailableQueue', $!.class.name
-      else
-        flunk 'Was supposed to raise an SQS::UnavailableQueue'
+      assert_statistically( :of => 3, :after => lambda{ |i,s| sleep 3 } ) do
+        begin
+          q = SQS.get_queue( @queue_prefix )
+        rescue
+          'SQS::UnavailableQueue' == $!.class.name
+        else
+          false
+        end
       end
     end
 
@@ -407,7 +409,7 @@ class SQS_QueueTest < Test::Unit::TestCase
       end
 
       assert @q.add_grant( :email => SQStest.other_aws_account[:email], :permission => :full )
-      assert_statistically( :of => 6, :after => lambda{ |i,s| sleep 5 } ) do
+      assert_statistically( :of => 6, :after => lambda{ |i,s| sleep i < 5 ? 5 : 10 } ) do
         grants = @q.list_grants
         4 == grants.size
       end

data/test/unit/sqs_test.rb

@@ -24,14 +24,23 @@ class SQSTest < Test::Unit::TestCase
 
     @used_prefixes[@queue_prefix] = true
 
-    @q = SQS.create_queue( @queue_prefix ) unless SQStest.skip_live_tests?
+    unless SQStest.skip_live_tests?
+      @original_access_key_id = SQS.access_key_id
+      @original_secret_access_key = SQS.secret_access_key
+
+      @q = SQS.create_queue( @queue_prefix )
+    end
     
     SQS.add_reasons_to_retry 'ServiceUnavailable'
     SQS.remove_reasons_to_retry( SQS.reasons_to_retry.reject { |r| r == 'ServiceUnavailable' } )
     SQS.retry_attempts = 10
+
   end
   def teardown
     unless SQStest.skip_live_tests?
+      SQS.access_key_id = @original_access_key_id
+      SQS.secret_access_key = @original_secret_access_key
+
       SQS.list_queues( @queue_prefix ).each do |q|
         begin
           q.delete! if q.exists?
@@ -42,6 +51,7 @@ class SQSTest < Test::Unit::TestCase
       end
     end
     print SQS.counter if SQStest.print_counter?
+
   end
 
   unless SQStest.skip_live_tests?
@@ -122,6 +132,26 @@ class SQSTest < Test::Unit::TestCase
     end
   end
   
+  def test_bad_conf_file
+    assert_nothing_raised do
+      SQS.conf_file = 'Should-not-exist.ext'
+    end
+  end
+
+  def test_good_conf_file
+    f = File.expand_path( File.join( File.dirname( __FILE__ ), 'test_conf.yml' ) )
+    
+    assert_not_equal f, SQS.conf_file
+    assert_not_equal 'number 5', SQS.access_key_id
+    assert_not_equal 'is alive', SQS.secret_access_key
+
+    SQS.conf_file = File.join( File.dirname( __FILE__ ), 'test_conf.yml' )
+
+    assert_equal f, SQS.conf_file
+    assert_equal 'number 5', SQS.access_key_id
+    assert_equal 'is alive', SQS.secret_access_key
+  end
+  
   def test_get_exception_class
     assert_raises ArgumentError do
       SQS.get_exception_class

data/test/unit/test_conf.yml

@@ -0,0 +1,2 @@
+access_key_id: 'number 5'
+secret_access_key: 'is alive'

data/test/unit/test_setup.rb

@@ -10,20 +10,20 @@ class SQStest
   def self.print_counter? ; false ; end
   def self.my_aws_account ; { :email => 'Replace this with your AWS account email address', :display_name => 'Replace this with your AWS display name' } ; end
   def self.other_aws_account ; { :email => 'Replace this with another valid AWS account email address', :display_name => 'Replace this with another valid AWS display name' } ; end
-  def self.secret_access_key ; 'Replace this with your secret access key' ; end
-  def self.access_key_id ; 'Replace this with your access key id' ; end
 end
-# End change these settings
-#############################
 
+# Uncomment these lines to set up your access_key_id and secret_access_key (not the preferred method)
+# SQS.access_key_id = ''
+# SQS.secret_access_key = ''
 
+# Uncomment this line to point SQS to a YAML file containing your
+# access_key_id and secret_access_key (the preferred method)
+SQS.conf_file = "~/aws.yml"
 
-SQS.secret_access_key = SQStest.secret_access_key
-SQS.access_key_id = SQStest.access_key_id
+# End change these settings
+#############################
 
 good = Hash.new
-good[:access_key_id] = SQS.access_key_id != 'Replace this with your access key id'
-good[:secret_access_key] = SQS.secret_access_key != 'Replace this with your secret access key'
 good[:my_aws_email] = SQStest.my_aws_account[:email] != 'Replace this with your AWS account email address'
 good[:my_aws_display_name] = SQStest.my_aws_account[:display_name] != 'Replace this with your AWS display name'
 good[:other_aws_email] = SQStest.other_aws_account[:email] != 'Replace this with another valid AWS account email address'
@@ -31,6 +31,7 @@ good[:other_aws_display_name] = SQStest.other_aws_account[:display_name] != 'Rep
 
 message = good.reject{ |k,v| v }.keys.collect{ |k| k.to_s.gsub( /_/, ' ' ) }.join(", ")
 
+
 unless message.to_s.empty?
   puts "\nWHOOPS: In order to run these tests, please change the #{ message.index(',') ? 'values' : 'value' } of #{message} in #{File.expand_path( __FILE__ )}\n\n"
   exit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: SQS
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Zach Holt
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-20 00:00:00 -08:00
+date: 2008-02-21 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -34,6 +34,7 @@ files:
 - test/unit/sqs_queue_test.rb
 - test/unit/sqs_test.rb
 - test/unit/test_setup.rb
+- test/unit/test_conf.yml
 - README
 - MIT-LICENSE
 - CHANGELOG
@@ -70,3 +71,4 @@ test_files:
 - test/unit/sqs_queue_test.rb
 - test/unit/sqs_test.rb
 - test/unit/test_setup.rb
+- test/unit/test_conf.yml