kura 0.4.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b1e26ce3831c008052f7c6d923e137dbcd75ab9ed1603020cd44ef66b1aec1a
-  data.tar.gz: 5368c0a514c6e1ec1bb71991ff0628e0e92f838053d84dc29e55ef5b17ede8d3
+  metadata.gz: a5b4b582e7e9867f750dced3712ac90a62c95db55ab056a5fd50fcc2d58245e6
+  data.tar.gz: 8412a814e581e6e1eb41cede2c5118bdfea829878c332713e8452178e60d587d
 SHA512:
-  metadata.gz: 9f8d0b1d35c0b082fe03517529e7f8d7e10a1f8acc307ecb2c8c3a67a047e4d00313443df148e9ae19bfca8ace00bf742bc57674dbc38f81601c35490360120a
-  data.tar.gz: 939dc6e930cd52896c0acaf341ffed403491ab8fe18ae002560f22cb3bce39910606b52870d4b8165dad01115e213e4a8e9e0e131e78855082bb18d91ad1ffc5
+  metadata.gz: be5c48bc70ea126832b9ed1a7c854772a55c034d73009d1a227f37288153872f1462542c72ce1663fc2deb8674e6ee0829989ef9cc56a91ba5b7e4a25e8e6a89
+  data.tar.gz: 76beca3315670d9229782beac5c6ccb4af5cdd4c33c15bcd6a8a4261ae093fe305c12b49b234d2e1be2ae2719d84ea1033d1b80e307282de93547c4cb289dc58

data/ChangeLog.md

@@ -1,3 +1,40 @@
+# 0.6.0
+
+## Changes
+
+* Replace runtime dependency "google-api-client.gem" -> "google-apis-bigquery_v2".
+  See https://github.com/groovenauts/gcs-ruby/pull/2://github.com/googleapis/google-api-ruby-client/blob/master/google-api-client/OVERVIEW.md for more details.
+
+# 0.5.0
+
+## Changes
+
+* `Kura::Client#list_tabledata` now return TIMESTAMP value in ISO 8601 format String.
+
+## Enhancements
+
+* Accept description field in schema specification at insert&load table.
+
+# 0.4.4
+
+## Enhancements
+
+* Support [Routines API](https://cloud.google.com/bigquery/docs/reference/rest/v2/routines/).
+
+# 0.4.3
+
+## Fixes
+
+* Query job with SCRIPT type could contain `status.errorResult` without `status.errors` property.
+  Fix to handle this case properly.
+
+# 0.4.2
+
+## Enhancements
+
+* Add `jobs` to wrap `jobs.list` API method (https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/list)
+* Add `Job#children` as a shortcut method to obtain child jobs for SCRIPT type job.
+
 # 0.4.1
 
 ## Fixes

data/README.md

@@ -43,7 +43,7 @@ client = Kura.client(.., scope: "https://www.googleapis.com/auth/drive")
 
 ```
 client.load("dataset", "table", "gs://mybucket/data.csv", wait: 120)
-client.query("SELECT * FROM [dataset.table];", dataset_id: "dest_dataset", table_id: dest_table", wait: 120)
+client.query("SELECT * FROM [dataset.table];", dataset_id: "dest_dataset", table_id: "dest_table", wait: 120)
 client.extract("dataset", "result", "gs://mybucket/extracted.csv", wait: 120)
 client.copy("src_dataset", "src_table", "dest_dataset", "dest_table", wait: 120)
 ```

data/kura.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.1'
 
-  spec.add_runtime_dependency "google-api-client", [">= 0.28.6", "!= 0.29.1"]
+  spec.add_runtime_dependency "google-apis-bigquery_v2"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/kura.rb

@@ -50,7 +50,13 @@ module Kura
       elsif project_id.is_a?(Hash)
         credential = project_id
       else
-        raise ArgumentError, "#{self.class.name}.client accept JSON credential file path or decoded Hash object."
+        begin
+          # get project id from metadata server
+          project_id = URI.open("http://metadata/computeMetadata/v1/project/project-id", "Metadata-Flavor" => "Google") do |f| f.read end
+          return self::Client.new(default_project_id: project_id)
+        rescue
+          raise ArgumentError, "#{self.class.name}.client accept JSON credential file path or decoded Hash object."
+        end
       end
       project_id = credential["project_id"]
       email_address = credential["client_email"]

data/lib/kura/client.rb

@@ -1,5 +1,6 @@
 # coding: utf-8
 
+require "time"
 require "json"
 require "google/apis/bigquery_v2"
 require "googleauth"
@@ -268,6 +269,8 @@ module Kura
         end
       when "BOOLEAN"
         x.to_s == "true"
+      when "TIMESTAMP"
+        Time.at(Float(x)).utc.iso8601(6)
       when "RECORD"
         _convert_tabledata_row(x, field_info["fields"])
       else
@@ -409,16 +412,16 @@ module Kura
               wait: nil,
               dry_run: false,
               &blk)
-      configuration = Google::Apis::BigqueryV2::JobConfiguration.new({
-        query: Google::Apis::BigqueryV2::JobConfigurationQuery.new({
+      configuration = Google::Apis::BigqueryV2::JobConfiguration.new(
+        query: Google::Apis::BigqueryV2::JobConfigurationQuery.new(
           query: sql,
           allow_large_results: normalize_parameter(allow_large_results),
           flatten_results: normalize_parameter(flatten_results),
           priority: priority,
           use_query_cache: normalize_parameter(use_query_cache),
           use_legacy_sql: use_legacy_sql,
-        })
-      })
+        )
+      )
       if mode
         configuration.query.write_disposition = mode_to_write_disposition(mode)
       end
@@ -433,15 +436,15 @@ module Kura
         configuration.query.maximum_bytes_billed = maximum_bytes_billed
       end
       if dataset_id and table_id
-        configuration.query.destination_table = Google::Apis::BigqueryV2::TableReference.new({ project_id: project_id, dataset_id: dataset_id, table_id: table_id })
+        configuration.query.destination_table = Google::Apis::BigqueryV2::TableReference.new(project_id: project_id, dataset_id: dataset_id, table_id: table_id)
       end
       if user_defined_function_resources
         configuration.query.user_defined_function_resources = Array(user_defined_function_resources).map do |r|
           r = r.to_s
           if r.start_with?("gs://")
-            Google::Apis::BigqueryV2::UserDefinedFunctionResource.new({ resource_uri: r })
+            Google::Apis::BigqueryV2::UserDefinedFunctionResource.new(resource_uri: r)
           else
-            Google::Apis::BigqueryV2::UserDefinedFunctionResource.new({ inline_code: r })
+            Google::Apis::BigqueryV2::UserDefinedFunctionResource.new(inline_code: r)
           end
         end
       end
@@ -459,6 +462,9 @@ module Kura
             type: (s[:type] || s["type"]),
             mode: (s[:mode] || s["mode"]),
           }
+          if (desc = (s[:description] || s["description"]))
+            f[:description] = desc
+          end
           if (sub_fields = (s[:fields] || s["fields"]))
             f[:fields] = normalize_schema(sub_fields)
           end
@@ -468,6 +474,9 @@ module Kura
             type: s.type,
             mode: s.mode,
           }
+          if s.respond_to?(:description)
+            f[:description] = s.description
+          end
           if (sub_fields = s.fields)
             f[:fields] = normalize_schema(sub_fields)
           end
@@ -493,26 +502,26 @@ module Kura
              &blk)
       write_disposition = mode_to_write_disposition(mode)
       source_uris = [source_uris] if source_uris.is_a?(String)
-      configuration = Google::Apis::BigqueryV2::JobConfiguration.new({
-        load: Google::Apis::BigqueryV2::JobConfigurationLoad.new({
-          destination_table: Google::Apis::BigqueryV2::TableReference.new({
+      configuration = Google::Apis::BigqueryV2::JobConfiguration.new(
+        load: Google::Apis::BigqueryV2::JobConfigurationLoad.new(
+          destination_table: Google::Apis::BigqueryV2::TableReference.new(
             project_id: project_id,
             dataset_id: dataset_id,
             table_id: table_id,
-          }),
+          ),
           write_disposition: write_disposition,
           allow_jagged_rows: normalize_parameter(allow_jagged_rows),
           max_bad_records: max_bad_records,
           ignore_unknown_values: normalize_parameter(ignore_unknown_values),
           source_format: source_format,
-        })
-      })
+        )
+      )
       if dry_run
         configuration.dry_run = true
         wait = nil
       end
       if schema
-        configuration.load.schema = Google::Apis::BigqueryV2::TableSchema.new({ fields: normalize_schema(schema) })
+        configuration.load.schema = Google::Apis::BigqueryV2::TableSchema.new(fields: normalize_schema(schema))
       end
       if source_format == "CSV"
         configuration.load.field_delimiter = field_delimiter
@@ -541,18 +550,18 @@ module Kura
                 dry_run: false,
                 &blk)
       dest_uris = [ dest_uris ] if dest_uris.is_a?(String)
-      configuration = Google::Apis::BigqueryV2::JobConfiguration.new({
-        extract: Google::Apis::BigqueryV2::JobConfigurationExtract.new({
+      configuration = Google::Apis::BigqueryV2::JobConfiguration.new(
+        extract: Google::Apis::BigqueryV2::JobConfigurationExtract.new(
           compression: compression,
           destination_format: destination_format,
-          source_table: Google::Apis::BigqueryV2::TableReference.new({
+          source_table: Google::Apis::BigqueryV2::TableReference.new(
             project_id: project_id,
             dataset_id: dataset_id,
             table_id: table_id,
-          }),
+          ),
           destination_uris: dest_uris,
-        })
-      })
+        )
+      )
       if dry_run
         configuration.dry_run = true
         wait = nil
@@ -574,21 +583,21 @@ module Kura
              dry_run: false,
              &blk)
       write_disposition = mode_to_write_disposition(mode)
-      configuration = Google::Apis::BigqueryV2::JobConfiguration.new({
-        copy: Google::Apis::BigqueryV2::JobConfigurationTableCopy.new({
-          destination_table: Google::Apis::BigqueryV2::TableReference.new({
+      configuration = Google::Apis::BigqueryV2::JobConfiguration.new(
+        copy: Google::Apis::BigqueryV2::JobConfigurationTableCopy.new(
+          destination_table: Google::Apis::BigqueryV2::TableReference.new(
             project_id: dest_project_id,
             dataset_id: dest_dataset_id,
             table_id: dest_table_id,
-          }),
-          source_table: Google::Apis::BigqueryV2::TableReference.new({
+          ),
+          source_table: Google::Apis::BigqueryV2::TableReference.new(
             project_id: src_project_id,
             dataset_id: src_dataset_id,
             table_id: src_table_id,
-          }),
+          ),
           write_disposition: write_disposition,
-        })
-      })
+        )
+      )
       if dry_run
         configuration.dry_run = true
         wait = nil
@@ -596,6 +605,27 @@ module Kura
       insert_job(configuration, wait: wait, job_id: job_id, project_id: job_project_id, &blk)
     end
 
+    def jobs(project_id: @default_project_id,
+             all_users: nil,
+             max_creation_time: nil,
+             min_creation_time: nil,
+             max_results: nil,
+             page_token: nil,
+             parent_job_id: nil,
+             projection: nil,
+             state_filter: nil)
+      @api.list_jobs(
+        project_id,
+        all_users: all_users,
+        max_creation_time: max_creation_time,
+        min_creation_time: min_creation_time,
+        max_results: max_results,
+        page_token: page_token,
+        parent_job_id: parent_job_id,
+        projection: projection,
+        state_filter: state_filter)
+    end
+
     def job(job_id, location: nil, project_id: @default_project_id, &blk)
       if blk
         @api.get_job(project_id, job_id, location: location) do |j, e|
@@ -633,13 +663,21 @@ module Kura
     def job_finished?(r)
       if r.status.state == "DONE"
         if r.status.error_result
-          raise Kura::ApiError.new(r.status.errors.map(&:reason).join(","),
-                                   r.status.errors.map{|e|
-                                     msg = "reason=#{e.reason} message=#{e.message}"
-                                     msg += " location=#{e.location}" if e.location
-                                     msg += " debug_infoo=#{e.debug_info}" if e.debug_info
-                                     msg
-                                   }.join("\n"))
+          if r.status.errors
+            raise Kura::ApiError.new(r.status.errors.map(&:reason).join(","),
+                                     r.status.errors.map{|e|
+              msg = "reason=#{e.reason} message=#{e.message}"
+              msg += " location=#{e.location}" if e.location
+              msg += " debug_info=#{e.debug_info}" if e.debug_info
+              msg
+            }.join("\n"))
+          else
+            e = r.status.error_result
+            msg = "reason=#{e.reason} message=#{e.message}"
+            msg += " location=#{e.location}" if e.location
+            msg += " debug_info=#{e.debug_info}" if e.debug_info
+            raise Kura::ApiError.new(e.reason, msg)
+          end
         end
         return true
       end
@@ -708,5 +746,72 @@ module Kura
       return nil if $!.respond_to?(:status_code) and $!.status_code == 404
       process_error($!)
     end
+
+    # Routines API
+    def routines(dataset_id, project_id: @default_project_id, limit: 1000, page_token: nil, &blk)
+      if blk
+        @api.list_routines(project_id, dataset_id, max_results: limit, page_token: page_token) do |result, err|
+          result &&= (result.routines || [])
+          blk.call(result, err)
+        end
+      else
+        @api.list_routines(project_id, dataset_id, max_results: limit, page_token: page_token)
+      end
+    rescue
+      process_error($!)
+    end
+
+    def routine(dataset_id, routine_id, project_id: @default_project_id, &blk)
+      if blk
+        @api.get_routine(project_id, dataset_id, routine_id) do |result, err|
+          if err.respond_to?(:status_code) and err.status_code == 404
+            result = nil
+            err = nil
+          end
+          blk.call(result, err)
+        end
+      else
+        @api.get_routine(project_id, dataset_id, routine_id)
+      end
+    rescue
+      return nil if $!.respond_to?(:status_code) and $!.status_code == 404
+      process_error($!)
+    end
+
+    def delete_routine(dataset_id, routine_id, project_id: @default_project_id, &blk)
+      @api.delete_routine(project_id, dataset_id, routine_id, &blk)
+    rescue
+      return nil if $!.respond_to?(:status_code) and $!.status_code == 404
+      process_error($!)
+    end
+
+    def insert_routine(dataset_id,
+                       routine_id,
+                       body,
+                       project_id: @default_project_id,
+                       routine_type: "PROCEDURE",
+                       language: "SQL",
+                       arguments: [],
+                       return_type: nil,
+                       imported_libraries: [],
+                       description: nil)
+      @api.insert_routine(
+        project_id,
+        dataset_id,
+        Google::Apis::BigqueryV2::Routine.new(
+          routine_reference: Google::Apis::BigqueryV2::RoutineReference.new(
+            project_id: project_id,
+            dataset_id: dataset_id,
+            routine_id: routine_id
+          ),
+          arguments: arguments,
+          definition_body: body,
+          imported_libraries: imported_libraries,
+          language: language,
+          return_type: return_type,
+          routine_type: routine_type,
+          description: description
+        ))
+    end
   end
 end

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

@@ -16,5 +16,9 @@ class Google::Apis::BigqueryV2::Job
   def inspect
     "<##{self.class} job_id=#{self.job_reference.job_id rescue nil}>"
   end
+
+  def children
+    kura_api.jobs(parent_job_id: self.job_reference.job_id)
+  end
 end
 

data/lib/kura/version.rb

@@ -1,3 +1,3 @@
 module Kura
-  VERSION = "0.4.1"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kura
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Chikanaga Tomoyuki
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-12-23 00:00:00.000000000 Z
+date: 2021-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: google-api-client
+  name: google-apis-bigquery_v2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.28.6
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.28.6
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +133,7 @@ homepage: https://github.com/nagachika/kura/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -154,8 +148,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Interface to BigQuery API v2.
 test_files: []