sdbcli 0.3.0 → 0.3.1

data/README

@@ -28,7 +28,7 @@ https://bitbucket.org/winebarrel/sdbcli
 
 == Example
 
-  ap-northeast-1> help
+  ap-northeast-1> .help
   SHOW domains
     displays a domain list
   
@@ -52,15 +52,15 @@ https://bitbucket.org/winebarrel/sdbcli
   
   SELECT output_list FROM domain_name [where expression] [sort_instructions] [limit limit]
     queries using the SELECT statement
-
+  
   DESC domain_name
     displays information about the domain;
-
+  
   ap-northeast-1> select * from test;
   ---
   - [itemname1, {attr1: val1, attr2: val2}]
   - [itemname2, {attr1: val1, attr2: val2}]
-
+  
   ap-northeast-1> select count(*) from `test-2`;
   ---
   - [Domain, {Count: "100"}]
@@ -78,10 +78,8 @@ see http://docs.amazonwebservices.com/AmazonSimpleDB/latest/DeveloperGuide/Quoti
     - itemname2
     - attr1: val1
       attr2: val2
-
-
+  
   shell> echo 'select * from test' | sdbcli
   ---
   - [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.3.0'
+Version = '0.3.1'
 HISTORY_FILE = File.join((ENV['HOME'] || ENV['USERPROFILE'] || '.'), '.sdbcli_history')
 
 require 'rubygems'
@@ -45,7 +45,7 @@ def output_error(msg)
   $stderr.puts "ERROR: #{msg}\n\n"
 end
 
-def execute(src)
+def execute(src, show_rows = false)
   ss = StringScanner.new(src.dup)
 
   while query = ss.scan_until(/(?:;|\\G)/i)
@@ -68,9 +68,14 @@ def execute(src)
     out = $runner.execute(query, inline)
 
     if out
-      out = YAML.dump(out)
-      out << "\n" unless out =~ /\n\n\Z/
-      puts out
+      str = YAML.dump(out).sub(/(?:\r\n|\r|\n)*\Z/, "\n")
+
+      if show_rows and out.kind_of?(Array)
+        str << "# #{out.length} rows in set\n"
+      end
+
+      str << "\n"
+      puts str
     end
   end
 
@@ -177,7 +182,7 @@ while buf = Readline.readline(prompt, true)
 
     begin
       src << (' ' + buf)
-      execute(src)
+      execute(src, true)
     rescue Racc::ParseError
       output_error 'Parse error'
     rescue => e

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sdbcli
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - winebarrel