sdbcli 0.2.8 → 0.2.9

data/README

@@ -1,75 +1,84 @@
-= sdbcli
-
-== Description
-
-sdbcli is an interactive command-line client of Amazon SimpleDB.
-
-== Source Code
-
-https://bitbucket.org/winebarrel/sdbcli
-
-== Install
-
-  shell> gem install sdbcli
-  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
-  shell> sdbcli
-
-== Example
-
-  ap-northeast-1> help
-  SHOW domains
-    displays a domain 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 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
-  
-  ap-northeast-1> select * from test;
-  ---
-  - [itemname1, {attr1: val1, attr2: val2}]
-  - [itemname2, {attr1: val1, attr2: val2}]
-
-  ap-northeast-1> select * from `test-2`;
-  ---
-  - [itemname1, {attr1: val1, attr2: val2}]
-  - [itemname2, {attr1: val1, attr2: val2}]
-
-Attribute and domain names may appear without quotes if they contain only letters, numbers, underscores (_), 
-or dollar symbols ($) and do not start with a number.
-You must quote all other attribute and domain names with the backtick (`).
-see http://docs.amazonwebservices.com/AmazonSimpleDB/latest/DeveloperGuide/QuotingRulesSelect.html
-  
-  ap-northeast-1> select * from test \G
-  ---
-  - - itemname1
-    - attr1: val1
-      attr2: val2
-    - itemname2
-    - attr1: val1
-      attr2: val2
-
-
-  shell> echo 'select * from test' | sdbcli
-  ---
-  - [itemname1, {attr1: val1, attr2: val2}]
-  - [itemname2, {attr1: val1, attr2: val2}]
-
+= sdbcli
+
+== Description
+
+sdbcli is an interactive command-line client of Amazon SimpleDB.
+
+== Source Code
+
+https://bitbucket.org/winebarrel/sdbcli
+
+== Install
+
+  shell> gem install sdbcli
+  shell> sdbcli -h
+  Usage: sdbcli [options]
+      -k, --access-key=ACCESS_KEY
+      -s, --secret-key=SECRET_KEY
+      -r, --region=REGION
+      -e, --eval=COMMAND
+  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
+  shell> sdbcli -e 'show domains'
+  ---
+  - test
+  - test-2
+  shell> sdbcli # show prompt
+
+== Example
+
+  ap-northeast-1> help
+  SHOW domains
+    displays a domain 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 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
+  
+  ap-northeast-1> select * from test;
+  ---
+  - [itemname1, {attr1: val1, attr2: val2}]
+  - [itemname2, {attr1: val1, attr2: val2}]
+
+  ap-northeast-1> select count(*) from `test-2`;
+  ---
+  - [Domain, {Count: "100"}]
+
+Attribute and domain names may appear without quotes if they contain only letters, numbers, underscores (_), 
+or dollar symbols ($) and do not start with a number.
+You must quote all other attribute and domain names with the backtick (`).
+see http://docs.amazonwebservices.com/AmazonSimpleDB/latest/DeveloperGuide/QuotingRulesSelect.html
+  
+  ap-northeast-1> select * from test \G
+  ---
+  - - itemname1
+    - attr1: val1
+      attr2: val2
+    - itemname2
+    - attr1: val1
+      attr2: val2
+
+
+  shell> echo 'select * from test' | sdbcli
+  ---
+  - [itemname1, {attr1: val1, attr2: val2}]
+  - [itemname2, {attr1: val1, attr2: val2}]
+

data/bin/sdbcli

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 $LOAD_PATH << File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib')
 
-Version = '0.2.8'
+Version = '0.2.9'
 HISTORY_FILE = File.join((ENV['HOME'] || ENV['USERPROFILE'] || '.'), '.sdbcli_history')
 
 require 'rubygems'
@@ -16,11 +16,13 @@ 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('-e', '--endpoint=ENDPOINT_OR_REGION') {|v| sdb_endpoint = 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
@@ -75,8 +77,8 @@ def execute(src)
   ss.rest.strip
 end
 
-unless $stdin.tty?
-  src = $stdin.read.strip
+if not $stdin.tty? or command
+  src = command || $stdin.read.strip
 
   unless src =~ /\s*(?:;|\\G)\Z/i
     src << ';'

data/lib/sdbcli/sdb-client.rb

@@ -1,128 +1,132 @@
-require 'cgi'
-require 'base64'
-require 'net/https'
-require 'openssl'
-require 'nokogiri'
-
-module SimpleDB
-  class Error < StandardError; end
-
-  class Client
-    API_VERSION = '2009-04-15'
-    SIGNATURE_VERSION = 2
-    SIGNATURE_ALGORITHM = :SHA256
-
-    attr_accessor :endpoint
-
-    def initialize(accessKeyId, secretAccessKey, endpoint = 'sdb.amazonaws.com')
-      @accessKeyId = accessKeyId
-      @secretAccessKey = secretAccessKey
-      @endpoint = endpoint
-    end
-
-    # domain action
-
-    def create_domain(domain_name, params = {})
-      params = params.merge(:DomainName => domain_name)
-      query('CreateDomain', params)
-    end
-
-    def list_domains(params = {})
-      query('ListDomains', params)
-    end
-
-    def delete_domain(domain_name, params = {})
-      params = params.merge(:DomainName => domain_name)
-      query('DeleteDomain', params)
-    end
-
-    # attr action
-
-    def put_attributes(domain_name, item_name, params = {})
-      params = params.merge(:DomainName => domain_name, :ItemName => item_name)
-      query('PutAttributes', params)
-    end
-
-    def get_attributes(domain_name, item_name, params = {})
-      params = params.merge(:DomainName => domain_name, :ItemName => item_name)
-      query('GetAttributes', params)
-    end
-
-    def select(params = {})
-      query('Select', params)
-    end
-
-    def delete_attributes(domain_name, item_name, params = {})
-      params = params.merge(:DomainName => domain_name, :ItemName => item_name)
-      query('DeleteAttributes', params)
-    end
-
-    # batch attr action
-
-    def batch_put_attributes(domain_name, params = {})
-      params = params.merge(:DomainName => domain_name)
-      query('BatchPutAttributes', params)
-    end
-
-    def batch_delete_attributes(domain_name, params = {})
-      params = params.merge(:DomainName => domain_name)
-      query('BatchDeleteAttributes', params)
-    end
-
-    private
-
-    def query(action, params = {})
-      params = {
-        :Action           => action,
-        :Version          => API_VERSION,
-        :Timestamp        => Time.now.getutc.strftime('%Y-%m-%dT%H:%M:%SZ'),
-        :SignatureVersion => SIGNATURE_VERSION,
-        :SignatureMethod  => "Hmac#{SIGNATURE_ALGORITHM}",
-        :AWSAccessKeyId   => @accessKeyId,
-      }.merge(params)
-
-      signature = aws_sign(params)
-      params[:Signature] = signature
-
-      Net::HTTP.version_1_2
-      https = Net::HTTP.new(@endpoint, 443)
-      https.use_ssl = true
-      https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-      doc = https.start do |w|
-        req = Net::HTTP::Post.new('/',
-          'Host' => @endpoint,
-          'Content-Type' => 'application/x-www-form-urlencoded'
-        )
-
-        req.set_form_data(params)
-        res = w.request(req)
-
-        Nokogiri::XML(res.body)
-      end
-
-      validate(doc)
-      return doc
-    end
-
-    private
-    def aws_sign(params)
-      params = params.sort_by {|a, b| a.to_s }.map {|k, v| "#{escape(k)}=#{escape(v)}" }.join('&')
-      string_to_sign = "POST\n#{@endpoint}\n/\n#{params}"
-      digest = OpenSSL::HMAC.digest(OpenSSL::Digest.const_get(SIGNATURE_ALGORITHM).new, @secretAccessKey, string_to_sign)
-      Base64.encode64(digest).gsub("\n", '')
-    end
-
-    def validate(doc)
-      if (error = doc.at_css('Errors Error'))
-        code = error.at_css('Code').content
-        message = error.at_css('Message').content
-        raise Error, "#{code}: #{message}"
-      end
-    end
-
-    def escape(str)
-      CGI.escape(str.to_s).gsub('+', '%20')
-    end
-  end # Client
-end # SimpleDB
+require 'cgi'
+require 'base64'
+require 'net/https'
+require 'openssl'
+require 'nokogiri'
+
+module SimpleDB
+  class Error < StandardError; end
+
+  class Client
+    API_VERSION = '2009-04-15'
+    SIGNATURE_VERSION = 2
+    SIGNATURE_ALGORITHM = :SHA256
+
+    attr_accessor :endpoint
+
+    def initialize(accessKeyId, secretAccessKey, endpoint = 'sdb.amazonaws.com')
+      @accessKeyId = accessKeyId
+      @secretAccessKey = secretAccessKey
+      @endpoint = endpoint
+    end
+
+    # domain action
+
+    def create_domain(domain_name, params = {})
+      params = params.merge(:DomainName => domain_name)
+      query('CreateDomain', params)
+    end
+
+    def list_domains(params = {})
+      query('ListDomains', params)
+    end
+
+    def delete_domain(domain_name, params = {})
+      params = params.merge(:DomainName => domain_name)
+      query('DeleteDomain', params)
+    end
+
+    # attr action
+
+    def put_attributes(domain_name, item_name, params = {})
+      params = params.merge(:DomainName => domain_name, :ItemName => item_name)
+      query('PutAttributes', params)
+    end
+
+    def get_attributes(domain_name, item_name, params = {})
+      params = params.merge(:DomainName => domain_name, :ItemName => item_name)
+      query('GetAttributes', params)
+    end
+
+    def select(params = {})
+      query('Select', params)
+    end
+
+    def delete_attributes(domain_name, item_name, params = {})
+      params = params.merge(:DomainName => domain_name, :ItemName => item_name)
+      query('DeleteAttributes', params)
+    end
+
+    # batch attr action
+
+    def batch_put_attributes(domain_name, params = {})
+      params = params.merge(:DomainName => domain_name)
+      query('BatchPutAttributes', params)
+    end
+
+    def batch_delete_attributes(domain_name, params = {})
+      params = params.merge(:DomainName => domain_name)
+      query('BatchDeleteAttributes', params)
+    end
+
+    def domain_metadata(domain_name)
+      query('DomainMetadata', :DomainName => domain_name)
+    end
+
+    private
+
+    def query(action, params = {})
+      params = {
+        :Action           => action,
+        :Version          => API_VERSION,
+        :Timestamp        => Time.now.getutc.strftime('%Y-%m-%dT%H:%M:%SZ'),
+        :SignatureVersion => SIGNATURE_VERSION,
+        :SignatureMethod  => "Hmac#{SIGNATURE_ALGORITHM}",
+        :AWSAccessKeyId   => @accessKeyId,
+      }.merge(params)
+
+      signature = aws_sign(params)
+      params[:Signature] = signature
+
+      Net::HTTP.version_1_2
+      https = Net::HTTP.new(@endpoint, 443)
+      https.use_ssl = true
+      https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+      doc = https.start do |w|
+        req = Net::HTTP::Post.new('/',
+          'Host' => @endpoint,
+          'Content-Type' => 'application/x-www-form-urlencoded'
+        )
+
+        req.set_form_data(params)
+        res = w.request(req)
+
+        Nokogiri::XML(res.body)
+      end
+
+      validate(doc)
+      return doc
+    end
+
+    private
+    def aws_sign(params)
+      params = params.sort_by {|a, b| a.to_s }.map {|k, v| "#{escape(k)}=#{escape(v)}" }.join('&')
+      string_to_sign = "POST\n#{@endpoint}\n/\n#{params}"
+      digest = OpenSSL::HMAC.digest(OpenSSL::Digest.const_get(SIGNATURE_ALGORITHM).new, @secretAccessKey, string_to_sign)
+      Base64.encode64(digest).gsub("\n", '')
+    end
+
+    def validate(doc)
+      if (error = doc.at_css('Errors Error'))
+        code = error.at_css('Code').content
+        message = error.at_css('Message').content
+        raise Error, "#{code}: #{message}"
+      end
+    end
+
+    def escape(str)
+      CGI.escape(str.to_s).gsub('+', '%20')
+    end
+  end # Client
+end # SimpleDB