sdbcli 0.2.5 → 0.2.6

data/bin/sdbcli

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 $LOAD_PATH << File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib')
 
-Version = '0.2.5'
+Version = '0.2.6'
 HISTORY_FILE = File.join((ENV['HOME'] || ENV['USERPROFILE'] || '.'), '.sdbcli_history')
 
 require 'rubygems'
@@ -16,18 +16,10 @@ access_key_id     = ENV['AWS_ACCESS_KEY_ID']
 secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
 sdb_endpoint      = ENV['SDB_ENDPOINT'] || ENV['REGION_NAME'] || 'sdb.amazonaws.com'
 
-if /\A[^.]+\Z/ =~ sdb_endpoint
-  if sdb_endpoint == 'us-east-1'
-    sdb_endpoint = 'sdb.amazonaws.com'
-  else
-    sdb_endpoint = "sdb.#{sdb_endpoint}.amazonaws.com"
-  end
-end
-
 ARGV.options do |opt|
   opt.on('-k', '--access-key=ACCESS_KEY') {|v| access_key_id = v }
   opt.on('-s', '--secret-key=SECRET_KEY') {|v| secret_access_key = v }
-  opt.on('-e', '--endpoint=ENDPOINT') {|v| sdb_endpoint = v }
+  opt.on('-e', '--endpoint=ENDPOINT_OR_REGION') {|v| sdb_endpoint = v }
   opt.parse!
 
   unless access_key_id and secret_access_key and sdb_endpoint
@@ -36,6 +28,14 @@ ARGV.options do |opt|
   end
 end
 
+if /\A[^.]+\Z/ =~ sdb_endpoint
+  if sdb_endpoint == 'us-east-1'
+    sdb_endpoint = 'sdb.amazonaws.com'
+  else
+    sdb_endpoint = "sdb.#{sdb_endpoint}.amazonaws.com"
+  end
+end
+
 $runner = SimpleDB::Runner.new(access_key_id, secret_access_key, sdb_endpoint)
 
 def output_error(msg)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sdbcli
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - winebarrel