sdbcli 0.1.6 → 0.1.7

data/README

@@ -47,6 +47,10 @@ 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.
+You must quote all other attribute and domain names with the backtick (`).
+see http://docs.amazonwebservices.com/AmazonSimpleDB/latest/DeveloperGuide/QuotingRulesSelect.html
   
   ap-northeast-1> select * from test \G
   ---

data/bin/sdbcli

@@ -1,103 +1,127 @@
-#!/usr/bin/env ruby
-$LOAD_PATH << File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib')
-Version = '0.1.6'
-
-require 'rubygems'
-require 'sdbcli'
-
-require 'optparse'
-require 'readline'
-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'
-
-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.parse!
-
-  unless access_key_id and secret_access_key and sdb_endpoint
-    puts opt.help
-    exit 1
-  end
-end
-
-$runner = SimpleDB::Runner.new(access_key_id, secret_access_key, sdb_endpoint)
-
-def execute(query)
-  query = query.strip.sub(/\s*;\Z/, '')
-  inline = true
-
-  if query =~ /\s*\\G\Z/i
-    query = query.sub(/\s*\\G\Z/i, '')
-    inline = false
-  end
-
-  out = $runner.execute(query, inline)
-
-  if out
-    out = YAML.dump(out)
-    out << "\n" unless out =~ /\n\n\Z/
-    puts out
-  end
-end
-
-unless $stdin.tty?
-  execute($stdin.read)
-  exit 0
-end
-
-if sdb_endpoint =~ /sdb\.([^.]+)\.amazonaws\.com/
-  region = $1
-else
-  region = 'us-east-1'
-end
-
-def help
-  <<-EOS
-SHOW domains
-  displays a domain list
-
-CREATE domain domain_name
-  creates a domain
-
-DROP DOMAIN domain_name
-  deletes a domain
-
-GET [attr_list] FROM domain_name WHERE itemName = '...'
-  gets the attribute of an item
-
-INSERT INTO domain_name (itemName, attr1, ...) values ('name', 'val1', ...)
-  creates an item
-
-UPDATE domain_name set attr1 = 'val1', ... where itemName = '...'
-  updates an item
-
-DELETE [attr1, ...] FROM domain_name itemName = '...'
-  deletes the attribute of an item or an item
-
-SELECT output_list FROM domain_name [where expression] [sort_instructions] [limit limit]
-  queries using the SELECT statement
-
-    EOS
-end
-
-while buf = Readline.readline("#{region}> ", true)
-  begin
-    case buf.downcase
-    when 'help'
-      puts help
-    when 'exit', 'quit'
-      exit
-    when 'version'
-      puts "sdbcli #{Version}"
-    else
-      execute(buf)
-    end
-  rescue => e
-    puts e.message.strip
-  end
-end
+#!/usr/bin/env ruby
+$LOAD_PATH << File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib')
+
+Version = '0.1.6'
+HISTORY_FILE = File.join((ENV['HOME'] || ENV['USERPROFILE'] || '.'), '.sdbcli_history')
+
+require 'rubygems'
+require 'sdbcli'
+
+require 'optparse'
+require 'readline'
+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'
+
+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.parse!
+
+  unless access_key_id and secret_access_key and sdb_endpoint
+    puts opt.help
+    exit 1
+  end
+end
+
+$runner = SimpleDB::Runner.new(access_key_id, secret_access_key, sdb_endpoint)
+
+def execute(query)
+  query = query.strip.sub(/\s*;\Z/, '')
+  inline = true
+
+  if query =~ /\s*\\G\Z/i
+    query = query.sub(/\s*\\G\Z/i, '')
+    inline = false
+  end
+
+  out = $runner.execute(query, inline)
+
+  if out
+    out = YAML.dump(out)
+    out << "\n" unless out =~ /\n\n\Z/
+    puts out
+  end
+end
+
+unless $stdin.tty?
+  execute($stdin.read)
+  exit 0
+end
+
+if sdb_endpoint =~ /sdb\.([^.]+)\.amazonaws\.com/
+  region = $1
+else
+  region = 'us-east-1'
+end
+
+def help
+  <<-EOS
+SHOW domains
+  displays a domain list
+
+CREATE domain domain_name
+  creates a domain
+
+DROP DOMAIN domain_name
+  deletes a domain
+
+GET [attr_list] FROM domain_name WHERE itemName = '...'
+  gets the attribute of an item
+
+INSERT INTO domain_name (itemName, attr1, ...) values ('name', 'val1', ...)
+  creates an item
+
+UPDATE domain_name set attr1 = 'val1', ... where itemName = '...'
+  updates an item
+
+DELETE [attr1, ...] FROM domain_name itemName = '...'
+  deletes the attribute of an item or an item
+
+SELECT output_list FROM domain_name [where expression] [sort_instructions] [limit limit]
+  queries using the SELECT statement
+
+    EOS
+end
+
+if File.exist?(HISTORY_FILE)
+  open(HISTORY_FILE) do |f|
+    f.each_line do |line|
+      line = line.strip
+      Readline::HISTORY.push(line) unless line.empty?
+    end
+  end
+end
+
+at_exit do
+  unless Readline::HISTORY.empty?
+    open(HISTORY_FILE, 'a') do |f|
+      Readline::HISTORY.each do |line|
+        line = line.strip
+        f.puts line
+      end
+    end
+  end
+end
+
+while buf = Readline.readline("#{region}> ", true)
+  Readline::HISTORY.pop if /\A\s*\Z/ =~ buf
+
+  begin
+    case buf.downcase
+    when 'help'
+      puts help
+    when 'exit', 'quit'
+      exit
+    when 'version'
+      puts "sdbcli #{Version}"
+    else
+      execute(buf)
+    end
+  rescue => e
+    puts e.message.strip
+  end
+end

data/lib/sdbcli/sdb-driver.rb

@@ -4,6 +4,8 @@ module SimpleDB
   class Error < StandardError; end
 
   class Driver
+    attr_accessor :iteratable
+
     def initialize(accessKeyId, secretAccessKey, endpoint = 'sdb.amazonaws.com')
       @client = Client.new(accessKeyId, secretAccessKey, endpoint)
     end
@@ -157,7 +159,12 @@ module SimpleDB
           @params.update(:NextToken => @token.content) if @token != :first
           doc = @client.send(@method, @params)
           yield(doc)
-          @token = doc.at_css('NextToken')
+
+          if @iteratable
+            @token = doc.at_css('NextToken')
+          else
+            @token = nil
+          end
         end
       end
     end # Iterator

metadata

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