postjob 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ac14950c33a8d27f1b7fec8de0781559f6a5cc1
-  data.tar.gz: e3e91f7b243cf9bb77bd7790a69023735e6bc51d
+  metadata.gz: 04c8dbb68c7f61be34b8bfe642fdd6ce04933e08
+  data.tar.gz: 355aca75cf91e2107d850163802ab87aabf94126
 SHA512:
-  metadata.gz: fbf45a53d92ecf44b380c0e13894da8a95f8e0da22adcfdf408db798bc8d9fef7f3b7e4ae2d671d6b5029a537c06e5c0a893248f4432fbb44d62cbf10f2ad830
-  data.tar.gz: 664a10208ac94e5b6ae0700c193c111497b8f42c75174a22e6bb26dd838afe826639bbb59df0ad878caae88d1dcf09d1e69701ff98ca6db12be79c3c60520a8e
+  metadata.gz: 50c02c184aab359a4c67d5b4b853560aac3a54636ed603cbfd7c161b61057c807d9ea0a752bce79a4c57c77f0f4841c4d7b5cbe33535bfafb42d2c0b8a50e46b
+  data.tar.gz: 56e861011da77177e1e8b147ff2447a26f292b8bdeceeec117dfd2b979cd4ca0449e493c2f00f4cce3cecceb99b2677f2fce177aaca241c61997082d7a6764d5

data/lib/postjob/cli/job.rb

@@ -1,4 +1,16 @@
 module Postjob::CLI
+  # Resolve a job by token
+  def job_resolve(token, result)
+    connect_to_database!
+    Postjob.resolve(token: token, result: result)
+  end
+
+  # # Fail a job by token
+  # def job_resolve(token, result)
+  #   connect_to_database!
+  #   Postjob.resolve(token: token, result: result)
+  # end
+
   # Enqueues a workflow
   #
   # Adds a workflow to the job table, with name <workflow> and the given

data/lib/postjob/cli/ps.rb

@@ -7,7 +7,7 @@ module Postjob::CLI
   def ps_query(tags:, limit:)
     sql = <<-SQL
       SELECT
-        id,
+        postjobs.id,
         full_id,
         workflow
           || (CASE WHEN workflow_version != '' THEN '@' ELSE '' END)
@@ -20,7 +20,7 @@ module Postjob::CLI
         COALESCE((results->0)::varchar, error_message) AS result,
         next_run_at,
         next_run_at - (now() at time zone 'utc') AS next_run_in,
-        to_char(EXTRACT(EPOCH FROM (now() at time zone 'utc') - created_at), '999999999.99') AS age,
+        to_char(EXTRACT(EPOCH FROM (now() at time zone 'utc') - postjobs.created_at), '999999999.99') AS age,
         CASE WHEN processing_started_at IS NOT NULL THEN
         format(
           '%s/%s',
@@ -30,7 +30,7 @@ module Postjob::CLI
         END AS processing,
         COALESCE(processing_client, '') || COALESCE('/' || processing_client_identifier, '') AS worker,
         tags
-      FROM postjob.postjobs
+      FROM postjob.postjobs AS postjobs
     SQL
 
     scope = Simple::SQL::Scope.new(sql)
@@ -105,8 +105,12 @@ module Postjob::CLI
   def ps_show(id, *ids)
     connect_to_database!
 
-    scope = Simple::SQL::Scope.new("SELECT * FROM postjob.postjobs")
-    scope = scope.where("id = ANY(?)", parse_ids(id, *ids))
+    scope = Simple::SQL::Scope.new <<~SQL
+      SELECT postjobs.*, tokens.token
+      FROM postjob.postjobs AS postjobs
+      LEFT JOIN postjob.tokens AS tokens ON tokens.postjob_id=postjobs.id
+    SQL
+    scope = scope.where("postjobs.id = ANY(?)", parse_ids(id, *ids))
 
     Simple::SQL.all(scope, into: Postjob::Job) do |job|
       pp job

data/lib/postjob.rb

@@ -162,6 +162,8 @@ module Postjob
 
   def resolve(token:, result:)
     job = Queue.find_job_by_token(token)
+    raise "No job with token #{token}" unless job
+
     Queue.set_job_result job, result, version: nil
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postjob
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - radiospiel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-30 00:00:00.000000000 Z
+date: 2018-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec