que 0.5.0 → 0.6.0

data/spec/unit/worker_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe Que::Worker do
   it "should work jobs when started until there are none available" do
     begin
-      Que::Job.queue
-      Que::Job.queue
+      Que::Job.enqueue
+      Que::Job.enqueue
       DB[:que_jobs].count.should be 2
 
       @worker = Que::Worker.new
@@ -23,13 +23,59 @@ describe Que::Worker do
     end
   end
 
+  it "should work jobs without a named queue by default" do
+    begin
+      Que::Job.enqueue 1
+      Que::Job.enqueue 2, :queue => 'my_queue'
+
+      @worker = Que::Worker.new
+      sleep_until { @worker.sleeping? }
+      DB[:que_jobs].count.should be 1
+
+      $logger.messages.map{|m| JSON.load(m)['event']}.should == %w(job_worked job_unavailable)
+
+      json = JSON.load($logger.messages[0])
+      json['job']['queue'].should == ''
+      json['job']['job_class'].should == 'Que::Job'
+      json['job']['args'].should == [1]
+    ensure
+      if @worker
+        @worker.stop
+        @worker.wait_until_stopped
+      end
+    end
+  end
+
+  it "should accept the name of a single queue to work jobs from" do
+    begin
+      Que::Job.enqueue 1
+      Que::Job.enqueue 2, :queue => 'my_queue'
+
+      @worker = Que::Worker.new(:my_queue)
+      sleep_until { @worker.sleeping? }
+      DB[:que_jobs].count.should be 1
+
+      $logger.messages.map{|m| JSON.load(m)['event']}.should == %w(job_worked job_unavailable)
+
+      json = JSON.load($logger.messages[0])
+      json['job']['queue'].should == 'my_queue'
+      json['job']['job_class'].should == 'Que::Job'
+      json['job']['args'].should == [2]
+    ensure
+      if @worker
+        @worker.stop
+        @worker.wait_until_stopped
+      end
+    end
+  end
+
   it "#wake! should return truthy if the worker was asleep and is woken up, at which point it should work until no jobs are available" do
     begin
       @worker = Que::Worker.new
       sleep_until { @worker.sleeping? }
 
-      Que::Job.queue
-      Que::Job.queue
+      Que::Job.enqueue
+      Que::Job.enqueue
       DB[:que_jobs].count.should be 2
 
       @worker.wake!.should be true
@@ -45,7 +91,7 @@ describe Que::Worker do
 
   it "#wake! should return falsy if the worker was already working" do
     begin
-      BlockJob.queue
+      BlockJob.enqueue
       @worker = Que::Worker.new
 
       $q1.pop
@@ -62,8 +108,8 @@ describe Que::Worker do
 
   it "should not be deterred by a job that raises an error" do
     begin
-      ErrorJob.queue :priority => 1
-      Que::Job.queue :priority => 5
+      ErrorJob.enqueue :priority => 1
+      Que::Job.enqueue :priority => 5
 
       @worker = Que::Worker.new
 
@@ -89,8 +135,8 @@ describe Que::Worker do
 
   it "should receive and respect a notification to stop down when it is working, after its current job completes" do
     begin
-      BlockJob.queue :priority => 1
-      Que::Job.queue :priority => 5
+      BlockJob.enqueue :priority => 1
+      Que::Job.enqueue :priority => 5
       DB[:que_jobs].count.should be 2
 
       @worker = Que::Worker.new

data/tasks/safe_shutdown.rb

@@ -40,7 +40,7 @@ task :safe_shutdown do
     end
   end
 
-  SafeJob.queue
+  SafeJob.enqueue
   Que.mode = :async
   $queue.pop
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: que
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Chris Hanks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-  prerelease: false
 description: A job queue that uses PostgreSQL's advisory locks for speed and reliability.
 email:
 - christopher.m.hanks@gmail.com
@@ -31,9 +31,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -45,6 +45,9 @@ files:
 - docs/inspecting_the_queue.md
 - docs/logging.md
 - docs/managing_workers.md
+- docs/migrating.md
+- docs/multiple_queues.md
+- docs/shutting_down_safely.md
 - docs/using_plain_connections.md
 - docs/using_sequel.md
 - docs/writing_reliable_jobs.md
@@ -58,10 +61,12 @@ files:
 - lib/que/adapters/sequel.rb
 - lib/que/job.rb
 - lib/que/migrations.rb
-- lib/que/migrations/1-down.sql
-- lib/que/migrations/1-up.sql
-- lib/que/migrations/2-down.sql
-- lib/que/migrations/2-up.sql
+- lib/que/migrations/1/down.sql
+- lib/que/migrations/1/up.sql
+- lib/que/migrations/2/down.sql
+- lib/que/migrations/2/up.sql
+- lib/que/migrations/3/down.sql
+- lib/que/migrations/3/up.sql
 - lib/que/railtie.rb
 - lib/que/rake_tasks.rb
 - lib/que/sql.rb
@@ -72,6 +77,8 @@ files:
 - spec/adapters/connection_pool_spec.rb
 - spec/adapters/pg_spec.rb
 - spec/adapters/sequel_spec.rb
+- spec/gemfiles/Gemfile1
+- spec/gemfiles/Gemfile2
 - spec/spec_helper.rb
 - spec/support/helpers.rb
 - spec/support/jobs.rb
@@ -79,11 +86,13 @@ files:
 - spec/support/shared_examples/multi_threaded_adapter.rb
 - spec/travis.rb
 - spec/unit/connection_spec.rb
+- spec/unit/customization_spec.rb
+- spec/unit/enqueue_spec.rb
 - spec/unit/helper_spec.rb
 - spec/unit/logging_spec.rb
 - spec/unit/migrations_spec.rb
 - spec/unit/pool_spec.rb
-- spec/unit/queue_spec.rb
+- spec/unit/run_spec.rb
 - spec/unit/states_spec.rb
 - spec/unit/stats_spec.rb
 - spec/unit/work_spec.rb
@@ -101,17 +110,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A PostgreSQL-based Job Queue
@@ -120,6 +129,8 @@ test_files:
 - spec/adapters/connection_pool_spec.rb
 - spec/adapters/pg_spec.rb
 - spec/adapters/sequel_spec.rb
+- spec/gemfiles/Gemfile1
+- spec/gemfiles/Gemfile2
 - spec/spec_helper.rb
 - spec/support/helpers.rb
 - spec/support/jobs.rb
@@ -127,11 +138,13 @@ test_files:
 - spec/support/shared_examples/multi_threaded_adapter.rb
 - spec/travis.rb
 - spec/unit/connection_spec.rb
+- spec/unit/customization_spec.rb
+- spec/unit/enqueue_spec.rb
 - spec/unit/helper_spec.rb
 - spec/unit/logging_spec.rb
 - spec/unit/migrations_spec.rb
 - spec/unit/pool_spec.rb
-- spec/unit/queue_spec.rb
+- spec/unit/run_spec.rb
 - spec/unit/states_spec.rb
 - spec/unit/stats_spec.rb
 - spec/unit/work_spec.rb