td 0.10.78 → 0.10.79

data/ChangeLog

@@ -1,3 +1,12 @@
+== 2013-06-13 version 0.10.79
+
+* -h option shows --version option
+* Show more messages when network related error occurred
+* Fix bulk import encoding issue when -e option is specified
+* Add user:apikey:add subcommand
+* Add user:apikey:remove subcommand
+
+
 == 2013-05-27 version 0.10.78
 
 * Add -q(--query) option to sched:create command

data/lib/td/command/list.rb

@@ -127,7 +127,7 @@ module List
   LIST = []
   COMMAND = {}
   GUESS = {}
-  HELP_EXCLUDE = [/^help/, /^account/, /^aggr/]
+  HELP_EXCLUDE = [/^help/, /^account/, /^aggr/, /^update/, /^user/, /^ip_limit/, /^role/, /^org/, /^acl/]
   USAGE_EXCLUDE = [/bulk_import:upload_part\z/, /bulk_import:delete_part\z/]
 
   def self.add_list(name, args, description, *examples)
@@ -284,7 +284,9 @@ module List
   add_list 'user:show', %w[name], 'Show an user'
   add_list 'user:create', %w[name], 'Create an user'
   add_list 'user:delete', %w[name], 'Delete an user'
-  add_list 'user:apikey:list', %w[name], 'Show API keys'
+  add_list 'user:apikey:list', %w[name], 'Show API keys of an user'
+  add_list 'user:apikey:add', %w[name], 'Add an API key to an user'
+  add_list 'user:apikey:remove', %w[name apikey], 'Remove an API key from an user'
   add_list 'user:password:change', %w[name], 'Change password'
 
   add_list 'role:list', %w[], 'Show list of roles'

data/lib/td/command/runner.rb

@@ -96,6 +96,11 @@ EOF
       usage nil
     }
 
+    op.on('--version', "show version") {
+      puts op.version
+      exit
+    }
+
     begin
       op.order!(argv)
       usage nil if argv.empty?
@@ -133,13 +138,23 @@ EOF
     rescue TreasureData::ConfigError
       $stderr.puts "TreasureData account is not configured yet."
       $stderr.puts "Run '#{$prog} account' first."
-    rescue
+    rescue => e
       $stderr.puts "error #{$!.class}: backtrace:"
       $!.backtrace.each {|b|
         $stderr.puts "  #{b}"
       }
       puts ""
       puts $!
+
+      require 'socket'
+      if e.is_a?(::SocketError)
+        $stderr.puts <<EOS
+
+Network dependent error occurred.
+If you want to use td command through a proxy,
+please set HTTP_PROXY environment variable (e.g. export HTTP_PROXY="host:port")
+EOS
+      end
     end
   end
 end

data/lib/td/command/table.rb

@@ -110,17 +110,25 @@ module Command
 
     rows = []
     ::Parallel.each(databases, :in_threads => num_threads) {|db|
-      db.tables.each {|table|
-        pschema = table.schema.fields.map {|f|
-          "#{f.name}:#{f.type}"
-        }.join(', ')
-        rows << {
-          :Database => db.name, :Table => table.name, :Type => table.type.to_s, :Count => TreasureData::Helpers.format_with_delimiter(table.count),
-          :Size => show_size_in_bytes ? TreasureData::Helpers.format_with_delimiter(table.estimated_storage_size) : table.estimated_storage_size_string,
-          'Last import' => table.last_import ? table.last_import.localtime : nil,
-          :Schema => pschema
+      begin
+        db.tables.each {|table|
+          pschema = table.schema.fields.map {|f|
+            "#{f.name}:#{f.type}"
+          }.join(', ')
+          rows << {
+            :Database => db.name, :Table => table.name, :Type => table.type.to_s, :Count => TreasureData::Helpers.format_with_delimiter(table.count),
+            :Size => show_size_in_bytes ? TreasureData::Helpers.format_with_delimiter(table.estimated_storage_size) : table.estimated_storage_size_string,
+            'Last import' => table.last_import ? table.last_import.localtime : nil,
+            :Schema => pschema
+          }
         }
-      }
+      rescue APIError => e
+        # ignores permission error because db:list shows all databases
+        # even if the user can't access to tables in the database
+        unless e.to_s =~ /not authorized/
+          raise e
+        end
+      end
     }
     rows = rows.sort_by {|map|
       [map[:Database], map[:Type].size, map[:Table]]

data/lib/td/command/user.rb

@@ -133,22 +133,10 @@ module Command
       client.create_organization(org)
     end
 
-    ok = false
     begin
       client.add_user(name, org, email, password)
-
-      begin
-        client.add_apikey(name)
-        ok = true
-
-      ensure
-        if !ok
-          client.remove_user(name)
-        end
-      end
-
     ensure
-      if create_org && !ok
+      if create_org
         client.delete_organization(org)
       end
     end
@@ -175,13 +163,39 @@ module Command
   #def user_email_change(op)
   #end
 
-  ## TODO user:apikey:add <name>
-  #def user_apikey_add(op)
-  #end
+  def user_apikey_add(op)
+    name = op.cmd_parse
 
-  ## TODO user:apikey:remove <name> <apikey>
-  #def user_apikey_remove(op)
-  #end
+    client = get_client
+
+    begin
+      client.add_apikey(name)
+    rescue TreasureData::NotFoundError
+      $stderr.puts "User '#{name}' does not exist."
+      $stderr.puts "Use '#{$prog} users' to show users."
+      exit 1
+    end
+
+    $stderr.puts "Added an API key to user '#{name}'."
+    $stderr.puts "Use '#{$prog} user:apikeys #{name}' to show the API key"
+  end
+
+  def user_apikey_remove(op)
+    name, key = op.cmd_parse
+
+    client = get_client
+
+    begin
+      client.remove_apikey(name, key)
+    rescue TreasureData::NotFoundError
+      $stderr.puts "User '#{name}' or API key '#{key}' does not exist."
+      $stderr.puts "Use '#{$prog} users' to show users."
+      $stderr.puts "Use '#{$prog} user:apikeys '#{key}' to show API keys"
+      exit 1
+    end
+
+    $stderr.puts "Removed an an API key from user '#{name}'."
+  end
 
   def user_apikey_list(op)
     name = op.cmd_parse

data/lib/td/file_reader.rb

@@ -50,7 +50,7 @@ module TreasureData
     class LineReader
       def initialize(io, error, opts)
         if encoding = opts[:encoding]
-          io.set_encoding(encoding) if io.respond_to?(:set_encoding)
+          io.set_encoding(encoding, 'UTF-8') if io.respond_to?(:set_encoding)
         end
         #@delimiter = opts[:line_delimiter_expr] || /\r?\n/
         @io = io

data/lib/td/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.10.78'
+VERSION = '0.10.79'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.10.78
+  version: 0.10.79
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -262,7 +262,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2134623419874142893
+      hash: 860167470271522845
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -271,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2134623419874142893
+      hash: 860167470271522845
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23