sdbcli 0.2.1 → 0.2.2

data/README

@@ -13,7 +13,7 @@ https://bitbucket.org/winebarrel/sdbcli
   shell> gem install sdbcli
   shell> export AWS_ACCESS_KEY_ID='...'
   shell> export AWS_SECRET_ACCESS_KEY='...'
-  shell> export SDB_ENDPOINT='sdb.ap-northeast-1.amazonaws.com'
+  shell> export SDB_ENDPOINT='sdb.ap-northeast-1.amazonaws.com' # or REGION_NAME=ap-northeast-1
   shell> sdbcli
 
 == Example
@@ -43,12 +43,12 @@ https://bitbucket.org/winebarrel/sdbcli
   SELECT output_list FROM domain_name [where expression] [sort_instructions] [limit limit]
     queries using the SELECT statement
   
-  ap-northeast-1> select * from test
+  ap-northeast-1> select * from test;
   ---
   - [itemname1, {attr1: val1, attr2: val2}]
   - [itemname2, {attr1: val1, attr2: val2}]
 
-  ap-northeast-1> select * from `test-2`
+  ap-northeast-1> select * from `test-2`;
   ---
   - [itemname1, {attr1: val1, attr2: val2}]
   - [itemname2, {attr1: val1, attr2: val2}]

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.1'
+Version = '0.2.2'
 HISTORY_FILE = File.join((ENV['HOME'] || ENV['USERPROFILE'] || '.'), '.sdbcli_history')
 
 require 'rubygems'
@@ -9,11 +9,16 @@ require 'sdbcli'
 
 require 'optparse'
 require 'readline'
+require 'strscan'
 require 'yaml'
 
 access_key_id     = ENV['AWS_ACCESS_KEY_ID']
 secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
-sdb_endpoint      = ENV['SDB_ENDPOINT'] || 'sdb.amazonaws.com'
+sdb_endpoint      = ENV['SDB_ENDPOINT'] || ENV['REGION_NAME'] || 'sdb.amazonaws.com'
+
+if /\A[^.]+\Z/ =~ sdb_endpoint
+  sdb_endpoint = "sdb.#{sdb_endpoint}.amazonaws.com"
+end
 
 ARGV.options do |opt|
   opt.on('-k', '--access-key=ACCESS_KEY') {|v| access_key_id = v }
@@ -29,33 +34,59 @@ end
 
 $runner = SimpleDB::Runner.new(access_key_id, secret_access_key, sdb_endpoint)
 
-def execute(query)
-  query = query.strip.sub(/\s*;\Z/, '')
-  inline = true
+def output_error(msg)
+  $stderr.puts "ERROR: #{msg}"
+end
+
+def execute(src)
+  ss = StringScanner.new(src.dup)
 
-  if query =~ /\s*\\G\Z/i
-    query = query.sub(/\s*\\G\Z/i, '')
-    inline = false
-  end
+  while query = ss.scan_until(/(?:;|\\G)/i)
+    src.replace(ss.rest.strip)
+    query.strip!
+
+    if query =~ /\s*\\G\Z/i
+      query = query.sub(/\s*\\G\Z/i, '')
+      inline = false
+    else
+      query = query.strip.sub(/\s*;\Z/, '')
+      inline = true
+    end
+
+    if query.empty?
+      output_error('No query specified')
+      next
+    end
 
-  out = $runner.execute(query, inline)
+    out = $runner.execute(query, inline)
 
-  if out
-    out = YAML.dump(out)
-    out << "\n" unless out =~ /\n\n\Z/
-    puts out
+    if out
+      out = YAML.dump(out)
+      out << "\n" unless out =~ /\n\n\Z/
+      puts out
+    end
   end
+
+  ss.rest.strip
 end
 
 unless $stdin.tty?
-  queries = $stdin.read
+  src = $stdin.read.strip
 
-  queries.split(';').each do |query|
-    next if /\A\s*\Z/ =~ query
-    execute(query)
+  unless src =~ /\s*(?:;|\\G)\Z/i
+    src << ';'
   end
 
-  exit 0
+  begin
+    execute(src)
+    exit 0
+  rescue Racc::ParseError
+    output_error 'Parse error'
+    exit 1
+  rescue => e
+    output_error e.message.strip
+    exit 1
+  end
 end
 
 def help
@@ -98,7 +129,7 @@ end
 
 at_exit do
   unless Readline::HISTORY.empty?
-    open(HISTORY_FILE, 'a') do |f|
+    open(HISTORY_FILE, 'wb') do |f|
       Readline::HISTORY.each do |line|
         next if /\A\s*\Z/ =~ line
         f.puts line
@@ -107,24 +138,42 @@ at_exit do
   end
 end
 
-while buf = Readline.readline("#{$runner.region || 'unknown'}> ", true)
+src = ''
+region = $runner.region || 'unknown'
+prompt1 = "#{region}> "
+prompt2 = "#{' ' * (region.length - 1)}-> "
+prompt = prompt1
+
+while buf = Readline.readline(prompt, true)
   if /\A\s*\Z/ =~ buf
     Readline::HISTORY.pop
     next
   end
 
-  begin
-    case buf.downcase
-    when 'help'
+  if src.empty? and buf =~ /\A\.(.+)/
+    r = /\A#{Regexp.compile($1.downcase)}/
+
+    if r =~ 'help'
       puts help
-    when 'exit', 'quit'
+    elsif r =~ 'exit' or r =~ 'quit'
       exit
-    when 'version'
+    elsif r =~ 'version'
       puts "sdbcli #{Version}"
     else
-      execute(buf)
+      output_error('Unknown command')
     end
-  rescue => e
-    puts e.message.strip
+  else
+    rv = nil
+
+    begin
+      src << (' ' + buf)
+      execute(src)
+    rescue Racc::ParseError
+      output_error 'Parse error'
+    rescue => e
+      output_error e.message.strip
+    end
+
+    prompt = src.empty? ? prompt1 : prompt2
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sdbcli
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - winebarrel
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-17 00:00:00 +09:00
-default_executable: 
+date: 2013-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.5.3
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: sdbcli is an interactive command-line client of Amazon SimpleDB.