kura 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afeddc460c9e0c9ad0b34eb12e0c162271774dc6
-  data.tar.gz: 313412d9b2195bf4b57f6d3214eadb762c257c7a
+  metadata.gz: a43b8117003920b804b11dc4ea494d4055c78cff
+  data.tar.gz: ec0b100e696809181e1d15623ba8d7a70e02a11e
 SHA512:
-  metadata.gz: 92432abce43b19932f34d3722828c58fd783c34f0a31271534765c256d86d2285ba522608c6327c402c842507555a87b7cffe7cc2756a5a3186755daa595cd16
-  data.tar.gz: e7e09872aeedc94f1f57250cffc47d8af86fa53a7bcf6f6d731f100f65aa2ba0d3b8b7d622172d475d1c299100e44aeac5730f9ff7db736cad473a69d3d6b853
+  metadata.gz: 9b37896a3d33c84502fd998e8aab0e283dbd207f78fb6be72ffdca68c339e33d531b620effe26b727bbce260437a740ecb1a3511a7362749809148151e95f6f0
+  data.tar.gz: fc63b4a36b3280448a38c99e09de3a49f3ba8cf2938fcf60ea889ef08d4bcbdf1f99e15c8b66c41bcfd675da53f2686f392e2ed865a4cc2b9060449d9e3c88e6

data/ChangeLog.md

@@ -1,3 +1,17 @@
+# 0.2.2
+
+## Enhancements
+
+* Add Kura::Client#cancel_job. Support jobs.cancel API.
+  https://cloud.google.com/bigquery/docs/reference/v2/jobs/cancel
+* Kura::Client#wait_job accept Google::Apis::BigqueryV2::Job instance.
+* Add Google::Apis::BigqueryV2::Job#wait and #cancel methods.
+
+## Incompatible Changes
+
+* Kura::Client#insert_job (and #query, #load, #extract, #copy) return job
+  object (Google::Apis::BigqueryV2::Job instance) instead of job id (String).
+
 # 0.2.1
 
 ## Enhancements

data/lib/kura/client.rb

@@ -3,6 +3,7 @@
 require "google/apis/bigquery_v2"
 require "googleauth"
 require "kura/version"
+require "kura/extensions"
 
 module Kura
   class Client
@@ -176,15 +177,15 @@ module Kura
     end
     private :mode_to_write_disposition
 
-    def insert_job(configuration, project_id: @default_project_id, media: nil, wait: nil)
+    def insert_job(configuration, project_id: @default_project_id, media: nil, wait: nil, &blk)
       job_object = Google::Apis::BigqueryV2::Job.new
       job_object.configuration = configuration
-      result = @api.insert_job(project_id, job_object, upload_source: media)
-      job_id = result.job_reference.job_id
+      job = @api.insert_job(project_id, job_object, upload_source: media)
+      job.kura_api = self
       if wait
-        wait_job(job_id, wait, project_id: project_id)
+        wait_job(job, wait, &blk)
       else
-        job_id
+        job
       end
     rescue
       process_error($!)
@@ -199,7 +200,8 @@ module Kura
               use_query_cache: true,
               project_id: @default_project_id,
               job_project_id: @default_project_id,
-              wait: nil)
+              wait: nil,
+              &blk)
       write_disposition = mode_to_write_disposition(mode)
       configuration = {
         query: {
@@ -214,7 +216,7 @@ module Kura
       if dataset_id and table_id
         configuration[:query][:destination_table] = { project_id: project_id, dataset_id: dataset_id, table_id: table_id }
       end
-      insert_job(configuration, wait: wait, project_id: job_project_id)
+      insert_job(configuration, wait: wait, project_id: job_project_id, &blk)
     end
 
     def normalize_schema(schema)
@@ -252,7 +254,8 @@ module Kura
              source_format: "CSV",
              project_id: @default_project_id,
              job_project_id: @default_project_id,
-             file: nil, wait: nil)
+             file: nil, wait: nil,
+             &blk)
       write_disposition = mode_to_write_disposition(mode)
       source_uris = [source_uris] if source_uris.is_a?(String)
       configuration = {
@@ -281,7 +284,7 @@ module Kura
       unless file
         configuration[:load][:source_uris] = source_uris
       end
-      insert_job(configuration, media: file, wait: wait, project_id: job_project_id)
+      insert_job(configuration, media: file, wait: wait, project_id: job_project_id, &blk)
     end
 
     def extract(dataset_id, table_id, dest_uris,
@@ -291,7 +294,8 @@ module Kura
                 print_header: true,
                 project_id: @default_project_id,
                 job_project_id: @default_project_id,
-                wait: nil)
+                wait: nil,
+                &blk)
       dest_uris = [ dest_uris ] if dest_uris.is_a?(String)
       configuration = {
         extract: {
@@ -309,7 +313,7 @@ module Kura
         configuration[:extract][:field_delimiter] = field_delimiter
         configuration[:extract][:print_header] = print_header
       end
-      insert_job(configuration, wait: wait, project_id: job_project_id)
+      insert_job(configuration, wait: wait, project_id: job_project_id, &blk)
     end
 
     def copy(src_dataset_id, src_table_id, dest_dataset_id, dest_table_id,
@@ -317,7 +321,8 @@ module Kura
              src_project_id: @default_project_id,
              dest_project_id: @default_project_id,
              job_project_id: @default_project_id,
-             wait: nil)
+             wait: nil,
+             &blk)
       write_disposition = mode_to_write_disposition(mode)
       configuration = {
         copy: {
@@ -334,15 +339,28 @@ module Kura
           write_disposition: write_disposition,
         }
       }
-      insert_job(configuration, wait: wait, project_id: job_project_id)
+      insert_job(configuration, wait: wait, project_id: job_project_id, &blk)
     end
 
     def job(job_id, project_id: @default_project_id)
-      @api.get_job(project_id, job_id)
+      @api.get_job(project_id, job_id).tap{|j| j.kura_api = self}
     rescue
       process_error($!)
     end
 
+    def cancel_job(job, project_id: @default_project_id)
+      case job
+      when String
+        jobid = job
+      when Google::Apis::BigqueryV2::Job
+        project_id = job.job_reference.project_id
+        jobid = job.job_reference.job_id
+      else
+        raise TypeError, "Kura::Client#cancel_job accept String(job-id) or Google::Apis::BigqueryV2::Job"
+      end
+      @api.cancel_job(project_id, jobid).job.tap{|j| j.kura_api = self}
+    end
+
     def job_finished?(r)
       if r.status.state == "DONE"
         if r.status.error_result
@@ -353,7 +371,16 @@ module Kura
       return false
     end
 
-    def wait_job(job_id, timeout=60*10, project_id: @default_project_id)
+    def wait_job(job, timeout=60*10, project_id: @default_project_id)
+      case job
+      when String
+        job_id = job
+      when Google::Apis::BigqueryV2::Job
+        project_id = job.job_reference.project_id
+        job_id = job.job_reference.job_id
+      else
+        raise TypeError, "Kura::Client#wait_job accept String(job-id) or Google::Apis::BigqueryV2::Job"
+      end
       expire = Time.now + timeout
       while expire > Time.now
         j = job(job_id, project_id: project_id)

data/lib/kura/extensions.rb

@@ -0,0 +1,3 @@
+# coding: utf-8
+
+require "kura/extensions/google/apis/bigquery_v2/job"

data/lib/kura/extensions/google/apis/bigquery_v2/job.rb

@@ -0,0 +1,16 @@
+# encoding: utf-8
+
+require "google/apis/bigquery_v2"
+
+class Google::Apis::BigqueryV2::Job
+  attr_accessor :kura_api
+
+  def wait(timeout, &blk)
+    kura_api.wait_job(self, timeout, &blk)
+  end
+
+  def cancel
+    kura_api.cancel_job(self)
+  end
+end
+

data/lib/kura/version.rb

@@ -1,3 +1,3 @@
 module Kura
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kura
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Chikanaga Tomoyuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -126,6 +126,8 @@ files:
 - kura.gemspec
 - lib/kura.rb
 - lib/kura/client.rb
+- lib/kura/extensions.rb
+- lib/kura/extensions/google/apis/bigquery_v2/job.rb
 - lib/kura/version.rb
 homepage: https://github.com/nagachika/kura/
 licenses: