td 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7b9e3d57fd08024e999160fe1678031a293941e
-  data.tar.gz: 39454d414e3afddb9e83fcf3e3c574c98911536f
+  metadata.gz: 578d2e406b4dc27d5b95c15ead295ee6ad177f1d
+  data.tar.gz: 35c5f56731a8d9dade9e0992796af12af6a31e27
 SHA512:
-  metadata.gz: d4846a9e5e75112f0350cbb4824e5335cb2861fabc927ddcacefe81a9a4894af08da0903920db5d1b4fcfd170b571341e5b41a77293c7a572df92ca4eec487e1
-  data.tar.gz: 0909c9942d35536d644db19f3ad0c3bf219d78ad59388ef8cee92af5c7f0d3271c4779503d5268dda0bd65cc2bcbaf231c3d5f02369b43dbcef0af50f77c364b
+  metadata.gz: ed9cd10e2fd21cf386d40d72b0799e828e812f83c531a92bfe98d8eeced6fd236b9590d89c7c8d6857d26b5d026fa2a4b42634880fe5548a832ddc562ff245ad
+  data.tar.gz: 04314077f5d84ce559f975701d027d7762260fc5deccd96cda3bae3f6cb96b744538c4b0a42f62abcfe92db245d2dff73f01f7a2b63685e5c43ab2283ee1a501

data/ChangeLog

@@ -1,3 +1,9 @@
+== 2015-12-14 version 0.13.1
+
+* fix table:import with no '-t' or '--time-key' option
+* fix show names on connector:list
+* fix create unnecessary file in spec
+
 == 2015-10-29 version 0.13.0
 
 * fix command error when recive 40X errror from server

data/appveyor.yml

@@ -5,8 +5,7 @@ install:
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
   - ruby --version
   - gem --version
-  - gem install bundler --quiet --no-ri --no-rdoc
-  - bundler --version
+  - bundle --version
   - bundle install
 build_script:
   - bundle exec rake build

data/lib/td/command/connector.rb

@@ -161,7 +161,7 @@ module Command
 
     client = get_client()
     # TODO database and table is empty at present. Fix API or Client.
-    keys = ['name', 'cron', 'timezone', 'delay', 'database', 'table', 'config', 'config_diff']
+    keys = ['name', 'cron', 'timezone', 'delay', 'database', 'table']
     fields = keys.map { |e| e.capitalize.to_sym }
     rows = client.bulk_load_list().sort_by { |e|
       e['name']
@@ -169,7 +169,7 @@ module Command
       Hash[fields.zip(e.values_at(*keys))]
     }
 
-    $stdout.puts cmd_render_table(rows, :fields => fields, :render_format => op.render_format)
+    $stdout.puts cmd_render_table(rows, :fields => fields, :render_format => op.render_format, resize: false)
   end
 
   def connector_create(op)

data/lib/td/command/table.rb

@@ -384,7 +384,7 @@ module Command
     time_key = 'time'
     auto_create = false
 
-    import_params = {}
+    import_params = {time_key: time_key}
 
     op.on('--format FORMAT', "file format (default: #{format})") {|s|
       import_params[:format] = s

data/lib/td/updater.rb

@@ -53,7 +53,7 @@ module ModuleDefinition
   def get_client_version_file(path)
     td_gems = Dir[File.join(path, "vendor/gems/td-*")]
     td_gems.each { |td_gem|
-      if td_gem =~ /#{"#{Regexp.escape(path)}\/vendor\/gems\/td-\\d*.\\d*.\\d*"}/
+      if /[\/\\]td-\d+.\d+.\d+\z/ =~ td_gem
         return File.join(td_gem, "/lib/td/version.rb")
       end
     }

data/lib/td/version.rb

@@ -1,3 +1,3 @@
 module TreasureData
-  TOOLBELT_VERSION = '0.13.0'
+  TOOLBELT_VERSION = '0.13.1'
 end

data/spec/td/command/import_spec.rb

@@ -347,7 +347,7 @@ module TreasureData::Command
         %w(--columns --column-header).each do |opt|
           context "with #{opt}" do
             let(:args) { ['url'] }
-            let(:arguments)     { ["path/to/prefix_*.csv", '--format', 'csv', opt, 'col1,col2'] }
+            let(:arguments)     { ["path/to/prefix_*.csv", '--format', 'csv', opt, 'col1,col2', '-o', out_file.path] }
 
             it "#{opt} is not migrate" do
               expect { command.import_config(option) }.not_to raise_error

data/spec/td/command/table_spec.rb

@@ -199,7 +199,6 @@ module TreasureData::Command
 
           it 'create table' do
             command.should_receive(:create_database_and_table_if_not_exist).with(client, db_name, table_name)
-
             command.table_import(option)
           end
         end
@@ -211,7 +210,50 @@ module TreasureData::Command
 
           it 'not create table' do
             command.should_not_receive(:create_database_and_table_if_not_exist)
+            command.table_import(option)
+          end
+        end
+      end
+
+      describe 'time key' do
+        before do
+          command.stub(:get_client) { client }
+          command.stub(:do_table_import)
+        end
+        let(:input_params) {{
+          db_name: "database",
+          table_name: "table",
+          paths: ["path"]
+        }}
+
+        context 'should specify the custom time key' do
+          ['-t', '--time-key'].each do |tk_option|
+            let(:option) {
+              List::CommandParser.new('table:import', [], %w(db_name table_name path), false, [db_name, table_name, 'path', tk_option, 'created_at'], true)
+            }
+
+            before do
+              input_params[:time_key] = 'created_at'
+            end
+
+            it "with '#{tk_option}' option" do
+              command.should_receive(:do_table_import).with(client, input_params)
+              command.table_import(option)
+            end
+          end
+        end
+
+        context 'should use default time key \'time\'' do
+          let(:option) {
+            List::CommandParser.new('table:import', [], %w(db_name table_name path), false, [db_name, table_name, 'path'], true)
+          }
+
+          before do
+            input_params[:time_key] = 'time'
+          end
 
+          it 'without \'-t / --time-key\' option' do
+            command.should_receive(:do_table_import).with(client, input_params)
             command.table_import(option)
           end
         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.76"
+  gem.add_dependency "td-client", "~> 0.8.77"
   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.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-12-17 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.76
+        version: 0.8.77
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.76
+        version: 0.8.77
 - !ruby/object:Gem::Dependency
   name: td-logger
   requirement: !ruby/object:Gem::Requirement
@@ -350,4 +350,3 @@ test_files:
 - spec/td/helpers_spec.rb
 - spec/td/updater_spec.rb
 - spec/td/version_spec.rb
-has_rdoc: false