sdbcli 1.0.0 → 1.0.1

data/README

@@ -18,6 +18,7 @@ https://bitbucket.org/winebarrel/sdbcli
       -r, --region=REGION
       -e, --eval=COMMAND
       -f, --format=YAML_OR_JSON
+      -c, --consistent
   shell> export AWS_ACCESS_KEY_ID='...'
   shell> export AWS_SECRET_ACCESS_KEY='...'
   shell> export SDB_ENDPOINT='sdb.ap-northeast-1.amazonaws.com' # or SDB_REGION=ap-northeast-1
@@ -76,10 +77,11 @@ https://bitbucket.org/winebarrel/sdbcli
   
   # List of commands
   
-  .help                 displays this message
-  .quit | .exit         exits sdbcli
-  .format (yaml|json)?  displays a format or changes it
-  .version              displays a version
+  .help                      displays this message
+  .quit | .exit              exits sdbcli
+  .format     (yaml|json)?   displays a format or changes it
+  .consistent (true|false)?  displays ConsistentRead parameter or changes it
+  .version                   displays a version
   
   ap-northeast-1> select * from test;
   ---

data/bin/sdbcli

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 
-Version = '1.0.0'
+Version = '1.0.1'
 HISTORY_FILE = File.join((ENV['HOME'] || ENV['USERPROFILE'] || '.'), '.sdbcli_history')
 HISTSIZE = 500
 
@@ -20,6 +20,7 @@ secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
 sdb_endpoint      = ENV['SDB_ENDPOINT'] || ENV['SDB_REGION'] || 'sdb.amazonaws.com'
 command = nil
 $format = :yaml
+$consistent = false
 
 ARGV.options do |opt|
   opt.on('-k', '--access-key=ACCESS_KEY') {|v| access_key_id = v }
@@ -27,6 +28,7 @@ ARGV.options do |opt|
   opt.on('-r', '--region=REGION') {|v| sdb_endpoint = v }
   opt.on('-e', '--eval=COMMAND') {|v| command = v }
   opt.on('-f', '--format=YAML_OR_JSON', [:yaml, :json]) {|v| $format = v }
+  opt.on('-c', '--consistent') { $consistent = true }
   opt.parse!
 
   unless access_key_id and secret_access_key and sdb_endpoint
@@ -85,7 +87,7 @@ def execute(src, show_rows = false)
         next
       end
 
-      out = $runner.execute(query, inline)
+      out = $runner.execute(query, inline, $consistent)
 
       if out.kind_of?(Integer)
         puts case $format
@@ -196,10 +198,11 @@ USE region_or_endpoint
 
 # List of commands
 
-.help                 displays this message
-.quit | .exit         exits sdbcli
-.format (yaml|json)?  displays a format or changes it
-.version              displays a version
+.help                      displays this message
+.quit | .exit              exits sdbcli
+.format     (yaml|json)?   displays a format or changes it
+.consistent (true|false)?  displays ConsistentRead parameter or changes it
+.version                   displays a version
 
     EOS
 end
@@ -254,6 +257,17 @@ while buf = Readline.readline(prompt, true)
       else
         output_error('Unknown format')
       end
+    elsif r =~ 'consistent'
+      case (arg || '').strip
+      when ''
+        puts $consistent
+      when 'true'
+        $consistent = true
+      when 'false'
+        $consistent = false
+      else
+        output_error('Invalid argument')
+      end
     elsif r =~ 'version'
       puts "sdbcli #{Version}"
     else

data/lib/sdbcli/sdb-driver.rb

@@ -44,9 +44,9 @@ module SimpleDB
 
     # attr action
 
-    def insert(domain_name, items = {}, consistent = false)
+    def insert(domain_name, items = {})
       until (chunk = items.slice!(0, MAX_NUMBER_SUBMITTED_ITEMS)).empty?
-        params = {:ConsistentRead => consistent}
+        params = {}
         i = j = 0
 
         chunk.each do |item_name, attrs|
@@ -67,9 +67,9 @@ module SimpleDB
       end
     end
 
-    def update(domain_name, items = {}, consistent = false)
+    def update(domain_name, items = {})
       until (chunk = items.slice!(0, MAX_NUMBER_SUBMITTED_ITEMS)).empty?
-        params = {:ConsistentRead => consistent}
+        params = {}
         i = j = 0
 
         chunk.each do |item_name, attrs|
@@ -110,9 +110,8 @@ module SimpleDB
       return items
     end
 
-    def delete(domain_name, items = {}, consistent = false)
+    def delete(domain_name, items = {})
       until (chunk = items.slice!(0, MAX_NUMBER_SUBMITTED_ITEMS)).empty?
-        params = {:ConsistentRead => consistent}
         i = j = 0
 
         chunk.each do |item_name, attrs|

data/lib/sdbcli/sdb-runner.rb

@@ -34,13 +34,13 @@ module SimpleDB
       REGIONS[endpoint]
     end
 
-    def execute(query, inline = true)
+    def execute(query, inline = true, consistent = false)
       parsed = Parser.parse(query)
       command = parsed.class.name.split('::').last.to_sym
 
       case command
       when :GET
-        item = @driver.get(parsed.domain, parsed.item_name, parsed.attr_names)
+        item = @driver.get(parsed.domain, parsed.item_name, parsed.attr_names, consistent)
 
         if inline
           def item.to_yaml_style; :inline; end
@@ -57,7 +57,7 @@ module SimpleDB
         rownum
       when :UPDATE_WITH_EXPR
         query = "SELECT itemName FROM #{parsed.domain} #{parsed.expr}"
-        items = @driver.select(query).map {|i| [i[0], parsed.attrs] }
+        items = @driver.select(query, consistent).map {|i| [i[0], parsed.attrs] }
         rownum = items.length
         @driver.update(parsed.domain, items)
         rownum
@@ -67,7 +67,7 @@ module SimpleDB
         rownum
       when :MERGE_WITH_EXPR
         query = "SELECT itemName FROM #{parsed.domain} #{parsed.expr}"
-        items = @driver.select(query).map {|i| [i[0], parsed.attrs] }
+        items = @driver.select(query, consistent).map {|i| [i[0], parsed.attrs] }
         rownum = items.length
         @driver.insert(parsed.domain, items)
         rownum
@@ -77,12 +77,12 @@ module SimpleDB
         rownum
       when :DELETE_WITH_EXPR
         query = "SELECT itemName FROM #{parsed.domain} #{parsed.expr}"
-        items = @driver.select(query).map {|i| [i[0], parsed.attrs] }
+        items = @driver.select(query, consistent).map {|i| [i[0], parsed.attrs] }
         rownum = items.length
         @driver.delete(parsed.domain, items)
         rownum
       when :SELECT
-        items = @driver.select(parsed.query)
+        items = @driver.select(parsed.query, consistent)
 
         if inline
           items.each do |item|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sdbcli
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-01 00:00:00.000000000 Z
+date: 2013-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri