jober 0.0.1 → 0.2

data/spec/chain_spec.rb

@@ -1,7 +1,7 @@
-require_relative "spec_helper"
+require "#{File.dirname(__FILE__)}/spec_helper"
 
 class MyChain < Jober::Task
-  every 3
+  interval 3
 
   def perform
     sleep 5

data/spec/integration_spec.rb

@@ -1,7 +1,7 @@
-require_relative "spec_helper"
+require "#{File.dirname(__FILE__)}/spec_helper"
 
 class A < Jober::Task
-  every 3000
+  interval 3000
 
   def perform
     10.times do |i|
@@ -12,7 +12,7 @@ class A < Jober::Task
 end
 
 class B < Jober::Queue
-  every 3
+  interval 3
 
   def perform(x)
     SO["b"] += x
@@ -20,18 +20,29 @@ class B < Jober::Queue
 end
 
 class C < Jober::QueueBatch
-  every 3
+  interval 3
 
   def perform(batch)
-    SO["c"] = batch.flatten
+    SO["c"] += batch.flatten
+  end
+end
+
+class D < Jober::Task
+  workers 2
+
+  def perform
+    SO["wrk:#{@worker_id}:#{@workers_count}"] = 1
   end
 end
 
 describe "integration" do
   it "should work" do
     SO["b"] = 0
-    run_manager_for(5, [A, B, C])
+    SO["c"] = []
+    run_manager_for(5, [A, B, C, D])
     SO["b"].should == 45
     SO["c"].should == [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+
+    SO.keys("wrk:*").sort.should == ["Jober::shared:wrk:0:2", "Jober::shared:wrk:1:2"]
   end
 end

data/spec/jober_spec.rb

@@ -0,0 +1,25 @@
+require "#{File.dirname(__FILE__)}/spec_helper"
+
+class A1 < Jober::Task; end
+class A2 < Jober::Queue; end
+class A3 < Jober::QueueBatch; end
+class A4 < Jober::UniqueQueue; end
+
+class Jober::B1 < Jober::Task; end
+
+describe "Jober" do
+  it "classes" do
+    Jober.internal_classes_names.each do |k|
+      Jober.classes.should_not include(eval(k))
+    end
+  end
+
+  it "find_class" do
+    Jober.find_class("A1").should == A1
+    Jober.find_class("A1234").should == nil
+    Jober.find_class("B1").should == Jober::B1
+    Jober.find_class("Jober::B1").should == Jober::B1
+    Jober.find_class("B2").should == nil
+    Jober.find_class("Jober::B2").should == nil
+  end
+end

data/spec/kill_task_spec.rb

@@ -1,4 +1,4 @@
-require_relative "spec_helper"
+require "#{File.dirname(__FILE__)}/spec_helper"
 
 class LongTask1 < Jober::Task
   def perform

data/spec/namespace_spec.rb

@@ -0,0 +1,16 @@
+require "#{File.dirname(__FILE__)}/spec_helper"
+
+class TestQ1 < Jober::Queue
+end
+
+describe "use namespace for keys" do
+  it "should work" do
+    TestQ1.queue_name.should == 'Jober::queue:test_q1'
+    Jober.namespace = "bla"
+    TestQ1.set_queue_name(TestQ1.short_name)
+    TestQ1.queue_name.should == 'Jober:bla:queue:test_q1'
+    Jober.namespace = nil
+    TestQ1.set_queue_name(TestQ1.short_name)
+    TestQ1.queue_name.should == 'Jober::queue:test_q1'
+  end
+end

data/spec/pids_spec.rb

@@ -1,7 +1,7 @@
-require_relative "spec_helper"
+require "#{File.dirname(__FILE__)}/spec_helper"
 
 class Man1 < Jober::Task
-  every 2
+  interval 2
 
   def perform
     sleep 3
@@ -9,7 +9,7 @@ class Man1 < Jober::Task
 end
 
 class Man2 < Jober::Task
-  every 2
+  interval 2
 
   def perform
     sleep 2
@@ -35,5 +35,12 @@ describe "manage pids" do
       sleep 1.1
       m.pids.size.should == 2
     end
+
+    st = Jober.stats
+    st['man1'][:crashed].should_not be
+    st['man2'][:crashed].should be
+
+    st['man1'][:finished].should be
+    st['man2'][:finished].should_not be
   end
 end

data/spec/queue_batch_spec.rb

@@ -1,4 +1,4 @@
-require_relative "spec_helper"
+require "#{File.dirname(__FILE__)}/spec_helper"
 
 class MyBatchQueue < Jober::QueueBatch
   batch_size 6
@@ -14,7 +14,7 @@ end
 describe "QueueBatch" do
   it "should set internals" do
     w = MyBatchQueue.new
-    w.queue_name.should == 'Jober:queue:my_batch'
+    w.queue_name.should == 'Jober::queue:my_batch'
   end
 
   it "should execute" do

data/spec/queue_parallel_spec.rb

@@ -1,7 +1,8 @@
-require_relative "spec_helper"
+require "#{File.dirname(__FILE__)}/spec_helper"
 
 class FkMyParallel < Jober::Queue
-  5.times { |i| every 3 }
+  interval 3
+  workers 5
 
   def perform(arg)
     SO["fork:#{$$}"] ||= 0

data/spec/queue_spec.rb

@@ -1,4 +1,4 @@
-require_relative "spec_helper"
+require "#{File.dirname(__FILE__)}/spec_helper"
 
 class MyQueue < Jober::Queue
   def initialize(*args)
@@ -23,7 +23,7 @@ end
 describe "Queue" do
   it "should set internals" do
     w = MyQueue.new
-    w.queue_name.should == 'Jober:queue:my'
+    w.queue_name.should == 'Jober::queue:my'
   end
 
   it "should execute" do
@@ -39,7 +39,6 @@ describe "Queue" do
 
   it "custom queue name" do
     10.times { Jasdfoadsfjaf.enqueue }
-    p Jober.llens
     Jober.llens['human_name'].should == 10
   end
 end

data/spec/shared_object_spec.rb

@@ -1,4 +1,4 @@
-require_relative "spec_helper"
+require "#{File.dirname(__FILE__)}/spec_helper"
 
 describe "SO" do
   it "should work" do

data/spec/spec_helper.rb

@@ -4,6 +4,8 @@ Bundler.require :default
 Jober::SharedObject
 SO = Jober::SharedObject
 
+Jober.logger = Logger.new("#{File.dirname(__FILE__)}/spec.log")
+
 RSpec.configure do |config|
   config.expect_with(:rspec) { |c| c.syntax = :should }
 

data/spec/stats_spec.rb

@@ -1,4 +1,4 @@
-require_relative "spec_helper"
+require "#{File.dirname(__FILE__)}/spec_helper"
 
 class MyQueue1 < Jober::Queue
   def perform
@@ -25,9 +25,11 @@ describe "Stats" do
     MyQueue1.enqueue
     run_manager_for(3, [MyQueue1, MyQueue2])
     h = Jober.stats
-    h['my1'][:start].should be
-    h['my1'][:end].should be
+    h['my1'][:started].should be
+    h['my1'][:finished].should be
     h['my1'][:duration].should be_within(0.1).of(2.0)
-    h['my2'].should == {:start=>nil, :end=>nil, :duration=>nil}
+    h['my2'][:started].should be
+    h['my2'][:finished].should be
+    h['my2'][:duration].should be_within(0.1).of(0.0)
   end
 end

data/spec/task_loop_spec.rb

@@ -0,0 +1,103 @@
+require "#{File.dirname(__FILE__)}/spec_helper"
+
+class AA1 < Jober::Task
+  interval 10
+end
+
+class AA2 < AA1
+  workers 2
+end
+
+class AA3 < AA2
+  interval 15
+end
+
+class AA4 < AA3
+end
+
+class Loop1 < Jober::Task
+  interval 1
+  def perform
+    SO["x"] ||= 0
+    SO["x"] += 1
+  end
+end
+
+class Loop2 < Jober::Task
+  interval 3
+  def perform
+    SO["y"] ||= 0
+    SO["y"] += 1
+  end
+end
+
+describe "Task" do
+  it "interval interval should be inherited" do
+    AA1.get_interval.should == 10
+    AA2.get_interval.should == 10
+    AA3.get_interval.should == 15
+    AA4.get_interval.should == 15
+  end
+
+  it "workers should not be inherited" do
+    AA1.get_workers.should == 1
+    AA2.get_workers.should == 2
+    AA3.get_workers.should == 1
+  end
+
+  it "run_loop" do
+    t = Thread.new { Loop1.new.run_loop }
+    sleep 3.5
+    t.kill
+    SO["x"].should == 4
+    st = Jober.stats['loop1']
+    (st[:finished] - st[:started]).should be_within(0.001).of(0)
+    (Time.now - st[:finished]).should be_within(0.7).of(1)
+  end
+
+  it "run_loop should wait, until interval ready" do
+    Loop2.new.execute
+    t = Thread.new { Loop2.new.run_loop }
+    sleep 4
+    t.kill
+    SO["y"].should == 2
+  end
+
+  it "run_loop should wait, until interval ready" do
+    l = Loop2.new
+    l.execute
+    t = Thread.new { l.run_loop }
+    sleep 2
+    l.stopped = true
+    sleep 0.3
+    SO["y"].should == 1
+  end
+
+  it "if skip_delay!, should start imidiately" do
+    l = Loop2.new
+    l.execute
+    Loop2.skip_delay!
+    t = Thread.new { l.run_loop }
+    sleep 2
+    l.stopped = true
+    sleep 0.3
+    SO["y"].should == 2
+  end
+
+  it "if skip_delay by option, should start imidiately" do
+    l = Loop2.new(:skip_delay => true)
+    l.execute
+    t = Thread.new { l.run_loop }
+    sleep 2
+    l.stopped = true
+    sleep 0.3
+    SO["y"].should == 2
+  end
+
+  it "skip_delay!" do
+    Loop2.pop_skip_delay_flag!.should == false
+    Loop2.skip_delay!
+    Loop2.pop_skip_delay_flag!.should == true
+    Loop2.pop_skip_delay_flag!.should == false
+  end
+end

data/spec/task_spec.rb

@@ -1,4 +1,4 @@
-require_relative "spec_helper"
+require "#{File.dirname(__FILE__)}/spec_helper"
 
 class WorkerTask < Jober::Task
   def initialize(*args)
@@ -14,16 +14,15 @@ class WorkerTask < Jober::Task
 end
 
 class Task2 < Jober::Task
-  every 3, :bla
-  every 5
-
-  def bla
-  end
-
+  interval 15
+  workers 2
   def perform
   end
 end
 
+class Jober::Bla < Jober::Task
+end
+
 describe "Task" do
   it "should execute" do
     w = WorkerTask.new
@@ -32,13 +31,15 @@ describe "Task" do
 
   it "should set short_name" do
     WorkerTask.short_name.should == 'worker'
+    Jober::Bla.short_name.should == 'bla'
   end
 
   it "should register class" do
     Jober.classes.should include(WorkerTask)
   end
 
-  it "set some schedulers" do
-    Task2.workers.should == [[3, :bla], [5, :perform]]
+  it "set some settings" do
+    Task2.get_workers.should == 2
+    Task2.get_interval.should == 15
   end
 end

data/spec/unique_queue_batch_spec.rb

@@ -0,0 +1,28 @@
+require "#{File.dirname(__FILE__)}/spec_helper"
+
+class MyUniqueBatchQueue < Jober::UniqueQueueBatch
+  batch_size 6
+
+  attr_reader :res
+
+  def perform(batch)
+    @res ||= []
+    @res << batch
+  end
+end
+
+describe "QueueBatch" do
+  it "should set internals" do
+    w = MyUniqueBatchQueue.new
+    w.queue_name.should == 'Jober::queue:my_unique_batch'
+  end
+
+  it "should execute" do
+    10.times { |i| 10.times { MyUniqueBatchQueue.enqueue(i) } }
+    MyUniqueBatchQueue.new.execute.res.flatten.sort.should == (0..9).to_a
+  end
+
+  it "should register class" do
+    Jober.classes.should include(MyUniqueBatchQueue)
+  end
+end

data/spec/unique_queue_spec.rb

@@ -1,4 +1,4 @@
-require_relative "spec_helper"
+require "#{File.dirname(__FILE__)}/spec_helper"
 
 class MyUniqueQueue < Jober::UniqueQueue
   def initialize(*args)
@@ -16,7 +16,7 @@ end
 describe "Queue" do
   it "should set internals" do
     w = MyUniqueQueue.new
-    w.queue_name.should == 'Jober:queue:my_unique'
+    w.queue_name.should == 'Jober::queue:my_unique'
   end
 
   it "should execute Only for unique values" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jober
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: '0.2'
 platform: ruby
 authors:
 - "'Konstantin Makarchev'"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -66,26 +66,58 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple background jobs, queues.
 email:
 - "'kostya27@gmail.com'"
 executables:
 - jober
-- manager
+- jober_manager
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - Rakefile
+- bench/queue.rb
 - bin/jober
-- bin/manager
+- bin/jober_manager
 - examples/classes.rb
 - examples/man.rb
 - jober.gemspec
 - lib/jober.rb
 - lib/jober/abstract_task.rb
+- lib/jober/ar_loop.rb
 - lib/jober/logger.rb
 - lib/jober/manager.rb
 - lib/jober/queue.rb
@@ -93,10 +125,14 @@ files:
 - lib/jober/shared_object.rb
 - lib/jober/task.rb
 - lib/jober/unique_queue.rb
+- lib/jober/unique_queue_batch.rb
 - lib/jober/version.rb
+- spec/ar_loop_spec.rb
 - spec/chain_spec.rb
 - spec/integration_spec.rb
+- spec/jober_spec.rb
 - spec/kill_task_spec.rb
+- spec/namespace_spec.rb
 - spec/pids_spec.rb
 - spec/queue_batch_spec.rb
 - spec/queue_parallel_spec.rb
@@ -104,7 +140,9 @@ files:
 - spec/shared_object_spec.rb
 - spec/spec_helper.rb
 - spec/stats_spec.rb
+- spec/task_loop_spec.rb
 - spec/task_spec.rb
+- spec/unique_queue_batch_spec.rb
 - spec/unique_queue_spec.rb
 homepage: ''
 licenses:
@@ -131,9 +169,12 @@ signing_key:
 specification_version: 4
 summary: Simple background jobs, queues.
 test_files:
+- spec/ar_loop_spec.rb
 - spec/chain_spec.rb
 - spec/integration_spec.rb
+- spec/jober_spec.rb
 - spec/kill_task_spec.rb
+- spec/namespace_spec.rb
 - spec/pids_spec.rb
 - spec/queue_batch_spec.rb
 - spec/queue_parallel_spec.rb
@@ -141,5 +182,7 @@ test_files:
 - spec/shared_object_spec.rb
 - spec/spec_helper.rb
 - spec/stats_spec.rb
+- spec/task_loop_spec.rb
 - spec/task_spec.rb
+- spec/unique_queue_batch_spec.rb
 - spec/unique_queue_spec.rb