patriot-gcp 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 40974fda52b072f2713f5af1fdeb0d40007b12bc
-  data.tar.gz: 444fd93b08537f1d1279100bbe73c1b2d773b6aa
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OWU1ZjcyZTZkYjJlNmE2ZjVlNjU1MDVlOTNmOWRlOTAxOTQyZDU5Nw==
+  data.tar.gz: !binary |-
+    Njk2ZDkwZWJmY2IyNjM0ZGNmNzk5YTQ3MWQ3ZWIyOGM4NTMwNWI3OQ==
 SHA512:
-  metadata.gz: 8645578eb374795e8bd9aae1398dca46cc257e0652a883b3d31cb604f534c88c70f872471b810c2084b5538593cb517824018cb1c6acfecfba56fe6aadf026c5
-  data.tar.gz: f16cca37d6e4ce03a9ea8728cded822dec6d4b25d2584885183de77a50dbef6ef7c9c5555135a46fb6479951bddf8540aeb52c5a1b0e2a2f2864ae8957456353
+  metadata.gz: !binary |-
+    ZGQxM2E5ZDY2MjgwNGVlZTdlNmEzNmI0NTUyOGNlOTIyNWYwNGFmYmVmZDVk
+    MzU5ODNkZjhhNWE5OTMxZmNhZmZlZWQwMjljZjM4NjhkZWNmYTYyZWFhNmMw
+    MjdmNjliZGY1MmM4ZWIyN2JhZGM4MTdjMmZjZWI0NGQ2YWFlOWI=
+  data.tar.gz: !binary |-
+    NzRlYzRmYmFjMDU3ODIxNmQzOGRjOGRkMDc0OTVkZWE3ZDg2OWU3YjM5M2M2
+    Zjg2OTdlZTdlMTVhOTlmOTdkMzhiNDdkZDMyMmMyNzRkZDMwYjRmMjE0OTA3
+    YjYwMDA2ZmE5ZjY5ZjcxOTdhOTYyMDYwNDk5NWRhYTg3YzQyY2Y=

data/lib/patriot_gcp/command/load_to_bigquery.rb

@@ -4,21 +4,34 @@ module PatriotGCP
       declare_command_name :load_to_bigquery
       include PatriotGCP::Ext::BigQuery
 
-      command_attr :inifile, :dataset, :table, :schema, :options, :input_file, :name_suffix, :polling_interval
+      command_attr :inifile, :project_id, :dataset, :table, :schema, :options, :input_file, :name_suffix, :polling_interval
+      validate_existence :inifile, :project_id, :dataset, :table
 
       class BigQueryException < Exception; end
       class GoogleCloudPlatformException < Exception; end
 
       def job_id
-        job_id = "#{command_name}_#{@dataset}_#{@table}"
-        job_id = "#{job_id}_#{@name_suffix}" unless @name_suffix.nil?
-        return job_id
+        "#{command_name}_#{@project_id}_#{@dataset}_#{@table}_#{@name_suffix}"
       end
 
+      # @see Patriot::Command::Base#configure
+      def configure
+        @name_suffix ||= _date_
+        self
+      end
 
       def execute
         @logger.info "start load_to_bigquery"
 
+        ini = IniFile.load(@inifile)
+        if ini.nil?
+          raise Exception, "inifile not found"
+        end
+
+        service_account  = ini["gcp"]["service_account"]
+        private_key      = ini["gcp"]["private_key"]
+        key_pass         = ini["gcp"]["key_pass"]
+
         unless File.exist?(@input_file)
           raise Exception, "The given file doesn't exist."
         end
@@ -28,20 +41,8 @@ module PatriotGCP
           return
         end
 
-        ini = IniFile.load(@inifile)
-        if ini.nil?
-          raise Exception, "inifile not found"
-        end
-
-        service_account = ini["gcp"]["service_account"]
-        private_key = ini["gcp"]["private_key"]
-        key_pass = ini["gcp"]["key_pass"]
-        project_id = ini["bigquery"]["project_id"]
-
         if service_account.nil? or private_key.nil?
           raise GoogleCloudPlatformException, "configuration for GCP is not enough."
-        elsif project_id.nil?
-          raise BigQueryException, "configuration for BigQuery is not enough."
         end
 
         @logger.info "start uploading"
@@ -49,7 +50,7 @@ module PatriotGCP
                             private_key,
                             key_pass,
                             service_account,
-                            project_id,
+                            @project_id,
                             @dataset,
                             @table,
                             @schema,

data/lib/patriot_gcp/version.rb

@@ -1,4 +1,4 @@
 class VERSION
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
   PROJECT_NAME = "patriot-gcp"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: patriot-gcp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Hitoshi Tsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: patriot-workflow-scheduler
@@ -31,14 +31,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/patriot_gcp/command/load_to_bigquery.rb
+- init.rb
+- lib/patriot_gcp.rb
 - lib/patriot_gcp/command.rb
-- lib/patriot_gcp/ext/bigquery.rb
+- lib/patriot_gcp/command/load_to_bigquery.rb
 - lib/patriot_gcp/ext.rb
+- lib/patriot_gcp/ext/bigquery.rb
 - lib/patriot_gcp/version.rb
-- lib/patriot_gcp.rb
-- init.rb
-homepage: https://github.com/CyberAgent/patriot-workflow-scheduler
+homepage: https://github.com/CyberAgent/patriot-workflow-scheduler/tree/master/plugins/patriot-gcp
 licenses:
 - Apache License, Version 2.0
 metadata: {}
@@ -48,17 +48,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: patriot-gcp
-rubygems_version: 2.0.14
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: GCP plugin for Patriot Workflow Scheduler