sdbcli 0.3.9 → 0.4.0

data/README

@@ -17,6 +17,7 @@ https://bitbucket.org/winebarrel/sdbcli
       -s, --secret-key=SECRET_KEY
       -r, --region=REGION
       -e, --eval=COMMAND
+      -f, --format=YAML_OR_JSON
   shell> export AWS_ACCESS_KEY_ID='...'
   shell> export AWS_SECRET_ACCESS_KEY='...'
   shell> export SDB_ENDPOINT='sdb.ap-northeast-1.amazonaws.com' # or REGION_NAME=ap-northeast-1
@@ -24,6 +25,11 @@ https://bitbucket.org/winebarrel/sdbcli
   ---
   - test
   - test-2
+  shell> sdbcli -f json -e 'show domains'
+  [
+    "test",
+    "test-2"
+  ]
   shell> sdbcli # show prompt
 
 == Example

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.9'
+Version = '0.4.0'
 HISTORY_FILE = File.join((ENV['HOME'] || ENV['USERPROFILE'] || '.'), '.sdbcli_history')
 HISTSIZE = 500
 
@@ -13,17 +13,20 @@ require 'readline'
 require 'strscan'
 require 'syck' if /\A1\.9/ =~ RUBY_VERSION
 require 'yaml'
+require 'json'
 
 access_key_id     = ENV['AWS_ACCESS_KEY_ID']
 secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
 sdb_endpoint      = ENV['SDB_ENDPOINT'] || ENV['REGION_NAME'] || 'sdb.amazonaws.com'
 command = nil
+$format = :yaml
 
 ARGV.options do |opt|
   opt.on('-k', '--access-key=ACCESS_KEY') {|v| access_key_id = v }
   opt.on('-s', '--secret-key=SECRET_KEY') {|v| secret_access_key = v }
   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.parse!
 
   unless access_key_id and secret_access_key and sdb_endpoint
@@ -35,7 +38,16 @@ end
 $runner = SimpleDB::Runner.new(access_key_id, secret_access_key, sdb_endpoint)
 
 def output_error(msg)
-  $stderr.puts "# #{msg}\n\n"
+  case $format
+  when :yaml
+    msg = "# #{msg}\n\n"
+  when :json
+    msg = "// #{msg}\n\n"
+  else
+    msg = "# #{msg}\n\n"
+  end
+
+  $stderr.puts msg
 end
 
 def execute(src, show_rows = false)
@@ -76,10 +88,32 @@ def execute(src, show_rows = false)
       out = $runner.execute(query, inline)
 
       if out
-        str = YAML.dump(out).sub(/(?:\r\n|\r|\n)*\Z/, "\n")
+        str = nil
+
+        case $format
+        when :yaml
+          str = YAML.dump(out)
+        when :json
+          str = JSON.pretty_generate(out)
+        else
+          output_error('Unknown format')
+        end
+
+        str.sub!(/(?:\r\n|\r|\n)*\Z/, "\n")
 
         if show_rows and out.kind_of?(Array)
-          str << "# #{out.length} #{out.length > 1 ? 'rows' : 'row'} in set\n"
+          rows_msg = nil
+
+          case $format
+          when :yaml
+            rows_msg = "# #{out.length} #{out.length > 1 ? 'rows' : 'row'} in set\n"
+          when :json
+            rows_msg = "// #{out.length} #{out.length > 1 ? 'rows' : 'row'} in set\n"
+          else
+            rows_msg = "# #{out.length} #{out.length > 1 ? 'rows' : 'row'} in set\n"
+          end
+
+          str << rows_msg
         end
 
         str << "\n"

metadata

@@ -1,87 +1,85 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sdbcli
-version: !ruby/object:Gem::Version 
-  hash: 1
+version: !ruby/object:Gem::Version
+  version: 0.4.0
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 9
-  version: 0.3.9
 platform: ruby
-authors: 
+authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: sgwr_dts@yahoo.co.jp
-executables: 
+executables:
 - sdbcli
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README
 - bin/sdbcli
-- bin/sdbcli.orig
 - lib/sdbcli/sdb-client.rb
 - lib/sdbcli/sdb-driver.rb
 - lib/sdbcli/sdb-parser.tab.rb
 - lib/sdbcli/sdb-parser.y
 - lib/sdbcli/sdb-runner.rb
-- lib/sdbcli/sdb-runner.rb.orig
 - lib/sdbcli.rb
 homepage: https://bitbucket.org/winebarrel/sdbcli
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: sdbcli is an interactive command-line client of Amazon SimpleDB.
 test_files: []
-

data/bin/sdbcli.orig

@@ -1,188 +0,0 @@
-#!/usr/bin/env ruby
-$LOAD_PATH << File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib')
-
-Version = '0.3.8'
-HISTORY_FILE = File.join((ENV['HOME'] || ENV['USERPROFILE'] || '.'), '.sdbcli_history')
-HISTSIZE = 500
-
-require 'rubygems'
-require 'sdbcli'
-
-require 'optparse'
-require 'readline'
-require 'strscan'
-require 'syck' if /\A1\.9/ =~ RUBY_VERSION
-require 'yaml'
-
-access_key_id     = ENV['AWS_ACCESS_KEY_ID']
-secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
-sdb_endpoint      = ENV['SDB_ENDPOINT'] || ENV['REGION_NAME'] || 'sdb.amazonaws.com'
-command = nil
-
-ARGV.options do |opt|
-  opt.on('-k', '--access-key=ACCESS_KEY') {|v| access_key_id = v }
-  opt.on('-s', '--secret-key=SECRET_KEY') {|v| secret_access_key = v }
-  opt.on('-r', '--region=REGION') {|v| sdb_endpoint = v }
-  opt.on('-e', '--eval=COMMAND') {|v| command = v }
-  opt.parse!
-
-  unless access_key_id and secret_access_key and sdb_endpoint
-    puts opt.help
-    exit 1
-  end
-end
-
-$runner = SimpleDB::Runner.new(access_key_id, secret_access_key, sdb_endpoint)
-
-def output_error(msg)
-  $stderr.puts "# #{msg}\n\n"
-end
-
-def execute(src, show_rows = false)
-  ss = StringScanner.new(src.gsub(%r{/\*/?(?:(?:\r\n|\r|\n)|[^/]|[^*]/)*\*/}m, ''))
-
-  while query = ss.scan_until(/(?:;|\\G)/i)
-    src.replace(ss.rest.strip)
-    query.strip!
-
-    if query =~ /\s*\\G\Z/i
-      query = query.sub(/\s*\\G\Z/i, '')
-      inline = false
-    else
-      query = query.strip.sub(/\s*;\Z/, '')
-      inline = true
-    end
-
-    if query.empty?
-      output_error('No query specified')
-      next
-    end
-
-    out = $runner.execute(query, inline)
-
-    if 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
-
-  ss.rest.strip
-end
-
-if not $stdin.tty? or command
-  src = command || $stdin.read.strip
-
-  unless src =~ /\s*(?:;|\\G)\Z/i
-    src << ';'
-  end
-
-  begin
-    execute(src)
-    exit 0
-  rescue => e
-    output_error e.message.strip
-    exit 1
-  end
-end
-
-def help
-  <<-EOS
-SHOW DOMAINS
-  displays a domain list
-
-SHOW REGIONS
-  displays a region list
-
-CREATE domain domain_name
-  creates a domain
-
-DROP DOMAIN domain_name
-  deletes a domain
-
-GET [attr_list] FROM domain_name WHERE itemName = '...'
-  gets the attribute of an item
-
-INSERT INTO domain_name (itemName, attr1, ...) VALUES ('name', 'val1', ...)
-  creates an item
-
-UPDATE domain_name set attr1 = 'val1', ... WHERE itemName = '...'
-  updates an item
-
-DELETE [attr1, ...] FROM domain_name WHERE itemName = '...'
-  deletes the attribute of an item or an item
-
-SELECT output_list FROM domain_name [WHERE expression] [sort_instructions] [LIMIT limit]
-  queries using the SELECT statement
-  see http://docs.aws.amazon.com/AmazonSimpleDB/latest/DeveloperGuide/UsingSelect.html
-
-DESC domain_name
-  displays information about the domain
-
-USE region_or_endpoint
-  changes an endpoint
-
-    EOS
-end
-
-if File.exist?(HISTORY_FILE)
-  open(HISTORY_FILE) do |f|
-    f.each_line do |line|
-      line = line.strip
-      Readline::HISTORY.push(line) unless line.empty?
-    end
-  end
-end
-
-at_exit do
-  unless Readline::HISTORY.empty?
-    open(HISTORY_FILE, 'wb') do |f|
-      (Readline::HISTORY.to_a.slice(-(Readline::HISTORY.length < HISTSIZE ? Readline::HISTORY.length : HISTSIZE)..-1) || []).each do |line|
-        next if /\A\s*\Z/ =~ line
-        f.puts line
-      end
-    end
-  end
-end
-
-src = ''
-prompt1 = lambda { "#{$runner.region || 'unknown'}> " }
-prompt2 = lambda { "#{' ' * (($runner.region || 'unknown').length - 1)}-> " }
-prompt = prompt1.call
-
-while buf = Readline.readline(prompt, true)
-  if /\A\s*\Z/ =~ buf
-    Readline::HISTORY.pop
-    next
-  end
-
-  if src.empty? and buf =~ /\A\.(.+)/
-    r = /\A#{Regexp.compile($1.downcase)}/
-
-    if r =~ 'help'
-      puts help
-    elsif r =~ 'exit' or r =~ 'quit'
-      exit
-    elsif r =~ 'version'
-      puts "sdbcli #{Version}"
-    else
-      output_error('Unknown command')
-    end
-  else
-    rv = nil
-
-    begin
-      src << (' ' + buf)
-      execute(src, true)
-    rescue => e
-      output_error e.message.strip
-    end
-
-    prompt = src.empty? ? prompt1.call : prompt2.call
-  end
-end

data/lib/sdbcli/sdb-runner.rb.orig

@@ -1,109 +0,0 @@
-require 'sdbcli/sdb-driver'
-require 'sdbcli/sdb-parser.tab'
-
-module SimpleDB
-  class Error < StandardError; end
-
-    REGIONS = {
-      'sdb.amazonaws.com'                => 'us-east-1',
-      'sdb.us-west-1.amazonaws.com'      => 'us-west-1',
-      'sdb.us-west-2.amazonaws.com'      => 'us-west-2',
-      'sdb.eu-west-1.amazonaws.com'      => 'eu-west-1',
-      'sdb.ap-southeast-1.amazonaws.com' => 'ap-southeast-1',
-      'sdb.ap-southeast-2.amazonaws.com' => 'ap-southeast-2',
-      'sdb.ap-northeast-1.amazonaws.com' => 'ap-northeast-1',
-      'sdb.sa-east-1.amazonaws.com'      => 'sa-east-1',
-    }
-
-  class Runner
-    def initialize(accessKeyId, secretAccessKey, endpoint = 'sdb.amazonaws.com')
-      endpoint = region_to_endpoint(endpoint)
-      @driver = Driver.new(accessKeyId, secretAccessKey, endpoint)
-    end
-
-    def endpoint
-      @driver.endpoint
-    end
-
-    def endpoint=(v)
-      v = region_to_endpoint(v)
-      @driver.endpoint = v
-    end
-
-    def region
-      REGIONS[endpoint]
-    end
-
-    def execute(query, inline = true)
-      parsed = Parser.parse(query)
-p parsed
-      command = parsed.class.name.split('::').last.to_sym
-
-      case command
-      when :GET
-        item = @driver.get(parsed.domain, parsed.item_name, parsed.attr_names)
-
-        if inline
-          def item.to_yaml_style; :inline; end
-        end
-
-        item
-      when :INSERT
-        @driver.insert(parsed.domain, parsed.item_name, parsed.attrs)
-        nil
-      when :UPDATE
-        @driver.update(parsed.domain, parsed.items)
-        nil
-      when :DELETE
-        @driver.delete(parsed.domain, parsed.items)
-        nil
-      when :SELECT
-        items = @driver.select(parsed.query)
-
-        if inline
-          items.each do |item|
-            def item.to_yaml_style; :inline; end
-          end
-        end
-
-        items
-      when :CREATE
-        @driver.create_domain(parsed.domain)
-        nil
-      when :DROP
-        @driver.drop_domain(parsed.domain)
-        nil
-      when :SHOW
-        case parsed.operand
-        when :domains
-          @driver.show_domains
-        when :regions
-          SimpleDB::REGIONS.values.sort
-        else
-          raise 'must not happen'
-        end
-      when :USE
-        self.endpoint = parsed.endpoint
-        nil
-      when :DESCRIBE
-        @driver.describe(parsed.domain)
-      else
-        raise 'must not happen'
-      end
-    end
-
-    private
-
-    def region_to_endpoint(region)
-      if /\A[^.]+\Z/ =~ region
-        region = SimpleDB::REGIONS.find {|k, v| v == region }
-        raise SimpleDB::Error, 'Unknown region' unless region
-        region = region.first
-      end
-
-      raise SimpleDB::Error, 'Unknown endpoint' unless SimpleDB::REGIONS[region]
-
-      return region
-    end
-  end # Runner
-end # SimpleDB