eq 0.0.1 → 0.1.0

data/spec/lib/eq-queueing_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe EQ do
+  context 'transient queueing' do
+    it "won't survives at least a dying queue actor" do
+      # setup a in-memory queue backend
+      EQ.config {|c| c.queue = 'sequel'; c.sequel = 'sqlite:/'}
+      EQ.boot :queue
+      EQ.queue.push AJob
+      EQ.queue.count.should == 1
+      EQ.shutdown
+      EQ.boot :queue
+      EQ.queue.count.should == 0
+    end
+  end
+end

data/spec/lib/eq-scheduling_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe EQ::Scheduling do
+  it 'list of events is empty per default' do
+    EQ::Scheduling.events.should == []
+  end
+end

data/spec/lib/eq-working/worker_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe EQ::Working::Worker do
+  subject { EQ::Working::Worker.new false }
+
+  it 'loops for new jobs' do
+    pending
+  end
+
+  it 'performs jobs' do
+    pending
+  end
+end

data/spec/lib/eq/job_spec.rb

@@ -1,26 +1,31 @@
 require 'spec_helper'
 
-describe EQ::Job do |variable|
-  it 'dumps const and payload' do
-    payload = EQ::Job.dump([EQ, 'bar', 'baz'])
-    Marshal.load(payload).should == [EQ, 'bar', 'baz']
+describe EQ::Job do
+
+  it 'creates a job with payload' do
+    job = EQ::Job.new nil, EQ::Job, ['bar', 'foo']
+    job.id.should == nil
+    job.queue.should == "EQ::Job"
+    job.job_class.should == EQ::Job
+    job.payload.should == ['bar', 'foo']
   end
 
-  it 'loads const and payload' do
-    serialized_payload = Marshal.dump [EQ, 'foo', 'bar']
-    job = EQ::Job.load(1, serialized_payload)
-    job.unpack.should == [EQ, 'foo', 'bar']
+  it 'creates a job without payload' do
+    job = EQ::Job.new nil, EQ::Job
+    job.id.should == nil
+    job.queue.should == "EQ::Job"
+    job.job_class.should == EQ::Job
+    job.payload.should == nil
   end
 
-  it 'performs using const.perform(*payload)' do
+  it 'performs using queue.perform(*payload)' do
     class MyJob
       def self.perform(*args)
         {result: args}
       end
     end
     my_job_args = [1,2,3]
-    serialized_payload = EQ::Job.dump(MyJob, *my_job_args)
-    job = EQ::Job.load(1, serialized_payload)
+    job = EQ::Job.new(nil, MyJob, my_job_args)
     job.perform.should == {result: my_job_args}
   end
 end

data/spec/lib/eq_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
 
 describe EQ do
-
+  
 end

data/spec/mocks/a_job.rb

@@ -0,0 +1,4 @@
+class AJob
+  def self.perform *args
+  end
+end

data/spec/mocks/a_unique_job.rb

@@ -0,0 +1,6 @@
+class AUniqueJob
+  @unique = true
+
+  def self.perform *args
+  end
+end

data/spec/spec_helper.rb

@@ -4,8 +4,14 @@
 # loaded once.
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+
+require 'fileutils'
+
 require File.join(File.dirname(__FILE__), '..', 'lib', 'eq', 'boot', 'all')
 Dir[File.join(File.dirname(__FILE__), '/support/**/*.rb')].each {|f| require f; puts f}
+Dir[File.join(File.dirname(__FILE__), '/mocks/**/*.rb')].each {|f| require f; puts f}
+
+Celluloid.logger = Logger.new(File.join(File.dirname(__FILE__), '..', 'log', 'rspec.log'))
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
@@ -17,6 +23,12 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
+
+  config.before :suite do
+    # cleanup rspec files
+    FileUtils.rm_rf 'tmp/rspec'
+    FileUtils.mkdir_p 'tmp/rspec'
+  end
 end
 
 require "timecop"

data/spec/support/shared_examples_for_queue.rb

@@ -1,75 +1,104 @@
 shared_examples_for 'queue backend' do
-  it 'pushes and pops' do
-    subject.push "foo"
-    job_id, payload = *subject.reserve
-    job_id.should == 1
-    payload.should == "foo"
+  let(:eq_job) { EQ::Job.new(nil, AJob, 'foo') }
+
+  it 'has no jobs at the beginning' do
+    subject.count(:jobs).should == 0
+    subject.count(:waiting).should == 0
+    subject.count(:working).should == 0
   end
-end
 
-shared_examples_for 'abstract queue' do
   it 'pushes jobs' do
-    subject.waiting_count.should == 0
-    subject.working_count.should == 0
-    subject.push("foo").should == 1 # job id
-    subject.waiting_count.should == 1
-    subject.working_count.should == 0
+    subject.push(eq_job).should_not be_nil # job_id
+    subject.count(:jobs).should == 1
+    subject.count(:waiting).should == 1
+    subject.count(:working).should == 0
   end
 
   it 'reserves jobs' do
-    id = subject.push "foo"
-    subject.reserve
-    subject.waiting_count.should == 0
-    subject.working_count.should == 1
-    subject.pop id
-    subject.waiting_count.should == 0
-    subject.working_count.should == 0
+    id = subject.push eq_job
+    subject.count(:jobs).should == 1
+    subject.count(:waiting).should == 1
+    subject.count(:working).should == 0
+    job = subject.reserve
+    id.should == job.id
+    subject.count(:jobs).should == 1
+    subject.count(:waiting).should == 0
+    subject.count(:working).should == 1
   end
 
   it 'pops jobs' do
     subject.pop(1).should be_false # no job
-    subject.push "foo"
-    subject.pop(1).should be_true # one job
+    job_id = subject.push eq_job
+    subject.count(:jobs).should == 1
+    subject.count(:waiting).should == 1
+    subject.count(:working).should == 0
+    subject.pop(job_id).should be_true # one job
+    subject.count(:jobs).should == 0
+    subject.count(:waiting).should == 0
+    subject.count(:working).should == 0
     subject.pop(1).should be_false # again no job"
   end
 
+  it 'clears jobs' do
+    10.times { subject.push(eq_job) }
+    subject.count.should == 10
+    subject.clear
+    subject.count.should == 0
+  end
+
   it 'puts working job back on waiting when they timeout via #requeue_timed_out_jobs' do
     # freeze time on start of 1986
     Timecop.freeze(Time.new(1986)) do
     
       # create a job
-      id = subject.push "foo"
+      id = subject.push eq_job
 
       # start working
       data = subject.reserve
 
       # no on working at the beginning
-      subject.waiting_count.should == 0
-      subject.working_count.should == 1
+      subject.count(:waiting).should == 0
+      subject.count(:working).should == 1
 
       # no one will be re-enqueued
       subject.requeue_timed_out_jobs.should == 0
 
       # no on working after senseless re-enqueueing
-      subject.waiting_count.should == 0
-      subject.working_count.should == 1
-
+      subject.count(:waiting).should == 0
+      subject.count(:working).should == 1
     end
 
     # freeze the time to 10s in the future
     Timecop.freeze(Time.new(1986, 01, 01, 00, 00, EQ.config.job_timeout)) do  
       
       # nothing happened yet...
-      subject.waiting_count.should == 0
-      subject.working_count.should == 1
+      subject.count(:waiting).should == 0
+      subject.count(:working).should == 1
 
       # this time one will be re-enqueued
       subject.requeue_timed_out_jobs.should == 1
     
       # now the old job is available again
-      subject.waiting_count.should == 1
-      subject.working_count.should == 0
+      subject.count(:waiting).should == 1
+      subject.count(:working).should == 0
+    end
+  end
+
+  context 'unique jobs' do
+    it 'does not enqueue multiple times when args are the same' do
+      subject.count.should == 0
+      id = subject.push EQ::Job.new(nil, AUniqueJob)
+      subject.count.should == 1
+      id = subject.push EQ::Job.new(nil, AUniqueJob)
+      subject.count.should == 1
+    end
 
+    it 'does enqueue multiple times when args differ' do
+      subject.count.should == 0
+      id = subject.push EQ::Job.new(nil, AUniqueJob, 'foo')
+      subject.count.should == 1
+      id = subject.push EQ::Job.new(nil, AUniqueJob, 'bar')
+      subject.count.should == 2
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eq
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2012-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: celluloid
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -27,6 +27,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: clockwork
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -35,7 +67,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -44,14 +76,30 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: celluloid
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: leveldb-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -155,31 +203,49 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- TODO.md
+- benchmarks/all.rb
+- benchmarks/parallel.rb
+- benchmarks/queue_backend_benchmark.rb
 - benchmarks/queueing.rb
 - benchmarks/working.rb
 - eq.gemspec
 - examples/queueing.rb
+- examples/scheduling.rb
 - examples/simple_usage.rb
 - examples/working.rb
 - lib/eq-queueing.rb
 - lib/eq-queueing/backends.rb
+- lib/eq-queueing/backends/leveldb.rb
 - lib/eq-queueing/backends/sequel.rb
 - lib/eq-queueing/queue.rb
+- lib/eq-scheduling.rb
+- lib/eq-scheduling/scheduler.rb
+- lib/eq-web.rb
+- lib/eq-web/server.rb
+- lib/eq-web/views/index.erb
 - lib/eq-working.rb
-- lib/eq-working/manager.rb
-- lib/eq-working/system.rb
 - lib/eq-working/worker.rb
 - lib/eq.rb
 - lib/eq/boot/all.rb
 - lib/eq/boot/queueing.rb
+- lib/eq/boot/scheduling.rb
 - lib/eq/boot/working.rb
+- lib/eq/error.rb
 - lib/eq/job.rb
 - lib/eq/logging.rb
 - lib/eq/version.rb
+- log/.gitkeep
+- spec/lib/eq-queueing/backends/leveldb_spec.rb
 - spec/lib/eq-queueing/backends/sequel_spec.rb
 - spec/lib/eq-queueing/queue_spec.rb
+- spec/lib/eq-queueing_spec.rb
+- spec/lib/eq-scheduling_spec.rb
+- spec/lib/eq-working/worker_spec.rb
 - spec/lib/eq/job_spec.rb
 - spec/lib/eq_spec.rb
+- spec/mocks/a_job.rb
+- spec/mocks/a_unique_job.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples_for_queue.rb
 homepage: https://github.com/dpree/eq
@@ -208,10 +274,16 @@ specification_version: 3
 summary: Based on Celluloid (multi-threading) and Sequel (SQLite3, MySQL, PostgreSQL,
   ...).
 test_files:
+- spec/lib/eq-queueing/backends/leveldb_spec.rb
 - spec/lib/eq-queueing/backends/sequel_spec.rb
 - spec/lib/eq-queueing/queue_spec.rb
+- spec/lib/eq-queueing_spec.rb
+- spec/lib/eq-scheduling_spec.rb
+- spec/lib/eq-working/worker_spec.rb
 - spec/lib/eq/job_spec.rb
 - spec/lib/eq_spec.rb
+- spec/mocks/a_job.rb
+- spec/mocks/a_unique_job.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples_for_queue.rb
 has_rdoc: 

data/lib/eq-working/manager.rb

@@ -1,31 +0,0 @@
-module EQ::Working
-  class Manager
-    include Celluloid
-    include EQ::Logging
-
-    def initialize
-      run!
-    end
-
-    # polls the EQ.queue via EQ.queue.reserve
-    def run
-      debug "worker manager running"
-      loop do
-        if EQ.queue && job = EQ.queue.reserve
-          debug "got #{job.inspect}"
-          if worker = EQ::Working.worker_pool
-            debug ' - found worker'
-            worker.process! job
-          else
-            debug ' - no worker'
-          end
-        else
-          # currently no job
-        end
-        sleep 0.01
-      end
-    rescue Celluloid::DeadActorError
-      retry
-    end
-  end
-end