ruby-aaws 0.4.3 → 0.4.4

data/NEWS

@@ -1,4 +1,15 @@
-$Id: NEWS,v 1.13 2008/09/21 22:25:55 ianmacd Exp $
+$Id: NEWS,v 1.14 2008/10/03 12:00:57 ianmacd Exp $
+
+
+0.4.4
+-----
+
+It's now possible to have Ruby/AWS use a user configuration file with a name
+other than .amazonrc. This is achieved by defining $AMAZONRCFILE. If left
+undefined, the default of .amazonrc is used.
+
+Locations other than $HOME were not being checked for .amazonrc. This bug has
+now been fixed.
 
 
 0.4.3

data/README

@@ -1,4 +1,4 @@
-$Id: README,v 1.16 2008/09/21 13:26:51 ianmacd Exp $
+$Id: README,v 1.17 2008/10/03 12:00:19 ianmacd Exp $
 
 
 Introduction
@@ -169,16 +169,18 @@ look something like this:
   cache = false
 
 Because you're embedding your key ID in the file, you should protect it (on
-UNIX and similar systems) by making it mode 0600:
+UNIX and equivalent systems) by making it mode 0600:
 
 $ chmod 600 ~/.amazonrc
 
 If you define 'cache' to be 'true', you may also define 'cache_dir' to point
 to somewhere other the default, /tmp/amazon.
 
-If $HOME is undefined, as is usually the case on Windows, alternative
-locations are searched for the user configuration file. In fact, one location
-is even searched prior to looking in $HOME.
+If you want to place .amazonrc somewhere other than $HOME, you may set
+$AMAZONRCDIR in the environment, as this location is checked prior to $HOME.
+
+If you're using Windows, $HOME is usually undefined, so a number of additional
+locations are checked for .amazonrc.
 
 The exact search order is as follows:
 
@@ -187,8 +189,12 @@ $HOME
 $HOMEDRIVE + $HOMEPATH
 $USERPROFILE
 
-So, you can put the user configuration file in any of these locations, but it
-must always be called .amazonrc.
+Note that only the first defined location is used, so if, for example, both
+$AMAZONRCDIR and $HOME are defined, but only the path specified by $HOME
+contains a file called .amazonrc, it will not be found.
+
+If you want the user configuration file to be called something other than
+.amazonrc, you may define $AMAZONRCFILE in the environment.
 
 Once you have your configuration file, you can get started on your code.
  

data/README.rdoc

@@ -1,5 +1,5 @@
 #--
-# $Id: README.rdoc,v 1.18 2008/09/21 22:25:55 ianmacd Exp $
+# $Id: README.rdoc,v 1.19 2008/10/03 12:00:57 ianmacd Exp $
 #++
 #
 #
@@ -120,15 +120,15 @@
 #
 # == Download
 #
-# Version 0.4.3
-# === {gzip'ed tar archive}[http://www.caliban.org/files/ruby/ruby-aws-0.4.3.tar.gz]
-# === {Ruby Gem}[http://www.caliban.org/files/ruby/ruby-aaws-0.4.3.gem]
-# === {Fedora 9 RPM}[http://www.caliban.org/files/redhat/RPMS/noarch/ruby-aws-0.4.3-1.fc9.noarch.rpm]
-# === {Fedora 9 doc RPM}[http://www.caliban.org/files/redhat/RPMS/noarch/ruby-aws-doc-0.4.3-1.fc9.noarch.rpm]
-# === {Fedora 9 source RPM}[http://www.caliban.org/files/redhat/SRPMS/ruby-aws-0.4.3-1.fc9.src.rpm]
+# Version 0.4.4
+# === {gzip'ed tar archive}[http://www.caliban.org/files/ruby/ruby-aws-0.4.4.tar.gz]
+# === {Ruby Gem}[http://www.caliban.org/files/ruby/ruby-aaws-0.4.4.gem]
+# === {Fedora 9 RPM}[http://www.caliban.org/files/redhat/RPMS/noarch/ruby-aws-0.4.4-1.fc9.noarch.rpm]
+# === {Fedora 9 doc RPM}[http://www.caliban.org/files/redhat/RPMS/noarch/ruby-aws-doc-0.4.4-1.fc9.noarch.rpm]
+# === {Fedora 9 source RPM}[http://www.caliban.org/files/redhat/SRPMS/ruby-aws-0.4.4-1.fc9.src.rpm]
 # 
 # 
 # ---
 # Author::   Ian Macdonald <mailto:ian@caliban.org>
-# Version::  0.4.3
+# Version::  0.4.4
 # Licence::  GPL[http://www.gnu.org/copyleft/gpl.html]

data/lib/amazon.rb

@@ -1,4 +1,4 @@
-# $Id: amazon.rb,v 1.23 2008/09/21 22:24:35 ianmacd Exp $
+# $Id: amazon.rb,v 1.25 2008/10/03 09:35:37 ianmacd Exp $
 #
 
 module Amazon
@@ -83,9 +83,10 @@ module Amazon
 	home = ENV['AMAZONRCDIR'] ||
 	       ENV['HOME'] || ENV['HOMEDRIVE'] + ENV['HOMEPATH'] ||
 	       ENV['USERPROFILE']
+	user_rcfile = ENV['AMAZONRCFILE'] || '.amazonrc'
 
 	if home
-	  config_files << File.expand_path( File.join( '~', '.amazonrc' ) )
+	  config_files << File.expand_path( File.join( home, user_rcfile ) )
 	end
 
 	config_class = File

data/lib/amazon/aws.rb

@@ -1,4 +1,4 @@
-# $Id: aws.rb,v 1.71 2008/09/21 22:28:17 ianmacd Exp $
+# $Id: aws.rb,v 1.72 2008/10/03 09:37:25 ianmacd Exp $
 #
 #:include: ../../README.rdoc
 
@@ -12,7 +12,7 @@ module Amazon
     require 'rexml/document'
 
     NAME = '%s/%s' % [ Amazon::NAME, 'AWS' ]
-    VERSION = '0.4.3'
+    VERSION = '0.4.4'
     USER_AGENT = '%s %s' % [ NAME, VERSION ]
 
     # Default Associate tags to use per locale.

data/test/tc_aws.rb

@@ -1,4 +1,4 @@
-# $Id: tc_aws.rb,v 1.9 2008/09/08 21:23:01 ianmacd Exp $
+# $Id: tc_aws.rb,v 1.11 2008/10/02 21:33:58 ianmacd Exp $
 #
 
 require 'test/unit'
@@ -93,17 +93,36 @@ class TestAWSBasics < AWSTest
   end
 
   def test_config
+    # Test bad quoting.
+    #
     assert_raise( Amazon::Config::ConfigError ) do
       cf = Amazon::Config.new( <<'      EOF' )
       bad_syntax = 'bad quotes"
       EOF
     end
 
+    # Test good quoting.
+    #
     assert_nothing_raised do
       cf = Amazon::Config.new( <<'      EOF' )
       good_syntax = 'good quotes'
       EOF
     end
+
+    # Test that config files are properly read from $AMAZONRC.
+    #
+    Dir.mktmpdir do |td|
+      ENV['AMAZONRCDIR'] = td
+      ENV['AMAZONRCFILE'] = '.user_defined_name'
+      File.open( File.join( td, '.user_defined_name' ), 'w' ) do |tf|
+        tf.puts( 'foo = bar' )
+      end
+
+      cf = Amazon::Config.new
+      assert_equal( 'bar', cf['foo'] )
+      ENV['AMAZONRCDIR'] = nil
+      ENV['AMAZONRCFILE'] = nil
+    end
   end
 
   def test_exceptions

metadata

@@ -1,33 +1,29 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: ruby-aaws
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
-date: 2008-09-22 00:00:00 +02:00
-summary: Ruby interface to Amazon Associates Web Services
-require_paths: 
-- lib
-email: ian@caliban.org
-homepage: 
-rubyforge_project: 
-description: 
-autorequire: amazon/aws/search
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.8.6
-  version: 
+  version: 0.4.4
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Ian Macdonald
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-10-03 00:00:00 +02:00
+default_executable: 
+dependencies: []
+
+description: 
+email: ian@caliban.org
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- COPYING
+- NEWS
+- README
+- README.rdoc
 files: 
 - example/customer_content_lookup1
 - example/browse_node_lookup1
@@ -68,6 +64,32 @@ files:
 - NEWS
 - README
 - README.rdoc
+has_rdoc: true
+homepage: http://www.caliban.org/ruby/ruby-aws/
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: 1.8.6
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: Ruby/(A)AWS
+rubygems_version: 1.2.0
+signing_key: 
+specification_version: 2
+summary: Ruby interface to Amazon Associates Web Services
 test_files: 
 - test/tc_amazon.rb
 - test/setup.rb
@@ -78,18 +100,3 @@ test_files:
 - test/tc_shopping_cart.rb
 - test/ts_aws.rb
 - test/tc_serialisation.rb
-rdoc_options: []
-
-extra_rdoc_files: 
-- COPYING
-- NEWS
-- README
-- README.rdoc
-executables: []
-
-extensions: []
-
-requirements: []
-
-dependencies: []
-