sdbcli 0.1.2 → 0.1.3

data/README

@@ -2,7 +2,7 @@
 
 == Description
 
-sdbcli is interactive command-line client of Amazon SimpleDB.
+sdbcli is an interactive command-line client of Amazon SimpleDB.
 
 == Source Code
 
@@ -47,6 +47,15 @@ https://bitbucket.org/winebarrel/sdbcli
   ---
   - [itemname1, {attr1: val1, attr2: val2}]
   - [itemname2, {attr1: val1, attr2: val2}]
+  ap-northeast-1> select * from test \G
+  ---
+  - - itemname1
+    - attr1: val1
+      attr2: val2
+    - itemname2
+    - attr1: val1
+      attr2: val2
+
 
   shell> echo 'select * from test' | sdbcli
   ---

data/bin/sdbcli

@@ -27,7 +27,15 @@ end
 $runner = SimpleDB::Runner.new(access_key_id, secret_access_key, sdb_endpoint)
 
 def execute(query)
-  out = $runner.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)
   puts YAML.dump(out) if out
 end
 
@@ -79,7 +87,7 @@ while buf = Readline.readline("#{region}> ", true)
     when 'exit', 'quit'
       exit
     else
-      execute(buf.sub(/;\Z/, ''))
+      execute(buf)
     end
   rescue => e
     puts e.message.strip

data/lib/sdbcli/sdb-runner.rb

@@ -17,14 +17,18 @@ module SimpleDB
       @driver.endpoint = v
     end
 
-    def execute(query)
+    def execute(query, inline = true)
       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)
-        def item.to_yaml_style; :inline; end
+
+        if inline
+          def item.to_yaml_style; :inline; end
+        end
+
         item
       when :INSERT
         @driver.insert(parsed.domain, parsed.item_name, parsed.attrs)
@@ -38,8 +42,10 @@ module SimpleDB
       when :SELECT
         items = @driver.select(parsed.query)
 
-        items.each do |item|
-          def item.to_yaml_style; :inline; end
+        if inline
+          items.each do |item|
+            def item.to_yaml_style; :inline; end
+          end
         end
 
         items

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sdbcli
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - winebarrel
@@ -80,6 +80,6 @@ rubyforge_project:
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: sdbcli is interactive command-line client of Amazon SimpleDB.
+summary: sdbcli is an interactive command-line client of Amazon SimpleDB.
 test_files: []