td 0.11.13 → 0.11.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 844dda6ec2ea3ce703d94332d12f07da0c8130c1
-  data.tar.gz: 2fe722894996e437589d8841b06dcf0d8da0534d
+  metadata.gz: 970c5f406c0af987d8e95c4d569eaab07d0d77a6
+  data.tar.gz: ca5eca4aa36566e7d30197ea564c2727f59ccbf4
 SHA512:
-  metadata.gz: 467d5b84f145cb1a2e11926b8332018eed6734fab410bbae0271873b4481ea1755c2aea6475e5835cef7981fb3f18605e7a5b8fbe983f9a608fbd2ca447ae12c
-  data.tar.gz: c1fae992cf68fc41304fe1b8326e8d1782ca29ad0b6b52828bb75553f66df0b4aa85ebf33888a0516e04929bbcdd1a406abb6cd25f68b77a043741e1c79ccb3b
+  metadata.gz: 992fb900d224d6d31f16becc16d9f3bdc06c08903fc679f937ebae31bd55ca9543b15302d34d5d78813edf23a3ca4e0ecf412eee67e809583f7351e7612b903a
+  data.tar.gz: 4f6e03812097e77553e7ea8e3941837922a2cbd76cbc5bd05449de0562863960cafa515ed945b85e262ed26c824c030c6ff93c6c340dc6655c24301ef0c98520

data/ChangeLog

@@ -1,3 +1,7 @@
+== 2015-08-03 version 0.11.14
+
+* fix connector:history was broken.
+
 == 2015-07-29 version 0.11.13
 
 * allow retry when `td query -w` fail show result.

data/lib/td/command/connector.rb

@@ -230,15 +230,15 @@ module Command
     client = get_client()
     rows = client.bulk_load_history(name).map { |e|
       {
-        :JobID => e.job_id,
-        :Status => e.status,
-        :Records => e.records,
+        :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,
+        :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'],
       }
     }
     $stdout.puts cmd_render_table(rows, :fields => fields, :render_format => op.render_format)

data/lib/td/version.rb

@@ -1,3 +1,3 @@
 module TreasureData
-  TOOLBELT_VERSION = '0.11.13'
+  TOOLBELT_VERSION = '0.11.14'
 end

data/spec/spec_helper.rb

@@ -47,3 +47,5 @@ def execute_td(command_line)
 
   [captured_stderr.string, captured_stdout.string]
 end
+
+class CallSystemExitError < RuntimeError; end

data/spec/td/command/import_spec.rb

@@ -1,25 +1,181 @@
 require 'spec_helper'
 require 'td/command/common'
+require 'td/command/list'
 require 'td/command/import'
 
 module TreasureData::Command
   describe 'import commands' do
-    describe CommandExecutor do
-      it 'executes command' do
-        CommandExecutor.new(['echo'], nil).execute.exitstatus.should == 0
+    let(:command) {
+      Class.new { include TreasureData::Command }.new
+    }
+    let(:stdout_io) { StringIO.new }
+    let(:stderr_io) { StringIO.new }
+
+    around do |example|
+      stdout = $stdout.dup
+      stderr = $stderr.dup
+
+      begin
+        $stdout = stdout_io
+        $stderr = stderr_io
+
+        example.run
+      ensure
+        $stdout = stdout
+        $stderr = stderr
+      end
+    end
+
+    describe '#import_list' do
+      let(:option) {
+        List::CommandParser.new("import:list", [], [], nil, [], true)
+      }
+      let(:database) { 'database' }
+      let(:table)    { 'table' }
+      let(:response) {
+        [
+          double(:bulk_import,
+            name: 'bulk_import',
+            database: database,
+            table: table,
+            status: :committed,
+            upload_frozen?: true,
+            job_id: '123456',
+            valid_parts: '',
+            error_parts: '',
+            valid_records: '',
+            error_records: '',
+          )
+        ]
+      }
+
+      before do
+        client = double(:client, bulk_imports: response)
+        command.stub(:get_client).and_return(client)
+
+        command.import_list(option)
+      end
+
+      it 'show import list' do
+        expect(stdout_io.string).to include [database, table].join('.')
+      end
+    end
+
+    describe '#import_list' do
+      let(:option) {
+        List::CommandParser.new("import:list", [], [], nil, [], true)
+      }
+      let(:database) { 'database' }
+      let(:table)    { 'table' }
+      let(:response) {
+        [
+          double(:bulk_import,
+            name: 'bulk_import',
+            database: database,
+            table: table,
+            status: :committed,
+            upload_frozen?: true,
+            job_id: '123456',
+            valid_parts: '',
+            error_parts: '',
+            valid_records: '',
+            error_records: '',
+          )
+        ]
+      }
+
+      before do
+        client = double(:client, bulk_imports: response)
+        command.stub(:get_client).and_return(client)
+
+        command.import_list(option)
+      end
+
+      it 'show import list' do
+        expect(stdout_io.string).to include [database, table].join('.')
       end
