td 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 578d2e406b4dc27d5b95c15ead295ee6ad177f1d
-  data.tar.gz: 35c5f56731a8d9dade9e0992796af12af6a31e27
+  metadata.gz: e20abc2bf25fadf9daeac46efc09aa0278f9d8cb
+  data.tar.gz: 83dfdb2445a9279810a3c651f979fc8b1af12ae0
 SHA512:
-  metadata.gz: ed9cd10e2fd21cf386d40d72b0799e828e812f83c531a92bfe98d8eeced6fd236b9590d89c7c8d6857d26b5d026fa2a4b42634880fe5548a832ddc562ff245ad
-  data.tar.gz: 04314077f5d84ce559f975701d027d7762260fc5deccd96cda3bae3f6cb96b744538c4b0a42f62abcfe92db245d2dff73f01f7a2b63685e5c43ab2283ee1a501
+  metadata.gz: 8a78076ea4a0b05fdd923980e63e0a7836e9dac065baa76a16358e5b6b5cd3043f6f8a792f67ef5ed8ad01782ff237fa042b356d9685502cee1cb678412dba08
+  data.tar.gz: 4c25dd9af339f532470e8d32322c50bbcdce1b987cd2891269f3dae1bc38688a0a43963d97d210473217ca26787b2ba9d05990283b6904a6dd6044e94714ab36

data/.travis.yml

@@ -3,9 +3,9 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
-  - 2.1.1
-  - 2.2.0
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
   - ruby-head
 
 gemfile:

data/ChangeLog

@@ -1,3 +1,8 @@
+== 2016-01-25 version 0.13.2
+
+* Replace Infinity and NaN inside Array or Hash
+* fix command line arguments handling on Windows
+
 == 2015-12-14 version 0.13.1
 
 * fix table:import with no '-t' or '--time-key' option

data/README.rdoc

@@ -1,5 +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://ci.appveyor.com/api/projects/status/github/treasure-data/td?branch=master&svg=true" alt="appveyor" />}[https://ci.appveyor.com/project/treasure-data/td/branch/master]
 {<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]

data/lib/td/command/job.rb

@@ -510,7 +510,14 @@ private
   end
 
   def sanitize_infinite_value(v)
-    (v.is_a?(Float) && !v.finite?) ? v.to_s : v
+    case v
+    when Float
+      v.finite? ? v : v.to_s
+    when Hash, Array
+      Marshal.load(Marshal.dump(v), ->(x){(x.is_a?(Float) && !x.finite?) ? x.to_s : x})
+    else
+      v
+    end
   end
 
   def job_priority_name_of(id)

data/lib/td/version.rb

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

data/spec/td/command/connector_spec.rb

@@ -5,21 +5,42 @@ require 'td/command/connector'
 
 module TreasureData::Command
   describe 'connector commands' do
-    describe '#connector_guess' do
-      let :command do
-        Class.new { include TreasureData::Command }.new
+    let :command do
+      Class.new { include TreasureData::Command }.new
+    end
+    let(:bulk_load_yaml) { File.join("spec", "td", "fixture", "bulk_load.yml") }
+    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 '#connector_guess' do
       describe 'guess plugins' do
         let(:guess_plugins) { %w(json query_string) }
-
-        let(:in_file)  { Tempfile.new('in.yml').tap{|f| f.close } }
-        let(:out_file) { Tempfile.new('out.yml').tap{|f| f.close } }
-
+        let(:stdout_io) { StringIO.new }
+        let(:stderr_io) { StringIO.new }
         let(:option) {
           List::CommandParser.new("connector:guess", ["config"], [], nil, [in_file.path, '-o', out_file.path, '--guess', guess_plugins.join(',')], true)
         }
-        let(:client) { double(:client) }
+        let(:response) {
+          {'config' => {'in' => {}, 'out' => {}}}
+        }
+        let(:client)   { double(:client) }
+        let(:in_file)  { Tempfile.new('in.yml').tap{|f| f.close } }
+        let(:out_file) { Tempfile.new('out.yml').tap{|f| f.close } }
 
         before do
           command.stub(:get_client).and_return(client)
@@ -46,27 +67,37 @@ module TreasureData::Command
           command.connector_guess(option)
         end
       end
-    end
 
-    describe '#connector_preview' do
-      let :command do
-        Class.new { include TreasureData::Command }.new
-      end
+      describe 'output config' do
+        let(:out_file)  { Tempfile.new('out.yml').tap(&:close)  }
+        let(:bulk_load_yaml) { File.join("spec", "td", "fixture", "bulk_load.yml") }
+        let(:option) {
+          List::CommandParser.new("connector:guess", ['config'], %w(access-id access-secret source out), nil, [bulk_load_yaml, '-o', out_file.path], true)
+        }
+        let(:response) {
+          {'config' => {'in' => {}, 'out' => {}}}
+        }
+        let(:client) {
+          double(:client, bulk_load_guess: response)
+        }
 
-      subject do
-        backup = $stdout.dup
-        buf = StringIO.new
+        before do
+            command.stub(:get_client).and_return(client)
+            command.connector_guess(option)
+        end
 
-        begin
-          $stdout = buf
+        it 'output yaml has [in, out] key' do
+          expect(YAML.load_file(out_file.path).keys).to eq(%w(in out))
+        end
+      end
+    end
 
-          op = List::CommandParser.new("connector:preview", ["config"], [], nil, [File.join("spec", "td", "fixture", "bulk_load.yml")], true)
-          command.connector_preview(op)
+    describe '#connector_preview' do
+      subject do
+        op = List::CommandParser.new("connector:preview", ["config"], [], nil, [bulk_load_yaml], true)
+        command.connector_preview(op)
 
-          buf.string
-        ensure
-          $stdout = backup
-        end
+        stdout_io.string
       end
 
       let(:preview_result) do
@@ -97,30 +128,10 @@ module TreasureData::Command
     end
 
     describe '#connector_issue' do
-      let :command do
-        Class.new { include TreasureData::Command }.new
-      end
-
-      let(:stderr_io) do
-        StringIO.new
-      end
-
       subject do
-        backup = $stdout.dup
-        stderr_backup = $stderr.dup
-        buf = StringIO.new
-
-        begin
-          $stdout = buf
-          $stderr = stderr_io
-
           command.connector_issue(option)
 
-          buf.string
-        ensure
-          $stdout = backup
-          $stderr = stderr_backup
-        end
+          stdout_io.string
       end
 
       describe 'queueing job' do
@@ -176,9 +187,6 @@ module TreasureData::Command
     describe '#connector_run' do
       include_context 'quiet_out'
 
-      let :command do
-        Class.new { include TreasureData::Command }.new
-      end
       let(:client) { double(:client) }
       let(:job_name) { 'job_1' }
 
@@ -218,9 +226,6 @@ module TreasureData::Command
     describe 'connector history' do
       include_context 'quiet_out'
 
-      let :command do
-        Class.new { include TreasureData::Command }.new
-      end
       let(:name) { 'connector_test' }
 
       subject do
@@ -282,5 +287,71 @@ module TreasureData::Command
         end
       end
     end
+
+    describe '#connector_list' do
+      let(:option) {
+        List::CommandParser.new("connector:list", [], [], nil, [], true)
+      }
+      let(:response) {
+        [{
+          'name'     => 'daily_mysql_import',
+          'cron'     => '10 0 * * *',
+          'timezone' => 'UTC',
+          'delay'    => 0,
+          'database' => 'td_sample_db',
+          'table'    => 'td_sample_table',
+          'config'   => {'type' => 'mysql'},
+        }]
+      }
+      let(:client) {
+        double(:client, bulk_load_list: response)
+      }
+
+      before do
+        command.stub(:get_client).and_return(client)
+        command.connector_list(option)
+      end
+
+      it 'show list use table format' do
+        expect(stdout_io.string).to include <<-EOL
+| daily_mysql_import | 10 0 * * * | UTC      | 0     | td_sample_db | td_sample_table |
+        EOL
+      end
+    end
+
+    describe '#connector_create' do
+      let(:name)     { 'daily_mysql_import' }
+      let(:cron)     { '10 0 * * *' }
+      let(:database) { 'td_sample_db' }
+      let(:table)    { 'td_sample_table' }
+      let(:config_file) {
+        Tempfile.new('config.json').tap {|tf|
+          tf.puts({}.to_json)
+          tf.close
+        }
+      }
+      let(:option) {
+        List::CommandParser.new("connector:create", %w(name cron database table config_file), [], nil, [name, cron, database, table, config_file.path], true)
+      }
+      let(:response) {
+        {'name' => name, 'cron' => cron, 'timezone' => 'UTC', 'delay' => 0, 'database' => database, 'table' => table, 'config' => ''}
+      }
+      let(:client) {
+        double(:client, bulk_load_create: response)
+      }
+
+      before do
+        command.stub(:get_table)
+        command.stub(:get_client).and_return(client)
+        command.connector_create(option)
+      end
+
+      it 'show create result' do
+        expect(stdout_io.string).to include name
+        expect(stdout_io.string).to include cron
+        expect(stdout_io.string).to include database
+        expect(stdout_io.string).to include table
+      end
+    end
   end
 end

data/spec/td/command/job_spec.rb

@@ -232,7 +232,13 @@ module TreasureData::Command
         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]]
+            inf = Float::INFINITY
+            nan = Float::NAN
+            @result = [
+              [[nan, inf, -inf], 1],
+              [[[nan, inf, -inf], 5.0, {key:6}], 2],
+              [["7", 8.0, {key:9}], 3],
+            ]
             @result_size = 3
             @status = 'success'
           end
@@ -245,12 +251,20 @@ module TreasureData::Command
 
         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)
+          File.read(file.path).should == <<text
+"""NaN""","""Infinity""","""-Infinity"""
+"[""NaN"",""Infinity"",""-Infinity""]",5.0,"{""key"":6}"
+7,8.0,"{""key"":9}"
+text
         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)
+          File.read(file.path).should == <<text
+"NaN"\t"Infinity"\t"-Infinity"
+["NaN","Infinity","-Infinity"]\t5.0\t{"key":6}
+7\t8.0\t{"key":9}
+text
         end
       end
     end

data/td.gemspec

@@ -17,11 +17,11 @@ Gem::Specification.new do |gem|
   gem.require_paths         = ['lib']
   gem.required_ruby_version = '>= 1.9'
 
-  gem.add_dependency "msgpack", [">= 0.4.4", "!= 0.5.0", "!= 0.5.1", "!= 0.5.2", "!= 0.5.3", "< 0.5.12"]
+  gem.add_dependency "msgpack", [">= 0.4.4", "!= 0.5.0", "!= 0.5.1", "!= 0.5.2", "!= 0.5.3", "< 0.8.0"]
   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.77"
+  gem.add_dependency "td-client", "~> 0.8.78"
   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.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -31,7 +31,7 @@ dependencies:
         version: 0.5.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.5.12
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -53,7 +53,7 @@ dependencies:
         version: 0.5.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.5.12
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -102,14 +102,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.77
+        version: 0.8.78
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.77
+        version: 0.8.78
 - !ruby/object:Gem::Dependency
   name: td-logger
   requirement: !ruby/object:Gem::Requirement