td-client 0.8.79 → 0.8.80

data/spec/td/client/model_job_spec.rb

@@ -43,20 +43,20 @@ describe 'Job Model' do
     let(:io)     { StringIO.new }
 
     context 'not finished?' do
-      before { job.stub(:finished?) { false } }
+      before { allow(job).to receive(:finished?) { false } }
 
       it 'do not call #job_result_raw' do
-        client.should_not_receive(:job_result_raw)
+        expect(client).not_to receive(:job_result_raw)
 
         expect(job.result_raw(format, io)).to_not be
       end
     end
 
     context 'finished?' do
-      before { job.stub(:finished?) { true } }
+      before { allow(job).to receive(:finished?) { true } }
 
       it 'call #job_result_raw' do
-        client.should_receive(:job_result_raw).with(job_id, format, io)
+        expect(client).to receive(:job_result_raw).with(job_id, format, io)
 
         job.result_raw(format, io)
       end

data/spec/td/client/model_schedule_spec.rb

@@ -14,11 +14,11 @@ describe 'Schedule Model' do
     let(:num) { 1 }
 
     before do
-      API.stub(:new).with(api_key, {}).and_return(api)
+      allow(API).to receive(:new).with(api_key, {}).and_return(api)
     end
 
     it 'success call api' do
-      api.should_receive(:run_schedule).with(name, time, num).and_return([])
+      expect(api).to receive(:run_schedule).with(name, time, num).and_return([])
 
       schedule.run(time, num)
     end

data/spec/td/client/partial_delete_api_spec.rb

@@ -27,7 +27,7 @@ describe 'PartialDelete API' do
       stub_api_request(:post, "/v3/table/partialdelete/#{e(db_name)}/#{e(table_name)}").with(:body => from_to).
         to_return(:body => {'database' => db_name, 'table' => table_name, 'job_id' => '1'}.to_json)
 
-      api.partial_delete(db_name, table_name, to, from).should == '1'
+      expect(api.partial_delete(db_name, table_name, to, from)).to eq('1')
     end
 
     it 'should return 404 error with non exist database name' do

data/spec/td/client/result_api_spec.rb

@@ -14,7 +14,7 @@ describe 'Result API' do
       params = {'url' => result_url}
       stub_api_request(:post, "/v3/result/create/#{e(result_name)}").with(:body => params).to_return(:body => {'result' => result_name}.to_json)
 
-      api.create_result(result_name, result_url).should be true
+      expect(api.create_result(result_name, result_url)).to be true
     end
 
     it 'should return 422 error with invalid name' do
@@ -56,14 +56,14 @@ describe 'Result API' do
     it 'should return name and url' do
       stub_api_request(:get, '/v3/result/list').
         to_return(:body => {'results' => [{'name' => 'name', 'url' => 'url'}]}.to_json)
-      api.list_result.should == [['name', 'url', nil]]
+      expect(api.list_result).to eq([['name', 'url', nil]])
     end
   end
 
   describe 'delete_result' do
     it 'should delete the result' do
       stub_api_request(:post, "/v3/result/delete/#{e(result_name)}")
-      api.delete_result(result_name).should == true
+      expect(api.delete_result(result_name)).to eq(true)
     end
 
     it 'should raise error' do

data/spec/td/client/sched_api_spec.rb

@@ -20,7 +20,7 @@ describe 'Schedule API' do
         with(:body => opts.merge('type' => 'hive')).
         to_return(:body => {'name' => sched_name, 'start' => start.to_s}.to_json)
 
-      api.create_schedule(sched_name, opts.merge('type' => 'hive')).should == start.to_s
+      expect(api.create_schedule(sched_name, opts.merge('type' => 'hive'))).to eq(start.to_s)
     end
 
     it 'should create a dummy schedule' do
@@ -28,7 +28,7 @@ describe 'Schedule API' do
         with(:body => opts.merge('type' => 'hive')).
         to_return(:body => {'name' => sched_name, 'start' => nil}.to_json)
 
-      api.create_schedule(sched_name, opts.merge('type' => 'hive')).should be_nil
+      expect(api.create_schedule(sched_name, opts.merge('type' => 'hive'))).to be_nil
     end
 
     it 'should return 422 error with invalid name' do
@@ -48,7 +48,7 @@ describe 'Schedule API' do
     it 'should delete the schedule' do
       stub_api_request(:post, "/v3/schedule/delete/#{e(sched_name)}").
         to_return(:body => {'cron' => 'cron', 'query' => 'query'}.to_json)
-      api.delete_schedule(sched_name).should == ['cron', 'query']
+      expect(api.delete_schedule(sched_name)).to eq(['cron', 'query'])
     end
   end
 
@@ -94,7 +94,7 @@ describe 'Schedule API' do
       stub_api_request(:get, "/v3/schedule/history/#{e(sched_name)}").
         with(:query => {'from' => 0, 'to' => 100}).
         to_return(:body => {'history' => [history]}.to_json)
-        api.history(sched_name, 0, 100).should == [[nil, 'job_id', :type, 'status', 'query', 'start_at', 'end_at', 'result', 'priority', 'database']]
+        expect(api.history(sched_name, 0, 100)).to eq([[nil, 'job_id', :type, 'status', 'query', 'start_at', 'end_at', 'result', 'priority', 'database']])
     end
   end
 
@@ -103,7 +103,7 @@ describe 'Schedule API' do
       stub_api_request(:post, "/v3/schedule/run/#{e(sched_name)}/123456789").
         with(:body => {'num' => '5'}).
         to_return(:body => {'jobs' => [{'job_id' => 'job_id', 'scheduled_at' => 'scheduled_at', 'type' => 'type'}]}.to_json)
-        api.run_schedule(sched_name, 123456789, 5).should == [['job_id', :type, 'scheduled_at']]
+        expect(api.run_schedule(sched_name, 123456789, 5)).to eq([['job_id', :type, 'scheduled_at']])
     end
   end
 end

data/spec/td/client/server_status_api_spec.rb

@@ -13,13 +13,13 @@ describe 'ServerStatus API' do
     it 'returns status' do
       stub_api_request(:get, '/v3/system/server_status').
         to_return(:body => {'status' => 'OK'}.to_json)
-      api.server_status.should == 'OK'
+      expect(api.server_status).to eq('OK')
     end
 
     it 'returns error description' do
       stub_api_request(:get, '/v3/system/server_status').
         to_return(:status => 500)
-      api.server_status.should == 'Server is down (500)'
+      expect(api.server_status).to eq('Server is down (500)')
     end
   end
 end

data/spec/td/client/table_api_spec.rb

@@ -27,7 +27,7 @@ describe 'Table API' do
     it 'should create a new table if the database exists' do
       stub_api_request(:post, "/v3/table/create/#{e db_name}/#{e(table_name)}/log").
         to_return(:body => {'database' => db_name, 'table' => table_name, 'type' => 'log'}.to_json)
-      api.create_log_table(db_name, table_name).should be true
+      expect(api.create_log_table(db_name, table_name)).to be true
     end
 
     it 'should return 400 error with invalid name' do
@@ -166,7 +166,7 @@ describe 'Table API' do
   describe 'swap_table' do
     it 'should swap tables' do
       stub_api_request(:post, '/v3/table/swap/db/table1/table2')
-      api.swap_table('db', 'table1', 'table2').should == true
+      expect(api.swap_table('db', 'table1', 'table2')).to eq(true)
     end
   end
 
@@ -175,7 +175,7 @@ describe 'Table API' do
       stub_api_request(:post, '/v3/table/update/db/table').
         with(:body => {'expire_days' => '5'}).
         to_return(:body => {'type' => 'type'}.to_json)
-      api.update_expire('db', 'table', 5).should == true
+      expect(api.update_expire('db', 'table', 5)).to eq(true)
     end
   end
 
@@ -197,14 +197,14 @@ describe 'Table API' do
       api.tail('db', 'table', 10) do |row|
         result << row
       end
-      result.should == [[1, 2, 3], [4, 5, 6]]
+      expect(result).to eq([[1, 2, 3], [4, 5, 6]])
     end
 
     it 'returns rows' do
       stub_api_request(:get, '/v3/table/tail/db/table').
         with(:query => {'format' => 'msgpack', 'count' => '10'}).
         to_return(:body => packed)
-      api.tail('db', 'table', 10).should == [[1, 2, 3], [4, 5, 6]]
+      expect(api.tail('db', 'table', 10)).to eq([[1, 2, 3], [4, 5, 6]])
     end
 
     it 'shows deprecated warning for from and to' do
@@ -220,7 +220,7 @@ describe 'Table API' do
         $stderr.reopen(backup)
         w.close
       end
-      r.read.should == %Q(parameter "to" and "from" no longer work\n)
+      expect(r.read).to eq(%Q(parameter "to" and "from" no longer work\n))
     end
   end
 end

data/spec/td/client/user_api_spec.rb

@@ -14,7 +14,7 @@ describe 'User API' do
     it 'returns apikey' do
       stub_api_request(:post, "/v3/user/authenticate").
         to_return(:body => {'apikey' => 'apikey'}.to_json)
-      api.authenticate('user', 'password').should == 'apikey'
+      expect(api.authenticate('user', 'password')).to eq('apikey')
     end
 
     it 'raises AuthError for authentication failure' do
@@ -38,30 +38,30 @@ describe 'User API' do
     it 'returns users' do
       stub_api_request(:get, "/v3/user/list").
         to_return(:body => {'users' => [{'name' => 'name1', 'email' => 'email1'}, {'name' => 'name2', 'email' => 'email2'}]}.to_json)
-      api.list_users.should == [
+      expect(api.list_users).to eq([
         ['name1', nil, nil, 'email1'],
         ['name2', nil, nil, 'email2'],
-      ]
+      ])
     end
   end
 
   describe 'add_user' do
     it 'runs' do
       stub_api_request(:post, "/v3/user/add/name").to_return(:body => {}.to_json)
-      api.add_user('name', "org", 'name+suffix@example.com', 'password').should == true
+      expect(api.add_user('name', "org", 'name+suffix@example.com', 'password')).to eq(true)
     end
 
     # TODO
     it 'does not escape sp but it must be a bug' do
       stub_api_request(:post, "/v3/user/add/!%20%20%20%20@%23$%25%5E&*()_%2B%7C~%2Ecom").to_return(:body => {}.to_json)
-      api.add_user('!    @#$%^&*()_+|~.com', "org", 'name+suffix@example.com', 'password').should == true
+      expect(api.add_user('!    @#$%^&*()_+|~.com', "org", 'name+suffix@example.com', 'password')).to eq(true)
     end
   end
 
   describe 'remove_user' do
     it 'runs' do
       stub_api_request(:post, "/v3/user/remove/name").to_return(:body => {}.to_json)
-      api.remove_user('name').should == true
+      expect(api.remove_user('name')).to eq(true)
     end
   end
 
@@ -70,7 +70,7 @@ describe 'User API' do
       stub_api_request(:post, "/v3/user/email/change/name").
         with(:body => {'email' => 'new@email.com'}).
         to_return(:body => {}.to_json)
-      api.change_email('name', 'new@email.com').should == true
+      expect(api.change_email('name', 'new@email.com')).to eq(true)
     end
   end
 
@@ -78,7 +78,7 @@ describe 'User API' do
     it 'runs' do
       stub_api_request(:get, "/v3/user/apikey/list/name").
         to_return(:body => {'apikeys' => ['key1', 'key2']}.to_json)
-      api.list_apikeys('name').should == ['key1', 'key2']
+      expect(api.list_apikeys('name')).to eq(['key1', 'key2'])
     end
   end
 
@@ -86,7 +86,7 @@ describe 'User API' do
     it 'does not return the generated apikey because you can list apikey afterwards' do
       stub_api_request(:post, "/v3/user/apikey/add/name").
         to_return(:body => {'apikey' => 'apikey'}.to_json)
-      api.add_apikey('name').should == true
+      expect(api.add_apikey('name')).to eq(true)
     end
   end
 
@@ -94,7 +94,7 @@ describe 'User API' do
     it 'runs' do
       stub_api_request(:post, "/v3/user/apikey/remove/name").
         to_return(:body => {}.to_json)
-      api.remove_apikey('name', 'apikey').should == true
+      expect(api.remove_apikey('name', 'apikey')).to eq(true)
     end
   end
 
@@ -103,7 +103,7 @@ describe 'User API' do
       stub_api_request(:post, "/v3/user/password/change/name").
         with(:body => {'password' => 'password'}).
         to_return(:body => {}.to_json)
-      api.change_password('name', 'password').should == true
+      expect(api.change_password('name', 'password')).to eq(true)
     end
   end
 
@@ -112,7 +112,7 @@ describe 'User API' do
       stub_api_request(:post, "/v3/user/password/change").
         with(:body => {'old_password' => 'old_password', 'password' => 'password'}).
         to_return(:body => {}.to_json)
-      api.change_my_password('old_password', 'password').should == true
+      expect(api.change_my_password('old_password', 'password')).to eq(true)
     end
   end
 end

data/spec/td/client_sched_spec.rb

@@ -28,14 +28,14 @@ describe 'Schedule Command' do
     context 'start is now' do
       let (:start){ Time.now.round }
       it 'returns Time object' do
-        client.create_schedule(sched_name, opts).should == start
+        expect(client.create_schedule(sched_name, opts)).to eq(start)
       end
     end
 
     context 'start is nil' do
       let (:start){ nil }
       it do
-        client.create_schedule(sched_name, opts).should == start
+        expect(client.create_schedule(sched_name, opts)).to eq(start)
       end
     end
   end
@@ -58,11 +58,11 @@ describe 'Schedule Command' do
         to_return(:body => {'count' => 1, 'history' => [h]}.to_json)
 
       client.history(sched_name, 0, 19).each do |scheduled_job|
-        scheduled_job.scheduled_at.xmlschema.should == Time.parse('2015-02-17T14:16:00+09:00').xmlschema #avoid depending on CI's Locale
-        scheduled_job.job_id.should == 'job_id'
-        scheduled_job.status.should == 'status'
-        scheduled_job.priority.should == 'priority'
-        scheduled_job.result_url.should == 'result'
+        expect(scheduled_job.scheduled_at.xmlschema).to eq(Time.parse('2015-02-17T14:16:00+09:00').xmlschema) #avoid depending on CI's Locale
+        expect(scheduled_job.job_id).to eq('job_id')
+        expect(scheduled_job.status).to eq('status')
+        expect(scheduled_job.priority).to eq('priority')
+        expect(scheduled_job.result_url).to eq('result')
       end
     end
 
@@ -72,7 +72,7 @@ describe 'Schedule Command' do
         to_return(:body => {'count' => 1, 'history' => [h]}.to_json)
 
       client.history(sched_name, 0, 19).each do |scheduled_job|
-        scheduled_job.scheduled_at.should == nil
+        expect(scheduled_job.scheduled_at).to eq(nil)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 0.8.79
+  version: 0.8.80
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -88,14 +88,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -264,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Treasure Data API library for Ruby