navvy 0.1.0 → 0.1.1

data/navvy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{navvy}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Kreeftmeijer"]
-  s.date = %q{2010-01-21}
+  s.date = %q{2010-01-26}
   s.description = %q{Simple background job processor inspired by delayed_job, but aiming for database agnosticism.}
   s.email = %q{jeff@kreeftmeijer.nl}
   s.extra_rdoc_files = [
@@ -28,18 +28,20 @@ Gem::Specification.new do |s|
      "lib/generators/navvy_generator.rb",
      "lib/navvy.rb",
      "lib/navvy/job/active_record.rb",
+     "lib/navvy/job/data_mapper.rb",
      "lib/navvy/job/mongo_mapper.rb",
      "lib/navvy/job/sequel.rb",
      "lib/navvy/log.rb",
      "lib/navvy/tasks.rb",
      "lib/navvy/worker.rb",
      "navvy.gemspec",
-     "spec/job/active_record_spec.rb",
-     "spec/job/mongo_mapper_spec.rb",
-     "spec/job/sequel_spec.rb",
+     "spec/job_spec.rb",
      "spec/log_spec.rb",
      "spec/setup/active_record.rb",
+     "spec/setup/data_mapper.rb",
+     "spec/setup/justlogging.rb",
      "spec/setup/mongo_mapper.rb",
+     "spec/setup/rails_default_logger.rb",
      "spec/setup/sequel.rb",
      "spec/spec_helper.rb",
      "spec/worker_spec.rb"
@@ -50,12 +52,13 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Simple background job processor inspired by delayed_job, but aiming for database agnosticism.}
   s.test_files = [
-    "spec/job/active_record_spec.rb",
-     "spec/job/mongo_mapper_spec.rb",
-     "spec/job/sequel_spec.rb",
+    "spec/job_spec.rb",
      "spec/log_spec.rb",
      "spec/setup/active_record.rb",
+     "spec/setup/data_mapper.rb",
+     "spec/setup/justlogging.rb",
      "spec/setup/mongo_mapper.rb",
+     "spec/setup/rails_default_logger.rb",
      "spec/setup/sequel.rb",
      "spec/spec_helper.rb",
      "spec/worker_spec.rb"
@@ -68,27 +71,21 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<yard>, [">= 0.5.2"])
-      s.add_development_dependency(%q<metric_fu>, [">= 1.1.6"])
-      s.add_development_dependency(%q<machinist>, [">= 1.0.6"])
       s.add_development_dependency(%q<mongo_mapper>, [">= 0.6.10"])
-      s.add_development_dependency(%q<machinist_mongomapper>, [">= 0.9.7"])
       s.add_development_dependency(%q<sequel>, [">= 3.8.0"])
+      s.add_development_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<yard>, [">= 0.5.2"])
-      s.add_dependency(%q<metric_fu>, [">= 1.1.6"])
-      s.add_dependency(%q<machinist>, [">= 1.0.6"])
       s.add_dependency(%q<mongo_mapper>, [">= 0.6.10"])
-      s.add_dependency(%q<machinist_mongomapper>, [">= 0.9.7"])
       s.add_dependency(%q<sequel>, [">= 3.8.0"])
+      s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<yard>, [">= 0.5.2"])
-    s.add_dependency(%q<metric_fu>, [">= 1.1.6"])
-    s.add_dependency(%q<machinist>, [">= 1.0.6"])
     s.add_dependency(%q<mongo_mapper>, [">= 0.6.10"])
-    s.add_dependency(%q<machinist_mongomapper>, [">= 0.9.7"])
     s.add_dependency(%q<sequel>, [">= 3.8.0"])
+    s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
   end
 end

data/spec/{job/active_record_spec.rb → job_spec.rb}

@@ -1,53 +1,49 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe 'Navvy::Job' do
-  before do
-    require File.expand_path(File.dirname(__FILE__) + '/../setup/active_record')
-  end
-
   describe '.enqueue' do
     before(:each) do
-      Navvy::Job.delete_all
+      delete_all_jobs
     end
 
     it 'should enqueue a job' do
       Navvy::Job.enqueue(Cow, :speak)
-      Navvy::Job.count.should == 1
+      job_count.should == 1
     end
 
     it 'should set the object and the method_name' do
       Navvy::Job.enqueue(Cow, :speak)
-      job = Navvy::Job.first
+      job = first_job
       job.object.should == 'Cow'
-      job.method_name.should == 'speak'
+      job.method_name.to_s.should == 'speak'
     end
 
     it 'should turn the method_name into a symbol' do
       Navvy::Job.enqueue(Cow, 'speak')
-      job = Navvy::Job.first
-      job.method_name.should == 'speak'
+      job = first_job
+      job.method_name.to_s.should == 'speak'
     end
 
     it 'should set the arguments' do
       Navvy::Job.enqueue(Cow, :speak, true, false)
-      job = Navvy::Job.first
-      YAML.load(job.arguments).should == [true, false]
+      job = first_job
+      job.args.should == [true, false]
     end
 
     it 'should set the created_at date' do
       Navvy::Job.enqueue(Cow, :speak, true, false)
-      job = Navvy::Job.first
+      job = first_job
       job.created_at.should be_instance_of Time
       job.created_at.should <= Time.now
-      job.created_at.should > 10.seconds.ago
+      job.created_at.should > Time.now - 10
     end
 
     it 'should set the run_at date' do
       Navvy::Job.enqueue(Cow, :speak, true, false)
-      job = Navvy::Job.first
+      job = first_job
       job.run_at.should be_instance_of Time
       job.run_at.should <= Time.now
-      job.created_at.should > 10.seconds.ago
+      job.created_at.should > Time.now - 10
     end
 
     it 'should return the enqueued job' do
@@ -58,12 +54,12 @@ describe 'Navvy::Job' do
 
   describe '.next' do
     before(:each) do
-      Navvy::Job.delete_all
+      delete_all_jobs
       Navvy::Job.create(
         :object =>      'Cow',
         :method_name => :last,
-        :created_at =>  Time.now + 1.day,
-        :run_at =>        Time.now
+        :created_at =>  Time.now + (60 * 60),
+        :run_at =>      Time.now
       )
       Navvy::Job.create(
         :object =>        'Cow',
@@ -80,7 +76,7 @@ describe 'Navvy::Job' do
       Navvy::Job.create(
         :object =>      'Cow',
         :method_name => :tomorrow,
-        :run_at =>      Time.now + 1.day
+        :run_at =>      Time.now + (60 * 60)
       )
       120.times do
         Navvy::Job.enqueue(Cow, :speak)
@@ -92,7 +88,7 @@ describe 'Navvy::Job' do
       jobs.count.should == 100
       jobs.each do |job|
         job.should be_instance_of Navvy::Job
-        job.method_name.should == 'speak'
+        job.method_name.to_s.should == 'speak'
       end
     end
 
@@ -108,11 +104,11 @@ describe 'Navvy::Job' do
 
   describe '.cleanup' do
     before(:each) do
-      Navvy::Job.delete_all
+      delete_all_jobs
       Navvy::Job.create(
         :object =>        'Cow',
         :method_name =>   :speak,
-        :completed_at =>  Time.now - 2.days
+        :completed_at =>  Time.now - (2 * 60 * 60)
       )
       Navvy::Job.create(
         :object =>        'Cow',
@@ -127,26 +123,25 @@ describe 'Navvy::Job' do
 
     it 'should delete all complete jobs when "keep" is false' do
       Navvy::Job.cleanup
-      Navvy::Job.count.should == 1
+      job_count.should == 1
     end
 
     it 'should not delete any complete jobs when "keep" is true' do
       Navvy::Job.keep = true
       Navvy::Job.cleanup
-      Navvy::Job.count.should == 3
+      job_count.should == 3
     end
 
     it 'should delete all complete jobs where "keep" has passed' do
-      Navvy::Job.keep = 1.day
+      Navvy::Job.keep = (60 * 60)
       Navvy::Job.cleanup
-      Navvy::Job.count.should == 2
+      job_count.should == 2
     end
   end
 
   describe '#run' do
-
     it 'should pass the arguments' do
-      Navvy::Job.delete_all
+      delete_all_jobs
       job = Navvy::Job.enqueue(Cow, :name, 'Betsy')
       Cow.should_receive(:name).with('Betsy')
       job.run
@@ -154,7 +149,7 @@ describe 'Navvy::Job' do
 
     describe 'when everything goes well' do
       before(:each) do
-        Navvy::Job.delete_all
+        delete_all_jobs
         Navvy::Job.enqueue(Cow, :speak)
         Navvy::Job.keep = false
       end
@@ -162,7 +157,7 @@ describe 'Navvy::Job' do
       it 'should run the job and delete it' do
         jobs = Navvy::Job.next
         jobs.first.run.should == 'moo'
-        Navvy::Job.count.should == 0
+        job_count.should == 0
       end
 
       describe 'when Navvy::Job.keep is set' do
@@ -170,39 +165,39 @@ describe 'Navvy::Job' do
           Navvy::Job.keep = true
           jobs = Navvy::Job.next
           jobs.first.run
-          Navvy::Job.count.should == 1
+          job_count.should == 1
           jobs.first.started_at.should be_instance_of Time
           jobs.first.completed_at.should be_instance_of Time
         end
 
         it 'should mark the job as complete when keep has not passed yer' do
-          Navvy::Job.keep = 1.day
+          Navvy::Job.keep = (60 * 60)
           jobs = Navvy::Job.next
           jobs.first.run
-          Navvy::Job.count.should == 1
+          job_count.should == 1
           jobs.first.started_at.should be_instance_of Time
           jobs.first.completed_at.should be_instance_of Time
         end
 
         it 'should delete the job when the "keep" flag has passed' do
-          Navvy::Job.keep = -1.day
+          Navvy::Job.keep = -(60 * 60)
           jobs = Navvy::Job.next
           jobs.first.run
-          Navvy::Job.count.should == 0
+          job_count.should == 0
         end
       end
     end
 
     describe 'when a job fails' do
       before(:each) do
-        Navvy::Job.delete_all
+        delete_all_jobs
         Navvy::Job.enqueue(Cow, :broken)
       end
 
       it 'should store the exception and current time' do
         jobs = Navvy::Job.next
         jobs.first.run
-        Navvy::Job.count.should == 1
+        job_count.should == 1
         jobs.first.exception.should == 'this method is broken'
         jobs.first.started_at.should be_instance_of Time
         jobs.first.failed_at.should be_instance_of Time
@@ -212,7 +207,7 @@ describe 'Navvy::Job' do
 
   describe '#completed' do
     before(:each) do
-      Navvy::Job.delete_all
+      delete_all_jobs
       Navvy::Job.enqueue(Cow, :speak)
     end
 
@@ -231,7 +226,7 @@ describe 'Navvy::Job' do
 
   describe '#failed' do
     before(:each) do
-      Navvy::Job.delete_all
+      delete_all_jobs
       Navvy::Job.enqueue(Cow, :speak)
     end
 
@@ -267,25 +262,25 @@ describe 'Navvy::Job' do
   describe '#duration' do
     it 'should return a duration if started_at and completed_at are set' do
       job = Navvy::Job.create(
-        :started_at =>    2.seconds.ago,
+        :started_at =>    Time.now - 2,
         :completed_at =>  Time.now
       )
 
-      job.duration.should >= 2.seconds
+      job.duration.should >= 2
     end
 
     it 'should return a duration if started_at and failed_at are set' do
       job = Navvy::Job.create(
-        :started_at =>  3.seconds.ago,
+        :started_at =>  Time.now - 3,
         :failed_at =>   Time.now
       )
 
-      job.duration.should >= 3.seconds
+      job.duration.should >= 3
     end
 
     it 'should return 0 if only started_at is set' do
       job = Navvy::Job.create(
-        :started_at => 4.seconds.ago
+        :started_at => Time.now - 4
       )
 
       job.duration.should == 0
@@ -299,27 +294,4 @@ describe 'Navvy::Job' do
       job.args.count.should == 2
     end
   end
-
-  describe '#status' do
-    before(:each) do
-      Navvy::Job.delete_all
-    end
-
-    it 'should return :pending' do
-      job = Navvy::Job.enqueue(Cow, :speak)
-      job.status.should == :pending
-    end
-
-    it 'should return :completed' do
-      job = Navvy::Job.enqueue(Cow, :speak)
-      job.completed
-      job.status.should == :completed
-    end
-
-    it 'should return :failed' do
-      job = Navvy::Job.enqueue(Cow, :speak)
-      job.failed
-      job.status.should == :failed
-    end
-  end
 end

data/spec/log_spec.rb

@@ -8,18 +8,13 @@ describe Navvy::Log do
       before do
         Navvy::Log.logger = :rails
       end
-      
+
       it 'should raise an error when the logger can not be found' do
         lambda { Navvy::Log.info('123') }.should raise_error
       end
-      
-      it 'should pass the log to RAILS_DEFAULT_LOGGER' do
-        class RailsLogger
-          def self.info(text);end
-        end
 
-        RAILS_DEFAULT_LOGGER = RailsLogger
-        
+      it 'should pass the log to RAILS_DEFAULT_LOGGER' do
+        require File.expand_path(File.dirname(__FILE__) + '/setup/rails_default_logger')
         RAILS_DEFAULT_LOGGER.should_receive(:info).with('123')
         Navvy::Log.info('123')
       end
@@ -29,16 +24,13 @@ describe Navvy::Log do
       before do
         Navvy::Log.logger = :justlogging
       end
-      
+
       it 'should raise an error when the logger can not be found' do
         lambda { Navvy::Log.info('123') }.should raise_error
       end
-      
+
       it 'should pass the log to justlogging' do
-        class Justlogging
-          def self.log(text);end
-        end
-        
+        require File.expand_path(File.dirname(__FILE__) + '/setup/justlogging')
         Justlogging.should_receive(:log).with('123')
         Navvy::Log.info('123')
       end
@@ -55,12 +47,12 @@ describe Navvy::Log do
         Navvy::Log.info('123')
       end
     end
-    
+
     describe 'when not using any logger' do
       before do
         Navvy::Log.logger = nil
       end
-      
+
       it 'should not log' do
         RAILS_DEFAULT_LOGGER.should_not_receive(:info)
         Justlogging.should_not_receive(:log)

data/spec/setup/active_record.rb

@@ -1,6 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/navvy/job/active_record')
 require 'rubygems'
-require 'yaml'
 
 ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => '/tmp/navvy_test.sqlite')
 

data/spec/setup/data_mapper.rb

@@ -0,0 +1,3 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/navvy/job/data_mapper')
+DataMapper.setup(:default, "sqlite3:///tmp/navvy_test.sqlite")
+Navvy::Job.auto_migrate!

data/spec/setup/justlogging.rb

@@ -0,0 +1,3 @@
+class Justlogging
+  def self.log(text);end
+end

data/spec/setup/rails_default_logger.rb

@@ -0,0 +1,5 @@
+class RailsLogger
+  def self.info(text);end
+end
+
+RAILS_DEFAULT_LOGGER = RailsLogger

data/spec/setup/sequel.rb

@@ -1,21 +1,20 @@
 require 'rubygems'
 require 'sequel'
-require 'yaml'
 
-Sequel.sqlite('/tmp/navvy_test_s.sqlite')
+Sequel.sqlite('/tmp/navvy_test.sqlite')
 
 Sequel::DATABASES[0].create_table!(:jobs) do
-    primary_key :id, :type=>Integer
-    String    :object
-    String    :method_name
-    String    :arguments, :text => true
-    String    :return
-    String    :exception
-    DateTime  :created_at
-    DateTime  :run_at
-    DateTime  :started_at
-    DateTime  :completed_at
-    DateTime  :failed_at
+  primary_key :id, :type => Integer
+  String    :object
+  String    :method_name
+  String    :arguments, :text => true
+  String    :return
+  String    :exception
+  DateTime  :created_at
+  DateTime  :run_at
+  DateTime  :started_at
+  DateTime  :completed_at
+  DateTime  :failed_at
 end
 
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/navvy/job/sequel')

data/spec/spec_helper.rb

@@ -7,6 +7,28 @@ require 'spec/autorun'
 Spec::Runner.configure do |config|
 end
 
+def delete_all_jobs
+  if defined? Navvy::Job.delete_all
+    Navvy::Job.delete_all
+  elsif defined? Navvy::Job.all.destroy
+    Navvy::Job.all.destroy
+  else
+    Navvy::Job.delete
+  end
+end
+
+def job_count
+  if defined? Navvy::Job.count
+    Navvy::Job.count
+  else
+    Navvy::Job.all.length
+  end
+end
+
+def first_job
+  Navvy::Job.first
+end
+
 class Cow
   def self.speak
     'moo'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: navvy
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jeff Kreeftmeijer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-21 00:00:00 +01:00
+date: 2010-01-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,26 +32,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.5.2
     version: 
-- !ruby/object:Gem::Dependency 
-  name: metric_fu
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.6
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: machinist
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.6
-    version: 
 - !ruby/object:Gem::Dependency 
   name: mongo_mapper
   type: :development
@@ -63,24 +43,24 @@ dependencies:
         version: 0.6.10
     version: 
 - !ruby/object:Gem::Dependency 
-  name: machinist_mongomapper
+  name: sequel
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.7
+        version: 3.8.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: sequel
+  name: sqlite3-ruby
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.8.0
+        version: 1.2.5
     version: 
 description: Simple background job processor inspired by delayed_job, but aiming for database agnosticism.
 email: jeff@kreeftmeijer.nl
@@ -103,18 +83,20 @@ files:
 - lib/generators/navvy_generator.rb
 - lib/navvy.rb
 - lib/navvy/job/active_record.rb
+- lib/navvy/job/data_mapper.rb
 - lib/navvy/job/mongo_mapper.rb
 - lib/navvy/job/sequel.rb
 - lib/navvy/log.rb
 - lib/navvy/tasks.rb
 - lib/navvy/worker.rb
 - navvy.gemspec
-- spec/job/active_record_spec.rb
-- spec/job/mongo_mapper_spec.rb
-- spec/job/sequel_spec.rb
+- spec/job_spec.rb
 - spec/log_spec.rb
 - spec/setup/active_record.rb
+- spec/setup/data_mapper.rb
+- spec/setup/justlogging.rb
 - spec/setup/mongo_mapper.rb
+- spec/setup/rails_default_logger.rb
 - spec/setup/sequel.rb
 - spec/spec_helper.rb
 - spec/worker_spec.rb
@@ -147,12 +129,13 @@ signing_key:
 specification_version: 3
 summary: Simple background job processor inspired by delayed_job, but aiming for database agnosticism.
 test_files: 
-- spec/job/active_record_spec.rb
-- spec/job/mongo_mapper_spec.rb
-- spec/job/sequel_spec.rb
+- spec/job_spec.rb
 - spec/log_spec.rb
 - spec/setup/active_record.rb
+- spec/setup/data_mapper.rb
+- spec/setup/justlogging.rb
 - spec/setup/mongo_mapper.rb
+- spec/setup/rails_default_logger.rb
 - spec/setup/sequel.rb
 - spec/spec_helper.rb
 - spec/worker_spec.rb