td 0.11.10 → 0.11.11

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e564b64771f7174a938bb3bbc1018c29dde82e23
+  data.tar.gz: 4ef2d5ce846fa9eb2b2e6a250f4a21947d9c86a0
+SHA512:
+  metadata.gz: ccd286b00461da0f4880faaee3f82663ea37559fe79e13ff5d606a77012f3fc7df1f0e7b99b1468eb4a0118a51ba00dcbdfa61df5aa4c42b24984592dd172e4d
+  data.tar.gz: d5a9c05c266d1efd0a2c853e2497bcc5f6389a38de0a6d45f76d2535fa20431a077db2eb860cff9369dd96c59a0843117fd15ebeb0a10f8ddf469893b41d3f8e

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.gitignore

@@ -5,4 +5,5 @@ Gemfile.lock
 vendor/*
 pkg/
 build/*
+coverage/
 *~

data/.travis.yml

@@ -0,0 +1,18 @@
+language: ruby
+
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - 2.1.1
+  - 2.2.0
+  - ruby-head
+
+gemfile:
+  - Gemfile
+
+script: bundle exec rake spec
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/ChangeLog

@@ -1,3 +1,13 @@
+== 2015-07-10 version 0.11.11
+
+* Updated 'td-client' gem dependency to 0.8.71. The new gem removed to/from
+  parameter from table/tail API.
+* Version up bundled Ruby for Mac and Windows.
+* Remove -t (to) and -f (from) from table:tail command.
+* connector:guess shows help message if no arguments are set.
+* table:* unsupported 'item' table.
+* upgrade rubyzip
+
 == 2015-05-19 version 0.11.10
 
 * Updated 'td-client' gem dependency to 0.8.70. The new gem removed client

data/README.rdoc

@@ -1,4 +1,6 @@
 = Treasure Data command line tool
+{<img src="https://travis-ci.org/treasure-data/td.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/treasure-data/td]
+{<img src="https://coveralls.io/repos/treasure-data/td/badge.svg?branch=master&service=github" alt="Coverage Status" />}[https://coveralls.io/github/treasure-data/td?branch=master]
 
 This CUI utility wraps the {Ruby Client Library td-client-ruby}[https://github.com/treasure-data/td-client-ruby]
 to interact with the REST API in managing databases and jobs on the Treasure Data Cloud.
@@ -146,5 +148,5 @@ These are the available hooks:
 
 = Copyright
 
-Copyright:: Copyright (c) 2014 Treasure Data Inc.
+Copyright:: Copyright (c) 2015 Treasure Data Inc.
 License::   Apache License, Version 2.0

data/Rakefile

@@ -145,3 +145,14 @@ Dir[File.expand_path("../dist/**/*.rake", __FILE__)].each do |rake|
   import rake
 end
 
+require 'rspec/core'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+end
+
+task :coverage do |t|
+  ENV['SIMPLE_COV'] = '1'
+  Rake::Task["spec"].invoke
+end

data/appveyor.yml

@@ -0,0 +1,17 @@
+---
+version: "{build}"
+clone_depth: 10
+install:
+  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
+  - ruby --version
+  - gem --version
+  - gem install bundler --quiet --no-ri --no-rdoc
+  - bundler --version
+  - bundle install
+build_script:
+  - bundle exec rake build
+test_script:
+  - bundle exec rake spec
+environment:
+  matrix:
+    - ruby_version: "22"

data/lib/td/command/connector.rb

@@ -18,21 +18,31 @@ module Command
     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
+    op.on('--type[=TYPE]', "(obsoleted)") { |s| type = s }
+    op.on('--access-id ID', "(obsoleted)") { |s| id = s }
+    op.on('--access-secret SECRET', "(obsoleted)") { |s| secret = s }
+    op.on('--source SOURCE', "(obsoleted)") { |s| source = s }
+    op.on('-o', '--out FILE_NAME', "output file name for connector:preview") { |s| out = s }
+
+    config_file = op.cmd_parse
+    if config_file
+      config = prepare_bulkload_job_config(config_file)
+      out ||= config_file
     else
-      required('--access-id', id)
-      required('--access-secret', secret)
-      required('--source', source)
-      required('--out', out)
+      begin
+        required('--access-id', id)
+        required('--access-secret', secret)
+        required('--source', source)
+        required('--out', out)
+      rescue ParameterConfigurationError
+        if id == nil && secret == nil && source == nil
+          $stdout.puts op.to_s
+          $stdout.puts ""
+          raise ParameterConfigurationError, "path to configuration file is required"
+        else
+          raise
+        end
+      end
 
       uri = URI.parse(source)
       endpoint = uri.host
@@ -40,26 +50,24 @@ module Command
       bucket = path_components.shift.sub(/\//, '')
       path_prefix = path_components.join.sub(/\//, '')
 
-      job = {
-        :config => {
-          :type => type,
-          :access_key_id => id,
-          :secret_access_key => secret,
-          :endpoint => endpoint,
-          :bucket => bucket,
-          :path_prefix => path_prefix,
-        }
+      config = {
+        :type => type,
+        :access_key_id => id,
+        :secret_access_key => secret,
+        :endpoint => endpoint,
+        :bucket => bucket,
+        :path_prefix => path_prefix,
       }
     end
 
     client = get_client
-    job = client.bulk_load_guess(job)
+    job = client.bulk_load_guess(config: config)
 
     create_bulkload_job_file_backup(out)
     if /\.json\z/ =~ out
-      config_str = JSON.pretty_generate(job)
+      config_str = JSON.pretty_generate(job['config'])
     else
-      config_str = YAML.dump(job)
+      config_str = YAML.dump(job['config'])
     end
     File.open(out, 'w') do |f|
       f << config_str
@@ -76,9 +84,9 @@ module Command
   def connector_preview(op)
     set_render_format_option(op)
     config_file = op.cmd_parse
-    job = prepare_bulkload_job_config(config_file)
+    config = prepare_bulkload_job_config(config_file)
     client = get_client()
-    preview = client.bulk_load_preview(job)
+    preview = client.bulk_load_preview(config: config)
 
     cols = preview['schema'].sort_by { |col|
       col['index']
@@ -105,7 +113,7 @@ module Command
     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('--time-column COLUMN_NAME', "data partitioning key") { |s| time_column = s }  # unnecessary but for backward compatibility
     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 }
 
@@ -114,11 +122,11 @@ module Command
     required('--database', database)
     required('--table', table)
 
-    job = prepare_bulkload_job_config(config_file)
-    job['time_column'] = time_column if time_column
+    config = prepare_bulkload_job_config(config_file)
+    (config['out'] ||= {})['time_column'] = time_column if time_column  # TODO will not work once embulk implements multi-job
 
     client = get_client()
-    job_id = client.bulk_load_issue(database, table, job)
+    job_id = client.bulk_load_issue(database, table, config: job)
 
     $stdout.puts "Job #{job_id} is queued."
     $stdout.puts "Use '#{$prog} " + Config.cl_options_string + "job:show #{job_id}' to show the status."
@@ -166,13 +174,13 @@ module Command
 
     name, cron, database, table, config_file = op.cmd_parse
 
-    job = prepare_bulkload_job_config(config_file)
+    config = 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)
+    session = client.bulk_load_create(name, database, table, opts.merge(config: config))
     dump_connector_session(session)
   end
 
@@ -187,10 +195,10 @@ module Command
   def connector_update(op)
     name, config_file = op.cmd_parse
 
-    job = prepare_bulkload_job_config(config_file)
+    config = prepare_bulkload_job_config(config_file)
 
     client = get_client()
-    session = client.bulk_load_update(name, job)
+    session = client.bulk_load_update(name, config: config)
     dump_connector_session(session)
   end
 
@@ -264,10 +272,24 @@ private
       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))
+
+    config = nil
+    begin
+      if file_type(config_str) == :yaml
+        config_str = JSON.pretty_generate(YAML.load(config_str))
+      end
+      config = JSON.load(config_str)
+    rescue => e
+      raise ParameterConfigurationError, "configuration file: #{config_file} #{e.message}"
+    end
+
+    if config['config']
+      if config.size != 1
+        raise "Setting #{(config.keys - ['config']).inspect} keys in a configuration file is not supported. Please set options to the command line argument."
+      end
+      config = config['config']
     end
-    JSON.load(config_str)
+    config
   end
 
   def create_bulkload_job_file_backup(out)
@@ -283,14 +305,14 @@ private
   end
 
   def dump_connector_session(session)
-    $stdout.puts "Name     : #{session.name}"
-    $stdout.puts "Cron     : #{session.cron}"
-    $stdout.puts "Timezone : #{session.timezone}"
-    $stdout.puts "Delay    : #{session.delay}"
-    $stdout.puts "Database : #{session.database}"
-    $stdout.puts "Table    : #{session.table}"
+    $stdout.puts "Name     : #{session["name"]}"
+    $stdout.puts "Cron     : #{session["cron"]}"
+    $stdout.puts "Timezone : #{session["timezone"]}"
+    $stdout.puts "Delay    : #{session["delay"]}"
+    $stdout.puts "Database : #{session["database"]}"
+    $stdout.puts "Table    : #{session["table"]}"
     $stdout.puts "Config"
-    $stdout.puts YAML.dump(session.config)
+    $stdout.puts YAML.dump(session["config"])
   end
 
   def wait_connector_job(client, job_id, exclude)

data/lib/td/command/import.rb

@@ -150,11 +150,15 @@ module Command
         begin
           Timeout.timeout(@timeout) do
             pid = Process.spawn(*@cmd)
-            Process.waitpid(pid)
-            return $?
+            waitpid(pid)
           end
         rescue Timeout::Error
           if pid
+            # NOTE last check has not been completed the process during sleep
+            if Process.waitpid(pid, Process::WNOHANG)
+              return $?
+            end
+
             require 'rbconfig'
             # win32 ruby does not support QUIT and TERM
             if RbConfig::CONFIG['host_os'] !~ /mswin|mingw|cygwin/
@@ -172,6 +176,17 @@ module Command
         return $?
       end
     end
+
+    def waitpid(pid)
+      # NOTE Use nonblocking mode, because Process.waitpid is block other thread at Windows.
+      loop do
+        if Process.waitpid(pid, Process::WNOHANG)
+          return $?
+        end
+
+        sleep 1
+      end
+    end
   end
 
   def check_java

data/lib/td/command/list.rb

@@ -236,7 +236,7 @@ module List
   add_list 'table:import', %w[db table files_], 'Parse and import files to a table', ['table:import example_db table1 --apache access.log', 'table:import example_db table1 --json -t time - < test.json']
   add_list 'table:export', %w[db table], 'Dump logs in a table to the specified storage', ['table:export example_db table1 --s3-bucket mybucket -k KEY_ID -s SECRET_KEY']
   add_list 'table:swap', %w[db table1 table2], 'Swap names of two tables', ['table:swap example_db table1 table2']
-  add_list 'table:tail', %w[db table], 'Get recently imported logs', ['table:tail example_db table1', 'table:tail example_db table1 -t "2011-01-02 03:04:05" -n 30']
+  add_list 'table:tail', %w[db table], 'Get recently imported logs', ['table:tail example_db table1', 'table:tail example_db table1 -n 30']
   add_list 'table:partial_delete', %w[db table], 'Delete logs from the table within the specified time range', ['table:partial_delete example_db table1 --from 1341000000 --to 1341003600']
   add_list 'table:expire', %w[db table expire_days], 'Expire data in table after specified number of days. Set to 0 to disable the expiration.', ['table:expire example_db table1 30']
 
@@ -332,7 +332,17 @@ 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']
+  connector_guess_example_config = "
+  in:
+    type: s3
+    bucket: my-s3-bucket
+    endpoint: s3-us-west-1.amazonaws.com
+    path_prefix: path/prefix/to/import/
+    access_key_id: ABCXYZ123ABCXYZ123
+    secret_access_key: AbCxYz123aBcXyZ123
+  out:
+    mode: append"
+  add_list 'connector:guess', %w[config?], 'Run guess to generate connector config file', ["connector:guess config.yml -o td-bulkload.yml\n\nexample config.yml:#{connector_guess_example_config}"]
   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']

data/lib/td/command/table.rb

@@ -18,9 +18,9 @@ module Command
     primary_key = nil
     primary_key_type = nil
 
-    op.on('-T', '--type TYPE', 'set table type (log or item)') {|s|
-      unless ['item', 'log'].include?(s)
-        raise "Unknown table type #{s.dump}. Supported types: log and item"
+    op.on('-T', '--type TYPE', 'set table type (log)') {|s|
+      unless s == 'log'
+        raise "Unknown table type #{s.dump}. Supported types: log"
       end
       type = s.to_sym
     }
@@ -49,19 +49,10 @@ module Command
       $stderr.puts "  For a list of all reserved keywords, see our FAQ: http://docs.treasure-data.com/articles/faq"
     end
 
-    if type == :item && (primary_key.nil? || primary_key_type.nil?)
-      $stderr.puts "for TYPE 'item', the primary-key is required"
-      exit 1
-    end
-
     client = get_client
 
     begin
-      if type == :item
-        client.create_item_table(db_name, table_name, primary_key, primary_key_type)
-      else
-        client.create_log_table(db_name, table_name)
-      end
+      client.create_log_table(db_name, table_name)
     rescue NotFoundError
       cmd_debug_error $!
       $stderr.puts "Database '#{db_name}' does not exist."
@@ -144,10 +135,6 @@ module Command
       databases = client.databases
     end
 
-    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 = []
@@ -168,9 +155,7 @@ module Command
             'Last log timestamp' => table.last_log_timestamp ? table.last_log_timestamp.localtime : nil,
             :Schema => pschema
           }
-          if has_item and table.type == :item
-            new_row['Primary key'] = "#{table.primary_key}:#{table.primary_key_type}"
-          end
+
           rows << new_row
         }
       rescue APIError => e
@@ -185,12 +170,7 @@ module Command
       [map[:Database], map[:Type].size, map[:Table]]
     }
 
-    fields = []
-    if has_item
-      fields = [:Database, :Table, :Type, :Count, :Size, 'Last import', 'Last log timestamp', 'Primary key', :Schema]
-    else
-      fields = [:Database, :Table, :Type, :Count, :Size, 'Last import', 'Last log timestamp', :Schema]
-    end
+    fields = [:Database, :Table, :Type, :Count, :Size, 'Last import', 'Last log timestamp', :Schema]
     $stdout.puts cmd_render_table(rows, :fields => fields, :max_width => 500, :render_format => op.render_format)
 
     if rows.empty?
@@ -235,7 +215,6 @@ module Command
     $stdout.puts "Type        : #{table.type}"
     $stdout.puts "Count       : #{table.count}"
     # p table.methods.each {|m| $stdout.puts m}
-    $stdout.puts "Primary key : #{table.primary_key}:#{table.primary_key_type}" if table.type == :item
     $stdout.puts "Schema      : ("
     table.schema.fields.each {|f|
       $stdout.puts "    #{f.name}:#{f.type}"
@@ -244,27 +223,9 @@ module Command
   end
 
   def table_tail(op)
-    from = nil
-    to = nil
     count = 10
     pretty = nil
 
-    op.on('-t', '--to TIME', 'end time of logs to get') {|s|
-      if s.to_i.to_s == s
-        to = s.to_i
-      else
-        require 'time'
-        to = Time.parse(s).to_i
-      end
-    }
-    op.on('-f', '--from TIME', 'start time of logs to get') {|s|
-      if s.to_i.to_s == s
-        from = s.to_i
-      else
-        require 'time'
-        from = Time.parse(s).to_i
-      end
-    }
     op.on('-n', '--count N', 'number of logs to get', Integer) {|i|
       count = i
     }
@@ -278,7 +239,7 @@ module Command
 
     table = get_table(client, db_name, table_name)
 
-    rows = table.tail(count, to, from)
+    rows = table.tail(count)
 
     require 'json'
     if pretty

data/lib/td/version.rb

@@ -1,3 +1,3 @@
 module TreasureData
-  TOOLBELT_VERSION = '0.11.10'
+  TOOLBELT_VERSION = '0.11.11'
 end

data/spec/spec_helper.rb

@@ -8,13 +8,19 @@ if ENV['SIMPLE_COV']
   # SimpleCov
   # https://github.com/colszowka/simplecov
   require 'simplecov'
-  SimpleCov.start do 
+  SimpleCov.start do
     add_filter 'spec/'
     add_filter 'pkg/'
     add_filter 'vendor/'
   end
 end
 
+# XXX skip coverage setting if run appveyor. Because, fail to push coveralls in appveyor.
+unless ENV['APPVEYOR']
+  require 'coveralls'
+  Coveralls.wear!('rails')
+end
+
 require 'td/command/runner'
 
 def execute_td(command_line)

data/spec/td/command/connector_spec.rb

@@ -6,6 +6,10 @@ require 'td/command/connector'
 module TreasureData::Command
   describe 'connector commands' do
     describe '#connector_preview' do
+      let :command do
+        Class.new { include TreasureData::Command }.new
+      end
+
       subject do
         backup = $stdout.dup
         buf = StringIO.new
@@ -13,7 +17,8 @@ module TreasureData::Command
         begin
           $stdout = buf
 
-          TreasureData::Command::Runner.new.run ["connector:preview", tempfile]
+          op = List::CommandParser.new("connector:preview", ["config"], [], nil, [File.join("spec", "td", "fixture", "bulk_load.yml")], true)
+          command.connector_preview(op)
 
           buf.string
         ensure
@@ -21,10 +26,6 @@ module TreasureData::Command
         end
       end
 
-      let(:tempfile) do
-        File.join("spec", "td", "fixture", "bulk_load.yml")
-      end
-
       let(:preview_result) do
         {
           "schema" => [
@@ -42,7 +43,8 @@ module TreasureData::Command
       end
 
       before do
-        TreasureData::Client.any_instance.stub(:bulk_load_preview).and_return(preview_result)
+        client = double(:client, bulk_load_preview: preview_result)
+        command.stub(:get_client).and_return(client)
       end
 
       it 'should include too_long_column_name without truncated' do

data/spec/td/command/job_spec.rb

@@ -13,7 +13,7 @@ module TreasureData::Command
     end
 
     describe 'write_result' do
-      let(:file) { Tempfile.new("job_spec") }
+      let(:file) { Tempfile.new("job_spec").tap {|s| s.close } }
 
       let :job do
         job = TreasureData::Job.new(nil, 12345, 'hive', 'select * from employee')
@@ -395,6 +395,14 @@ ACTUAL
         [multibyte_string, 2.0, {multibyte_string => multibyte_string}]
       end
 
+      let(:line_separator) {
+        if RUBY_PLATFORM =~ /mswin32|mingw32/
+          "\r\n"
+        else
+          "\n"
+        end
+      }
+
       let :job do
         row = multibyte_row
         job = TreasureData::Job.new(nil, 12345, 'hive', 'select * from employee')
@@ -414,24 +422,24 @@ ACTUAL
 
       it 'supports json output' do
         row = multibyte_row
-        file = Tempfile.new("job_spec")
+        file = Tempfile.new("job_spec").tap {|s| s.close }
         command.send(:show_result, job, file, nil, 'json')
-        File.read(file.path).should == '[' + [row, row].map { |e| Yajl.dump(e) }.join(",\n") + ']'
+        File.read(file.path, encoding: 'UTF-8').should == '[' + [row, row].map { |e| Yajl.dump(e) }.join(",\n") + ']'
       end
 
       it 'supports csv output' do
         row = multibyte_row.map { |e| dump_column(e) }
-        file = Tempfile.new("job_spec")
+        file = Tempfile.new("job_spec").tap {|s| s.close }
         command.send(:show_result, job, file, nil, 'csv')
-        File.binread(file.path).should == [row, row].map { |e| CSV.generate_line(e) }.join
+        File.binread(file.path).should == [row, row].map { |e| CSV.generate_line(e, :row_sep => line_separator) }.join
         File.open(file.path, 'r:Windows-31J').read.encode('UTF-8').split.first.should == 'メール,2.0,"{""メール"":""メール""}"'
       end
 
       it 'supports tsv output' do
         row = multibyte_row.map { |e| dump_column(e) }
-        file = Tempfile.new("job_spec")
+        file = Tempfile.new("job_spec").tap {|s| s.close }
         command.send(:show_result, job, file, nil, 'tsv')
-        File.binread(file.path).should == [row, row].map { |e| e.join("\t") + "\n" }.join
+        File.binread(file.path).should == [row, row].map { |e| e.join("\t") + line_separator }.join
         File.open(file.path, 'r:Windows-31J').read.encode('UTF-8').split("\n").first.should == "メール\t2.0\t{\"メール\":\"メール\"}"
       end
     end

data/spec/td/updater_spec.rb

@@ -8,34 +8,42 @@ require 'logger'
 
 module TreasureData::Updater
 
-  describe 'without the TD_TOOLBELT_UPDATE_ROOT environment variable defined' do
-    let :default_toolbelt_url do
-      "http://toolbelt.treasuredata.com"
-    end
+ %w(x86_64-darwin14 i386-mingw32).each do |platform|
+    describe "RUBY_PLATFORM is '#{platform}'" do
+      before do
+        stub_const('RUBY_PLATFORM', platform)
+      end
+
+      describe 'without the TD_TOOLBELT_UPDATE_ROOT environment variable defined' do
+        let :default_toolbelt_url do
+          "http://toolbelt.treasuredata.com"
+        end
 
-    describe 'endpoints methods' do
-      it 'use the default root path' do
-        TreasureData::Updater.endpoint_root.should == default_toolbelt_url
-        TreasureData::Updater.version_endpoint.should =~ Regexp.new(default_toolbelt_url)
-        TreasureData::Updater.update_package_endpoint.should =~ Regexp.new(default_toolbelt_url)
+        describe 'endpoints methods' do
+          it 'use the default root path' do
+            TreasureData::Updater.endpoint_root.should == default_toolbelt_url
+            TreasureData::Updater.version_endpoint.should =~ Regexp.new(default_toolbelt_url)
+            TreasureData::Updater.update_package_endpoint.should =~ Regexp.new(default_toolbelt_url)
+          end
+        end
       end
-    end
-  end
 
-  describe 'with the TD_TOOLBELT_UPDATE_ROOT environment variable defined' do
-    before do
-      ENV['TD_TOOLBELT_UPDATE_ROOT'] = 'https://0.0.0.0:5000/'
-    end
-    describe 'endpoints methods' do
-      it 'use the custom root path' do
-        TreasureData::Updater.endpoint_root.should == ENV['TD_TOOLBELT_UPDATE_ROOT']
-        TreasureData::Updater.version_endpoint.should =~ Regexp.new(ENV['TD_TOOLBELT_UPDATE_ROOT'])
-        TreasureData::Updater.update_package_endpoint.should =~ Regexp.new(ENV['TD_TOOLBELT_UPDATE_ROOT'])
+      describe 'with the TD_TOOLBELT_UPDATE_ROOT environment variable defined' do
+        before do
+          ENV['TD_TOOLBELT_UPDATE_ROOT'] = 'https://0.0.0.0:5000/'
+        end
+        describe 'endpoints methods' do
+          it 'use the custom root path' do
+            TreasureData::Updater.endpoint_root.should == ENV['TD_TOOLBELT_UPDATE_ROOT']
+            TreasureData::Updater.version_endpoint.should =~ Regexp.new(ENV['TD_TOOLBELT_UPDATE_ROOT'])
+            TreasureData::Updater.update_package_endpoint.should =~ Regexp.new(ENV['TD_TOOLBELT_UPDATE_ROOT'])
+          end
+        end
+        after do
+          ENV.delete 'TD_TOOLBELT_UPDATE_ROOT'
+        end
       end
     end
-    after do
-      ENV.delete 'TD_TOOLBELT_UPDATE_ROOT'
-    end
   end
 
   describe 'with a proxy' do

data/td.gemspec

@@ -21,10 +21,12 @@ 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.70"
+  gem.add_dependency "td-client", "~> 0.8.71"
   gem.add_dependency "td-logger", "~> 0.3.21"
-  gem.add_dependency "rubyzip", "~> 0.9.9"
+  gem.add_dependency "rubyzip", "~> 1.1.7"
+  gem.add_dependency "zip-zip", "~> 0.3"
   gem.add_development_dependency "rake", "~> 0.9"
   gem.add_development_dependency "rspec", "~> 2.11.0"
-  gem.add_development_dependency "simplecov", "~> 0.5.4"
+  gem.add_development_dependency "simplecov", "~> 0.10.0"
+  gem.add_development_dependency 'coveralls'
 end

metadata

@@ -1,34 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.11.10
-  prerelease: 
+  version: 0.11.11
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.5.1
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.5.2
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.5.3
     - - <
@@ -37,21 +35,20 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.5.1
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.5.2
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.5.3
     - - <
@@ -60,7 +57,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -68,7 +64,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,23 +71,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hirb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.5
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -100,7 +92,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -108,23 +99,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: td-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.70
+        version: 0.8.71
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.70
+        version: 0.8.71
 - !ruby/object:Gem::Dependency
   name: td-logger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -132,7 +120,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -140,23 +127,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 1.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 1.1.7
+- !ruby/object:Gem::Dependency
+  name: zip-zip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -164,7 +162,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -172,7 +169,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -180,7 +176,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -188,19 +183,31 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: CLI to manage data on Treasure Data, the Hadoop-based cloud data warehousing
 email: support@treasure-data.com
 executables:
@@ -208,11 +215,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .coveralls.yml
 - .gitignore
+- .travis.yml
 - ChangeLog
 - Gemfile
 - README.rdoc
 - Rakefile
+- appveyor.yml
 - bin/td
 - contrib/completion/_td
 - contrib/completion/td-completion.bash
@@ -277,30 +287,26 @@ files:
 - td.gemspec
 homepage: http://treasure-data.com/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1990136432195876879
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: CLI to manage data on Treasure Data, the Hadoop-based cloud data warehousing
 test_files:
 - spec/file_reader/filter_spec.rb