postqueue 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a52b3b91a65a4f5f48a6d12395c0dba897190aef
-  data.tar.gz: 0d8cecbc763a5a1797d309116f1ccc6ae82877ba
+  metadata.gz: ad176bce5f7bba7fda654b053e5fa32acd41abdd
+  data.tar.gz: 646743647918dbc637ea6e740f4015b3ef942f82
 SHA512:
-  metadata.gz: 53c4d7dcd874b253451268ebb34cccec7a7545b92c259cfde136890080eb39b608fe48c44b7ad5fecaef542f2dbf2cd81535abcdcd07a2e706afeb36e5765452
-  data.tar.gz: 81a9ff3a9f19a2bffbca50aabf44b9ee2129279842a252f10f4eed786c9f83dbebce0606378edf78bb946848e0683b3d78804239d1606787227458691572c31f
+  metadata.gz: ffd319be64f642202f294c85b7c2d89d310b4d42dc4654cbb6d3d4d2bf65ffcd57ab80a6aa9aa328062a7243ca5d2696d03e120993b46db1f49a578c65a124e2
+  data.tar.gz: 587ab795e8b9e239f8e126d6325418dca8d9014999c1da4d696ddbc19115074497be3d5ee00fd457ca2dac234f7a2ff21801be154457c5b03f34428c14466ce1

data/lib/postqueue/cli/options_parser.rb

@@ -16,7 +16,11 @@ module Postqueue
       def parse_args
         require "optparse"
         options = OpenStruct.new
-        options.sub_command = argv.shift || usage!
+        options.sub_command = argv.shift || "stats"
+
+        unless %w(stats peek enqueue run process).include?(options.sub_command)
+          usage!
+        end
 
         case options.sub_command
         when "enqueue"
@@ -32,13 +36,22 @@ module Postqueue
         argv.shift || usage!
       end
 
-      def usage!
+      def usage
         STDERR.puts <<-USAGE
-  postqueue stats
+This is postqueue #{Postqueue::VERSION}. Usage examples:
+
+  postqueue [ stats ]
+  postqueue peek
   postqueue enqueue op entity_id,entity_id,entity_id
   postqueue run
+  postqueue help
   postqueue process
-  USAGE
+
+USAGE
+      end
+
+      def usage!
+        usage
         exit 1
       end
     end

data/lib/postqueue/cli/stats.rb

@@ -10,14 +10,22 @@ module Postqueue
         sql = <<-SQL
         SELECT op,
           COUNT(*) AS count,
+          failed_attempts,
+          CASE
+            WHEN failed_attempts >= 5 THEN 'FAILED'
+            WHEN failed_attempts > 0 THEN 'RETRY'
+            WHEN next_run_at < now() THEN 'READY'
+            ELSE 'WAIT'
+          END AS status,
           MIN(now() - created_at) AS min_age,
           MAX(now() - created_at) AS max_age,
           AVG(now() - created_at) AS avg_age
-        FROM #{Postqueue.item_class.table_name} GROUP BY op
+        FROM #{Postqueue.item_class.table_name}
+        GROUP BY op, failed_attempts, status
         SQL
 
         recs = Postqueue.item_class.find_by_sql(sql)
-        tp recs, :op, :count, :avg_age, :min_age, :max_age
+        tp recs, :status, :op, :failed_attempts, :count, :avg_age, :min_age, :max_age
       end
 
       def peek(_options)

data/lib/postqueue/cli.rb

@@ -30,7 +30,7 @@ module Postqueue
     end
 
     def connect_to_rails!
-      if File.exists?("config/environment.rb")
+      if File.exist?("config/environment.rb")
         load "config/environment.rb"
       else
         logger.warn "Trying to load postqueue configuration from config/postqueue.rb"

data/lib/postqueue/default_queue.rb

@@ -12,7 +12,7 @@ module Postqueue
   extend SingleForwardable
 
   def_delegators :default_queue, :enqueue
-  def_delegators :default_queue, :item_class, :batch_sizes, :on
+  def_delegators :default_queue, :item_class, :batch_sizes, :on, :on_exception
   def_delegators :default_queue, :process, :process_one
   def_delegators :default_queue, :processing
   def_delegators :default_queue, :run, :run!

data/lib/postqueue/queue/processing.rb

@@ -52,6 +52,7 @@ module Postqueue
       item_class.postpone items.map(&:id)
       log_exception(e, match.op, entity_ids)
       on_exception.call(e, match.op, entity_ids)
+      0
     end
   end
 end

data/lib/postqueue/queue.rb

@@ -38,7 +38,7 @@ module Postqueue
       end
 
       on "fail" do |_op, entity_ids|
-        raise RuntimeError, "Postqueue test failure, w/entity_ids: #{entity_ids.inspect}"
+        raise "Postqueue test failure, w/entity_ids: #{entity_ids.inspect}"
       end
 
       on :missing_handler do |op, entity_ids|

data/lib/postqueue/version.rb

@@ -1,3 +1,3 @@
 module Postqueue
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/spec/postqueue/enqueue_spec.rb

@@ -16,13 +16,13 @@ describe "enqueuing" do
     end
 
     it "enqueues arrays" do
-      queue.enqueue op: "myop", entity_id: [13,14,15]
-      expect(items.pluck(:entity_id)).to eq([12,13,14,15])
+      queue.enqueue op: "myop", entity_id: [13, 14, 15]
+      expect(items.pluck(:entity_id)).to eq([12, 13, 14, 15])
     end
 
     it "enqueues sets" do
-      queue.enqueue op: "myop", entity_id: Set.new([13,14,15])
-      expect(items.pluck(:entity_id)).to eq([12,13,14,15])
+      queue.enqueue op: "myop", entity_id: Set.new([13, 14, 15])
+      expect(items.pluck(:entity_id)).to eq([12, 13, 14, 15])
     end
 
     it "sets defaults" do

data/spec/postqueue/process_mode_spec.rb

@@ -44,9 +44,9 @@ describe "process mode" do
     end
 
     it "raises an error for invalid ops" do
-      expect {
+      expect do
         queue.enqueue op: "invalid", entity_id: 12
-      }.to raise_error(Postqueue::MissingHandler)
+      end.to raise_error(Postqueue::MissingHandler)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postqueue
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - radiospiel