zfben_rails_jobs 0.0.4 → 0.0.5

data/README.rdoc

@@ -12,10 +12,7 @@
   bundle install
 
 == How to use
-
-  class Sth
-    def todo args
-    end
-  end
   
-  Jobs.new.add(Sth, :todo, args)
+  Jobs.new class: ClassName, method: MethodName, args: MethodArguments
+  
+  Jobs.new at: ScheduleTime

data/lib/tasks.rb

@@ -1,5 +1,11 @@
+require 'fileutils'
+
 namespace :jobs do
-  jobs_root = Rails.root.join('tmp/jobs').to_s
+  if defined? Rails
+    jobs_root = Rails.root.join('tmp/jobs').to_s
+  else
+    jobs_root = File.realpath('.') << '/tmp/jobs'
+  end
   
   desc 'Init Jobs Folders'
   task :init do
@@ -16,7 +22,7 @@ namespace :jobs do
     File.open(jobs_root + '/.lock', 'w'){ |f| f.write Process.pid.to_s }
     print "Starting jobs at process##{Process.pid}\n"
     loop do
-      list = Dir[jobs_root + '*']
+      list = Dir.glob(jobs_root + '/[a-z0-9-]*')
       if list.length > 0
         print "#{list.length} jobs found, running..\n"
         list.each do |id|
@@ -24,10 +30,8 @@ namespace :jobs do
           jobs = Jobs.new
           jobs.import File.basename(id)
           print "Jobs detail: #{jobs.data}\n"
-          jobs.run
+          print "Jobs result: #{jobs.run}\n"
         end
-      else
-        print "No job found, skipping..\n"
       end
       sleep 10
     end

data/lib/zfben_rails_jobs.rb

@@ -15,20 +15,26 @@ module ZfbenRailsJobs
   end
 end
 
+if !defined?(Rails) && defined?(Rake)
+  require File.join(File.dirname(__FILE__), 'tasks.rb')
+end
+
 class Jobs
   def import id
-    if File.exists?(@path + id)
-      yaml = YAML::load(File.read(@path + id))
-      @id = yaml[:id]
-      @list = yaml[:list]
+    if File.exists?(@data[:dir] + id)
+      @data = merge YAML::load(File.read(@data[:dir] + id))
+      true
     else
       false
     end
   end
   
-  def add cls, method, args = nil
+  def add opts = {}
     unless locked?
-      @list.push [cls.to_s, method, args]
+      [:class, :method].each{ |key|
+        opts[key] = opts[key].to_s.to_sym
+      }
+      @data[:list].push opts
       true
     else
       false
@@ -37,40 +43,56 @@ class Jobs
   
   def save
     unless locked?
-      @locked = true
-      File.open(@path + @id, 'w'){ |f| f.write data.to_yaml }
+      @data[:locked] = true
+      File.open(path, 'w'){ |f| f.write @data.to_yaml }
       true
     else
       false
     end
   end
   
+  def destroy
+    if File.exists? path
+      File.delete path
+    end
+    @data = merge
+  end
+  
   def id
-    @id
+    @data[:id]
   end
   
   def list
-    @list
+    @data[:list]
   end
   
   def data
-    { id: @id, list: @list, at: @at }
+    @data
+  end
+  
+  def path
+    @data[:dir] + @data[:id]
   end
   
   def result
     successed = 0
     failed = 0
     pending = 0
-    @list.map{ |l|
-      if l.length < 4
-        pending = pending + 1
-      elsif l[3]
-        successed = successed + 1
+    @data[:list].each{ |job|
+      if job.has_key? :status
+        case job[:status]
+        when :successed
+          successed = successed + 1
+        when :failed
+          failed = failed + 1
+        else
+          pending = pending + 1
+        end
       else
-        failed = failed + 1
+        pending = pending + 1
       end
     }
-    { successed: successed, failed: failed, pending: pending }
+    { successed: successed, failed: failed, pending: pending, total: @data[:list].length }
   end
   
   def finished?
@@ -79,41 +101,45 @@ class Jobs
   end
   
   def locked?
-    @locked
+    @data[:locked]
   end
   
   def run
-    unless @at.nil?
-      if Time.now < @at
+    unless @data[:at].nil?
+      if Time.now < @data[:at]
         return false
       end
     end
     
-    @locked = true
+    @data[:locked] = true
     
-    @list.each_index do |i|
-      if !@list[i][3]
-        unless Object.const_defined?(@list[i][0])
-          @list[i].push false, 'Class missing'
+    @data[:list].map!{ |job|
+      if !job.has_key?(:status) || job[:status] != :successed
+        unless Object.const_defined?(job[:class])
+          job[:status] = :failed
+          job[:status_msg] = 'Class missing'
           next
         end
         
-        obj = Object.const_get(@list[i][0])
+        obj = Object.const_get(job[:class])
         
-        unless obj.respond_to?(@list[i][1])
-          @list[i].push false, 'Method missing'
+        unless obj.respond_to?(job[:method])
+          job[:status] = :failed
+          job[:status_msg] = 'Method missing'
           next
         end
         
         begin
-          obj.send @list[i][1], *@list[i][2]
+          obj.send job[:method], *job[:args]
         rescue => e
-          @list[i].push false, e
+          job[:status] = :failed
+          job[:status_msg] = e
           next
         end
-        @list[i].push true, 'Finished'
+        job[:status] = :successed
       end
-    end
+      job
+    }
     
     update
     true
@@ -121,21 +147,34 @@ class Jobs
   
   private
   
-  def initialize at = nil
-    @id = UUID.new.generate
-    @list = []
-    @path = File.realpath(Rails.root) + '/tmp/jobs/'
-    FileUtils.mkdir(@path) unless File.exists?(@path)
-    @locked = false
-    @at = at
+  
+  def initialize opts = {}
+    @data = merge opts
+    FileUtils.mkdir(@data[:dir]) unless File.exists?(@data[:dir])
+    if @data.has_key?(:class)
+      add class: @data[:class], method: @data[:method], args: @data[:args]
+      @data.delete :class
+      @data.delete :method
+      @data.delete :args
+    end
+  end
+  
+  def merge opts = {}
+    {
+      id: UUID.new.generate,
+      list: [],
+      at: nil,
+      locked: false,
+      dir: (defined?(::Rails) ? File.realpath(::Rails.root) : File.realpath('.')) << '/tmp/jobs/'
+    }.merge(opts)
   end
   
   def update
-    if File.exists? @path + @id
+    if File.exists? path
       if finished?
-        File.delete @path + @id
+        File.delete path
       else
-        File.open(@path + @id, 'w'){ |f| f.write data.to_yaml }
+        File.open(path, 'w'){ |f| f.write data.to_yaml }
       end
     end
   end

data/test/jobs_test.rb

@@ -15,31 +15,33 @@ class JobsTest < Test::Unit::TestCase
   
   def test_jobs_add
     jobs = Jobs.new
-    assert jobs.add Example, :job_0
-    assert_equal jobs.list, [['Example', :job_0, nil]]
-    assert jobs.add Example, :job, 5
-    assert_equal jobs.list, [['Example', :job_0, nil], ['Example', :job, 5]]
+    assert jobs.add class: Example, method: :job_0, args: nil
+    assert_equal jobs.list, Jobs.new(class: Example, method: :job_0).list
+    assert jobs.add class: Example, method: :job, args: 5
+    assert_equal jobs.list, [{class: :Example, method: :job_0, args: nil}, {class: :Example, method: :job, args: 5}]
   end
   
   def test_jobs_save
     jobs = Jobs.new
-    jobs.add Example, :job_0
+    jobs.add class: Example, method: :job_0
     assert jobs.save
+    jobs.destroy
   end
   
   def test_jobs_import
     jobs = Jobs.new
-    jobs.add Example, :job_0
+    jobs.add class: Example, method: :job_0
     jobs.save
     jobs2 = Jobs.new
     assert jobs2.import(jobs.id)
     assert_equal jobs.data, jobs2.data
+    jobs.destroy
   end
   
   def test_jobs_run
     jobs = Jobs.new
-    jobs.add Example, :job_0
-    jobs.add Example, :job, 1
+    jobs.add class: Example, method: :job_0
+    jobs.add class: Example, method: :job, args: 1
     jobs.save
     assert jobs.run
     assert_equal jobs.result[:successed], 2
@@ -47,12 +49,13 @@ class JobsTest < Test::Unit::TestCase
     jobs2.import jobs.id
     assert jobs2.run
     assert_equal jobs.result[:successed], 2
+    jobs.destroy
   end
   
   def test_jobs_run_at
     at = 1.seconds.from_now
-    jobs = Jobs.new(at)
-    jobs.add Example, :job_0
+    jobs = Jobs.new at: at
+    jobs.add class: Example, method: :job_0
     assert !jobs.run
     sleep 2
     assert jobs.run

data/zfben_rails_jobs.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "zfben_rails_jobs"
-  s.version     = '0.0.4'
+  s.version     = '0.0.5'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ben"]
   s.email       = ["ben@zfben.com"]
@@ -28,6 +28,4 @@ Gem::Specification.new do |s|
   
   s.add_dependency 'rails', '>=3.1.0'
   s.add_dependency 'uuid'
-  s.add_dependency 'whenever'
-  s.add_dependency 'rainbow'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zfben_rails_jobs
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-29 00:00:00.000000000 Z
+date: 2011-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &12197140 !ruby/object:Gem::Requirement
+  requirement: &12519240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *12197140
+  version_requirements: *12519240
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &12222060 !ruby/object:Gem::Requirement
+  requirement: &12518680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,29 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12222060
-- !ruby/object:Gem::Dependency
-  name: whenever
-  requirement: &12220240 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *12220240
-- !ruby/object:Gem::Dependency
-  name: rainbow
-  requirement: &12218100 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *12218100
+  version_requirements: *12518680
 description: ''
 email:
 - ben@zfben.com