disc 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ffe5775ac38d2ed07abc9c602d02bece9ed62be
-  data.tar.gz: 3bb2ef3b149eedcfe99f15ea8b5a9c2a5bfcdc47
+  metadata.gz: 98230b94d3119aa8d3b6173dd2df9758961e88eb
+  data.tar.gz: 3ad4fe6b39858293874a1891fad05c21016cd996
 SHA512:
-  metadata.gz: d4d2f921456d0843e97101bda9a408db66ecd9bac51c961edddcfb05ca330a71d447354bf3fe9d805daa6ac65358aae51bd56d248edfd721cf0c541758bca8e7
-  data.tar.gz: a6ca018282b0c2d773424d823524e48814b67d67c1e7272baf8cedc6dbb70825fc0a6aed5bc6f2d8452516ee6e02476f102b0265987df176acc707857e0852fa
+  metadata.gz: 24c241f496c3bef60e8229bd0b138500e6192d6f7ce9b5d23b4f27500bbf3bcec654d1099e2cf170d4f79c1ff8faaaa3c40dc1c081047f7a6fe4324aadb8adf8
+  data.tar.gz: 5349b3bb90a78c4170456344fecc5775024b9668d3bf3410f8e8a797d85643a4a499c9073d10bd8f3d92bd2011f34ee0048ae84e8c0f1c443cc3a63b1977d066

data/bin/disc

@@ -8,7 +8,7 @@ Clap.run ARGV,
 
 if defined?(Celluloid)
   concurrency = ENV.fetch('DISC_CONCURRENCY', '25').to_i
-  STDOUT.puts(
+  $stdout.puts(
     "[Notice] Disc running in celluloid mode! Current DISC_CONCURRENCY is\
  #{ concurrency }."
   )
@@ -32,6 +32,6 @@ if defined?(Celluloid)
     )
   end
 else
-  STDOUT.puts("[Notice] Disc running in non-threaded mode")
+  $stdout.puts("[Notice] Disc running in non-threaded mode")
   Disc::Worker.run
 end

data/examples/echoer.rb

@@ -2,11 +2,9 @@ require 'disc'
 
 class Echoer
   include Disc::Job
-  disc queue: 'test_medium'
+  disc queue: 'test_urgent'
 
   def perform(first, second, third)
-    puts "First: #{ first }"
-    puts "Second: #{ second }"
-    puts "Third: #{ third }"
+    puts "First: #{ first }, Second: #{ second }, Third: #{ third }"
   end
 end

data/lib/disc/version.rb

@@ -1,3 +1,3 @@
 class Disc
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/lib/disc.rb

@@ -29,7 +29,7 @@ class Disc
   end
 
   def self.on_error(exception, job)
-    STDERR.puts exception
+    $stderr.puts exception
   end
 
   class Worker
@@ -64,7 +64,7 @@ class Disc
     end
 
     def run
-      STDOUT.puts("Disc::Worker listening in #{queues}")
+      $stdout.puts("Disc::Worker listening in #{queues}")
       loop do
         jobs = disque.fetch(from: queues, timeout: timeout, count: count)
         Array(jobs).each do |queue, msgid, serialized_job|
@@ -113,15 +113,15 @@ class Disc
       end
 
       def enqueue(*args)
-        enqueue_at(nil, args)
+        enqueue_at(nil, *args)
       end
 
       def enqueue_at(datetime, *args)
         disque.push(
           queue,
           {
-            class: self.new.class.name,
-            arguments: args.first
+            class: self.name,
+            arguments: args
           }.to_msgpack,
           Disc.disque_timeout,
           delay: datetime.nil? ? nil : (datetime.to_time.to_i - DateTime.now.to_time.to_i)

data/test/disc_test.rb

@@ -1,18 +1,9 @@
-$: << 'lib'
 require 'cutest'
 require 'disc'
 require 'msgpack'
+require 'pty'
 
-class TestJob
-  include Disc::Job
-  disc queue: 'test_urgent'
-
-  def perform(first, second, third)
-    puts "First: #{ first }"
-    puts "Second: #{ second }"
-    puts "Third: #{ third }"
-  end
-end
+require_relative '../examples/echoer'
 
 prepare do
   Disc.disque.call('DEBUG', 'FLUSHALL')
@@ -20,19 +11,20 @@ end
 
 scope do
   test 'jobs are enqueued to the correct Disque queue with appropriate parameters and class' do
-    TestJob.enqueue('one argument', { random: 'data' }, 3)
+    jobid = Echoer.enqueue('one argument', { random: 'data' }, 3)
 
     jobs = Array(Disc.disque.fetch(from: ['test_urgent'], timeout: Disc.disque_timeout, count: 1))
     assert jobs.any?
     assert_equal 1, jobs.count
 
-    jobs.first.tap do |queue, _, serialized_job|
+    jobs.first.tap do |queue, id, serialized_job|
       job = MessagePack.unpack(serialized_job)
 
       assert job.has_key?('class')
       assert job.has_key?('arguments')
 
-      assert_equal 'TestJob', job['class']
+      assert_equal 'Echoer', job['class']
+      assert_equal jobid, id
 
       args = job['arguments']
       assert_equal 3, args.size
@@ -41,4 +33,57 @@ scope do
       assert_equal(3, args[2])
     end
   end
+
+  test 'enqueue_at behaves properly' do
+    in_3_seconds = (Time.now + 3).to_datetime
+    jobid = Echoer.enqueue_at(in_3_seconds, 'one argument', { random: 'data' }, 3)
+
+    jobs = Array(Disc.disque.fetch(from: ['test_urgent'], timeout: Disc.disque_timeout, count: 1))
+    assert jobs.empty?
+
+    sleep 1
+    jobs = Array(Disc.disque.fetch(from: ['test_urgent'], timeout: Disc.disque_timeout, count: 1))
+    assert jobs.empty?
+
+    sleep 2
+    jobs = Array(Disc.disque.fetch(from: ['test_urgent'], timeout: Disc.disque_timeout, count: 1))
+    assert jobs.any?
+    assert_equal 1, jobs.size
+
+    jobs.first.tap do |queue, id, serialized_job|
+      assert_equal 'test_urgent', queue
+      assert_equal jobid, id
+      job = MessagePack.unpack(serialized_job)
+      assert job.has_key?('class')
+      assert job.has_key?('arguments')
+      assert_equal 'Echoer', job['class']
+      assert_equal 3, job['arguments'].size
+    end
+  end
+
+  test 'jobs are executed' do
+    begin
+      Echoer.enqueue('one argument', { random: 'data' }, 3)
+
+      cout, _, pid = PTY.spawn(
+        'QUEUES=test_urgent ruby -Ilib bin/disc -r ./examples/echoer'
+      )
+      sleep 0.5
+
+      jobs = Disc.disque.fetch(from: ['test_urgent'], timeout: Disc.disque_timeout, count: 1)
+      assert jobs.nil?
+
+      matched = false
+      counter = 0
+      while !matched && counter < 5
+        counter += 1
+        matched = cout.gets.match(/First: one argument, Second: {"random"=>"data"}, Third: 3/)
+        sleep(1) unless matched
+      end
+
+      assert matched
+    ensure
+      Process.kill("KILL", pid)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: disc
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - pote
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: disque