td 0.13.2 → 0.14.0

data/spec/td/command/import_spec.rb

@@ -51,7 +51,7 @@ module TreasureData::Command
 
       before do
         client = double(:client, bulk_imports: response)
-        command.stub(:get_client).and_return(client)
+        allow(command).to receive(:get_client).and_return(client)
 
         command.import_list(option)
       end
@@ -86,7 +86,7 @@ module TreasureData::Command
 
       before do
         client = double(:client, bulk_imports: response)
-        command.stub(:get_client).and_return(client)
+        allow(command).to receive(:get_client).and_return(client)
 
         command.import_list(option)
       end
@@ -104,13 +104,13 @@ module TreasureData::Command
       let(:client) { double(:client) }
 
       before do
-        command.stub(:get_client).and_return(client)
+        allow(command).to receive(: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 }
+          expect(client).to receive(:bulk_import).with(import_name).and_return(nil)
+          expect(command).to receive(:exit).with(1) { raise CallSystemExitError }
 
           expect {
             command.import_show(option)
@@ -139,8 +139,8 @@ module TreasureData::Command
         }
 
         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)
+          expect(client).to receive(:bulk_import).with(import_name).and_return(bulk_import)
+          expect(client).to receive(:list_bulk_import_parts).with(import_name).and_return(bulk_import_parts)
 
           command.import_show(option)
         end
@@ -167,11 +167,11 @@ module TreasureData::Command
       let(:client) { double(:client) }
 
       before do
-        command.stub(:get_client).and_return(client)
+        allow(command).to receive(:get_client).and_return(client)
       end
 
       it 'create bulk import' do
-        client.should_receive(:create_bulk_import).with(import_name, database, table, {})
+        expect(client).to receive(:create_bulk_import).with(import_name, database, table, {})
 
         command.import_create(option)
 
@@ -195,8 +195,8 @@ module TreasureData::Command
       let(:apikey) { '1234ABCDEFGHIJKLMN' }
 
       before do
-        TreasureData::Config.stub(:endpoint).and_return(endpoint)
-        TreasureData::Config.stub(:apikey).and_return(apikey)
+        allow(TreasureData::Config).to receive(:endpoint).and_return(endpoint)
+        allow(TreasureData::Config).to receive(:apikey).and_return(apikey)
       end
 
       context 'unknown format' do

data/spec/td/command/job_spec.rb

@@ -34,11 +34,11 @@ module TreasureData::Command
           let(:format) { "json" }
 
           it do
-            FileUtils.should_receive(:mv).with(tempfile, file.path)
+            expect(FileUtils).to receive(:mv).with(tempfile, file.path)
             subject
           end
           it do
-            command.should_receive(:open_file).with(tempfile, "w")
+            expect(command).to receive(:open_file).with(tempfile, "w")
             subject
           end
         end
@@ -47,11 +47,11 @@ module TreasureData::Command
           let(:format) { "csv" }
 
           it do
-            FileUtils.should_receive(:mv).with(tempfile, file.path)
+            expect(FileUtils).to receive(:mv).with(tempfile, file.path)
             subject
           end
           it do
-            command.should_receive(:open_file).with(tempfile, "w")
+            expect(command).to receive(:open_file).with(tempfile, "w")
             subject
           end
         end
@@ -60,11 +60,11 @@ module TreasureData::Command
           let(:format) { "tsv" }
 
           it do
-            FileUtils.should_receive(:mv).with(tempfile, file.path)
+            expect(FileUtils).to receive(:mv).with(tempfile, file.path)
             subject
           end
           it do
-            command.should_receive(:open_file).with(tempfile, "w")
+            expect(command).to receive(:open_file).with(tempfile, "w")
             subject
           end
         end
@@ -73,15 +73,15 @@ module TreasureData::Command
           let(:format) { "msgpack" }
 
           before do
-            job.stub(:result_format) # for msgpack
+            allow(job).to receive(:result_format) # for msgpack
           end
 
           it do
-            FileUtils.should_receive(:mv).with(tempfile, file.path)
+            expect(FileUtils).to receive(:mv).with(tempfile, file.path)
             subject
           end
           it do
-            command.should_receive(:open_file).with(tempfile, "wb")
+            expect(command).to receive(:open_file).with(tempfile, "wb")
             subject
           end
         end
@@ -90,15 +90,15 @@ module TreasureData::Command
           let(:format) { "msgpack.gz" }
 
           before do
-            job.stub(:result_raw)    # for msgpack.gz
+            allow(job).to receive(:result_raw)    # for msgpack.gz
           end
 
           it do
-            FileUtils.should_receive(:mv).with(tempfile, file.path)
+            expect(FileUtils).to receive(:mv).with(tempfile, file.path)
             subject
           end
           it do
-            command.should_receive(:open_file).with(tempfile, "wb")
+            expect(command).to receive(:open_file).with(tempfile, "wb")
             subject
           end
         end
@@ -107,17 +107,17 @@ module TreasureData::Command
       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}]])
+          expect(File.read(file.path)).to eq(%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)
+          expect(File.read(file.path)).to eq(%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)
+          expect(File.read(file.path)).to eq(%Q(1\t2.0\t{"key":3}\n4\t5.0\t{"key":6}\n7\t8.0\t{"key":9}\n))
         end
       end
 
@@ -138,49 +138,49 @@ module TreasureData::Command
 
         context 'with --column-header option' do
           before do
-            job.stub(:hive_result_schema).and_return([['c0', 'time'], ['c1', 'double'], ['v', nil], ['c3', 'long']])
+            allow(job).to receive(: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)
+            allow(client).to receive(:job).with(job_id).and_return(job)
+            allow(command).to receive(: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([{"c0":null,"c1":2.0,"v":{"key":3},"c3":null}])
+            expect(File.read(file.path)).to eq(%Q([{"c0":null,"c1":2.0,"v":{"key":3},"c3":null}]))
           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)
+            expect(File.read(file.path)).to eq(%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)
+            expect(File.read(file.path)).to eq(%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}]])
+            expect(File.read(file.path)).to eq(%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)
+            expect(File.read(file.path)).to eq(%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)
+            expect(File.read(file.path)).to eq(%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}]])
+            expect(File.read(file.path)).to eq(%Q([[null,2.0,{"key":3}]]))
           end
 
           context 'csv format' do
@@ -189,7 +189,7 @@ module TreasureData::Command
 
               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)
+                expect(File.read(file.path)).to eq(%Q(NULL,2.0,"{""key"":3}"\n))
               end
             end
 
@@ -198,14 +198,14 @@ module TreasureData::Command
 
               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)
+                expect(File.read(file.path)).to eq(%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)
+            expect(File.read(file.path)).to eq(%Q(""\t2.0\t{"key":3}\n))
           end
         end
       end
@@ -214,17 +214,17 @@ module TreasureData::Command
 
         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}]])
+          expect(File.read(file.path)).to eq(%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)
+          expect(File.read(file.path)).to eq(%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)
+          expect(File.read(file.path)).to eq(%Q(1\t2.0\t{"key":3}\n4\t5.0\t{"key":6}\n7\t8.0\t{"key":9}\n))
         end
       end
 
@@ -251,7 +251,7 @@ module TreasureData::Command
 
         it 'supports csv output' do
           command.send(:show_result, job, file, nil, 'csv')
-          File.read(file.path).should == <<text
+          expect(File.read(file.path)).to eq <<text
 """NaN""","""Infinity""","""-Infinity"""
 "[""NaN"",""Infinity"",""-Infinity""]",5.0,"{""key"":6}"
 7,8.0,"{""key"":9}"
@@ -260,7 +260,7 @@ text
 
         it 'supports tsv output' do
           command.send(:show_result, job, file, nil, 'tsv')
-          File.read(file.path).should == <<text
+          expect(File.read(file.path)).to eq <<text
 "NaN"\t"Infinity"\t"-Infinity"
 ["NaN","Infinity","-Infinity"]\t5.0\t{"key":6}
 7\t8.0\t{"key":9}
@@ -301,16 +301,16 @@ text
       end
 
       before do
-        job.stub(:finished?).and_return(true)
+        allow(job).to receive(:finished?).and_return(true)
 
         client = Object.new
-        client.stub(:job).with(job_id).and_return(job)
-        command.stub(:get_client).and_return(client)
+        allow(client).to receive(:job).with(job_id).and_return(job)
+        allow(command).to receive(: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})
+          allow(command).to receive(: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
@@ -318,13 +318,13 @@ text
 
       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"} )
+          allow(command).to receive(: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=>'""'} )
+          allow(command).to receive(: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
@@ -388,8 +388,8 @@ text
 
       before do
         client = Object.new
-        client.stub(:jobs).and_return(jobs)
-        command.stub(:get_client).and_return(client)
+        allow(client).to receive(:jobs).and_return(jobs)
+        allow(command).to receive(:get_client).and_return(client)
       end
 
       it 'should display all job list' do
@@ -437,31 +437,31 @@ ACTUAL
 
       it 'assumes test setting is correct' do
         # the String is actually in Windows-31J but encoding is UTF-8 msgpack-ruby reports
-        multibyte_string.encoding.should == Encoding::UTF_8
-        multibyte_string.force_encoding('Windows-31J').encode('UTF-8').should == 'メール'
+        expect(multibyte_string.encoding).to eq(Encoding::UTF_8)
+        expect(multibyte_string.force_encoding('Windows-31J').encode('UTF-8')).to eq('メール')
       end
 
       it 'supports json output' do
         row = multibyte_row
         file = Tempfile.new("job_spec").tap {|s| s.close }
         command.send(:show_result, job, file, nil, 'json')
-        File.read(file.path, encoding: 'UTF-8').should == '[' + [row, row].map { |e| Yajl.dump(e) }.join(",\n") + ']'
+        expect(File.read(file.path, encoding: 'UTF-8')).to eq('[' + [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").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, :row_sep => line_separator) }.join
-        File.open(file.path, 'r:Windows-31J').read.encode('UTF-8').split.first.should == 'メール,2.0,"{""メール"":""メール""}"'
+        expect(File.binread(file.path)).to eq([row, row].map { |e| CSV.generate_line(e, :row_sep => line_separator) }.join)
+        expect(File.open(file.path, 'r:Windows-31J').read.encode('UTF-8').split.first).to eq('メール,2.0,"{""メール"":""メール""}"')
       end
 
       it 'supports tsv output' do
         row = multibyte_row.map { |e| dump_column(e) }
         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") + line_separator }.join
-        File.open(file.path, 'r:Windows-31J').read.encode('UTF-8').split("\n").first.should == "メール\t2.0\t{\"メール\":\"メール\"}"
+        expect(File.binread(file.path)).to eq([row, row].map { |e| e.join("\t") + line_separator }.join)
+        expect(File.open(file.path, 'r:Windows-31J').read.encode('UTF-8').split("\n").first).to eq("メール\t2.0\t{\"メール\":\"メール\"}")
       end
     end
 

data/spec/td/command/query_spec.rb

@@ -0,0 +1,42 @@
+# encoding: utf-8
+
+require 'spec_helper'
+require 'td/command/common'
+require 'td/command/list'
+require 'td/command/query'
+require 'td/client'
+require 'tempfile'
+
+module TreasureData::Command
+  describe 'query commands' do
+    let :client do
+      double('client')
+    end
+    let :job do
+      double('job', job_id: 123)
+    end
+    let :command do
+      Class.new { include TreasureData::Command }.new
+    end
+    before do
+      allow(command).to receive(:get_client).and_return(client)
+      expect(client).to receive(:database).with('sample_datasets')
+    end
+
+    it 'accepts --domain-key' do
+      expect(client).to receive(:query).
+        with("sample_datasets", "SELECT 1;", nil, nil, nil, {"domain_key"=>"hoge"}).
+        and_return(job)
+      op = List::CommandParser.new("query", %w[query], %w[], nil, ['--domain-key=hoge', '-dsample_datasets', 'SELECT 1;'], false)
+      command.query(op)
+    end
+
+    it 'raises error if --domain-key is duplicated' do
+      expect(client).to receive(:query).
+        with("sample_datasets", "SELECT 1;", nil, nil, nil, {"domain_key"=>"hoge"}).
+        and_raise(::TreasureData::AlreadyExistsError.new('Query failed: domain_key has already been taken'))
+      op = List::CommandParser.new("query", %w[query], %w[], nil, ['--domain-key=hoge', '-dsample_datasets', 'SELECT 1;'], false)
+      expect{ command.query(op) }.to raise_error(TreasureData::AlreadyExistsError)
+    end
+  end
+end

data/spec/td/command/sched_spec.rb

@@ -23,13 +23,13 @@ module TreasureData::Command
     let(:op) { List::CommandParser.new('sched:last_job', %w[], %w[], false, argv, []) }
 
     before do
-      client.stub(:schedules).and_return(schedules)
-      command.stub(:get_client).and_return(client)
+      allow(client).to receive(:schedules).and_return(schedules)
+      allow(command).to receive(:get_client).and_return(client)
     end
 
     describe 'sched_history' do
       before do
-        client.stub(:history).and_return(history)
+        allow(client).to receive(:history).and_return(history)
       end
 
       let(:history) { [job1, job2] }
@@ -45,12 +45,12 @@ module TreasureData::Command
       subject { command.sched_result(op) }
 
       before do
-        command.stub(:get_history).with(client, nil, (back_number - 1), back_number).and_return(history)
+        allow(command).to receive(:get_history).with(client, nil, (back_number - 1), back_number).and_return(history)
       end
 
       shared_examples_for("passing argv and job_id to job:show") do
         it "invoke 'job:show [original argv] [job id]'" do
-          TreasureData::Command::Runner.any_instance.should_receive(:run).with(["job:show", *show_arg, job_id])
+          expect_any_instance_of(TreasureData::Command::Runner).to receive(:run).with(["job:show", *show_arg, job_id])
           subject
         end
       end
@@ -135,7 +135,7 @@ module TreasureData::Command
       context "history dose not exists" do
         let(:back_number) { 1 }
         let(:history) { [] }
-        before { client.stub(:history) { raise TreasureData::NotFoundError } }
+        before { allow(client).to receive(:history) { raise TreasureData::NotFoundError } }
 
         it "exit with 1" do
           begin