postjob 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19ac068f3a63b97556c7ce6aefe07e10ead759f1
-  data.tar.gz: 003e5725fa65129288ddc34eac9625a751cc252e
+  metadata.gz: cc0ff8a30a5358fa8df2bbdd1f57b0325c1868ab
+  data.tar.gz: 0c4349e79f4b3d9397cf3edef49b04ada2ab0a63
 SHA512:
-  metadata.gz: 3874859c70f5c0182189acbb7cbf6e16130497b6ea5783658f280f2355a6e205a020724100c293f0fe427fa146251e1fc57756af6ad892ed08b24b68c9745745
-  data.tar.gz: 9f040743503861a3aaa2571a56d4081c4c915649b558990f201218e9207c2dc8e3576332ed7793c6a13835db66bbdaeab2687d02a8d5ff14adb0f8c284e9a945
+  metadata.gz: 58c65caff06342c0f397f803aa585341724f930a5a9a407a9c0d1cc9dd31563733c9ccef7a1ed5ab6516b2141f39607b916bde24725a3dfe250840d58a66dcd6
+  data.tar.gz: 488d9e2afb636eb561d27a8b0567499f30ca45cdfac21bd19ee100bda6a7eec057d126ddf2f1b0330c8fa8b7f4cc04c4ada37fefd6271939a1a4e12b29d40b11

data/lib/postjob/cli/ps.rb

@@ -1,19 +1,10 @@
 # rubocop:disable Lint/HandleExceptions
-# rubocop:disable Metrics/ModuleLength
 
 module Postjob::CLI
   private
 
-  def ps_query(conditions = [])
-    conditions.compact!
-
-    conditions << "TRUE"
-    condition_fragment = conditions
-                         .compact
-                         .map { |s| "(#{s})" }
-                         .join(" AND ")
-
-    <<~SQL
+  def ps_query(tags:, limit:)
+    sql = <<-SQL
       SELECT
         id,
         full_id,
@@ -39,16 +30,14 @@ module Postjob::CLI
         COALESCE(processing_client, '') || COALESCE('/' || processing_client_identifier, '') AS worker,
         tags
       FROM postjob.postjobs
-      WHERE #{condition_fragment}
-      ORDER BY root_id DESC, id ASC
     SQL
-  end
 
-  def tags_condition(tags)
-    return nil unless tags
+    scope = Simple::SQL::Scope.new(sql)
+    scope = scope.where("tags @> ?", Postjob::Queue::Encoder.encode(parse_tags(tags))) if tags
 
-    kv = parse_tags(tags)
-    "tags @> '#{Postjob::Queue::Encoder.encode(kv)}'"
+    scope
+      .paginate(per: limit, page: 1)
+      .order_by("root_id DESC, id ASC")
   end
 
   public
@@ -78,15 +67,26 @@ module Postjob::CLI
       return
     end
 
-    conditions = []
-    conditions << "root_id=id OR status NOT IN ('ready', 'sleep', 'ok') OR failed_attempts > 0"
-    conditions << tags_condition(tags)
-    conditions << ids_condition(ids)
+    query = ps_query(tags: tags, limit: limit)
+    query = query.where("root_id=id OR status NOT IN ('ready', 'sleep', 'ok') OR failed_attempts > 0")
+
+    print_results query: query
+  end
+
+  def ps_full(*ids, limit: 100, tags: nil)
+    connect_to_database!
+
+    query = ps_query(tags: tags, limit: limit)
+
+    unless ids.empty?
+      parsed_ids = parse_ids(*ids)
+      query = query.where("root_id IN (#{parsed_ids.join(',')})")
+    end
 
-    query = ps_query(conditions)
-    print_sql limit: limit, query: query
+    print_results query: query, on_empty: "Note that ps_full requires the **root ids**"
   end
 
+  # Show up-to-date information once per second
   def ps_top(*ids, limit: "100", tags: nil, full: false)
     loop do
       system "clear"
@@ -102,51 +102,35 @@ module Postjob::CLI
 
   # Show all information about this job
   def ps_show(id, *ids)
-    ids = ([id] + ids).map { |s| Integer(s) }
+    connect_to_database!
 
-    jobs = Simple::SQL.all <<~SQL, ids, into: Postjob::Job
-      SELECT * FROM postjob.postjobs WHERE id = ANY($1)
-    SQL
+    scope = Simple::SQL::Scope.new("SELECT * FROM postjob.postjobs")
+    scope = scope.where("id = ANY(?)", parse_ids(id, *ids))
 
-    jobs.each do |job|
+    Simple::SQL.all(scope, into: Postjob::Job) do |job|
       pp job
     end
   end
 
-  def ps_full(*ids, limit: 100, tags: nil)
-    connect_to_database!
-
-    conditions = []
-    conditions << tags_condition(tags)
-    conditions << ids_condition(ids)
-
-    query = ps_query(conditions)
-
-    limit = Integer(limit)
-    print_sql limit: limit, query: query
-  end
-
   private
 
   def parse_ids(*ids)
-    return [] if ids.empty?
-    ids.flatten.inject([]) { |a, ids_string| a.concat ids_string.split(",") }
-       .map { |p| Integer(p) }
-       .uniq
+    ids.map do |s|
+      s = s.gsub(/.*\./, "")
+      Integer(s)
+    end.uniq
   end
 
-  def ids_condition(ids)
-    ids = parse_ids(ids)
-    return nil if ids.empty?
-    "root_id IN (#{ids.join(',')})"
-  end
+  def print_results(query:, on_empty: nil)
+    records = Simple::SQL.all(query, into: Hash)
+    tp records
 
-  def print_sql(limit:, query:)
-    records = Simple::SQL.all("#{query} LIMIT $1+1", limit, into: Hash)
+    if records.total_count > records.length
+      logger.warn "Output limited up to limit #{records.length}. Use the --limit command line option for a different limit."
+    end
 
-    tp records[0, limit]
-    if records.length > limit
-      logger.warn "Output limited up to limit #{limit}. Use the --limit command line option for a different limit."
+    if records.empty? && on_empty
+      logger.warn(on_empty)
     end
   end
 end

data/lib/postjob/runner.rb

@@ -142,7 +142,7 @@ module Postjob::Runner
     error_backtrace = error_backtrace.map { |path| path.start_with?(curdir) ? path[curdir.length..-1] : path }
 
     shutdown = should_shutdown?(exception) ? :shutdown : nil
-    [ state, [exception.class.name, exception.to_s, error_backtrace], shutdown ]
+    [ state, [exception.class.name, exception.message, error_backtrace], shutdown ]
   end
 
   def log_result!(job, status, value)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postjob
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - radiospiel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -120,20 +120,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: simple-cli
   requirement: !ruby/object:Gem::Requirement