td 0.11.8.2 → 0.11.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3254397bd4682922aecaf0d08242c2219e16f76e
-  data.tar.gz: ac9686878f407ad6c950a9907f85b695ffadef04
+  metadata.gz: 35121e210f89e8af8d88f3de09c5da1a46f465f5
+  data.tar.gz: 2ed8a007214c1861d9653ad88a6e204b11959487
 SHA512:
-  metadata.gz: 881fdc4e2dcdc2a72c545ff7520e88ed507a348932e58996058d865b9e070d59efbbf93ee7d13fe97ffe0f0af65a1047ae5644c1ed0ef8371f3ba2d7c44ab5f9
-  data.tar.gz: ee2a8080e1b490981a23dd2ce50314817c2abf1552cd8f09acf3d798485a5b8c872379eff7bda7edd3c84f126b7c410ad9df5fec063aa073230a3df46c9b7916
+  metadata.gz: e29254a97c4170455119d3d0d11a8c026d05b431f3fe58ad69bbaeb7f6837805fcdbe51fdd91c8ebe3ae6a9c7077f3312cd681a0f865a3bf2eddb43399446be0
+  data.tar.gz: 908f511b6ed2f6b293cdc809b203a367869607f7fd0d130c5f85919cc5d0462fec372a214c31df2ecde30cde248804c173fb9a5d32136d84f605d5557fc09cb3

data/ChangeLog

@@ -1,12 +1,21 @@
-== 2015-03-24 version 0.11.8.2
-
-* Experimental: table:export with tsv.gz option.
-
-== 2015-03-19 version 0.11.8.1
-
-* Fix: exclude dist directory from gem package.
-  This release is gem, not Toolbelt. It only includes td.gemspec change from
-  0.11.8.
+== 2015-04-17 version 0.11.9
+
+* add connector commands.
+* add tsv.gz format to export command.
+* add --null option to job:show that specifies what character to represent
+  null value in csv or tsv format. It emits 'null' by default for backward
+  compatibility but you can specify '--null ""' to use empty string instead
+  of 'null'.
+* fix: remove illegal TAB character at the end of header record. Thanks y-ken!
+* fix: do fancy format of numbers in table:list only if format is 'table'.
+* fix: job:show to convert NaN to empty String if format is csv or tsv. The
+  column data NaN, Infinity and -Infinity caused an error if previous
+  versions.  If json format is specified it still raises an error because JSON
+  format does not have representation of those values.
+* fix: internal cwd handling for auto jar update that caused import:upload to
+  fail by changing cwd before reading specified file.
+* fix: table:list to consider import_only databases. It just skips such
+  databases and no longer crashes with insufficient permission.
 
 == 2015-02-20 version 0.11.8
 

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
+#gem 'td-client', :git => 'https://github.com/treasure-data/td-client-ruby.git'
+
 gemspec

data/lib/td/command/connector.rb

