sidekiq-running 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a849f1752910eba28b10c12cbd0e112cbd35aae0
-  data.tar.gz: 97a727756281b834260e142a94e476972a171030
+  metadata.gz: f34952bfa9e6145c3ea2af494e8d3c05bc6259ff
+  data.tar.gz: 5391abdc655fdc5cd63a7b930d8dbaa17c235886
 SHA512:
-  metadata.gz: dbe8831b8c9dace44f767940bb89deb718d8b05f5e151a111ab821f6c5abdf72bb703f4b06db361fc462a0136679420ff431a3a3268d4b2ee3eba4aa8655338e
-  data.tar.gz: b680a15a5a295c1cfd0d96cb8bae31e78ad81963cd32e17622ab54ed9f3f4b3cdb8a93e2af30115e89521dc45c49e09927aea85ffce2a4f6ef9a7f529c7d2fc2
+  metadata.gz: a8ff491c0a03cc5b2acc144a6eafa89a3b094fd09e8ab4d2e14044598219a0cca5089bf9337313a0c4007e316c1b268b04d4a9ef7b80f8031297eadf4778beac
+  data.tar.gz: a517d8a4aefc5a9f4368bf917b19caebb07b18ccd4f569a6eee2a7881cdec3b49d2f0172645baf218b51825657711abc86b2c1b0d1cb9a5ab15261d38e321bd9

data/README.md

@@ -30,17 +30,35 @@ Now, you can run
 HardWorker.queued?("buy dr.pepper", 10) # => false
 HardWorker.perform_async("buy dr.pepper", 10)
 HardWorker.queued?("buy dr.pepper", 10) # => true
+
+HardWorker.perform_in(10.minutes, "whatever")
+HardWorker.scheduled?("whatever") # => 2014-10-08 15:46:20 UTC
+HardWorker.scheduled?("this is not scheduled") # => false
+
+HardWorker.running?("buy dr.pepper", 10) # => true
+HardWorker.running?("this is not running") # => false
+
+# programmed is queued or scheduled
+HardWorker.programmed?("whatever") # => 2014-10-08 15:46:20 UTC
+HardWorker.programmed?("buy dr.pepper", 10) # => true
 ```
 
 ## Methods Available
 ``Sidekiq::Running`` adds the following class methods to your sidekiq workers:
 
-- queued?(*args)
 - running?(*args)
-- queued_or_running?(*args)
-- perform_async_unless_queued(*args)
+- queued?(*args)
+- scheduled?(*args)
+
+- running_or_queued?(*args)
+- running_or_programmed?(*args)
+
 - perform_async_unless_running(*args)
-- perform_async_unless_queued_or_running(*args)
+- perform_async_unless_queued(*args)
+- perform_async_unless_scheduled(*args)
+- perform_async_unless_programmed(*args)
+- perform_async_unless_running_or_queued(*args)
+- perform_async_unless_running_or_programmed(*args)
 - queue_name
 
 ## Contributing

data/lib/sidekiq/running/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Running
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/sidekiq/running.rb

@@ -27,9 +27,27 @@ module Sidekiq
         end
       end
 
-      def queued_or_running?(*args)
+      def scheduled?(*args)
+        scheduled = Sidekiq::ScheduledSet.new
+        scheduled_job = scheduled.find do |job|
+          job.klass == self.name && job.args == args
+        end
+        scheduled_job && scheduled_job.enqueued_at or false
+      end
+
+      def programmed?(*args)
+        queued?(*args) or scheduled?(*args)
+      end
+
+      def running_or_queued?(*args)
         running?(*args) or queued?(*args)
       end
+      alias_method :queued_or_running?, :running_or_queued?
+
+      def running_or_programmed?(*args)
+        queued?(*args) or programmed?(*args)
+      end
+      alias_method :programmed_or_running?, :running_or_programmed?
 
       def perform_async_unless_queued(*args)
         perform_async(*args) unless queued?(*args)
@@ -39,9 +57,23 @@ module Sidekiq
         perform_async(*args) unless running?(*args)
       end
 
-      def perform_async_unless_queued_or_running(*args)
-        perform_async(*args) unless queued_or_running?(*args)
+      def perform_async_unless_scheduled(*args)
+        perform_async(*args) unless scheduled?(*args)
+      end
+
+      def perform_async_unless_programmed(*args)
+        perform_async(*args) unless programmed?(*args)
+      end
+
+      def perform_async_unelss_running_or_queued(*args)
+        perform_async(*args) unless running_or_queued?(*args)
+      end
+      alias_method :perform_async_unless_queued_or_running, :perform_async_unelss_running_or_queued
+
+      def perform_async_unless_running_or_programmed(*args)
+        perform_async(*args) unless running_or_programmed?(*args)
       end
+      alias_method :perform_async_unless_programmed_or_running, :perform_async_unless_running_or_programmed
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-running
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - José Tomás Albornoz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler