sdbcli 1.1.4 → 1.2.0

data/README

@@ -70,7 +70,7 @@ https://bitbucket.org/winebarrel/sdbcli
   DELETE [attr1, ...] FROM domain_name WHERE [WHERE expression] [sort_instructions] [LIMIT limit]
     deletes the attribute of an item or an item
   
-  SELECT output_list FROM domain_name [WHERE expression] [sort_instructions] [LIMIT limit]
+  SELECT output_list FROM domain_name [WHERE expression] [sort_instructions] [LIMIT limit] [ | ruby script ]
     queries using the SELECT statement
     see http://docs.aws.amazon.com/AmazonSimpleDB/latest/DeveloperGuide/UsingSelect.html
   
@@ -134,3 +134,26 @@ see http://docs.amazonwebservices.com/AmazonSimpleDB/latest/DeveloperGuide/Quoti
   // 7500 rows was inputted...
 
 If '-' is specified as a file name, the input/output of data will become a standard input/output.
+
+== Pipe to ruby
+
+  ap-northeast-1> select * from employees limit 3;
+  ---
+  - ["100000", {first_name: Hiroyasu, hire_date: "1991-07-02", birth_date: "1956-01-11", last_name: Emden}]
+  - ["100001", {first_name: Jasminko, hire_date: "1994-12-25", birth_date: "1953-02-07", last_name: Antonakopoulos}]
+  - ["100002", {first_name: Claudi, hire_date: "1988-02-20", birth_date: "1957-03-04", last_name: Kolinko}]
+  # 3 rows in set
+  
+  ap-northeast-1> select * from employees limit 3 | hire_date.max;
+  --- "1994-12-25"
+  
+  ap-northeast-1> select * from employees limit 3 | hire_date.to_i;
+  ---
+  - 1991
+  - 1994
+  - 1988
+  # 3 rows in set
+  ap-northeast-1> select * from employees limit 3 | hire_date.to_f.avg;
+  --- 1991.0
+
+'sum' method and 'avg' method are added to the Array class.

data/bin/sdbcli

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 
-Version = '1.1.4'
+Version = '1.2.0'
 HISTORY_FILE = File.join((ENV['HOME'] || ENV['USERPROFILE'] || '.'), '.sdbcli_history')
 HISTSIZE = 500
 SELECT_LIMIT = 2500
@@ -16,6 +16,7 @@ require 'strscan'
 require 'syck' if /\A1\.9/ =~ RUBY_VERSION
 require 'yaml'
 require 'json'
+require 'time'
 
 access_key_id     = ENV['AWS_ACCESS_KEY_ID']
 secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
@@ -72,7 +73,7 @@ def execute(src, show_rows = false)
   buf = ''
 
   until ss.eos?