+    end
+
+    describe '#import_show' do
+      let(:import_name) { 'bulk_import' }
+      let(:option) {
+        List::CommandParser.new("import:show", ['name'], [], nil, [import_name], true)
+      }
+      let(:client) { double(:client) }
+
+      before do
+        command.stub(:get_client).and_return(client)
+      end
+
+      context 'not exists import' do
+        it 'should be error' do
+          client.should_receive(:bulk_import).with(import_name).and_return(nil)
+          command.should_receive(:exit).with(1).and_return { raise CallSystemExitError }
 
-      it 'executes command' do
-        expect {
-          CommandExecutor.new(['exit', '1'], nil).execute
-        }.to raise_error BulkImportExecutionError, /td-bulk-import\.log/
+          expect {
+            command.import_show(option)
+          }.to raise_error CallSystemExitError
+        end
       end
 
-      it 'terminates process on timeout' do
-        CommandExecutor.new(['sleep', '1'], 2).execute
-        expect {
-          CommandExecutor.new(['sleep', '2'], 1).execute
-        }.to raise_error BulkImportExecutionError, /timed out/
+      context 'exist import' do
+        let(:import_name) { 'bulk_import' }
+        let(:bulk_import) {
+          double(:bulk_import,
+            name: import_name,
+            database: 'database',
+            table: 'table',
+            status: :committed,
+            upload_frozen?: true,
+            job_id: '123456',
+            valid_parts: '',
+            error_parts: '',
+            valid_records: '',
+            error_records: '',
+          )
+        }
+        let(:bulk_import_parts) {
+          %w(part1 part2 part3)
+        }
+
+        before do
+          client.should_receive(:bulk_import).with(import_name).and_return(bulk_import)
+          client.should_receive(:list_bulk_import_parts).with(import_name).and_return(bulk_import_parts)
+
+          command.import_show(option)
+        end
+
+        it 'stderr should be include import name' do
+          expect(stderr_io.string).to include import_name
+        end
+
+        it 'stdout should be include import parts' do
+          bulk_import_parts.each do |part|
+            expect(stdout_io.string).to include part
+          end
+        end
+      end
+    end
+
+    describe '#import_create' do
+      let(:import_name) { 'bulk_import' }
+      let(:database) { 'database' }
+      let(:table) { 'table' }
+      let(:option) {
+        List::CommandParser.new("import:create", %w(name, db_name, table_name), [], nil, [import_name, database, table], true)
+      }
+      let(:client) { double(:client) }
+
+      before do
+        command.stub(:get_client).and_return(client)
+      end
+
+      it 'create bulk import' do
+        client.should_receive(:create_bulk_import).with(import_name, database, table, {})
+
+        command.import_create(option)
+
+        expect(stderr_io.string).to include import_name
       end
     end
   end

data/spec/td/command/table_spec.rb

@@ -17,7 +17,7 @@ module TreasureData::Command
         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)
+            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)
           }
         }
         db_tables = create_tables.call(db.name)
@@ -44,7 +44,7 @@ module TreasureData::Command
         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)
+            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)
           }
         }
         qo_db_tables = create_tables.call(qo_db.name)
@@ -92,7 +92,7 @@ module TreasureData::Command
         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)
+            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)
           }
         }
         qo_db_tables = create_tables.call(qo_db.name)
@@ -131,7 +131,7 @@ module TreasureData::Command
           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, number_raw, Time.now.to_i, Time.now.to_i, 0, nil, nil, nil, nil, nil)
+              TreasureData::Table.new(client, db_name, db_name + "_table_#{i}", 'log', schema, number_raw, Time.now.to_i, Time.now.to_i, 0, nil, nil, nil)
             }
           }
           db_tables = create_tables.call(db.name)

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.73"
+  gem.add_dependency "td-client", "~> 0.8.74"
   gem.add_dependency "td-logger", "~> 0.3.21"
   gem.add_dependency "rubyzip", "~> 1.1.7"
   gem.add_dependency "zip-zip", "~> 0.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.11.13
+  version: 0.11.14
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-08-03 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.73
+        version: 0.8.74
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.73
+        version: 0.8.74
 - !ruby/object:Gem::Dependency
   name: td-logger
   requirement: !ruby/object:Gem::Requirement