sdbcli 0.1.9 → 0.2.0

data/README

@@ -48,7 +48,13 @@ https://bitbucket.org/winebarrel/sdbcli
   - [itemname1, {attr1: val1, attr2: val2}]
   - [itemname2, {attr1: val1, attr2: val2}]
 
-Attribute and domain names may appear without quotes if they contain only letters, numbers, underscores (_), or dollar symbols ($) and do not start with a number.
+  ap-northeast-1> select * from `test-2`
+  ---
+  - [itemname1, {attr1: val1, attr2: val2}]
+  - [itemname2, {attr1: val1, attr2: val2}]
+
+Attribute and domain names may appear without quotes if they contain only letters, numbers, underscores (_), 
+or dollar symbols ($) and do not start with a number.
 You must quote all other attribute and domain names with the backtick (`).
 see http://docs.amazonwebservices.com/AmazonSimpleDB/latest/DeveloperGuide/QuotingRulesSelect.html
   

data/bin/sdbcli

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 $LOAD_PATH << File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib')
 
-Version = '0.1.9'
+Version = '0.2.0'
 HISTORY_FILE = File.join((ENV['HOME'] || ENV['USERPROFILE'] || '.'), '.sdbcli_history')
 
 require 'rubygems'
@@ -48,14 +48,14 @@ def execute(query)
 end
 
 unless $stdin.tty?
-  execute($stdin.read)
-  exit 0
-end
+  queries = $stdin.read
 
-if sdb_endpoint =~ /sdb\.([^.]+)\.amazonaws\.com/
-  region = $1
-else
-  region = 'us-east-1'
+  queries.split(';').each do |query|
+    next if /\A\s*\Z/ =~ query
+    execute(query)
+  end
+
+  exit 0
 end
 
 def help
@@ -100,14 +100,14 @@ at_exit do
   unless Readline::HISTORY.empty?
     open(HISTORY_FILE, 'a') do |f|
       Readline::HISTORY.each do |line|
-        line = line.strip
+        next if /\A\s*\Z/ =~ line
         f.puts line
       end
     end
   end
 end
 
-while buf = Readline.readline("#{region}> ", true)
+while buf = Readline.readline("#{$runner.region || 'unknown'}> ", true)
   if /\A\s*\Z/ =~ buf
     Readline::HISTORY.pop
     next

data/lib/sdbcli/sdb-runner.rb

@@ -4,6 +4,16 @@ require 'sdbcli/sdb-parser.tab'
 module SimpleDB
   class Error < StandardError; end
 
+    REGIONS = {
+      'sdb.amazonaws.com'                => 'us-east-1',
+      'sdb.us-west-1.amazonaws.com'      => 'us-west-1',
+      'sdb.us-west-2.amazonaws.com'      => 'us-west-2',
+      'sdb.eu-west-1.amazonaws.com'      => 'eu-west-1',
+      'sdb.ap-southeast-1.amazonaws.com' => 'ap-southeast-1',
+      'sdb.ap-northeast-1.amazonaws.com' => 'ap-northeast-1',
+      'sdb.sa-east-1.amazonaws.com'      => 'sa-east-1',
+    }
+
   class Runner
     def initialize(accessKeyId, secretAccessKey, endpoint = 'sdb.amazonaws.com')
       @driver = Driver.new(accessKeyId, secretAccessKey, endpoint)
@@ -17,6 +27,10 @@ module SimpleDB
       @driver.endpoint = v
     end
 
+    def region
+      REGIONS[endpoint]
+    end
+
     def execute(query, inline = true)
       parsed = Parser.parse(query)
       command = parsed.class.name.split('::').last.to_sym

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sdbcli
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 9
-  version: 0.1.9
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - winebarrel
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-17 00:00:00 +09:00
-default_executable: 
+date: 2012-01-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -49,7 +48,6 @@ files:
 - lib/sdbcli/sdb-parser.y
 - lib/sdbcli/sdb-runner.rb
 - lib/sdbcli.rb
-has_rdoc: true
 homepage: https://bitbucket.org/winebarrel/sdbcli
 licenses: []
 
@@ -79,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: sdbcli is an interactive command-line client of Amazon SimpleDB.