kura 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d152cd817d2c2b1d5ca66756310e5af0a4a1d338
-  data.tar.gz: a18b967e4fec4f97b1d22937590ef5e9866f4f96
+  metadata.gz: 80adcab6f4a5fd5ed60452a26121bbc13ecd491a
+  data.tar.gz: 51431b6a1f57e9f01615b3af4b513652c155aeed
 SHA512:
-  metadata.gz: a834c80e7c6eec7e1aea2c32a37616e4adbbdfc44509df5f49c3e5859eedce046d69b256d3919d1fb38267de61734e59f496a52a35a3910a7eebcfb582b8f180
-  data.tar.gz: dd055673db99ecd8c38bf2810c7d44c53ee449292e08bd0a53206bc3a9072b372bc1bdf3accc2e5ed15b48b266e350df38af60891b0758487004891b45be815d
+  metadata.gz: 77490104632b871a6f15f2ff034263b1a45379ca07a5412c6c83556c4a6993bea17f172c885e02201faa466068872d10c0d8d788d2056d1f54fa523cf98ead0f
+  data.tar.gz: 0246eb96056d65d30e7b2473640d06ca713936725bd5350d607340be2e09afda189e85cc7f0b23aa37e07514f1bbb2b2e1588500e9cdf050cf72f38737d824c7

data/ChangeLog.md

@@ -1,3 +1,11 @@
+# 0.1.3
+
+## Enhancements
+
+* Add Kura::Client#projects support projects.list API.
+* All APIs accept `project_id` keyword argument to override @default_project_id.
+* Get @default_project_id by projects.list API if not specified by the argument.
+
 # 0.1.2
 
 ## Incompatible Changes

data/README.md

@@ -24,7 +24,7 @@ Or install it yourself as:
 ```
 client = Kura.client(project_id, email, private_key)
 client.load("dataset", "table", "gs://mybucket/data.csv", wait: 120)
-client.query("dataset", "result", "SELECT * FROM [dataset.table];", wait: 120)
+client.query("SELECT * FROM [dataset.table];", wait: 120)
 client.extract("dataset", "result", "gs://mybucket/extracted.csv", wait: 120)
 ```
 

data/lib/kura/client.rb

@@ -6,7 +6,7 @@ require "kura/version"
 module Kura
   class Client
     def initialize(project_id, email_address, private_key)
-      @project_id = project_id
+      @default_project_id = project_id
       @scope = "https://www.googleapis.com/auth/bigquery"
       @email_address = email_address
       @private_key = private_key
@@ -19,9 +19,22 @@ module Kura
       @api = Google::APIClient.new(application_name: "Kura", application_version: Kura::VERSION, authorization: auth)
       @api.authorization.fetch_access_token!
       @bigquery_api = @api.discovered_api("bigquery", "v2")
+
+      if @default_project_id.nil?
+        @default_project_id = self.projects.first.id
+      end
     end
 
-    def datasets(project_id: @project_id, all: false, limit: 1000)
+    def projects(limit: 1000)
+      r = @api.execute(api_method: @bigquery_api.projects.list, parameters: { maxResults: limit })
+      unless r.success?
+        error = r.data["error"]["errors"][0]
+        raise Kura::ApiError.new(error["reason"], error["message"])
+      end
+      r.data.projects
+    end
+
+    def datasets(project_id: @default_project_id, all: false, limit: 1000)
       r = @api.execute(api_method: @bigquery_api.datasets.list, parameters: { projectId: project_id, all: all, maxResult: limit })
       unless r.success?
         error = r.data["error"]["errors"][0]
@@ -30,7 +43,7 @@ module Kura
       r.data.datasets
     end
 
-    def dataset(dataset_id, project_id: @project_id)
+    def dataset(dataset_id, project_id: @default_project_id)
       r = @api.execute(api_method: @bigquery_api.datasets.get, parameters: { projectId: project_id, datasetId: dataset_id })
       unless r.success?
         if r.data.error["code"] == 404
@@ -43,8 +56,8 @@ module Kura
       r.data
     end
 
-    def insert_dataset(dataset_id)
-      r = @api.execute(api_method: @bigquery_api.datasets.insert, parameters: { projectId: @project_id }, body_object: { datasetReference: { datasetId: dataset_id } })
+    def insert_dataset(dataset_id, project_id: @default_project_id)
+      r = @api.execute(api_method: @bigquery_api.datasets.insert, parameters: { projectId: project_id }, body_object: { datasetReference: { datasetId: dataset_id } })
       unless r.success?
         error = r.data["error"]["errors"][0]
         raise Kura::ApiError.new(error["reason"], error["message"])
@@ -52,8 +65,8 @@ module Kura
       r.data
     end
 
-    def delete_dataset(dataset_id, delete_contents: false)
-      r = @api.execute(api_method: @bigquery_api.datasets.delete, parameters: { projectId: @project_id, datasetId: dataset_id, deleteContents: delete_contents })
+    def delete_dataset(dataset_id, project_id: @default_project_id, delete_contents: false)
+      r = @api.execute(api_method: @bigquery_api.datasets.delete, parameters: { projectId: project_id, datasetId: dataset_id, deleteContents: delete_contents })
       unless r.success?
         error = r.data["error"]["errors"][0]
         raise Kura::ApiError.new(error["reason"], error["message"])
@@ -61,7 +74,7 @@ module Kura
       r.data
     end
 
-    def patch_dataset(dataset_id, project_id: @project_id, access: nil, description: nil, default_table_expiration_ms: nil, friendly_name: nil )
+    def patch_dataset(dataset_id, project_id: @default_project_id, access: nil, description: nil, default_table_expiration_ms: nil, friendly_name: nil )
       body = {}
       body["access"] = access if access
       body["defaultTableExpirationMs"] = default_table_expiration_ms if default_table_expiration_ms
@@ -75,7 +88,7 @@ module Kura
       r.data
     end
 
-    def tables(dataset_id, project_id: @project_id, limit: 1000)
+    def tables(dataset_id, project_id: @default_project_id, limit: 1000)
       params = { projectId: project_id, datasetId: dataset_id, maxResult: limit }
       r = @api.execute(api_method: @bigquery_api.tables.list, parameters: params)
       unless r.success?
@@ -85,7 +98,7 @@ module Kura
       r.data.tables
     end
 
-    def table(dataset_id, table_id, project_id: @project_id)
+    def table(dataset_id, table_id, project_id: @default_project_id)
       params = { projectId: project_id, datasetId: dataset_id, tableId: table_id }
       r = @api.execute(api_method: @bigquery_api.tables.get, parameters: params)
       unless r.success?
@@ -99,8 +112,8 @@ module Kura
       r.data
     end
 
-    def delete_table(dataset_id, table_id)
-      params = { projectId: @project_id, datasetId: dataset_id, tableId: table_id }
+    def delete_table(dataset_id, table_id, project_id: @default_project_id)
+      params = { projectId: project_id, datasetId: dataset_id, tableId: table_id }
       r = @api.execute(api_method: @bigquery_api.tables.delete, parameters: params)
       unless r.success?
         if r.data["error"]["code"] == 404
@@ -113,7 +126,7 @@ module Kura
       r.data
     end
 
-    def list_tabledata(dataset_id, table_id, project_id: @project_id, start_index: 0, max_result: 100, page_token: nil, schema: nil)
+    def list_tabledata(dataset_id, table_id, project_id: @default_project_id, start_index: 0, max_result: 100, page_token: nil, schema: nil)
       schema ||= table(dataset_id, table_id, project_id: project_id).schema.fields
       field_names = schema.map{|f| f["name"] }
       params = { projectId: project_id, datasetId: dataset_id, tableId: table_id, maxResults: max_result }
@@ -144,8 +157,8 @@ module Kura
     end
     private :mode_to_write_disposition
 
-    def insert_job(configuration, media: nil, wait: nil)
-      params = { projectId: @project_id }
+    def insert_job(configuration, project_id: @default_project_id, media: nil, wait: nil)
+      params = { projectId: project_id }
       if media
         params["uploadType"] = "multipart"
       end
@@ -156,7 +169,7 @@ module Kura
         raise Kura::ApiError.new(error["reason"], error["message"])
       end
       if wait
-        wait_job(r.data.jobReference.jobId, wait)
+        wait_job(r.data.jobReference.jobId, wait, project_id: project_id)
       else
         r.data.jobReference.jobId
       end
@@ -169,6 +182,8 @@ module Kura
               flatten_results: true,
               priority: "INTERACTIVE",
               use_query_cache: true,
+              project_id: @default_project_id,
+              job_project_id: @default_project_id,
               wait: nil)
       write_disposition = mode_to_write_disposition(mode)
       configuration = {
@@ -182,9 +197,9 @@ module Kura
         }
       }
       if dataset_id and table_id
-        configuration[:query][:destinationTable] = { projectId: @project_id, datasetId: dataset_id, tableId: table_id }
+        configuration[:query][:destinationTable] = { projectId: project_id, datasetId: dataset_id, tableId: table_id }
       end
-      insert_job(configuration, wait: wait)
+      insert_job(configuration, wait: wait, project_id: job_project_id)
     end
 
     def load(dataset_id, table_id, source_uris=nil,
@@ -194,13 +209,15 @@ module Kura
              allow_quoted_newlines: false,
              quote: '"', skip_leading_rows: 0,
              source_format: "CSV",
+             project_id: @default_project_id,
+             job_project_id: @default_project_id,
              file: nil, wait: nil)
       write_disposition = mode_to_write_disposition(mode)
       source_uris = [source_uris] if source_uris.is_a?(String)
       configuration = {
         load: {
           destinationTable: {
-            projectId: @project_id,
+            projectId: project_id,
             datasetId: dataset_id,
             tableId: table_id,
           },
@@ -225,7 +242,7 @@ module Kura
       else
         configuration[:load][:sourceUris] = source_uris
       end
-      insert_job(configuration, media: file, wait: wait)
+      insert_job(configuration, media: file, wait: wait, project_id: job_project_id)
     end
 
     def extract(dataset_id, table_id, dest_uris,
@@ -233,6 +250,8 @@ module Kura
                 destination_format: "CSV",
                 field_delimiter: ",",
                 print_header: true,
+                project_id: @default_project_id,
+                job_project_id: @default_project_id,
                 wait: nil)
       dest_uris = [ dest_uris ] if dest_uris.is_a?(String)
       configuration = {
@@ -240,7 +259,7 @@ module Kura
           compression: compression,
           destinationFormat: destination_format,
           sourceTable: {
-            projectId: @project_id,
+            projectId: project_id,
             datasetId: dataset_id,
             tableId: table_id,
           },
@@ -251,31 +270,36 @@ module Kura
         configuration[:extract][:fieldDelimiter] = field_delimiter
         configuration[:extract][:printHeader] = print_header
       end
-      insert_job(configuration, wait: wait)
+      insert_job(configuration, wait: wait, project_id: job_project_id)
     end
 
-    def copy(src_dataset_id, src_table_id, dest_dataset_id, dest_table_id, mode: :truncate, wait: nil)
+    def copy(src_dataset_id, src_table_id, dest_dataset_id, dest_table_id,
+             mode: :truncate,
+             src_project_id: @default_project_id,
+             dest_project_id: @default_project_id,
+             job_project_id: @default_project_id,
+             wait: nil)
       write_disposition = mode_to_write_disposition(mode)
       configuration = {
         copy: {
           destinationTable: {
-            projectId: @project_id,
+            projectId: dest_project_id,
             datasetId: dest_dataset_id,
             tableId: dest_table_id,
           },
           sourceTable: {
-            projectId: @project_id,
+            projectId: src_project_id,
             datasetId: src_dataset_id,
             tableId: src_table_id,
           },
           writeDisposition: write_disposition,
         }
       }
-      insert_job(configuration, wait: wait)
+      insert_job(configuration, wait: wait, project_id: job_project_id)
     end
 
-    def job(job_id)
-      params = { projectId: @project_id, jobId: job_id }
+    def job(job_id, project_id: @default_project_id)
+      params = { projectId: project_id, jobId: job_id }
       r = @api.execute(api_method: @bigquery_api.jobs.get, parameters: params)
       unless r.success?
         error = r.data["error"]["errors"][0]
@@ -294,10 +318,10 @@ module Kura
       return false
     end
 
-    def wait_job(job_id, timeout=60*10)
+    def wait_job(job_id, timeout=60*10, project_id: @default_project_id)
       expire = Time.now + timeout
       while expire > Time.now
-        j = job(job_id)
+        j = job(job_id, project_id: project_id)
         if job_finished?(j)
           return j
         end

data/lib/kura/version.rb

@@ -1,3 +1,3 @@
 module Kura
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kura
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Chikanaga Tomoyuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client