tq 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc0bd8304fbc66b4f921997f047c637f579250b9
-  data.tar.gz: d694a8a9b632e17715d78d32a7a2311176d4fed8
+  metadata.gz: e61541481bfdeea720c65bb55a70a7a7016ee078
+  data.tar.gz: e57448c12dad85090950ed38864d9b854bf8bddb
 SHA512:
-  metadata.gz: f0062de8772a7555928676469d0fa9191c9d36429f0b451d8cdf28ff0225e07d8eac29d69b826f74636110639936209dda94908e9df2d18ddaf9dafcc68076c7
-  data.tar.gz: 370c3621670e588217dd84fea9087d94fda54c040bc8776c55ea1f592383835f32c6d0baf366c3ce5052e0f655d729b59e88b0fe3af1069cdb5de706b4ac0983
+  metadata.gz: 6a6114945d7ca4e92db2bad2ebfc4f6afb4b5e70cc33a007999ad3572a833e72cca784b3508bf0c6909da7ac08920afd7baf69aab546916f720740fad925969a
+  data.tar.gz: 57dad8072196d556eacf93fadc1cb5cf88135f9554a3338c2988feb353b96717cca15567d1260efae2a4f9e58a5226094a17a17595357b568ac16e2e618c3a26

data/lib/tq/app.rb

@@ -63,12 +63,17 @@ module TQ
       options({'stderr' => _})
     end
     
+    def service_run!(issuer, p12_file)
+      setup_logger!
+      _run *(_queues( TQ::Queue.new( *(service_auth!(issuer, p12_file)) ).project(@options['project']) ) )
+    end
+
     def run!(secrets_file=nil, store_file=nil)
       setup_logger!
       _run *(_queues( TQ::Queue.new( *(auth!(secrets_file, store_file)) ).project(@options['project']) ) )
     end
 