@@ -0,0 +1,299 @@
+require 'td/command/common'
+require 'td/command/job'
+require 'json'
+require 'uri'
+require 'yaml'
+
+module TreasureData
+module Command
+
+  def required(opt, value)
+    if value.nil?
+      raise ParameterConfigurationError, "#{opt} option required"
+    end
+  end
+
+  def connector_guess(op)
+    type = 's3'
+    id = secret = source = nil
+    out = 'td-bulkload.yml'
+
+    op.on('--type[=TYPE]', "connector type; only 's3' is supported") { |s| type = s }
+    op.on('--access-id ID', "access ID (S3 access key id for type: s3)") { |s| id = s }
+    op.on('--access-secret SECRET', "access secret (S3 secret access key for type: s3)") { |s| secret = s }
+    op.on('--source SOURCE', "resource(s) URI to be imported (e.g. https://s3-us-west-1.amazonaws.com/bucketname/path/prefix/to/import/)") { |s| source = s }
+    op.on('--out FILE_NAME', "configuration file") { |s| out = s }
+
+    config = op.cmd_parse
+    if config
+      job = prepare_bulkload_job_config(config)
+      out ||= config
+    else
+      required('--access-id', id)
+      required('--access-secret', secret)
+      required('--source', source)
+      required('--out', out)
+
+      uri = URI.parse(source)
+      endpoint = uri.host
+      path_components = uri.path.scan(/\/[^\/]*/)
+      bucket = path_components.shift.sub(/\//, '')
+      path_prefix = path_components.join.sub(/\//, '')
+
+      job = API::BulkLoad::BulkLoad.from_hash(
+        :config => {
+          :type => type,
+          :access_key_id => id,
+          :secret_access_key => secret,
+          :endpoint => endpoint,
+          :bucket => bucket,
+          :path_prefix => path_prefix,
+        }
+      ).validate
+    end
+
+    client = get_client
+    job = client.bulk_load_guess(job)
+
+    create_bulkload_job_file_backup(out)
+    if /\.json\z/ =~ out
+      config_str = JSON.pretty_generate(job.to_h)
+    else
+      config_str = YAML.dump(job.to_h)
+    end
+    File.open(out, 'w') do |f|
+      f << config_str
+    end
+
+    puts "Created #{out} file."
+    puts "Use '#{$prog} " + Config.cl_options_string + "connector:preview #{out}' to see bulk load preview."
+  end
+
+  def connector_preview(op)
+    set_render_format_option(op)
+    config_file = op.cmd_parse
+    job = prepare_bulkload_job_config(config_file)
+    client = get_client()
+    preview = client.bulk_load_preview(job)
+
+    cols = preview.schema.sort_by { |col|
+      col['index']
+    }
+    fields = cols.map { |col| col['name'] + ':' + col['type'] }
+    types = cols.map { |col| col['type'] }
+    rows = preview.records.map { |row|
+      cols = {}
+      row.each_with_index do |col, idx|
+        cols[fields[idx]] = col.inspect
+      end
+      cols
+    } 
+
+    puts cmd_render_table(rows, :fields => fields, :render_format => op.render_format)
+
+    puts "Update #{config_file} and use '#{$prog} " + Config.cl_options_string + "connector:preview #{config_file}' to preview again."
+    puts "Use '#{$prog} " + Config.cl_options_string + "connector:issue #{config_file}' to run Server-side bulk load."
+  end
+
+  def connector_issue(op)
+    database = table = nil
+    time_column = nil
+    wait = exclude = false
+    op.on('--database DB_NAME', "destination database") { |s| database = s }
+    op.on('--table TABLE_NAME', "destination table") { |s| table = s }
+    op.on('--time-column COLUMN_NAME', "data partitioning key") { |s| time_column = s }
+    op.on('-w', '--wait', 'wait for finishing the job', TrueClass) { |b| wait = b }
+    op.on('-x', '--exclude', 'do not automatically retrieve the job result', TrueClass) { |b| exclude = b }
+
+    config_file = op.cmd_parse
+
+    required('--database', database)
+    required('--table', table)
+
+    job = prepare_bulkload_job_config(config_file)
+    job['time_column'] = time_column if time_column
+
+    client = get_client()
+    job_id = client.bulk_load_issue(database, table, job)
+
+    puts "Job #{job_id} is queued."
+    puts "Use '#{$prog} " + Config.cl_options_string + "job:show #{job_id}' to show the status."
+
+    if wait
+      wait_connector_job(client, job_id, exclude)
+    end
+  end
+
+  def connector_list(op)
+    set_render_format_option(op)
+    op.cmd_parse
+
+    client = get_client()
+    # TODO database and table is empty at present. Fix API or Client.
+    keys = ['name', 'cron', 'timezone', 'delay', 'database', 'table', 'config']
+    fields = keys.map { |e| e.capitalize.to_sym }
+    rows = client.bulk_load_list().sort_by { |e|
+      e['name']
+    }.map { |e|
+      Hash[fields.zip(e.to_h.values_at(*keys))]
+    }
+
+    puts cmd_render_table(rows, :fields => fields, :render_format => op.render_format)
+  end
+
+  def connector_create(op)
+    # TODO it's a must parameter at this moment but API should be fixed
+    opts = {:timezone => 'UTC'}
+    op.on('--time-column COLUMN_NAME', "data partitioning key") {|s|
+      opts[:time_column] = s
+    }
+    op.on('-t', '--timezone TZ', "name of the timezone.",
+                                 "  Only extended timezones like 'Asia/Tokyo', 'America/Los_Angeles' are supported,",
+                                 "  (no 'PST', 'PDT', etc...).",
+                                 "  When a timezone is specified, the cron schedule is referred to that timezone.",
+                                 "  Otherwise, the cron schedule is referred to the UTC timezone.",
+                                 "  E.g. cron schedule '0 12 * * *' will execute daily at 5 AM without timezone option",
+                                 "  and at 12PM with the -t / --timezone 'America/Los_Angeles' timezone option") {|s|
+      opts[:timezone] = s
+    }
+    op.on('-D', '--delay SECONDS', 'delay time of the schedule', Integer) {|i|
+      opts[:delay] = i
+    }
+
+    name, cron, database, table, config_file = op.cmd_parse
+
+    job = prepare_bulkload_job_config(config_file)
+    opts[:cron] = cron
+
+    client = get_client()
+    get_table(client, database, table)
+
+    session = client.bulk_load_create(name, database, table, job, opts)
+    dump_connector_session(session)
+  end
+
+  def connector_show(op)
+    name = op.cmd_parse
+
+    client = get_client()
+    session = client.bulk_load_show(name)
+    dump_connector_session(session)
+  end
+
+  def connector_update(op)
+    name, config_file = op.cmd_parse
+
+    job = prepare_bulkload_job_config(config_file)
+
+    client = get_client()
+    session = client.bulk_load_update(name, job)
+    dump_connector_session(session)
+  end
+
+  def connector_delete(op)
+    name = op.cmd_parse
+
+    client = get_client()
+    session = client.bulk_load_delete(name)
+    puts 'Deleted session'
+    puts '--'
+    dump_connector_session(session)
+  end
+
+  def connector_history(op)
+    set_render_format_option(op)
+    name = op.cmd_parse
+
+    fields = [:JobID, :Status, :Records, :Database, :Table, :Priority, :Started, :Duration]
+    client = get_client()
+    rows = client.bulk_load_history(name).map { |e|
+      {
+        :JobID => e.job_id,
+        :Status => e.status,
+        :Records => e.records,
+        # TODO: td-client-ruby should retuan only name
+        :Database => e.database['name'],
+        :Table => e.table['name'],
+        :Priority => e.priority,
+        :Started => Time.at(e.start_at),
+        :Duration => (e.end_at.nil? ? Time.now.to_i : e.end_at) - e.start_at,
+      }
+    }
+    puts cmd_render_table(rows, :fields => fields, :render_format => op.render_format)
+  end
+
+  def connector_run(op)
+    wait = exclude = false
+    op.on('-w', '--wait', 'wait for finishing the job', TrueClass) { |b| wait = b }
+    op.on('-x', '--exclude', 'do not automatically retrieve the job result', TrueClass) { |b| exclude = b }
+
+    name, scheduled_time = op.cmd_parse
+
+    client = get_client()
+    job_id = client.bulk_load_run(name)
+    puts "Job #{job_id} is queued."
+    puts "Use '#{$prog} " + Config.cl_options_string + "job:show #{job_id}' to show the status."
+
+    if wait
+      wait_connector_job(client, job_id, exclude)
+    end
+  end
+
+private
+
+  def file_type(str)
+    begin
+      YAML.load(str)
+      return :yaml
+    rescue
+    end
+    begin
+      JSON.parse(str)
+      return :json
+    rescue
+    end
+    nil
+  end
+
+  def prepare_bulkload_job_config(config_file)
+    unless File.exist?(config_file)
+      raise ParameterConfigurationError, "configuration file: #{config_file} not found"
+    end
+    config_str = File.read(config_file)
+    if file_type(config_str) == :yaml
+      config_str = JSON.pretty_generate(YAML.load(config_str))
+    end
+    API::BulkLoad::BulkLoad.from_json(config_str)
+  end
+
+  def create_bulkload_job_file_backup(out)
+    return unless File.exist?(out)
+    0.upto(100) do |idx|
+      backup = "#{out}.#{idx}"
+      unless File.exist?(backup)
+        FileUtils.mv(out, backup)
+        return
+      end
+    end
+    raise "backup file creation failed"
+  end
+
+  def dump_connector_session(session)
+    puts "Name     : #{session.name}"
+    puts "Cron     : #{session.cron}"
+    puts "Timezone : #{session.timezone}"
+    puts "Delay    : #{session.delay}"
+    puts "Database : #{session.database}"
+    puts "Table    : #{session.table}"
+    puts "Config"
+    puts YAML.dump(session.config.to_h)
+  end
+
+  def wait_connector_job(client, job_id, exclude)
+    job = client.job(job_id)
+    wait_job(job, true)
+    puts "Status     : #{job.status}"
+  end
+
+end
+end

data/lib/td/command/job.rb

@@ -1,4 +1,3 @@
-
 module TreasureData
 module Command
 
@@ -143,6 +142,10 @@ module Command
       exclude = b
     }
 
+    op.on('--null STRING', "null expression in csv or tsv") {|s|
+      render_opts[:null_expr] = s.to_s
+    }
+
     job_id = op.cmd_parse
 
     # parameter concurrency validation
@@ -166,8 +169,38 @@ module Command
             "Option -l / --limit is only valid when not outputting to file (no -o / --output option provided)"
     end
 
+    get_and_show_result(job_id, wait, exclude, output, limit, format, render_opts, verbose)
+  end
+
+  def job_status(op)
+    job_id = op.cmd_parse
     client = get_client
 
+    puts client.job_status(job_id)
+  end
+
+  def job_kill(op)
+    job_id = op.cmd_parse
+
+    client = get_client
+
+    former_status = client.kill(job_id)
+    if TreasureData::Job::FINISHED_STATUS.include?(former_status)
+      $stderr.puts "Job #{job_id} is already finished (#{former_status})"
+      exit 0
+    end
+
+    if former_status == TreasureData::Job::STATUS_RUNNING
+      $stderr.puts "Job #{job_id} is killed."
+    else
+      $stderr.puts "Job #{job_id} is canceled."
+    end
+  end
+
+private
+
+  def get_and_show_result(job_id, wait, exclude = false, output = nil, limit = nil, format = nil, render_opts = {}, verbose = false)
+    client = get_client
     job = client.job(job_id)
 
     puts "JobID       : #{job.job_id}"
@@ -194,61 +227,14 @@ module Command
       end
     end
 
-    # up to 7 retries with exponential (base 2) back-off starting at 'retry_delay'
-    retry_delay = 5
-    max_cumul_retry_delay = 200
-    cumul_retry_delay = 0
-
     if wait && !job.finished?
       wait_job(job)
       if [:hive, :pig, :impala, :presto].include?(job.type) && !exclude
-        puts "Result      :"
-
-        begin
-          show_result(job, output, limit, format, render_opts)
-        rescue TreasureData::NotFoundError => e
-          # Got 404 because result not found.
-        rescue TreasureData::APIError, # HTTP status code 500 or more
-               Errno::ECONNREFUSED, Errno::ECONNRESET, Timeout::Error, EOFError,
-               OpenSSL::SSL::SSLError, SocketError => e
-          # don't retry on 300 and 400 errors
-          if e.class == TreasureData::APIError && e.message !~ /^5\d\d:\s+/
-            raise e
-          end
-          if cumul_retry_delay > max_cumul_retry_delay
-            raise e
-          end
-          $stderr.puts "Error #{e.class}: #{e.message}. Retrying after #{retry_delay} seconds..."
-          sleep retry_delay
-          cumul_retry_delay += retry_delay
-          retry_delay *= 2
-          retry
-        end
+        show_result_with_retry(job, output, limit, format, render_opts)
       end
-
     else
       if [:hive, :pig, :impala, :presto].include?(job.type) && !exclude && job.finished?
-        puts "Result      :"
-        begin
-          show_result(job, output, limit, format, render_opts)
-        rescue TreasureData::NotFoundError => e
-          # Got 404 because result not found.
-        rescue TreasureData::APIError,
-               Errno::ECONNREFUSED, Errno::ECONNRESET, Timeout::Error, EOFError,
-               OpenSSL::SSL::SSLError, SocketError => e
-          # don't retry on 300 and 400 errors
-          if e.class == TreasureData::APIError && e.message !~ /^5\d\d:\s+/
-            raise e
-          end
-          if cumul_retry_delay > max_cumul_retry_delay
-            raise e
-          end
-          $stderr.puts "Error #{e.class}: #{e.message}. Retrying after #{retry_delay} seconds..."
-          sleep retry_delay
-          cumul_retry_delay += retry_delay
-          retry_delay *= 2
-          retry
-        end
+        show_result_with_retry(job, output, limit, format, render_opts)
       end
 
       if verbose
@@ -272,32 +258,6 @@ module Command
     puts "\rUse '-v' option to show detailed messages." + " " * 20 unless verbose
   end
 
-  def job_status(op)
-    job_id = op.cmd_parse
-    client = get_client
-
-    puts client.job_status(job_id)
-  end
-
-  def job_kill(op)
-    job_id = op.cmd_parse
-
-    client = get_client
-
-    former_status = client.kill(job_id)
-    if TreasureData::Job::FINISHED_STATUS.include?(former_status)
-      $stderr.puts "Job #{job_id} is already finished (#{former_status})"
-      exit 0
-    end
-
-    if former_status == TreasureData::Job::STATUS_RUNNING
-      $stderr.puts "Job #{job_id} is killed."
-    else
-      $stderr.puts "Job #{job_id} is canceled."
-    end
-  end
-
-  private
   def wait_job(job, first_call = false)
     $stderr.puts "queued..."
 
@@ -328,6 +288,35 @@ module Command
     end
   end
 
+  def show_result_with_retry(job, output, limit, format, render_opts)
+    # up to 7 retries with exponential (base 2) back-off starting at 'retry_delay'
+    retry_delay = 5
+    max_cumul_retry_delay = 200
+    cumul_retry_delay = 0
+
+    puts "Result      :"
+    begin
+      show_result(job, output, limit, format, render_opts)
+    rescue TreasureData::NotFoundError => e
+      # Got 404 because result not found.
+    rescue TreasureData::APIError, # HTTP status code 500 or more
+            Errno::ECONNREFUSED, Errno::ECONNRESET, Timeout::Error, EOFError,
+            OpenSSL::SSL::SSLError, SocketError => e
+      # don't retry on 300 and 400 errors
+      if e.class == TreasureData::APIError && e.message !~ /^5\d\d:\s+/
+        raise e
+      end
+      if cumul_retry_delay > max_cumul_retry_delay
+        raise e
+      end
+      $stderr.puts "Error #{e.class}: #{e.message}. Retrying after #{retry_delay} seconds..."
+      sleep retry_delay
+      cumul_retry_delay += retry_delay
+      retry_delay *= 2
+      retry
+    end
+  end
+
   def show_result(job, output, limit, format, render_opts={})
     if output
       write_result(job, output, limit, format, render_opts)
@@ -387,7 +376,7 @@ module Command
         job.result_each_with_compr_size {|row, compr_size|
           # TODO limit the # of columns
           writer << row.map {|col|
-            dump_column(col)
+            dump_column(col, render_opts[:null_expr])
           }
           n_rows += 1
           if n_rows % 100 == 0 # flush every 100 recods
@@ -405,10 +394,7 @@ module Command
       open_file(output, "w") {|f|
         # output headers
         if render_opts[:header] && job.hive_result_schema
-          job.hive_result_schema.each {|name,type|
-            f.write name + "\t"
-          }
-          f.write "\n"
+          f.write job.hive_result_schema.map {|name, type| name}.join("\t") + "\n"
         end
         # output data
         n_rows = 0
@@ -417,8 +403,9 @@ module Command
             "NOTE: the job result is being written to #{output} in tsv format",
             job.result_size, 0.1, 1)
         end
+
         job.result_each_with_compr_size {|row, compr_size|
-          f.write row.map {|col| dump_column(col)}.join("\t") + "\n"
+          f.write row.map {|col| dump_column(col, render_opts[:null_expr])}.join("\t") + "\n"
           n_rows += 1
           if n_rows % 100 == 0
             f.flush # flush every 100 recods
@@ -493,7 +480,7 @@ module Command
       job.result_each_with_compr_size {|row, compr_size|
         indicator.update(compr_size)
         rows << row.map {|v|
-          dump_column_safe_utf8(v)
+          dump_column_safe_utf8(v, render_opts[:null_expr])
         }
         n_rows += 1
         break if !limit.nil? and n_rows == limit
@@ -514,15 +501,17 @@ module Command
     end
   end
 
-  def dump_column(v)
-    s = v.is_a?(String) ? v.to_s : Yajl.dump(v)
+  def dump_column(v, null_expr = nil)
+    v = null_expr if v.nil? && null_expr
+
+    s = v.is_a?(String) ? v.to_s : Yajl.dump(sanitize_infinite_value(v))
     # CAUTION: msgpack-ruby populates byte sequences as Encoding.default_internal which should be BINARY
     s = s.force_encoding('BINARY') if s.respond_to?(:encode)
     s
   end
 
-  def dump_column_safe_utf8(v)
-    s = dump_column(v)
+  def dump_column_safe_utf8(v, null_expr = false)
+    s = dump_column(v, null_expr)
     # Here does UTF-8 -> UTF-16LE -> UTF8 conversion:
     #   a) to make sure the string doesn't include invalid byte sequence
     #   b) to display multi-byte characters as it is
@@ -532,6 +521,10 @@ module Command
     s
   end
 
+  def sanitize_infinite_value(v)
+    (v.is_a?(Float) && !v.finite?) ? v.to_s : v
+  end
+
   def job_priority_name_of(id)
     PRIORITY_FORMAT_MAP[id] || 'NORMAL'
   end

data/lib/td/command/list.rb

@@ -311,7 +311,7 @@ module List
   # TODO acl:test
 
   add_list 'server:status', %w[], 'Show status of the Treasure Data server'
-  add_list 'server:endpoint', %w[api_endpoint], "Set the Treasure Data API server's endpoint (must be a valid URI)", ["td server:endpoint 'https://api.treasuredata.com'"]
+  add_list 'server:endpoint', %w[api_endpoint], "Set the Treasure Data API server's endpoint (must be a valid URI)", ["server:endpoint 'https://api.treasuredata.com'"]
 
   add_list 'sample:apache', %w[path.json], 'Create a sample log file', [], false
 
@@ -320,6 +320,19 @@ module List
 
   add_list 'update', %w[], 'Update td and related libraries for TreasureData toolbelt'
 
+  add_list 'connector:guess', %w[config?], 'Run guess to generate connector config file', ['connector:guess td-bulkload.yml', 'connector:guess --access-id s3accessId --access-secret s3AccessKey --source https://s3.amazonaws.com/bucketname/path/prefix --database connector_database --table connector_table']
+  add_list 'connector:preview', %w[config], 'Show preview of connector execution', ['connector:preview td-bulkload.yml']
+
+  add_list 'connector:issue', %w[config], 'Run one time connector execution', ['connector:issue td-bulkload.yml']
+
+  add_list 'connector:list', %w[], 'Show list of connector sessions', ['connector:list']
+  add_list 'connector:create', %w[name cron database table config], 'Create new connector session', ['connector:create connector1 "0 * * * *" connector_database connector_table td-bulkload.yml']
+  add_list 'connector:show', %w[name], 'Show connector session', ['connector:show connector1']
+  add_list 'connector:update', %w[name config], 'Modify connector session', ['connector:update connector1 td-bulkload.yml']
+  add_list 'connector:delete', %w[name], 'Delete connector session', ['connector:delete connector1']
+  add_list 'connector:history', %w[name], 'Show job history of connector session', ['connector:history connector1']
+  add_list 'connector:run', %w[name time], 'Run connector session for the specified time', ['connector:run connector1 "2016-01-01 00:00:00"']
+
   # aliases
   add_alias 'db', 'db:show'
   add_alias 'dbs', 'db:list'
@@ -377,6 +390,8 @@ module List
 
   add_alias 's', 'status'
 
+  add_alias 'connector', 'connector:guess'
+
   # backward compatibility
   add_alias 'show-databases',   'db:list'
   add_alias 'show-dbs',         'db:list'

data/lib/td/command/runner.rb

@@ -46,6 +46,7 @@ Basic commands:
   result         # create/delete/list result URLs
   sched          # create/delete/list schedules that run a query periodically
   schema         # create/delete/modify schemas of tables
+  connector      # manage connectors
 
 Additional commands:
 

data/lib/td/command/table.rb

@@ -144,18 +144,25 @@ module Command
       databases = client.databases
     end
 
-    has_item = databases.select {|db| db.tables.select {|table| table.type == :item}.length > 0 }.length > 0
+    has_item = databases.select {|db|
+      db.permission != :import_only ? (db.tables.select {|table| table.type == :item}.length > 0) : false
+    }.length > 0
 
+    # ref. https://github.com/treasure-data/td/issues/26
+    should_number_format = [nil, "table"].include?(op.render_format)
     rows = []
     ::Parallel.each(databases, :in_threads => num_threads) {|db|
       begin
+        if db.permission == :import_only
+          next
+        end
         db.tables.each {}
         db.tables.each {|table|
           pschema = table.schema.fields.map {|f|
             "#{f.name}:#{f.type}"
           }.join(', ')
           new_row = {
-            :Database => db.name, :Table => table.name, :Type => table.type.to_s, :Count => TreasureData::Helpers.format_with_delimiter(table.count),
+            :Database => db.name, :Table => table.name, :Type => table.type.to_s, :Count => (should_number_format ? TreasureData::Helpers.format_with_delimiter(table.count) : 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,
             'Last log timestamp' => table.last_log_timestamp ? table.last_log_timestamp.localtime : nil,
@@ -188,8 +195,12 @@ module Command
 
     if rows.empty?
       if db_name
-        $stderr.puts "Database '#{db_name}' has no tables."
-        $stderr.puts "Use '#{$prog} " + Config.cl_options_string + "table:create <db> <table>' to create a table."
+        if databases.first.permission == :import_only
+          $stderr.puts "Database '#{db_name}' is import only, cannot list or create tables."
+        else
+          $stderr.puts "Database '#{db_name}' has no tables."
+          $stderr.puts "Use '#{$prog} " + Config.cl_options_string + "table:create <db> <table>' to create a table."
+        end
       elsif databases.empty?
         $stderr.puts "There are no databases."
         $stderr.puts "Use '#{$prog} " + Config.cl_options_string + "db:create <db>' to create a database."

data/lib/td/command/user.rb

@@ -120,7 +120,7 @@ module Command
     client.add_user(name, nil, email, password)
 
     $stderr.puts "User '#{name}' is created."
-    $stderr.puts "Use '#{$prog} " + Config.cl_options_string + "user:apikeys #{name}' to show the API key."    
+    $stderr.puts "Use '#{$prog} " + Config.cl_options_string + "user:apikeys #{name}' to show the API key."
   end
 
   def user_delete(op)

data/lib/td/updater.rb

@@ -330,35 +330,35 @@ end # module ModuleDefinition
 
     if updated > last_updated
       FileUtils.mkdir_p(Updater.jarfile_dest_path) unless File.exists?(Updater.jarfile_dest_path)
-      Dir.chdir Updater.jarfile_dest_path
+      Dir.chdir(Updater.jarfile_dest_path) do
+        File.open('VERSION', 'w') {|f|
+          if hourly
+            f.print "#{version} via hourly jar auto-update"
+          else
+            f.print "#{version} via import:jar_update command"
+          end
+        }
+        File.open('td-import-java.version', 'w') {|f|
+          f.print "#{version} #{updated}"
+        }
 
-      File.open('VERSION', 'w') {|f|
-        if hourly
-          f.print "#{version} via hourly jar auto-update"
-        else
-          f.print "#{version} via import:jar_update command"
-        end
-      }
-      File.open('td-import-java.version', 'w') {|f|
-        f.print "#{version} #{updated}"
-      }
-
-      status = nil
-      indicator = Command::TimeBasedDownloadProgressIndicator.new(
-        "Updating td-import.jar", Time.new.to_i, 2)
-      File.open('td-import.jar.new', 'wb') {|binfile|
-        status = Updater.stream_fetch("#{maven_repo}/#{version}/td-import-#{version}-jar-with-dependencies.jar", binfile) {
-          indicator.update
+        status = nil
+        indicator = Command::TimeBasedDownloadProgressIndicator.new(
+          "Updating td-import.jar", Time.new.to_i, 2)
+        File.open('td-import.jar.new', 'wb') {|binfile|
+          status = Updater.stream_fetch("#{maven_repo}/#{version}/td-import-#{version}-jar-with-dependencies.jar", binfile) {
+            indicator.update
+          }
         }
-      }
-      indicator.finish()
+        indicator.finish()
 
-      if status
-        puts "Installed td-import.jar v#{version} in '#{Updater.jarfile_dest_path}'.\n"
-        File.rename 'td-import.jar.new', 'td-import.jar'
-      else
-        puts "Update of td-import.jar failed." unless ENV['TD_TOOLBELT_DEBUG'].nil?
-        File.delete 'td-import.jar.new' if File.exists? 'td-import.jar.new'
+        if status
+          puts "Installed td-import.jar v#{version} in '#{Updater.jarfile_dest_path}'.\n"
+          File.rename 'td-import.jar.new', 'td-import.jar'
+        else
+          puts "Update of td-import.jar failed." unless ENV['TD_TOOLBELT_DEBUG'].nil?
+          File.delete 'td-import.jar.new' if File.exists? 'td-import.jar.new'
+        end
       end
     else
       puts 'Installed td-import.jar is already at the latest version.' unless hourly

data/lib/td/version.rb

@@ -1,3 +1,3 @@
 module TreasureData
-  TOOLBELT_VERSION = '0.11.8.2'
+  TOOLBELT_VERSION = '0.11.9'
 end

data/spec/td/command/job_spec.rb

@@ -13,6 +13,8 @@ module TreasureData::Command
     end
 
     describe 'write_result' do
+      let(:file) { Tempfile.new("job_spec") }
+
       let :job do
         job = TreasureData::Job.new(nil, 12345, 'hive', 'select * from employee')
         job.instance_eval do
@@ -23,22 +25,216 @@ module TreasureData::Command
         job
       end
 
-      it 'supports json output' do
-        file = Tempfile.new("job_spec")
-        command.send(:show_result, job, file, nil, 'json')
-        File.read(file.path).should == %Q([["1",2.0,{"key":3}],\n["4",5.0,{"key":6}],\n["7",8.0,{"key":9}]])
+      context 'result without nil' do
+        it 'supports json output' do
+          command.send(:show_result, job, file, nil, 'json')
+          File.read(file.path).should == %Q([["1",2.0,{"key":3}],\n["4",5.0,{"key":6}],\n["7",8.0,{"key":9}]])
+        end
+
+        it 'supports csv output' do
+          command.send(:show_result, job, file, nil, 'csv')
+          File.read(file.path).should == %Q(1,2.0,"{""key"":3}"\n4,5.0,"{""key"":6}"\n7,8.0,"{""key"":9}"\n)
+        end
+
+        it 'supports tsv output' do
+          command.send(:show_result, job, file, nil, 'tsv')
+          File.read(file.path).should == %Q(1\t2.0\t{"key":3}\n4\t5.0\t{"key":6}\n7\t8.0\t{"key":9}\n)
+        end
       end
 
-      it 'supports csv output' do
-        file = Tempfile.new("job_spec")
-        command.send(:show_result, job, file, nil, 'csv')
-        File.read(file.path).should == %Q(1,2.0,"{""key"":3}"\n4,5.0,"{""key"":6}"\n7,8.0,"{""key"":9}"\n)
+      context 'result with nil' do
+        let :job_id do
+          12345
+        end
+
+        let :job do
+          job = TreasureData::Job.new(nil, job_id, 'hive', 'select * from employee')
+          job.instance_eval do
+            @result = [[[nil, 2.0, {key:3}], 1]]
+            @result_size = 3
+            @status = 'success'
+          end
+          job
+        end
+
+        context 'with --column-header option' do
+          before do
+            job.stub(:hive_result_schema).and_return([['c0', 'time'], ['c1', 'double'], ['v', nil], ['c3', 'long']])
+            client = Object.new
+            client.stub(:job).with(job_id).and_return(job)
+            command.stub(:get_client).and_return(client)
+          end
+
+          it 'supports json output' do
+            command.send(:show_result, job, file, nil, 'json', { header: true })
+            File.read(file.path).should == %Q([[null,2.0,{"key":3}]])
+          end
+
+          it 'supports csv output' do
+            command.send(:show_result, job, file, nil, 'csv', { header: true })
+            File.read(file.path).should == %Q(c0,c1,v,c3\nnull,2.0,"{""key"":3}"\n)
+          end
+
+          it 'supports tsv output' do
+            command.send(:show_result, job, file, nil, 'tsv', { header: true })
+            File.read(file.path).should == %Q(c0\tc1\tv\tc3\nnull\t2.0\t{"key":3}\n)
+          end
+        end
+
+        context 'without --null option' do
+          it 'supports json output' do
+            command.send(:show_result, job, file, nil, 'json')
+            File.read(file.path).should == %Q([[null,2.0,{"key":3}]])
+          end
+
+          it 'supports csv output' do
+            command.send(:show_result, job, file, nil, 'csv')
+            File.read(file.path).should == %Q(null,2.0,"{""key"":3}"\n)
+          end
+
+          it 'supports tsv output' do
+            command.send(:show_result, job, file, nil, 'tsv')
+            File.read(file.path).should == %Q(null\t2.0\t{"key":3}\n)
+          end
+        end
+
+        context 'with --null option' do
+          it 'dose not effect json output (nil will be shown as null)' do
+            command.send(:show_result, job, file, nil, 'json', { null_expr: "NULL" })
+            File.read(file.path).should == %Q([[null,2.0,{"key":3}]])
+          end
+
+          context 'csv format' do
+            context 'specified string is NULL' do
+              let!(:null_expr) { "NULL" }
+
+              it 'shows nill as specified string' do
+                command.send(:show_result, job, file, nil, 'csv', { null_expr: null_expr })
+                File.read(file.path).should == %Q(NULL,2.0,"{""key"":3}"\n)
+              end
+            end
+
+            context 'specified string is empty string' do
+              let!(:null_expr) { '' }
+
+              it 'shows nill as empty string' do
+                command.send(:show_result, job, file, nil, 'csv', { null_expr: null_expr })
+                File.read(file.path).should == %Q("",2.0,"{""key"":3}"\n)
+              end
+            end
+          end
+
+          it 'supports tsv output' do
+            command.send(:show_result, job, file, nil, 'tsv', { null_expr: "\"\"" })
+            File.read(file.path).should == %Q(""\t2.0\t{"key":3}\n)
+          end
+        end
       end
 
-      it 'supports tsv output' do
-        file = Tempfile.new("job_spec")
-        command.send(:show_result, job, file, nil, 'tsv')
-        File.read(file.path).should == %Q(1\t2.0\t{"key":3}\n4\t5.0\t{"key":6}\n7\t8.0\t{"key":9}\n)
+      context 'without NaN/Infinity' do
+
+        it 'supports json output' do
+          command.send(:show_result, job, file, nil, 'json')
+          File.read(file.path).should == %Q([["1",2.0,{"key":3}],\n["4",5.0,{"key":6}],\n["7",8.0,{"key":9}]])
+        end
+
+        it 'supports csv output' do
+          command.send(:show_result, job, file, nil, 'csv')
+          File.read(file.path).should == %Q(1,2.0,"{""key"":3}"\n4,5.0,"{""key"":6}"\n7,8.0,"{""key"":9}"\n)
+        end
+
+        it 'supports tsv output' do
+          command.send(:show_result, job, file, nil, 'tsv')
+          File.read(file.path).should == %Q(1\t2.0\t{"key":3}\n4\t5.0\t{"key":6}\n7\t8.0\t{"key":9}\n)
+        end
+      end
+
+      context 'with NaN/Infinity' do
+        let :job do
+          job = TreasureData::Job.new(nil, 12345, 'hive', 'select * from employee')
+          job.instance_eval do
+            @result = [[[0.0/0.0, 1.0/0.0, 1.0/-0.0], 1], [["4", 5.0, {key:6}], 2], [["7", 8.0, {key:9}], 3]]
+            @result_size = 3
+            @status = 'success'
+          end
+          job
+        end
+
+        it 'does not support json output' do
+          expect { command.send(:show_result, job, file, nil, 'json') }.to raise_error Yajl::EncodeError
+        end
+
+        it 'supports csv output' do
+          command.send(:show_result, job, file, nil, 'csv')
+          File.read(file.path).should == %Q("""NaN""","""Infinity""","""-Infinity"""\n4,5.0,"{""key"":6}"\n7,8.0,"{""key"":9}"\n)
+        end
+
+        it 'supports tsv output' do
+          command.send(:show_result, job, file, nil, 'tsv')
+          File.read(file.path).should == %Q("NaN"\t"Infinity"\t"-Infinity"\n4\t5.0\t{"key":6}\n7\t8.0\t{"key":9}\n)
+        end
+      end
+    end
+
+    describe '#job_show' do
+      let(:job_id) { "12345" }
+
+      let :job_classs do
+        Struct.new(:job_id,
+                   :status,
+                   :type,
+                   :db_name,
+                   :priority,
+                   :retry_limit,
+                   :result_url,
+                   :query,
+                   :cpu_time,
+                   :result_size
+                  )
+      end
+
+      let :job do
+        job_classs.new(job_id,
+                       nil,
+                       :hive,
+                       "db_name",
+                       1,
+                       1,
+                       "test_url",
+                       "test_qury",
+                       1,
+                       3
+                      )
+      end
+
+      before do
+        job.stub(:finished?).and_return(true)
+
+        client = Object.new
+        client.stub(:job).with(job_id).and_return(job)
+        command.stub(:get_client).and_return(client)
+      end
+
+      context 'without --null option' do
+        it 'calls #show_result without null_expr option' do
+          command.stub(:show_result).with(job, nil, nil, nil, {:header=>false})
+          op = List::CommandParser.new("job:show", %w[job_id], %w[], nil, ["12345"], true)
+          command.job_show(op)
+        end
+      end
+
+      context 'with --null option' do
+        it 'calls #show_result with null_expr option' do
+          command.stub(:show_result).with(job, nil, nil, nil, {:header=>false, :null_expr=>"NULL"} )
+          op = List::CommandParser.new("job:show", %w[job_id], %w[], nil, ["12345", "--null", "NULL"], true)
+          command.job_show(op)
+        end
+
+        it 'calls #show_result with null_expr option' do
+          command.stub(:show_result).with(job, nil, nil, nil, {:header=>false, :null_expr=>'""'} )
+          op = List::CommandParser.new("job:show", %w[job_id], %w[], nil, ["12345", "--null", '""'], true)
+          command.job_show(op)
+        end
       end
     end
 

data/spec/td/command/table_spec.rb

@@ -0,0 +1,186 @@
+require 'spec_helper'
+require 'td/command/common'
+require 'td/config'
+require 'td/command/list'
+require 'td/command/table'
+require 'td/client/model'
+
+module TreasureData::Command
+
+  describe 'table command' do
+    describe 'table_list' do
+      it 'lists tables in a database' do
+        client = Object.new
+
+        db = TreasureData::Database.new(client, 'full_access_db', nil, 1000, Time.now.to_i, Time.now.to_i, nil, 'full_access')
+
+        create_tables = lambda {|db_name|
+          (1..6).map {|i|
+            schema = TreasureData::Schema.new.from_json(JSON.parse('[]'))
+            TreasureData::Table.new(client, db_name, db_name + "_table_#{i}", 'log', schema, 500, Time.now.to_i, Time.now.to_i, 0, nil, nil, nil, nil, nil)
+          }
+        }
+        db_tables = create_tables.call(db.name)
+
+        client.stub(:tables).with(db.name).and_return(db_tables)
+
+        command = Class.new { include TreasureData::Command }.new
+        command.stub(:get_client).and_return(client)
+        command.stub(:get_database).and_return(db)
+
+        op = List::CommandParser.new('table:list', %w[], %w[db], false, %w(full_access_db), true)
+        expect {
+          command.table_list(op)
+        }.to_not raise_exception
+      end
+
+      it 'lists all tables in all databases' do
+        client = Object.new
+
+        qo_db = TreasureData::Database.new(client, 'query_only_db', nil, 2000, Time.now.to_i, Time.now.to_i, nil, 'query_only')
+        fa_db = TreasureData::Database.new(client, 'full_access_db', nil, 3000, Time.now.to_i, Time.now.to_i, nil, 'full_access')
+        own_db = TreasureData::Database.new(client, 'owner_db', nil, 4000, Time.now.to_i, Time.now.to_i, nil, 'owner')
+
+        create_tables = lambda {|db_name|
+          (1..6).map {|i|
+            schema = TreasureData::Schema.new.from_json(JSON.parse('[]'))
+            TreasureData::Table.new(client, db_name, db_name + "_table_#{i}", 'log', schema, 500, Time.now.to_i, Time.now.to_i, 0, nil, nil, nil, nil, nil)
+          }
+        }
+        qo_db_tables = create_tables.call(qo_db.name)
+        fa_db_tables = create_tables.call(fa_db.name)
+        own_db_tables = create_tables.call(own_db.name)
+
+        client.stub(:databases).and_return([qo_db, fa_db, own_db])
+
+        client.stub(:tables).with(qo_db.name).and_return(qo_db_tables)
+        client.stub(:tables).with(fa_db.name).and_return(fa_db_tables)
+        client.stub(:tables).with(own_db.name).and_return(own_db_tables)
+
+        command = Class.new { include TreasureData::Command }.new
+        command.stub(:get_client).and_return(client)
+
+        op = List::CommandParser.new('table:list', %w[], %w[db], false, %w(), true)
+        expect {
+          command.table_list(op)
+        }.to_not raise_exception
+      end
+
+      it 'avoids listing tables of an \'import_only\' database' do
+        client = Object.new
+
+        db = TreasureData::Database.new(client, 'import_only_db', nil, 1234, Time.now.to_i, Time.now.to_i, nil, 'import_only')
+
+        command = Class.new { include TreasureData::Command }.new
+        command.stub(:get_client).and_return(client)
+        command.stub(:get_database).and_return(db)
+
+        op = List::CommandParser.new('table:list', %w[], %w[db], false, %w(import_only_db), true)
+        expect {
+          command.table_list(op)
+        }.to_not raise_exception
+      end
+
+      it 'avoids listing tables of the \'import_only\' databases in the list' do
+        client = Object.new
+
+        io_db = TreasureData::Database.new(client, 'import_only_db', nil, 1000, Time.now.to_i, Time.now.to_i, nil, 'import_only')
+        qo_db = TreasureData::Database.new(client, 'query_only_db', nil, 2000, Time.now.to_i, Time.now.to_i, nil, 'query_only')
+        fa_db = TreasureData::Database.new(client, 'full_access_db', nil, 3000, Time.now.to_i, Time.now.to_i, nil, 'full_access')
+        own_db = TreasureData::Database.new(client, 'owner_db', nil, 4000, Time.now.to_i, Time.now.to_i, nil, 'owner')
+
+        create_tables = lambda {|db_name|
+          (1..6).map {|i|
+            schema = TreasureData::Schema.new.from_json(JSON.parse('[]'))
+            TreasureData::Table.new(client, db_name, db_name + "_table_#{i}", 'log', schema, 500, Time.now.to_i, Time.now.to_i, 0, nil, nil, nil, nil, nil)
+          }
+        }
+        qo_db_tables = create_tables.call(qo_db.name)
+        fa_db_tables = create_tables.call(fa_db.name)
+        own_db_tables = create_tables.call(own_db.name)
+
+        client.stub(:databases).and_return([io_db, qo_db, fa_db, own_db])
+
+        client.stub(:tables).with(io_db.name).and_raise("not permitted")
+        client.stub(:tables).with(qo_db.name).and_return(qo_db_tables)
+        client.stub(:tables).with(fa_db.name).and_return(fa_db_tables)
+        client.stub(:tables).with(own_db.name).and_return(own_db_tables)
+
+        command = Class.new { include TreasureData::Command }.new
+        command.stub(:get_client).and_return(client)
+
+        op = List::CommandParser.new('table:list', %w[], %w[db], false, %w(), true)
+        expect {
+          command.table_list(op)
+        }.to_not raise_exception
+      end
+
+      describe "number format" do
+        let(:number_raw) { "1234567" }
+        let(:number_format) { "1,234,567" }
+        let(:client) { double('null object').as_null_object }
+        let(:db) { TreasureData::Database.new(client, 'full_access_db', nil, 1000, Time.now.to_i, Time.now.to_i, nil, 'full_access') }
+        let(:command) do
+          command = Class.new { include TreasureData::Command }.new
+          command.stub(:get_client).and_return(client)
+          command.stub(:get_database).and_return(db)
+          command
+        end
+
+        before do
+          create_tables = lambda {|db_name|
+            (1..6).map {|i|
+              # NOTE: TreasureData::Helpers.format_with_delimiter uses `gsub!` to their argument
+              #       the argument (in our case, `number_raw`) will be rewritten by them
+              #       To avoid that behavior, pass `number_raw.dup` instead of `number_raw`
+              schema = TreasureData::Schema.new.from_json(JSON.parse('[]'))
+              TreasureData::Table.new(client, db_name, db_name + "_table_#{i}", 'log', schema, number_raw.dup, Time.now.to_i, Time.now.to_i, 0, nil, nil, nil, nil, nil)
+            }
+          }
+          db_tables = create_tables.call(db.name)
+          client.stub(:tables).with(db.name).and_return(db_tables)
+        end
+
+        subject do
+          # command.table_list uses `puts` to display result
+          # so temporary swapping $stdout with StringIO to fetch their output
+          backup = $stdout.dup
+          buf = StringIO.new
+          op = List::CommandParser.new('table:list', [], %w[db], false, options + %w(full_access_db), true)
+          begin
+            $stdout = buf
+            command.table_list(op)
+            $stdout.rewind
+            $stdout.read
+          ensure
+            $stdout = backup
+          end
+        end
+
+        context "without --format" do
+          let(:options) { [] }
+          it { should include(number_format) }
+          it { should_not include(number_raw) }
+        end
+
+        context "with --format table" do
+          let(:options) { %w(--format table) }
+          it { should include(number_format) }
+          it { should_not include(number_raw) }
+        end
+
+        context "with --format csv" do
+          let(:options) { %w(--format csv) }
+          it { should_not include(number_format) }
+          it { should include(number_raw) }
+        end
+
+        context "with --format tsv" do
+          let(:options) { %w(--format tsv) }
+          it { should_not include(number_format) }
+          it { should include(number_raw) }
+        end
+      end
+    end
+  end
+end

data/spec/td/updater_spec.rb

@@ -105,6 +105,42 @@ module TreasureData::Updater
       end
     end
 
+    describe "current working directory doesn't change after call `jar_update`" do
+      shared_examples_for("jar_update behavior") do
+        it "doesn't change cwd" do 
+          with_env('TD_TOOLBELT_JARUPDATE_ROOT', "https://localhost:#{@server.config[:Port]}") do
+            pwd = Dir.pwd
+            subject
+            expect(Dir.pwd).to eq pwd
+          end
+        end
+
+        it "don't exists td-import.jar.new" do
+          with_env('TD_TOOLBELT_JARUPDATE_ROOT', "https://localhost:#{@server.config[:Port]}") do
+            subject
+          end
+          tmpfile = File.join(TreasureData::Updater.jarfile_dest_path, 'td-import.jar.new')
+          expect(File.exists?(tmpfile)).to eq false
+        end
+      end
+
+      let(:updater) { JarUpdateTester.new }
+
+      subject { updater.kick }
+
+      context "not updated" do
+        before { updater.stub(:existent_jar_updated_time).and_return(Time.now) }
+
+        it_behaves_like "jar_update behavior"
+      end
+
+      context "updated" do
+        before { updater.stub(:existent_jar_updated_time).and_return(Time.at(0)) }
+
+        it_behaves_like "jar_update behavior"
+      end
+    end
+
     def with_proxy
       with_env('HTTP_PROXY', "http://localhost:#{@proxy_server.config[:Port]}") do
         yield
@@ -185,7 +221,7 @@ module TreasureData::Updater
       res.body = '<metadata><versioning><lastUpdated>20141204123456</lastUpdated><release>version</release></versioning></metadata>'
     end
 
-    def jar
+    def jar(req, res)
       res['content-type'] = 'application/octet-stream'
       res.body = File.read(fixture_file('tmp.zip'))
     end

data/td.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "yajl-ruby", "~> 1.1"
   gem.add_dependency "hirb", ">= 0.4.5"
   gem.add_dependency "parallel", "~> 0.6.1"
-  gem.add_dependency "td-client", "~> 0.8.68"
+  gem.add_dependency "td-client", "~> 0.8.69"
   gem.add_dependency "td-logger", "~> 0.3.21"
   gem.add_dependency "rubyzip", "~> 0.9.9"
   gem.add_development_dependency "rake", "~> 0.9"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.11.8.2
+  version: 0.11.9
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -102,14 +102,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.68
+        version: 0.8.69
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.68
+        version: 0.8.69
 - !ruby/object:Gem::Dependency
   name: td-logger
   requirement: !ruby/object:Gem::Requirement
@@ -204,6 +204,7 @@ files:
 - lib/td/command/apikey.rb
 - lib/td/command/bulk_import.rb
 - lib/td/command/common.rb
+- lib/td/command/connector.rb
 - lib/td/command/db.rb
 - lib/td/command/export.rb
 - lib/td/command/help.rb
@@ -239,7 +240,8 @@ files:
 - spec/spec_helper.rb
 - spec/td/command/import_spec.rb
 - spec/td/command/job_spec.rb
-- spec/td/command_sched_spec.rb
+- spec/td/command/sched_spec.rb
+- spec/td/command/table_spec.rb
 - spec/td/common_spec.rb
 - spec/td/fixture/ca.cert
 - spec/td/fixture/server.cert
@@ -282,7 +284,8 @@ test_files:
 - spec/spec_helper.rb
 - spec/td/command/import_spec.rb
 - spec/td/command/job_spec.rb
-- spec/td/command_sched_spec.rb
+- spec/td/command/sched_spec.rb
+- spec/td/command/table_spec.rb
 - spec/td/common_spec.rb
 - spec/td/fixture/ca.cert
 - spec/td/fixture/server.cert