ddbcli 0.2.1 → 0.2.2

data/README

@@ -85,9 +85,9 @@ https://bitbucket.org/winebarrel/ddbcli
   DELETE ALL FROM table_name WHERE [WHERE attr1 = '...' AND ...] [ORDER {ASC|DESC}] [LIMIT limit]
     deletes items
   
-  SELECT {*|attrs|COUNT(*)} FROM table_name [USE INDEX (index_name)] [WHERE key1 = '...' AND ...] [ORDER {ASC|DESC}] [LIMIT limit]
-  SELECT ALL {*|attrs|COUNT(*)}  FROM table_name [WHERE attr1 = '...' AND ...] [LIMIT limit]
-  SELECT segment/total_segments {*|attrs|COUNT(*)}  FROM table_name [WHERE attr1 = '...' AND ...] [LIMIT limit]
+  SELECT {*|attr1,attr2,...|COUNT(*)} FROM table_name [USE INDEX (index_name)] [WHERE key1 = '...' AND ...] [ORDER {ASC|DESC}] [LIMIT limit]
+  SELECT ALL {*|attr1,attr2,...|COUNT(*)} FROM table_name [WHERE attr1 = '...' AND ...] [LIMIT limit]
+  SELECT segment/total_segments {*|attr1,attr2,...|COUNT(*)} FROM table_name [WHERE attr1 = '...' AND ...] [LIMIT limit]
     queries using the Query/Scan action
     see http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/QueryAndScan.html
   

data/bin/ddbcli

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 
-Version = '0.2.1'
+Version = '0.2.2'
 
 HISTORY_FILE = File.join((ENV['HOME'] || ENV['USERPROFILE'] || '.'), '.ddbcli_history')
 HISTSIZE = 500

data/lib/ddbcli/cli/help.rb

@@ -50,9 +50,9 @@ DELETE FROM table_name WHERE key1 = '...' AND ..
 DELETE ALL FROM table_name WHERE [WHERE attr1 = '...' AND ...] [ORDER {ASC|DESC}] [LIMIT limit]
   deletes items
 
-SELECT {*|attrs|COUNT(*)} FROM table_name [USE INDEX (index_name)] [WHERE key1 = '...' AND ...] [ORDER {ASC|DESC}] [LIMIT limit]
-SELECT ALL {*|attrs|COUNT(*)}  FROM table_name [WHERE attr1 = '...' AND ...] [LIMIT limit]
-SELECT segment/total_segments {*|attrs|COUNT(*)}  FROM table_name [WHERE attr1 = '...' AND ...] [LIMIT limit]
+SELECT {*|attr1,attr2,...|COUNT(*)} FROM table_name [USE INDEX (index_name)] [WHERE key1 = '...' AND ...] [ORDER {ASC|DESC}] [LIMIT limit]
+SELECT ALL {*|attr1,attr2,...|COUNT(*)} FROM table_name [WHERE attr1 = '...' AND ...] [LIMIT limit]
+SELECT segment/total_segments {*|attr1,attr2,...|COUNT(*)} FROM table_name [WHERE attr1 = '...' AND ...] [LIMIT limit]
   queries using the Query/Scan action
   see http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/QueryAndScan.html
 

data/lib/ddbcli/cli/options.rb

@@ -1,5 +1,6 @@
 require 'optparse'
 require 'ostruct'
+require 'uri'
 
 def parse_options
   options = OpenStruct.new
@@ -20,6 +21,15 @@ def parse_options
     opt.on('-k', '--access-key=ACCESS_KEY')          {|v| options.access_key_id          = v      }
     opt.on('-s', '--secret-key=SECRET_KEY')          {|v| options.secret_access_key      = v      }
     opt.on('-r', '--region=REGION_OR_ENDPOINT')      {|v| options.ddb_endpoint_or_region = v      }
+
+    opt.on('',   '--uri=URI') {|v|
+      uri = v
+      uri = "http://#{uri}" unless uri =~ %r|\A\w+://|
+      uri = URI.parse(uri)
+      raise URI::InvalidURIError, "invalid shceme: #{v}" unless /\Ahttps?\Z/ =~ uri.scheme
+      options.ddb_endpoint_or_region = uri
+    }
+
     opt.on('-e', '--eval=COMMAND')                   {|v| options.command                = v      }
     opt.on('-t', '--timeout=SECOND', Integer)        {|v| options.timeout                = v.to_i }
 

data/lib/ddbcli/ddb-client.rb

@@ -5,6 +5,7 @@ require 'time'
 require 'stringio'
 require 'zlib'
 require 'pp'
+require 'uri'
 
 require 'ddbcli/ddb-error'
 require 'ddbcli/ddb-endpoint'
@@ -18,7 +19,6 @@ module DynamoDB
 
     DEFAULT_TIMEOUT = 60
 
-    attr_reader :endpoint
     attr_reader :region
     attr_accessor :timeout
     attr_accessor :retry_num
@@ -36,7 +36,13 @@ module DynamoDB
     end
 
     def set_endpoint_and_region(endpoint_or_region)
-      @endpoint, @region = DynamoDB::Endpoint.endpoint_and_region(endpoint_or_region)
+      if endpoint_or_region.kind_of?(URI)
+        @endpoint = endpoint_or_region
+        @region = [@endpoint.host, @endpoint.port].join(':')
+      else
+        host, @region = DynamoDB::Endpoint.endpoint_and_region(endpoint_or_region)
+        @endpoint = URI.parse("https://#{host}")
+      end
     end
 
     def query(action, hash)
@@ -73,16 +79,20 @@ EOS
       headers['Authorization'] = authorization(date, headers, req_body)
 
       Net::HTTP.version_1_2
-      https = Net::HTTP.new(@endpoint, 443)
-      https.use_ssl = true
-      https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      https.open_timeout = @timeout
-      https.read_timeout = @timeout
+      http = Net::HTTP.new(@endpoint.host, @endpoint.port)
+
+      if @endpoint.scheme == 'https'
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+
+      http.open_timeout = @timeout
+      http.read_timeout = @timeout
 
       res_code = nil
       res_msg  = nil
 
-      res_body = https.start do |w|
+      res_body = http.start do |w|
         req = Net::HTTP::Post.new('/', headers)
         req.body = req_body
         res = w.request(req)

data/lib/ddbcli/ddb-driver.rb

@@ -198,6 +198,12 @@ module DynamoDB
         %w(TableStatus ItemCount TableSizeBytes).each do |i|
           h[table_name][i] = table_info[i]
         end
+
+        provisioned_throughput = table_info['ProvisionedThroughput']
+
+        %w(ReadCapacityUnits WriteCapacityUnits).each do |i|
+          h[table_name][i] = provisioned_throughput[i]
+        end
       end
 
       return h
@@ -284,7 +290,18 @@ module DynamoDB
     end
 
     def do_use(parsed)
-      set_endpoint_and_region(parsed.endpoint_or_region)
+      eor = parsed.endpoint_or_region
+
+      if %r|\A\w+://| =~ eor or /:\d+\Z/ =~ eor
+        eor = "http://#{eor}" unless eor =~ %r|\A\w+://|
+        eor = URI.parse(eor)
+
+        unless /\Ahttps?\Z/ =~ eor.scheme
+          raise URI::InvalidURIError, "invalid shceme: #{parsed.endpoint_or_region}"
+        end
+      end
+
+      set_endpoint_and_region(eor)
       nil
     end
 

data/lib/ddbcli/ddb-parser.tab.rb

@@ -92,6 +92,7 @@ private :struct
 
 def scan
   tok = nil
+  @prev_tokens = []
 
   until @ss.eos?
     if (tok = @ss.scan /\s+/)
@@ -133,21 +134,46 @@ def scan
       yield [:RUBY_SCRIPT, tok.slice(1..-1)]
     elsif (tok = @ss.scan /\!(?:.*)/)
       yield [:SHELL_SCRIPT, tok.slice(1..-1)]
-    elsif (tok = @ss.scan /[-.0-9a-z_]*/i)
+    elsif (tok = @ss.scan %r|[-.0-9a-z_:/]*|i)
       yield [:IDENTIFIER, tok]
     else
-      raise Racc::ParseError, ('parse error on value "%s"' % @ss.rest.inspect)
+      raise_error(tok, @prev_tokens, @ss)
     end
+
+    @prev_tokens << tok
   end
 
-  yield [false, 'EOF']
+  yield [false, '']
 end
 private :scan
 
+def raise_error(error_value, prev_tokens, scanner)
+  errmsg = ["__#{error_value}__"]
+
+  if prev_tokens and not prev_tokens.empty?
+    toks = prev_tokens.reverse[0, 5].reverse
+    toks.unshift('...') if prev_tokens.length > toks.length
+    errmsg.unshift(toks.join.strip) unless toks.empty?
+  end
+
+  if scanner and not (rest = (scanner.rest || '').strip).empty?
+    str = rest[0, 16]
+    str += '...' if rest.length > str.length
+    errmsg << str
+  end
+
+  raise Racc::ParseError, ('parse error on value: %s' % errmsg.join(' '))
+end
+private :raise_error
+
 def parse
   yyparse self, :scan
 end
 
+def on_error(error_token_id, error_value, value_stack)
+  raise_error(error_value, @prev_tokens, @ss)
+end
+
 def self.parse(obj)
   self.new(obj).parse
 end

data/lib/ddbcli/ddb-parser.y

@@ -567,6 +567,7 @@ private :struct
 
 def scan
   tok = nil
+  @prev_tokens = []
 
   until @ss.eos?
     if (tok = @ss.scan /\s+/)
@@ -608,21 +609,46 @@ def scan
       yield [:RUBY_SCRIPT, tok.slice(1..-1)]
     elsif (tok = @ss.scan /\!(?:.*)/)
       yield [:SHELL_SCRIPT, tok.slice(1..-1)]
-    elsif (tok = @ss.scan /[-.0-9a-z_]*/i)
+    elsif (tok = @ss.scan %r|[-.0-9a-z_:/]*|i)
       yield [:IDENTIFIER, tok]
     else
-      raise Racc::ParseError, ('parse error on value "%s"' % @ss.rest.inspect)
+      raise_error(tok, @prev_tokens, @ss)
     end
+
+    @prev_tokens << tok
   end
 
-  yield [false, 'EOF']
+  yield [false, '']
 end
 private :scan
 
+def raise_error(error_value, prev_tokens, scanner)
+  errmsg = ["__#{error_value}__"]
+
+  if prev_tokens and not prev_tokens.empty?
+    toks = prev_tokens.reverse[0, 5].reverse
+    toks.unshift('...') if prev_tokens.length > toks.length
+    errmsg.unshift(toks.join.strip) unless toks.empty?
+  end
+
+  if scanner and not (rest = (scanner.rest || '').strip).empty?
+    str = rest[0, 16]
+    str += '...' if rest.length > str.length
+    errmsg << str
+  end
+
+  raise Racc::ParseError, ('parse error on value: %s' % errmsg.join(' '))
+end
+private :raise_error
+
 def parse
   yyparse self, :scan
 end
 
+def on_error(error_token_id, error_value, value_stack)
+  raise_error(error_value, @prev_tokens, @ss)
+end
+
 def self.parse(obj)
   self.new(obj).parse
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddbcli
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2013-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json