-    if (tok = ss.scan %r{[^-`'";\\/#]+})
+    if (tok = ss.scan %r{[^-`'";\\/#]+}) #'
       buf << tok
     elsif (tok = ss.scan /`(?:[^`]|``)*`/)
       buf << tok
@@ -108,14 +109,15 @@ def execute(src, show_rows = false)
         out = $runner.execute(query, inline, $consistent)
       end
 
-      if out.kind_of?(Integer)
+      if out.kind_of?(SimpleDB::Runner::Rownum)
+        rownum = out.to_i
         puts case $format
              when :yaml
-               "# #{out} #{out > 1 ? 'rows' : 'row'} changed"
+               "# #{rownum} #{rownum > 1 ? 'rows' : 'row'} changed"
              when :json
-               "// #{out} #{out > 1 ? 'rows' : 'row'} changed"
+               "// #{rownum} #{rownum > 1 ? 'rows' : 'row'} changed"
              else
-               "# #{out} #{out > 1 ? 'rows' : 'row'} changed"
+               "# #{rownum} #{rownum > 1 ? 'rows' : 'row'} changed"
              end
       elsif out
         str = nil
@@ -374,6 +376,7 @@ DELETE [attr1, ...] FROM domain_name WHERE [WHERE expression] [sort_instructions
   deletes the attribute of an item or an item
 
 SELECT output_list FROM domain_name [WHERE expression] [sort_instructions] [LIMIT limit]
+SELECT output_list FROM domain_name [WHERE expression] [sort_instructions] [LIMIT limit] [ | ruby script ]
   queries using the SELECT statement
   see http://docs.aws.amazon.com/AmazonSimpleDB/latest/DeveloperGuide/UsingSelect.html
 

data/lib/sdbcli/sdb-parser.tab.rb

@@ -13,7 +13,7 @@ module SimpleDB
 
 class Parser < Racc::Parser
 
-module_eval(<<'...end sdb-parser.y/module_eval...', 'sdb-parser.y', 228)
+module_eval(<<'...end sdb-parser.y/module_eval...', 'sdb-parser.y', 249)
 
 KEYWORDS = %w(
   ADD
@@ -609,82 +609,103 @@ module_eval(<<'.,.,', 'sdb-parser.y', 162)
 
 module_eval(<<'.,.,', 'sdb-parser.y', 168)
   def _reduce_41(val, _values)
-                      struct(:SELECT, :query => val[0])
+                      query = ''
+                  ruby = nil
+
+                  ss = StringScanner.new(val[0])
+
+                  until ss.eos?
+                    if (tok = ss.scan %r{[^-`'";\\/#|]+}) #'
+                      query << tok
+                    elsif (tok = ss.scan /`(?:[^`]|``)*`/)
+                      query << tok
+                    elsif (tok = ss.scan /'(?:[^']|'')*'/) #'
+                      query << tok
+                    elsif (tok = ss.scan /"(?:[^"]|"")*"/) #"
+                      query << tok
+                    elsif (tok = ss.scan /\|/)
+                      ruby = ss.scan_until(/\Z/)
+                    elsif (tok = ss.scan /./)
+                      query << tok
+                    end
+                  end
+
+                  struct(:SELECT, :query => query, :ruby => ruby)
                 
   end
 .,.,
 
-module_eval(<<'.,.,', 'sdb-parser.y', 173)
+module_eval(<<'.,.,', 'sdb-parser.y', 194)
   def _reduce_42(val, _values)
                       struct(:CREATE, :domain => val[2])
                 
   end
 .,.,
 
-module_eval(<<'.,.,', 'sdb-parser.y', 178)
+module_eval(<<'.,.,', 'sdb-parser.y', 199)
   def _reduce_43(val, _values)
                     struct(:DROP, :domain => val[2])
               
   end
 .,.,
 
-module_eval(<<'.,.,', 'sdb-parser.y', 183)
+module_eval(<<'.,.,', 'sdb-parser.y', 204)
   def _reduce_44(val, _values)
                     struct(:SHOW, :operand => :domains)
               
   end
 .,.,
 
-module_eval(<<'.,.,', 'sdb-parser.y', 187)
+module_eval(<<'.,.,', 'sdb-parser.y', 208)
   def _reduce_45(val, _values)
                     struct(:SHOW, :operand => :regions)
               
   end
 .,.,
 
-module_eval(<<'.,.,', 'sdb-parser.y', 191)
+module_eval(<<'.,.,', 'sdb-parser.y', 212)
   def _reduce_46(val, _values)
                    struct(:USE, :endpoint => val[1])
              
   end
 .,.,
 
-module_eval(<<'.,.,', 'sdb-parser.y', 195)
+module_eval(<<'.,.,', 'sdb-parser.y', 216)
   def _reduce_47(val, _values)
                     struct(:DESCRIBE, :domain => val[1])
               
   end
 .,.,
 
-module_eval(<<'.,.,', 'sdb-parser.y', 199)
+module_eval(<<'.,.,', 'sdb-parser.y', 220)
   def _reduce_48(val, _values)
                     struct(:DESCRIBE, :domain => val[1])
               
   end
 .,.,
 
-module_eval(<<'.,.,', 'sdb-parser.y', 204)
+module_eval(<<'.,.,', 'sdb-parser.y', 225)
   def _reduce_49(val, _values)
                          [val[0]]
                    
   end
 .,.,
 
-module_eval(<<'.,.,', 'sdb-parser.y', 208)
+module_eval(<<'.,.,', 'sdb-parser.y', 229)
   def _reduce_50(val, _values)
                          val[0] + [val[2]]
                    
   end
 .,.,
 
-module_eval(<<'.,.,', 'sdb-parser.y', 213)
+module_eval(<<'.,.,', 'sdb-parser.y', 234)
   def _reduce_51(val, _values)
                      [val[0]]
                
   end
 .,.,
 
-module_eval(<<'.,.,', 'sdb-parser.y', 217)
+module_eval(<<'.,.,', 'sdb-parser.y', 238)
   def _reduce_52(val, _values)
                      [val[0], val[2]].flatten
                

data/lib/sdbcli/sdb-parser.y

@@ -166,7 +166,28 @@ rule
 
   select_stmt : SELECT
                 {
-                  struct(:SELECT, :query => val[0])
+                  query = ''
+                  ruby = nil
+
+                  ss = StringScanner.new(val[0])
+
+                  until ss.eos?
+                    if (tok = ss.scan %r{[^-`'";\\/#|]+}) #'
+                      query << tok
+                    elsif (tok = ss.scan /`(?:[^`]|``)*`/)
+                      query << tok
+                    elsif (tok = ss.scan /'(?:[^']|'')*'/) #'
+                      query << tok
+                    elsif (tok = ss.scan /"(?:[^"]|"")*"/) #"
+                      query << tok
+                    elsif (tok = ss.scan /\|/)
+                      ruby = ss.scan_until(/\Z/)
+                    elsif (tok = ss.scan /./)
+                      query << tok
+                    end
+                  end
+
+                  struct(:SELECT, :query => query, :ruby => ruby)
                 }
 
   create_stmt : CREATE DOMAIN IDENTIFIER

data/lib/sdbcli/sdb-runner.rb

@@ -1,6 +1,29 @@
 require 'sdbcli/sdb-driver'
 require 'sdbcli/sdb-parser.tab'
 
+# XXX:
+class Array
+  def to_s
+    self.map {|i| i.to_s }
+  end
+
+  def to_i
+    self.map {|i| i.to_i }
+  end
+
+  def to_f
+    self.map {|i| i.to_f }
+  end
+
+  def sum
+    self.inject {|r, i| r + i }
+  end
+
+  def avg
+    self.sum / self.length
+  end
+end
+
 module SimpleDB
   class Error < StandardError; end
 
@@ -16,6 +39,16 @@ module SimpleDB
     }
 
   class Runner
+    class Rownum
+      def initialize(rownum)
+        @rownum = rownum
+      end
+
+      def to_i
+        @rownum
+      end
+    end
+
     attr_reader :driver
 
     def initialize(accessKeyId, secretAccessKey, endpoint = 'sdb.amazonaws.com')
@@ -60,43 +93,69 @@ module SimpleDB
       when :INSERT
         rownum = parsed.items.length
         @driver.insert(parsed.domain, parsed.items)
-        rownum
+        Rownum.new(rownum)
       when :UPDATE
         rownum = parsed.items.length
         @driver.update(parsed.domain, parsed.items)
-        rownum
+        Rownum.new(rownum)
       when :UPDATE_WITH_EXPR
         query = "SELECT itemName FROM #{parsed.domain} #{parsed.expr}"
         items = @driver.select(query, consistent).map {|i| [i[0], parsed.attrs] }
         rownum = items.length
         @driver.update(parsed.domain, items)
-        rownum
+        Rownum.new(rownum)
       when :MERGE
         rownum = parsed.items.length
         @driver.insert(parsed.domain, parsed.items)
-        rownum
+        Rownum.new(rownum)
       when :MERGE_WITH_EXPR
         query = "SELECT itemName FROM #{parsed.domain} #{parsed.expr}"
         items = @driver.select(query, consistent).map {|i| [i[0], parsed.attrs] }
         rownum = items.length
         @driver.insert(parsed.domain, items)
-        rownum
+        Rownum.new(rownum)
       when :DELETE
         rownum = parsed.items.length
         @driver.delete(parsed.domain, parsed.items)
-        rownum
+        Rownum.new(rownum)
       when :DELETE_WITH_EXPR
         query = "SELECT itemName FROM #{parsed.domain} #{parsed.expr}"
         items = @driver.select(query, consistent).map {|i| [i[0], parsed.attrs] }
         rownum = items.length
         @driver.delete(parsed.domain, items)
-        rownum
+        Rownum.new(rownum)
       when :SELECT
         items = @driver.select(parsed.query, consistent)
 
-        if inline
+        def items.method_missing(method_name)
+          case method_name.to_s
+          when /itemName/i
+            self.map {|i| i[0] }
+          else
+            self.map {|i| i[1][method_name.to_s] }
+          end
+        end
+
+        items.each do |item|
+          def item.method_missing(method_name)
+            case method_name.to_s
+            when /itemName/i
+              self[0]
+            else
+              self[1][method_name.to_s]
+            end
+          end
+        end
+
+        if parsed.ruby
+          items = items.instance_eval(parsed.ruby.strip)
+        end
+
+        if inline and items.kind_of?(Array)
           items.each do |item|
-            def item.to_yaml_style; :inline; end
+            if item.kind_of?(Array)
+              def item.to_yaml_style; :inline; end
+            end
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sdbcli
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors: