td-client 0.8.77 → 0.8.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 979926070464720f6bd1b6a59807be434867d11e
-  data.tar.gz: 4d091e61892417bdf7204db853959364bf22f73d
+  metadata.gz: b7b08bc82aed5007cc2f9b0500847ca78520cc78
+  data.tar.gz: 1fa61539241cce5a9152f23629f46c5c95a7ec01
 SHA512:
-  metadata.gz: 0fc6cd57b053cfd3b88bcfe53e03014c65699a6fd95bd270dd3e35b67bdef565a212e643458283263deed4037775946b9f675859b959a22863c23d68460f775f
-  data.tar.gz: c23339a69564b86d9676f825706a49cafde1fb404e485a3e6a7d3eb64ed7051cd4efeddd63ce7288ece545d4ddb0b3a30e769ea9114b84d9e55dbac8eb3dcb38
+  metadata.gz: cd680197fab594cf321145804b06b99d9070cecb97115625b7a489d94b4baae685f47744a866172f20baf6d50b7e9c9eca0287b20ab0d4692cfeec38aa5e9448
+  data.tar.gz: 64fc10d47a765efc4bab85fb24fa12b0cbc459336467f21765007057807117c6177f936f642c84da608d15fa09ddb9dacf5e08a3b50fcb96f900860f78c9c02e

data/lib/td/client/api.rb

@@ -121,7 +121,12 @@ class API
         record[k] = v.to_s
       end
     }
-    record.to_msgpack(out)
+    if out
+      out << record.to_msgpack
+      out
+    else
+      record.to_msgpack
+    end
   end
 
   # @param [String] target

data/lib/td/client/model.rb

@@ -1,7 +1,7 @@
+require 'timeout'
 
 module TreasureData
 
-
 class Model
   # @param [TreasureData::Client] client
   def initialize(client)
@@ -403,8 +403,25 @@ class Job < Model
   attr_reader :priority, :retry_limit, :org_name, :db_name
   attr_reader :duration
 
-  def wait(timeout=nil)
-    # TODO
+  def wait(timeout=nil, wait_interval=2)
+    # this should use monotonic clock but td-client-ruby supports Ruby 1.8.7 now.
+    # therefore add workaround to initializing clock on each delta
+    if timeout
+      orig_timeout = timeout
+      t1 = Time.now.to_f
+    end
+    until finished?
+      if timeout
+        t = Time.now.to_f
+        d = t - t1
+        t1 = t
+        timeout -= d if d > 0
+        raise ::TimeoutError, "timeout=#{orig_timeout} wait_interval=#{wait_interval}" if timeout <= 0
+      end
+      sleep wait_interval
+      yield self if block_given?
+      update_progress!
+    end
   end
 
   def kill!

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
   class Client
-    VERSION = '0.8.77'
+    VERSION = '0.8.78'
   end
 end

data/spec/td/client/api_ssl_connection_spec.rb

@@ -4,11 +4,34 @@ require 'logger'
 require 'webrick'
 require 'webrick/https'
 
+# Workaround for https://github.com/jruby/jruby-openssl/issues/78
+# With recent JRuby + jruby-openssl, X509CRL#extentions_to_text causes
+# StringIndexOOBException when we try to dump SSL Server Certificate.
+# when one of extensions has "" as value.
+# This hack is from httpclient https://github.com/nahi/httpclient/blob/master/lib/httpclient/util.rb#L27-L46
+if defined? JRUBY_VERSION
+  require 'openssl'
+  require 'java'
+  module OpenSSL
+    module X509
+      class Certificate
+        java_import 'java.security.cert.Certificate'
+        java_import 'java.security.cert.CertificateFactory'
+        java_import 'java.io.ByteArrayInputStream'
+        def to_text
+          cf = CertificateFactory.getInstance('X.509')
+          cf.generateCertificate(ByteArrayInputStream.new(self.to_der.to_java_bytes)).toString
+        end
+      end
+    end
+  end
+end
+
 describe 'API SSL connection' do
   DIR = File.dirname(File.expand_path(__FILE__))
 
   after :each do
-    @server.shutdown
+    @server.shutdown if @server
   end
 
   it 'should fail to connect SSLv3 only server' do

data/spec/td/client/model_job_spec.rb

@@ -62,4 +62,72 @@ describe 'Job Model' do
       end
     end
   end
+
+  describe '#wait' do
+    let(:client) { Client.authenticate('user', 'password') }
+    let(:job_id) { 12345678 }
+    let(:job)    { Job.new(client, job_id, nil, nil) }
+
+    def change_job_status(status)
+      allow(client).to receive(:job_status).with(job_id).and_return(status)
+    end
+
+    before do
+      change_job_status(Job::STATUS_QUEUED)
+    end
+
+    context 'without timeout' do
+      it 'waits the job to be finished' do
+        begin
+          thread = Thread.start { job.wait }
+          expect(thread).to be_alive
+          change_job_status(Job::STATUS_SUCCESS)
+          thread.join(1)
+          expect(thread).to be_stop
+        ensure
+          thread.kill # just in case
+        end
+      end
+
+      it 'calls a given block in every wait_interval second' do
+        expect { |b|
+          begin
+            thread = Thread.start {
+              job.wait(nil, 0.1, &b)
+            }
+            sleep 0.3
+            change_job_status(Job::STATUS_SUCCESS)
+            thread.join(0.5)
+            expect(thread).to be_stop
+          ensure
+            thread.kill # just in case
+          end
+        }.to yield_control.at_least(2).at_most(3).times
+      end
+    end
+
+    context 'with timeout' do
+      context 'the job running time is too long' do
+        it 'raise ::TimeoutError' do
+          expect {
+            job.wait(0.1)
+          }.to raise_error(::TimeoutError)
+        end
+      end
+
+      it 'calls a given block in every wait_interval second, and timeout' do
+        expect { |b|
+          begin
+            thread = Thread.start {
+              job.wait(0.3, 0.1, &b)
+            }
+            expect{ thread.value }.to raise_error(::TimeoutError)
+            expect(thread).to be_stop
+          ensure
+            thread.kill # just in case
+          end
+        }.to yield_control.at_least(2).times
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 0.8.77
+  version: 0.8.78
 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.6.0
+        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.6.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -72,22 +72,16 @@ dependencies:
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.5.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.5.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement