jobit 0.0.3 → 0.0.4

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v0.0.4
+
+* Updating jobs processing
+* jobs listed in jobit_items should have suffix "_task"
+
+
 ## v0.0.3
 
 * README updated

data/README.md

@@ -20,11 +20,11 @@ Create jobs file app/model/jobit_items.rb and put your tasks there:
 ```ruby
 method JobitItems
 
-  def some_long_running_task_without_response(arg)
+  def job_without_output_task(arg)
     sleep 60
   end
 
-  def some_long_running_task_with_response(arg1, arg2)
+  def job_with_output_task(arg1, arg2)
     add_message("job #{name} started\n")
     set_progress(10)
     sleep 60
@@ -37,6 +37,14 @@ method JobitItems
 end
 ```
 
+Jobs should be defined as "job_name" + "_task" suffix:
+
+```ruby
+def new_job_task
+end
+```
+
+
 ###Running worker to process the jobs queue
 
 ```ruby
@@ -48,10 +56,10 @@ rake jobit:work
 
 ```ruby
 #job will be added to queue and processed. After successful processing it will be destroyed
-new_job = Jobit::Job.add("job_name", :some_long_running_task_without_response, 'val1')
+new_job = Jobit::Job.add("job_name", :job_without_output, 'val1')
 
-#job will be added to queue and processed. After processing it wont be destroyed so you can see its messages and progress
-new_job = Jobit::Job.add("job_name", :some_long_running_task_with_response, 'val1', 'val2'){{ :keep => true }}
+#job will be added to queue and processed. After processing wont be destroyed so you can see outputs from it
+new_job = Jobit::Job.add("job_name", :job_with_output, 'val1', 'val2'){{ :keep => true }}
 ```
 
 ###Monitoring job progress and responses
@@ -61,7 +69,7 @@ new_job = Jobit::Job.add("job_name", :some_long_running_task_with_response, 'val
 job = Jobit::Job.find_by_name('job_name')
 
 job.status #current job status
-job.message #job responses in defined in job
+job.message #job responses if job sent any
 job.progress #job progress
 job.error #job error if status is "failed"
 ```

data/lib/jobit/job.rb

@@ -64,12 +64,12 @@ module Jobit
     # Jobit::Job.add(name, object, *args) {{options}}
     # options:
     #   :priority => the job priority (Integer)
-    #   :run_after => run job after some time from now ex: :run_after => 4.hours
+    #   :run_at => run job at some time ex: :run_at => Time.now + 4.hours
     #   :schedule => run job at some time. ex: :schedule_at => "16:00"
     #   :repeat => how many times to repeat the job (Integer)
     #   :repeat_delay => delay in seconds before next repeat
     def self.add(name, object, *args, &block)
-      unless JobitItems.method_defined?(object)
+      unless JobitItems.method_defined?("#{object}_task")
         raise ArgumentError, "Can't add job #{object}. It's not defined in jobs."
       end
 
@@ -88,10 +88,14 @@ module Jobit
       num.times do
         jobs = self.where({:status => 'new'})
         break unless jobs.size > 0
-        res = jobs.first.run_job
+        job = jobs.first
+        next unless job.time_to_run?
+        res = jobs.first.run_job(self.worker_name)
+        next if res.nil?
         complete += res[0]
         failed += res[1]
         reissued += res[2]
+        job = nil
         break if $exit
       end
       [complete, failed, reissued]

data/lib/jobit/jobby.rb

@@ -39,15 +39,20 @@ module Jobit
 
     def process_job(args)
       begin
-        logger.info "* [JOB] aquiring lock on #{name}"
+        logger.info "* [JOB:#{name}] acquiring lock"
         runtime = Benchmark.realtime do
-          set_status 'running'
-          set_start_time
-          self.send(object,*args)
-          set_status 'complete'
-          set_stop_time
+          self.status = 'running'
+          self.started_at = Time.now.to_f
+          update
+
+          self.send("#{object}_task",*args)
+
+          self.status = 'complete'
+          self.progress = 100
+          self.stopped_at = Time.now.to_f
+          update
         end
-        logger.info "* [JOB] #{name} completed after %.4f" % runtime
+        logger.info "* [JOB:#{name}]  completed after %.4f" % runtime
       rescue Exception => e
         log_exception(e)
         msg = "#{e.message}\n\n#{e.backtrace.join("\n")}"
@@ -68,8 +73,6 @@ module Jobit
         increase_tries
         sleep delay if delay > 0
       end
-      #p self.class.send(:method_defined?, :perform)
-      #p self.class.send(:undef_method, :perform)
       cleanup
     end
 
@@ -91,7 +94,7 @@ module Jobit
       self.message = ''
       self.progress = 0
       self.priority = 0
-      self.run_at = nil
+      self.run_at = id
       self.repeat = 0
       self.repeat_delay = 0
       self.created_at = id
@@ -117,7 +120,7 @@ module Jobit
       if failed?
         if tries < MAX_ATTEMPTS
           self.tries += 1
-          self.run_at = Time.now + (tries ** 4) + 5
+          self.run_at = Time.now.to_f + (tries ** 4) + 5
           self.status = 'new'
           unlock!
           update
@@ -129,8 +132,6 @@ module Jobit
         end
       elsif complete?
         if keep?
-          set_progress(100)
-          set_stop_time
           unlock!
         else
           destroy

data/lib/jobit/jobs/commands.rb

@@ -53,7 +53,6 @@ module Jobit
       end
 
       def lock!(worker_name)
-        self.run_at= Time.now.to_f
         self.locked_at= Time.now.to_f
         self.locked_by= worker_name
         update

data/lib/jobit/jobs/statuses.rb

@@ -48,6 +48,14 @@ module Jobit
           :failed_at => failed_at
         }
       end
+
+      def time_to_run?
+        if tries == 0
+          Time.now.to_f >= run_at.to_f
+        else
+          true
+        end
+      end
     end
   end
 end

data/lib/jobit/storage.rb

@@ -4,7 +4,8 @@ module Jobit
 
     def self.all_files
       Dir.mkdir(Jobit::Job.jobs_path) unless Dir.exist?(Jobit::Job.jobs_path)
-      Dir.glob("#{Jobit::Job.jobs_path}/*").find_all { |x| File.file? x }
+      arr = Dir.glob("#{Jobit::Job.jobs_path}/*").find_all { |x| File.file? x }
+      arr.sort
     end
 
     def self.destroy_all

data/lib/jobit/version.rb

@@ -1,3 +1,3 @@
 module Jobit
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/tasks/tasks.rb

@@ -14,7 +14,6 @@ namespace :jobit do
 
   desc "Start a Jobit worker."
   task :work => :environment do
-    p Rails.root
     Jobit::Worker.new().start
   end
 end

data/spec/jobit_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 module JobitItems
 
-  def good_job(opt1, opt2)
+  def good_job_task(opt1, opt2)
     set_progress(10)
     unless opt1 == 'val1'
       raise(NoMethodError, 'wrong arguments 0')
@@ -14,7 +14,7 @@ module JobitItems
     set_progress(100)
   end
 
-  def bad_job(text)
+  def bad_job_task(text)
     add_message "start"
     set_progress(10)
     add_message "end"
@@ -23,7 +23,20 @@ module JobitItems
 end
 
 describe Jobit do
-  describe "Job" do
+
+  after(:all) do
+    begin
+      files = Jobit::Storage.all_files
+      for file in files
+        File.delete(file)
+      end
+      Dir.delete(Jobit::Job.jobs_path)
+    rescue
+      nil
+    end
+  end
+
+  describe "Jobit::Job basic stuff" do
 
     before(:each) do
       @job_name = 'job-1'
@@ -37,14 +50,6 @@ describe Jobit do
       @new_job.destroy
     end
 
-    after(:all) do
-      begin
-        Dir.delete(Jobit::JOBS_PATH)
-      rescue
-        nil
-      end
-    end
-
     it "creates new job" do
       @new_job.name.should eq(@job_name)
     end
@@ -130,11 +135,11 @@ describe Jobit do
 
     it 'adds message' do
       @new_job.message.should eq('')
-      @new_job.add_message('hello',true)
+      @new_job.add_message('hello', true)
       @new_job.message.should eq('hello')
       job = Jobit::Job.find_by_name(@job_name)
       job.message.should eq('hello')
-      @new_job.add_message(' there',true)
+      @new_job.add_message(' there', true)
       @new_job.message.should eq('hello there')
       job = Jobit::Job.find_by_name(@job_name)
       job.message.should eq('hello there')
@@ -146,6 +151,10 @@ describe Jobit do
       job.should eq(nil)
     end
 
+  end
+
+  describe "Jobit::Job work_off and different runs" do
+
     it 'running good job 5 times' do
       job = Jobit::Job.add('good_job', :good_job, 'val1', 'val2') { {
         :priority => 0,
@@ -204,7 +213,6 @@ describe Jobit do
     end
 
     it 'work_off test' do
-      @new_job.destroy
       for i in (0..5)
         Jobit::Job.add("work_off_#{i}", :good_job, 'val1', 'val2') { {
           :priority => rand(6),
@@ -215,14 +223,26 @@ describe Jobit do
         :priority => 2,
         :keep => true
       } }
+      jobs = []
+      for i in (0..5)
+        jobs[i] = Jobit::Job.find_by_name("work_off_#{i}")
+        jobs[i].tries.should eq(0), "#{jobs[i]}"
+        jobs[i].status.should eq('new'), "#{jobs[i]}"
+        jobs[i].run_at.should_not eq(nil)
+        jobs[i].started_at.should eq(nil)
+        jobs[i].run_at.should be < Time.now.to_f
+      end
 
       Jobit::Job.work_off
+
       jobs = []
       for i in (0..5)
-        job = Jobit::Job.find_by_name("work_off_#{i}")
-        job.status.should eq('complete'), " #{job}"
-        job.destroy
-        job.id.should eq(nil)
+        jobs[i] = Jobit::Job.find_by_name("work_off_#{i}")
+        jobs[i].run_at.should be < Time.now.to_f
+        jobs[i].tries.should eq(1), "#{jobs[i]}"
+        jobs[i].status.should eq('complete'), "#{jobs[i]}"
+        jobs[i].destroy
+        jobs[i].id.should eq(nil)
       end
 
       job_failed = Jobit::Job.find_by_name('work_off_bad')
@@ -232,5 +252,35 @@ describe Jobit do
 
     end
 
+    it 'new job should have run_at after creation and started_at after running' do
+      job = Jobit::Job.add('good_job_keep_11', :good_job, 'val1', 'val2') { {
+        :keep => true
+      } }
+      job.run_at.should_not eq(nil)
+      job.run_job
+      job.started_at.should_not eq(nil)
+      job = Jobit::Job.find_by_name('good_job_keep_11')
+      job.tries.should eq(1)
+      job.run_at.should_not eq(nil)
+      job.started_at.should_not eq(nil)
+      job.destroy
+    end
+
+    it 'Job should not be processed if run_at set to later time' do
+      run_at_time = Time.now.to_f + 10000
+      job = Jobit::Job.add('test_run_at', :good_job, 'val1', 'val2') { {
+        :run_at => run_at_time
+      } }
+      job.run_at.should eq(run_at_time)
+
+      Jobit::Job.work_off
+
+      job = Jobit::Job.find_by_name('test_run_at')
+      job.tries.should eq(0)
+      job.run_at.should eq(run_at_time)
+      job.started_at.should eq(nil)
+      job.destroy
+    end
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jobit
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &2166619500 !ruby/object:Gem::Requirement
+  requirement: &2158419860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2166619500
+  version_requirements: *2158419860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2166619080 !ruby/object:Gem::Requirement
+  requirement: &2158419440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166619080
+  version_requirements: *2158419440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2166618660 !ruby/object:Gem::Requirement
+  requirement: &2158419020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166618660
+  version_requirements: *2158419020
 description: Process background jobs in queue.
 email:
 - v.t.g.m.b.x@gmail.com