-
+    # Note issuer is not a file name but the service account email address
     def service_auth!(issuer, p12_file)
       key = Google::APIClient::KeyUtils.load_from_pkcs12(p12_file, 'notasecret')
       client.authorization = Signet::OAuth2::Client.new(

data/lib/tq/shell.rb

@@ -8,8 +8,6 @@ module TQ
   
     DEFAULT_OPTIONS = {
       app: {},
-      auth_secrets_file: './tq-client.json',
-      auth_store_file:   './tq-client-store.json',
       config_file:       './tq-app.json'
     }
 
@@ -33,12 +31,24 @@ module TQ
 
       @logger.info(progname) { "Configuring #{@app.id}" } if @logger
       opts = parse_args(argv)
-      @logger.debug(progname) { "Configuration: #{opts[:app].inspect}" } if @logger
+      @logger.debug(progname) { "Configuration: #{opts.inspect}" } if @logger
 
-      @app = @app.options( opts[:app] ).logger(@logger)
+      @app = @app.options( opts[:app] )
+      @app = @app.logger(@logger) if @logger
 
       @logger.info(progname) { "Running #{@app.id} using worker #{@app.worker}" } if @logger
-      @app.run!( opts[:auth_secrets_file], opts[:auth_store_file] )
+
+      secrets, store = opts[:auth_secrets_file],        opts[:auth_store_file] 
+      issuer, p12    = opts[:service_auth_issuer_file], opts[:service_auth_p12_file]
+
+      if secrets
+        @app.run!(secrets, store)
+      elsif issuer && p12
+        @app.service_run!(File.read(issuer).chomp, p12)
+      else
+        raise ArgumentError, "You must provide either OAuth2 secrets and credentials store, " +
+                             "or service-account issuer and p12 files."
+      end
 
     end
 
@@ -58,10 +68,18 @@ module TQ
           opts[:auth_secrets_file] = given
         end
 
-        shell.on('-s', '--auth-store [FILE]', "Google OAuth2 storage file") do |given|
+        shell.on('-s', '--auth-store [FILE]', "Google OAuth2 credentials storage file") do |given|
           opts[:auth_store_file] = given
         end
 
+        shell.on('-i', '--service-auth-issuer [FILE]', "Google service account issuer file") do |given|
+          opts[:service_auth_issuer_file] = given
+        end
+
+        shell.on('-p', '--service-auth-p12 [FILE]', "Google service account p12 file") do |given|
+          opts[:service_auth_p12_file] = given
+        end
+
         shell.on('-c', '--config [FILE]', "Application config file (json)") do |given|
           opts[:config_file] = given
           opts[:app] = JSON.load( File.open(given, 'r') )

data/lib/version.rb

@@ -1,4 +1,4 @@
 
 module TQ
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/test/test_auth.rb

@@ -14,7 +14,7 @@ end
 CLIENT_SECRETS_FILE = File.expand_path('../config/secrets/test/client_secrets.json', File.dirname(__FILE__))
 CREDENTIALS_FILE    = File.expand_path("../config/secrets/test/#{File.basename(__FILE__,'.rb')}-oauth2.json", File.dirname(__FILE__))
 
-# for service account auth -- not quite working
+# for service account auth 
 SERVICE_ISSUER_FILE = File.expand_path('../config/secrets/test/issuer', File.dirname(__FILE__))
 SERVICE_P12_FILE    = File.expand_path('../config/secrets/test/client.p12', File.dirname(__FILE__))
 

data/test/test_shell.rb

@@ -8,7 +8,6 @@ end
 
 class ShellTests < Minitest::Spec
 
-  include 
   # for installed app auth
   CLIENT_SECRETS_FILE = File.expand_path(
     '../config/secrets/test/client_secrets.json', File.dirname(__FILE__)
@@ -18,6 +17,9 @@ class ShellTests < Minitest::Spec
     File.dirname(__FILE__)
   )
 
+  SERVICE_ISSUER_FILE = File.expand_path('../config/secrets/test/issuer', File.dirname(__FILE__))
+  SERVICE_P12_FILE    = File.expand_path('../config/secrets/test/client.p12', File.dirname(__FILE__))
+
   # task queue constants
   TASKQUEUE_APP_CONFIG = 
     File.expand_path("../config/secrets/test/#{File.basename(__FILE__,'.rb')}" + 
@@ -91,6 +93,13 @@ class ShellTests < Minitest::Spec
     ]
   end
 
+  def shell_args_service
+    [ "--service-auth-issuer", SERVICE_ISSUER_FILE,
+      "--service-auth-p12", SERVICE_P12_FILE,
+      "--config", TASKQUEUE_APP_CONFIG
+    ]
+  end
+
   def setup 
     sleep TASKQUEUE_LEASE_SECS+1 
     clear_queue!
@@ -120,6 +129,30 @@ class ShellTests < Minitest::Spec
     assert_tasks_on_queue(exps.length - app_stdin_num_tasks)
 
   end
+ 
+  it 'should execute using service auth' do
+    exps = [
+        { 'What is your name?' => 'Sir Lancelot', 
+          'What is your quest?' => 'To seek the holy grail', 
+          'What is your favorite color?' => 'blue' },
+        { 'What is your name?' => 'Sir Robin', 
+          'What is your quest?' => 'To seek the holy grail', 
+          'What is the capital of Assyria?' => nil },
+        { 'What is your name?' => 'Galahad', 
+          'What is your quest?' => 'To seek the grail', 
+          'What is your favorite color?' => ['blue','yellow'] },
+        { 'What is your name?' => 'Arthur', 
+          'What is your quest?' => 'To seek the holy grail', 
+          'What is the air-speed velocity of an unladen swallow?' => 'African or European swallow?' }
+    ]
+
+    populate_queue! exps
+    
+    TQ::Shell.new(@app, logger).call( shell_args_service )
+
+    assert_tasks_on_queue(exps.length - app_stdin_num_tasks)
+
+  end
 
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tq
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Eric Gjertsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client