postburner 1.0.0.pre.10 → 1.0.0.pre.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d70db5c9a39d758ab94b917a9bddd996ccaa5de1520180ab07d0e228ea1ed24
-  data.tar.gz: a2df7d54ebf98e399d212d98f3aa7c3589f68ae7912b38b31bf060bbe1350928
+  metadata.gz: 9b5f90445398301e11e085449c666e936228297490c7b301bc84f7c41a1d1e38
+  data.tar.gz: f8cf070edea1a1c568d737ac04190b13ec23de982b5885c037bb2c6814b42903
 SHA512:
-  metadata.gz: 1346d6ad7b6edb4abaff3eaba39c0bb5572bb9042cec8c6e31876c8b202da6b841d995f567b990545d74adc5d45c5040752077af5acd785bdf1a9fcce4336299
-  data.tar.gz: a00d649a8f2dbf7e0c5ed0ab589b6d365cd3decc9dadf33bd8a1c73865ca5e5e390823ff98d707b620c714abf41ccd648729d283a8a950dfe6dd1313c759f2aa
+  metadata.gz: 043701c81dc62b4e4eb548dcd16df2d697c484f73bf7bc7bb9c22970d549770aa3469629f9902550d13e4f9fd8592d6a7a5d71cbda2c7b8e1401ea8297a25f76
+  data.tar.gz: 6ab252caef040ac51fb52b380f4e04460632a6dc61dbf20a31db951a9df378d08cea8b744287876a2d09e3a5c646ff6063266514aea993bb5e7f34e5583ff6fa

data/README.md

@@ -1383,8 +1383,8 @@ Postburner uses [Beaneater](https://github.com/beanstalkd/beaneater) as the Ruby
 ```ruby
 # Get a cached Beaneater connection (returns Beaneater instance)
 conn = Postburner.connection
-conn.tubes.to_a  # List all tubes
-conn.stats       # Server statistics
+conn.tubes.to_a      # List all tubes
+conn.beanstalk.stats # Server statistics
 
 # Block form - yields connection, recommended for one-off operations
 Postburner.connected do |conn|

data/lib/postburner/active_job/adapter.rb

@@ -125,7 +125,7 @@ module ActiveJob
         )
 
         # Calculate delay for Beanstalkd
-        delay = timestamp ? [(timestamp.to_f - Time.now.to_f).to_i, 0].max : 0
+        delay = timestamp ? [(timestamp.to_f - Time.zone.now.to_f).to_i, 0].max : 0
 
         # Queue to Beanstalkd with minimal payload
         Postburner.connected do |conn|
@@ -160,7 +160,7 @@ module ActiveJob
       # @return [void]
       #
       def enqueue_default(job, timestamp)
-        delay = timestamp ? [(timestamp.to_f - Time.now.to_f).to_i, 0].max : 0
+        delay = timestamp ? [(timestamp.to_f - Time.zone.now.to_f).to_i, 0].max : 0
 
         Postburner.connected do |conn|
           tube_name = expand_tube_name(job.queue_name)

data/lib/postburner/tube.rb

@@ -0,0 +1,53 @@
+module Postburner
+  class Tube
+    def initialize(tube)
+      @tube = tube
+    end
+
+    # Get all tubes as Postburner::Tube instances.
+    #
+    def self.all
+      Postburner.connection.tubes.all.map { |tube| self.new(tube) }
+    end
+
+    # Get all peeked ids across all known tubes.
+    #
+    def self.peek_ids
+      self.all.map(&:peek_ids).flatten.sort
+    end
+
+    # Get all peeked ids.
+    #
+    def peek_ids
+      [ :buried, :ready, :delayed ].map { |type| @tube.peek(type) }.
+        reject(&:nil?).map(&:id).map(&:to_i)
+    end
+
+    # Get paginated array of jobs.
+    #
+    # Attempts to do this efficiently as possible, by peeking at known
+    # ids and exiting when count has been fulfilled.
+    #
+    # Just pass the last known id to after for the next batch.
+    #
+    def jobs(count=20, limit: 1000, after: nil)
+      stats = @tube.stats
+      jobs = Array.new
+
+      min_known = (
+        peek_ids.any? ? self.peek_ids.min : self.class.peek_ids.min
+      ).to_i
+      min = after ? after.to_i + 1 : min_known
+      max = min + limit
+
+      for i in min..max
+        job = @tube.client.jobs.find(i)
+        jobs << job if job && stats[:name] == job.stats[:tube]
+        break if jobs.length >= count
+      end
+
+      return jobs
+    end
+
+  end
+end

data/lib/postburner/version.rb

@@ -1,3 +1,3 @@
 module Postburner
-  VERSION = '1.0.0.pre.10'
+  VERSION = '1.0.0.pre.11'
 end

data/lib/postburner/workers/worker.rb

@@ -374,8 +374,8 @@ module Postburner
         end
 
         # Wait up to 30 seconds for children to exit
-        timeout = Time.now + 30
-        until @children.empty? || Time.now > timeout
+        timeout = Time.zone.now + 30
+        until @children.empty? || Time.zone.now > timeout
           pid, status = Process.wait2(-1, Process::WNOHANG)
           @children.delete(pid) if pid
           sleep 0.5

data/lib/postburner.rb

@@ -1,6 +1,7 @@
 require "postburner/version"
 require "postburner/configuration"
 require "postburner/connection"
+require "postburner/tube"
 require "postburner/beanstalkd"
 require "postburner/tracked"
 require "postburner/active_job/payload"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postburner
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.10
+  version: 1.0.0.pre.11
 platform: ruby
 authors:
 - Matt Smith
@@ -154,6 +154,7 @@ files:
 - lib/postburner/strategies/test_queue.rb
 - lib/postburner/time_helpers.rb
 - lib/postburner/tracked.rb
+- lib/postburner/tube.rb
 - lib/postburner/version.rb
 - lib/postburner/workers/base.rb
 - lib/postburner/workers/worker.rb