ddbcli 0.2.5 → 0.2.6

data/README

@@ -35,14 +35,18 @@ https://bitbucket.org/winebarrel/ddbcli
       ...
   shell> ddbcli # show prompt
 
+== Use DynamoDB Local
+
+  ddbcli --uri localhost:8000
+
 == Help
 
   ##### Query #####
   
-  SHOW TABLES
+  SHOW TABLES [LIMIT num] [LIKE '...']
     displays a table list
   
-  SHOW TABLE STATUS
+  SHOW TABLE STATUS [LIKE '...']
     displays table statues
   
   SHOW REGIONS
@@ -69,7 +73,7 @@ https://bitbucket.org/winebarrel/ddbcli
   ALTER TABLE table_name READ = num, WRITE = num
     updates the provisioned throughput
   
-  GET {*|attrs} FROM table_name WHERE key1 = '...' AND ...
+  GET {*|attr1,attr2,...} FROM table_name WHERE key1 = '...' AND ...
     gets items
   
   INSERT INTO table_name (attr1, attr2, ...) VALUES ('val1', 'val2', ...), ('val3', 'val4', ...), ...
@@ -153,10 +157,13 @@ https://bitbucket.org/winebarrel/ddbcli
         ...
   
   
-  ##### Save #####
+  ##### Output to a file #####
+  
+  Overwrite
+    SELECT ALL * FROM employees > 'foo.json';
   
-  SELECT ALL * FROM employees > 'foo.json';
-  SELECT ALL * FROM employees >> 'foo.json';
+  Append
+    SELECT ALL * FROM employees >> 'foo.json';
   
   
   ##### Command #####

data/bin/ddbcli

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 
-Version = '0.2.5'
+Version = '0.2.6'
 
 HISTORY_FILE = File.join((ENV['HOME'] || ENV['USERPROFILE'] || '.'), '.ddbcli_history')
 HISTSIZE = 500
@@ -41,7 +41,7 @@ elsif not $stdin.tty? or options.command
   end
 
   begin
-    evaluate_query(driver, src)
+    evaluate_query(driver, src, :strip => true)
   rescue => e
     print_error(e.message)
     print_error(e.backtrace) if driver.debug

data/lib/ddbcli/cli/evaluate.rb

@@ -34,7 +34,7 @@ def evaluate_query(driver, src, opts = {})
       elapsed = Time.now - start_time
 
       if out.kind_of?(DynamoDB::Driver::Rownum)
-        print_rownum(out, :time => elapsed)
+        print_rownum(out, opts.merge(:time => elapsed))
       elsif out.kind_of?(String)
         puts out
       elsif out

data/lib/ddbcli/cli/functions.rb

@@ -9,7 +9,8 @@ def print_rownum(data, opts = {})
   rownum = data.to_i
   msg = "// #{rownum} #{rownum > 1 ? 'rows' : 'row'} changed"
   msg << " (%.2f sec)" % opts[:time] if opts[:time]
-  msg << "\n\n"
+  msg << "\n"
+  msg << "\n" unless opts[:strip]
   puts msg
 end
 
@@ -61,7 +62,7 @@ def print_json(data, out, opts = {})
     str << "// has more\n"
   end
 
-  str << "\n"
+  str << "\n" unless opts[:strip]
   out.puts(str)
 end
 
@@ -73,7 +74,7 @@ def evaluate_command(driver, cmd_arg)
 
   commands = {
     'help' => lambda {
-      print_help
+      print_help(:pagerize => true)
     },
 
     ['exit', 'quit'] => lambda {

data/lib/ddbcli/cli/help.rb

@@ -4,10 +4,10 @@ def print_help(options = {})
   doc =<<EOS
 ##### Query #####
 
-SHOW TABLES
+SHOW TABLES [LIMIT num] [LIKE '...']
   displays a table list
 
-SHOW TABLE STATUS
+SHOW TABLE STATUS [LIKE '...']
   displays table statues
 
 SHOW REGIONS
@@ -34,7 +34,7 @@ DROP TABLE table_name
 ALTER TABLE table_name READ = num, WRITE = num
   updates the provisioned throughput
 
-GET {*|attrs} FROM table_name WHERE key1 = '...' AND ...
+GET {*|attr1,attr2,...} FROM table_name WHERE key1 = '...' AND ...
   gets items
 
 INSERT INTO table_name (attr1, attr2, ...) VALUES ('val1', 'val2', ...), ('val3', 'val4', ...), ...
@@ -117,10 +117,13 @@ Shell
       {"birth_date"=>"1964-04-30", "emp_no"=>225407,...
       ...
 
-##### Save #####
+##### Output to a file #####
 
-SELECT ALL * FROM employees > 'foo.json';
-SELECT ALL * FROM employees >> 'foo.json';
+Overwrite
+  SELECT ALL * FROM employees > 'foo.json';
+
+Append
+  SELECT ALL * FROM employees >> 'foo.json';
 
 
 ##### Command #####

data/lib/ddbcli/ddb-driver.rb

@@ -3,6 +3,7 @@ require 'ddbcli/ddb-parser.tab'
 require 'ddbcli/ddb-iteratorable'
 
 require 'forwardable'
+require 'strscan'
 
 module DynamoDB
   class Driver
@@ -115,10 +116,10 @@ module DynamoDB
             f.read
           end
         when :overwrite
-          open(script, 'wb') {|f| print_json(retval, f, opts) }
+          open(script, 'wb') {|f| print_json(retval, f, opts.merge(:show_rows => false, :strip => true)) }
           retval = nil
         when :append
-          open(script, 'ab') {|f| print_json(retval, f, opts) }
+          open(script, 'ab') {|f| print_json(retval, f, opts.merge(:show_rows => false, :strip => true)) }
           retval = nil
         else
           retval
@@ -164,10 +165,11 @@ module DynamoDB
     private
 
     def do_show_tables(parsed)
-      do_show_tables0(parsed.limit)
+      do_show_tables0(parsed.like, parsed.limit)
     end
 
-    def do_show_tables0(limit = nil)
+    def do_show_tables0(like, limit = nil)
+      like = like ? like_to_regexp(like) : nil
       req_hash = {}
       table_names = []
 
@@ -190,11 +192,11 @@ module DynamoDB
         end
       end
 
-      return table_names
+      return like ? table_names.select {|i| i =~ like } : table_names
     end
 
     def do_show_table_status(parsed)
-      table_names = do_show_tables0
+      table_names = do_show_tables0(parsed.like)
       h = {}
 
       table_names.map do |table_name|
@@ -851,5 +853,29 @@ module DynamoDB
       end
     end
 
+    def like_to_regexp(like)
+      ss = StringScanner.new(like)
+      tok = nil
+      regexp = ''
+
+      until ss.eos?
+        if (tok = ss.scan /\\\\/)
+          regexp << '\\'
+        elsif (tok = ss.scan /\\%/)
+          regexp << '%'
+        elsif (tok = ss.scan /\\_/)
+          regexp << '_'
+        elsif (tok = ss.scan /%/)
+          regexp << '.*'
+        elsif (tok = ss.scan /_/)
+          regexp << '.'
+        elsif (tok = ss.scan /[^\\%_]+/)
+          regexp << tok
+        end
+      end
+
+      Regexp.compile("\\A#{regexp}\\Z")
+    end
+
   end # Driver
 end # DynamoDB