updater 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/bin/updater

@@ -12,8 +12,7 @@ dbconfig = YAML.load_file('config/database.yml')
 
 DataMapper.setup(dbconfig['development'])
 
-
-
+Worker.new.start
 
 
 

data/lib/updater/update.rb

@@ -208,6 +208,9 @@ module Updater
       #Gets a single gob form the queue, locks and runs it.
       def work_off(worker)
         updates = worker_set
+        if updates.empty?
+          return queue_time
+        end
         
         #concept copied form delayed_job.  If there are a number of 
         #different processes working on the queue, the niave approch

data/lib/updater/worker.rb

@@ -24,8 +24,9 @@ module Updater
           delay = Update.work_off(self)
           break if $exit
           sleep delay
-          break if exit
+          break if $exit
         end
+        clear_locks
       end
       
       trap('TERM') { terminate_with t }
@@ -44,6 +45,10 @@ module Updater
       logger.info text if logger      
     end
     
+    def clear_locks
+      Update.all(:lock_name=>@name).update(:lock_name=>nil) 
+    end
+    
   private
   
     def terminate_with(t)
@@ -51,11 +56,9 @@ module Updater
       $exit = true
       t.run
       say "Forcing Shutdown" unless status = t.join(15) #Nasty inline assignment
-      Update.clear_locks(self)
+      clear_locks
       exit status ? 0 : 1
     end
-    
-    
   end
   
 end

data/spec/lock_spec.rb

@@ -68,6 +68,14 @@ describe "Update Locking:" do
     
   end
   
-  it "#clear_locks should lear all locks from a worker"
+  it "#clear_locks should clear all locks from a worker" do
+    @v = Update.immidiate(Foo,:bar,[:arg1,:arg2])
+    @u.lock(@w)
+    @v.lock(@w)
+    @u.locked?.should be_true
+    @w.clear_locks
+    @u.reload.locked?.should be_false
+    @v.reload.locked?.should be_false
+  end
   
 end

data/spec/worker_spec.rb

@@ -60,7 +60,11 @@ describe "working off jobs:" do
       Update.work_off(Worker.new(:name=>"first", :quiet=>true)).should == 0
     end
     
-    it "should return the number of seconds till the next job if there are no jobs to be run"
+    it "should return the number of seconds till the next job if there are no jobs to be run" do
+      Timecop.freeze(Time.now)
+      u1 = Update.at(Time.now + 30, Foo,:bar,[:arg1])
+      Update.work_off(Worker.new(:name=>"first", :quiet=>true)).should == 30
+    end
     
     it "should return nil if the job queue is empty" do
       u1 = Update.immidiate(Foo,:bar,[:arg1])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: updater
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - John F. Miller
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-09 00:00:00 -07:00
+date: 2009-10-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency