sdbcli 0.3.8 → 0.3.9

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.8'
+Version = '0.3.9'
 HISTORY_FILE = File.join((ENV['HOME'] || ENV['USERPROFILE'] || '.'), '.sdbcli_history')
 HISTSIZE = 500
 
@@ -40,39 +40,58 @@ end
 
 def execute(src, show_rows = false)
   ss = StringScanner.new(src.dup)
+  buf = ''
+
+  until ss.eos?
+    if (tok = ss.scan %r{[^-`'";\\/#]+})
+      buf << tok
+    elsif (tok = ss.scan /`(?:[^`]|``)*`/)
+      buf << tok
+    elsif (tok = ss.scan /'(?:[^']|'')*'/) #'
+      buf << tok
+    elsif (tok = ss.scan /"(?:[^"]|"")*"/) #"
+      buf << tok
+    elsif (tok = ss.scan %r{/\*/?(\n|[^/]|[^*]/)*\*/})
+      # nothing to do
+    elsif (tok = ss.scan /--[^\r\n]*(?:\r\n|\r|\n|\Z)/)
+      # nothing to do
+    elsif (tok = ss.scan /#[^\r\n]*(?:\r\n|\r|\n|\Z)/)
+      # nothing to do
+    elsif (tok = ss.scan /(?:;|\\G)/)
+      src.replace(ss.rest)
+      query = buf
+      buf = ''
+
+      if tok == '\G'
+        inline = false
+      else
+        inline = true
+      end
 
-  while query = ss.scan_until(/(?:;|\\G)/i)
-    src.replace(ss.rest.strip)
-    query.strip!
+      if query.strip.empty?
+        output_error('No query specified')
+        next
+      end
 
-    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
+      out = $runner.execute(query, inline)
 
-    if query.empty?
-      output_error('No query specified')
-      next
-    end
+      if out
+        str = YAML.dump(out).sub(/(?:\r\n|\r|\n)*\Z/, "\n")
 
-    out = $runner.execute(query, inline)
+        if show_rows and out.kind_of?(Array)
+          str << "# #{out.length} #{out.length > 1 ? 'rows' : 'row'} in set\n"
+        end
 
-    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"
+        str << "\n"
+        puts str
       end
-
-      str << "\n"
-      puts str
+    elsif (tok = ss.scan /./)
+      buf << tok
     end
   end
 
-  ss.rest.strip
+  src.replace(buf.strip)
+  buf
 end
 
 if not $stdin.tty? or command
@@ -177,7 +196,12 @@ while buf = Readline.readline(prompt, true)
     rv = nil
 
     begin
-      src << (' ' + buf)
+      if src.empty?
+        src << buf
+      else
+        src << ("\n" + buf)
+      end
+
       execute(src, true)
     rescue => e
       output_error e.message.strip

data/bin/sdbcli.orig

@@ -0,0 +1,188 @@
+#!/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

@@ -10,14 +10,14 @@ module SimpleDB
       '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
-    attr_reader :driver
-
     def initialize(accessKeyId, secretAccessKey, endpoint = 'sdb.amazonaws.com')
+      endpoint = region_to_endpoint(endpoint)
       @driver = Driver.new(accessKeyId, secretAccessKey, endpoint)
     end
 
@@ -26,6 +26,7 @@ module SimpleDB
     end
 
     def endpoint=(v)
+      v = region_to_endpoint(v)
       @driver.endpoint = v
     end
 
@@ -35,6 +36,7 @@ module SimpleDB
 
     def execute(query, inline = true)
       parsed = Parser.parse(query)
+p parsed
       command = parsed.class.name.split('::').last.to_sym
 
       case command
@@ -72,12 +74,36 @@ module SimpleDB
         @driver.drop_domain(parsed.domain)
         nil
       when :SHOW
-        @driver.show_domains
+        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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sdbcli
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 3
-  - 8
-  version: 0.3.8
+  - 9
+  version: 0.3.9
 platform: ruby
 authors: 
 - winebarrel
@@ -42,6 +42,7 @@ extra_rdoc_files: []
 files: 
 - README
 - bin/sdbcli
+- bin/sdbcli.orig
 - lib/sdbcli/sdb-client.rb
 - lib/sdbcli/sdb-driver.rb
 - lib/sdbcli/sdb-parser.tab.rb