disc 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf220b91a7f56d811b3926018f82fcf65e35956d
-  data.tar.gz: 64c8e523ed22e996a54b31da8f2b077c08b6ff7d
+  metadata.gz: 725931a50fe6e4d4e96b47a0d8b5ed5666de7d60
+  data.tar.gz: 79806a4c3156650850e772f00a05187fafbe7e1e
 SHA512:
-  metadata.gz: 6045fb0e6e7aaf39812feada1334c6dc288f4f6eef5d0e7f901e80d577a353c70e8b1b4e7a0df51faa5c52980b4a5dbcd7d5c415bdb2dbe56e137b9077de53ab
-  data.tar.gz: 0e4fe719be855badefeb2aa726d61240f5908b62b383afaf4586ab1df0cd5864f1aec02c081ba4319a1fff2b79ba5ae41c918142388fefe03fce69fac711314a
+  metadata.gz: 6733970968415f9df5dfc02080ffecb27c9acf22f06df94787f95fc80ffc15afd619f6a7f1fb4f99e74d2cd1fed4cfe4d1a66b24efe8fa9bc3cc0e04b36a4ce1
+  data.tar.gz: 6fc60c37ca4fec2b2e25a9a6fe51baeae1bb26f8afe3ad5d0d0cfe740dd206876734c95af98b39b9a1c3ac2adc2fbf75f11a3365e7475a8ef9b1868ffa08a934

data/README.md

@@ -35,10 +35,14 @@ Disc fills the gap between your Ruby service objects and [antirez](http://antire
   CreateGameGrid.enqueue('light_cycle')
   ```
 
-4. Or enqueue them to be performed at some time in the future.
+4. Or enqueue them to be performed at some time in the future, or on a queue other than it's default.
 
   ```ruby
-  CreateGameGrid.enqueue_at(DateTime.new(2015, 12, 31), 'disc_arena')
+  CreateGameGrid.enqueue(
+    'disc_arena',
+    at: DateTime.new(2015, 12, 31),
+    queue: 'not_so_important'
+  )
   ```
 
 5. Create a file that requires anything needed for your jobs to run
@@ -49,7 +53,7 @@ Disc fills the gap between your Ruby service objects and [antirez](http://antire
   Dir['./jobs/**/*.rb'].each { |job| require job }
   ```
 
-7. Run as many Disc Worker processes as you wish.
+6. Run as many Disc Worker processes as you wish, requiring your `disc_init.rb` file
 
   ```bash
   $ QUEUES=urgent,default disc -r ./disc_init.rb
@@ -94,9 +98,9 @@ The error handler function gets the data of the current job as a Hash, that has
 | `'queue'`     | (String) The queue from which this job was picked up. |
 | `'id'`        | (String) Disque's job ID.                             |
 
-## PowerUps
+## [Optional] Celluloid integration
 
-Disc workers can run just fine on their own, but if you're using
+Disc workers can run just fine on their own, but if you happen to be using
 [Celluloid](https://github.com/celluloid/celluloid) you might want Disc to take
 advantage of it and spawn multiple worker threads per process, doing this is
 trivial! Just require Celluloid before your init file:
@@ -144,7 +148,7 @@ As always, make sure your `disc_init.rb` file requires the necessary jobs and yo
 
 ## A note on stability
 
-The version of Disque at the time of this writing is `0.0.1`. It is a wonderful project, I know of people running it in production, and I expect it will only get better and better with time, but please do not expect Disc to be more production ready than Disque is, Disque still gives me the occasional segfault when running Disc's test suite.
+The version of Disque at the time of this writing is `0.0.1`. It is a wonderful project, I know of people running it in production and I expect it will only get better and better with time, but please do not expect Disc to be more production ready than Disque is.
 
 ## License
 
@@ -157,3 +161,9 @@ more information.
 * To [@antirez](https://github,com/antirez) for Redis, Disque, and his refreshing way of programming wonderful tools.
 * To [@soveran](https://github.com/soveran) for pushing me to work on this and publishing gems that keep me enjoying ruby.
 * To [all contributors](https://github.com/pote/disc/graphs/contributors)
+
+## Sponsorship
+
+This open source tool is proudly sponsored by [13Floor](http://13Floor.org)
+
+![13Floor](./13Floor-circulo-1.png)

data/lib/disc/version.rb

@@ -1,3 +1,3 @@
 class Disc
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

data/lib/disc.rb

@@ -113,19 +113,15 @@ class Disc
         disc_options.fetch(:queue, 'default')
       end
 
-      def enqueue(*args)
-        enqueue_at(nil, *args)
-      end
-
-      def enqueue_at(datetime, *args)
+      def enqueue(args, at: nil, queue: nil)
         disque.push(
-          queue,
+          queue || self.queue,
           {
             class: self.name,
-            arguments: args
+            arguments: Array(args)
           }.to_msgpack,
           Disc.disque_timeout,
-          delay: datetime.nil? ? nil : (datetime.to_time.to_i - DateTime.now.to_time.to_i)
+          delay: at.nil? ? nil : (at.to_time.to_i - DateTime.now.to_time.to_i)
         )
       end
     end

data/test/disc_test.rb

@@ -35,7 +35,7 @@ end
 
 scope do
   test 'jobs are enqueued to the correct Disque queue with appropriate parameters and class' do
-    jobid = Echoer.enqueue('one argument', { random: 'data' }, 3)
+    jobid = Echoer.enqueue(['one argument', { random: 'data' }, 3])
 
     jobs = Array(Disc.disque.fetch(from: ['test'], timeout: Disc.disque_timeout, count: 1))
     assert jobs.any?
@@ -58,9 +58,8 @@ scope do
     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)
+  test 'enqueue at timestamp behaves properly' do
+    jobid = Echoer.enqueue(['one argument', { random: 'data' }, 3], at: Time.now + 3)
 
     jobs = Array(Disc.disque.fetch(from: ['test'], timeout: Disc.disque_timeout, count: 1))
     assert jobs.empty?
@@ -87,7 +86,7 @@ scope do
 
   test 'jobs are executed' do
     begin
-      Echoer.enqueue('one argument', { random: 'data' }, 3)
+      Echoer.enqueue(['one argument', { random: 'data' }, 3])
 
       cout, _, pid = PTY.spawn(
         'QUEUES=test ruby -Ilib bin/disc -r ./examples/echoer'
@@ -99,10 +98,9 @@ scope do
 
       matched = false
       counter = 0
-      while !matched && counter < 5
+      while !matched && counter < 3
         counter += 1
         matched = cout.gets.match(/First: one argument, Second: {"random"=>"data"}, Third: 3/)
-        sleep(1) unless matched
       end
 
       assert matched
@@ -130,7 +128,7 @@ scope do
         printed_job: false
       }
 
-      while tasks.values.include?(false) && counter < 10
+      while tasks.values.include?(false) && counter < 5
         counter += 1
         output = cout.gets
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: disc
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - pote
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-18 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: disque
@@ -63,6 +63,7 @@ files:
 - ".env.sample"
 - ".gems"
 - ".gitignore"
+- 13Floor-circulo-1.png
 - CONTRIBUTING.md
 - LICENSE
 - Makefile