jober 0.3.37 → 0.3.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68d2b76b5ce65c40e2dd400e56da949542b58ad1
-  data.tar.gz: b1bf5509a4eb9046d54a8f210543608b9cd7c685
+  metadata.gz: 00c159d15e3e82299c7bab18a5a9793925955a09
+  data.tar.gz: c59fe0b176b51fc601e04a647b73209fd0519e62
 SHA512:
-  metadata.gz: b85813cff723ce9c897b5737c949c53f223621df6a17aceda7d717e868eeb83dedbb43f5c39897a540ba602a44bf69562a6f2b2a92e5324a73ec633ae0aadde4
-  data.tar.gz: 9aedb0ffbe32e15120d4f6ba5036a5f7a93b00487c987114b54b63a8a2ff16654d3da141f77b1a0254f641fa4281711967aac83697530969c8767c77eba66304
+  metadata.gz: b70718209990268efaa926bf9044d1bccf52cc010b3d215f365607a0771dd2461025749a9cdb77797f5dd4ded4b1da59e33c3af7bc49fc3c7354fca9b7f06cf3
+  data.tar.gz: 99c68a86e99ec22e92b480abcd9d6e61a627ba31f13ff0f38a0591b59fbfb24f9fe62957d071ff4a7c0c77c4053439edd8fb69e0266fffe076f015ade2b59404

data/bin/jober

@@ -36,13 +36,21 @@ end.parse!
 
 if req = options[:require]
   require File.expand_path(req)
+else
+  filenames = []
+  filenames << File.expand_path(ENV['APP_ROOT']) if ENV['APP_ROOT']
+  filenames << File.expand_path('config/environment')
+  filenames << File.expand_path('config/environment.rb')
+  filenames.each do |filename|
+    require filename if File.exist?(filename)
+  end
 end
 
 klass_name = options[:klass]
 klass = Jober.find_class(klass_name)
 
 unless klass
-  puts "not found class #{klass_name}"
+  puts "Please set class_name by option -c"
   exit(1)
 end
 

data/lib/jober.rb

@@ -9,6 +9,7 @@ module Jober
   autoload :AbstractTask,     'jober/abstract_task'
   autoload :Task,             'jober/task'
   autoload :Queue,            'jober/queue'
+  autoload :SlowQueue,        'jober/slow_queue'
   autoload :QueueBatch,       'jober/queue_batch'
   autoload :UniqueQueue,      'jober/unique_queue'
   autoload :Logger,           'jober/logger'
@@ -40,7 +41,7 @@ module Jober
     end
 
     def internal_classes_names
-      @internal_classes_names ||= (%w{Manager ThreadedManager AbstractTask Task Queue} +
+      @internal_classes_names ||= (%w{Manager ThreadedManager AbstractTask Task Queue SlowQueue} +
         %w{QueueBatch UniqueQueue UniqueQueueBatch Logger SharedObject ARLoop Exception}).map { |k| "Jober::#{k}" }
     end
 

data/lib/jober/abstract_task.rb

@@ -32,7 +32,7 @@ class Jober::AbstractTask
     attr_accessor :short_name
   end
 
-  attr_reader :finished, :stopped, :worker_id, :workers_count
+  attr_reader :finished, :stopped, :worker_id, :workers_count, :unique_id
 
   def self.inherited(base)
     Jober.add_class(base)
@@ -51,6 +51,7 @@ class Jober::AbstractTask
     @worker_id = (opts[:worker_id] || 0).to_i
     @workers_count = (opts[:workers_count] || 1).to_i
     @skip_delay = opts[:skip_delay]
+    @unique_id = opts[:unique_id]
   end
 
   def before_execute

data/lib/jober/logger.rb

@@ -12,6 +12,7 @@ module Jober::Logger
   def logger_tag
     @logger_tag ||= begin
       tag = '[' + self.class.to_s
+      tag += "(#{unique_id})" if respond_to?(:unique_id) && unique_id.to_i > 0
       tag += " #{@worker_id}-#{@workers_count}" if @worker_id && @workers_count && @workers_count > 1
       tag += ']'
       tag

data/lib/jober/queue.rb

@@ -22,6 +22,10 @@ class Jober::Queue < Jober::Task
     Jober.redis.rpush(queue_name, Jober.dump_args(*args))
   end
 
+  def self.dequeue(*args)
+    Jober.redis.lpush(queue_name, Jober.dump_args(*args))
+  end
+
   def self.len
     Jober.redis.llen(self.queue_name)
   end

data/lib/jober/slow_queue.rb

@@ -0,0 +1,12 @@
+class Jober::SlowQueue < Jober::Queue
+
+  # one event per perform
+  def run
+    if args = pop
+      perform(*args)
+      info { "processed event args: #{args.inspect}" }
+    else
+      info { "no pending events" }
+    end
+  end
+end

data/lib/jober/threaded_manager.rb

@@ -13,13 +13,16 @@ class Jober::ThreadedManager
   def initialize(klasses = nil, opts = {})
     @klasses = Array(klasses || Jober.auto_classes)
     @stopped = false
+    h = Hash.new(0)
     @objects = @klasses.map do |klass|
       if klass.is_a?(String)
         klass_str = klass
         klass = Jober.find_class(klass_str)
         raise "unknown class #{klass_str}" unless klass
       end
-      klass.new(opts)
+      obj = klass.new(opts.merge(:unique_id => h[klass]))
+      h[klass] += 1
+      obj
     end
   end
 

data/lib/jober/version.rb

@@ -1,3 +1,3 @@
 module Jober
-  VERSION = "0.3.37"
+  VERSION = "0.3.38"
 end

data/spec/slow_queue_spec.rb

@@ -0,0 +1,42 @@
+require "#{File.dirname(__FILE__)}/spec_helper"
+
+class MySlowQueue < Jober::SlowQueue
+  interval 0.5
+  def perform(x)
+    $slow_counter += x
+  end
+end
+
+describe "SlowQueue" do
+  before { $slow_counter = 0 }
+
+  it "should set internals" do
+    w = MySlowQueue.new
+    w.queue_name.should == 'Jober::queue:my_slow'
+  end
+
+  it "should execute" do
+    MySlowQueue.enqueue(1)
+    MySlowQueue.enqueue(2)
+    MySlowQueue.enqueue(3)
+    MySlowQueue.new.execute
+    $slow_counter.should == 1
+  end
+
+  it "run_loop" do
+    MySlowQueue.enqueue(1)
+    MySlowQueue.enqueue(2)
+    MySlowQueue.enqueue(3)
+    t = Thread.new do
+      MySlowQueue.new.run_loop
+    end
+    sleep 0.1
+    $slow_counter.should == 1
+    sleep 0.6
+    $slow_counter.should == 3
+    sleep 0.6
+    $slow_counter.should == 6
+    t.kill
+  end
+
+end

data/spec/threaded_manager_spec.rb

@@ -3,6 +3,7 @@ require "#{File.dirname(__FILE__)}/spec_helper"
 class T1 < Jober::Task
   def perform
     SO["t1"] += 1
+    SO["un"] += [unique_id]
   end
 end
 
@@ -57,6 +58,7 @@ describe Jober::ThreadedManager do
     SO["t3"] = 0
     SO["t41"] = 0
     SO["t5"] = 0
+    SO["un"] = []
   end
 
   it "just work" do
@@ -64,9 +66,10 @@ describe Jober::ThreadedManager do
     SO["t1"].should == 1
   end
 
-  xit "run multiple identical tasks" do
-    run_threaded_manager_for(0.2, [T1, T1, T1])
-    SO["t"].should == 3
+  it "run multiple identical tasks" do
+    run_threaded_manager_for(0.5, [T1, T1, T1])
+    sleep 0.2
+    SO["un"].sort.should == [0, 1, 2]
   end
 
   it "run multiple tasks" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jober
 version: !ruby/object:Gem::Version
-  version: 0.3.37
+  version: 0.3.38
 platform: ruby
 authors:
 - "'Konstantin Makarchev'"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -125,6 +125,7 @@ files:
 - lib/jober/queue.rb
 - lib/jober/queue_batch.rb
 - lib/jober/shared_object.rb
+- lib/jober/slow_queue.rb
 - lib/jober/task.rb
 - lib/jober/threaded_manager.rb
 - lib/jober/unique_queue.rb
@@ -141,6 +142,7 @@ files:
 - spec/queue_parallel_spec.rb
 - spec/queue_spec.rb
 - spec/shared_object_spec.rb
+- spec/slow_queue_spec.rb
 - spec/spec_helper.rb
 - spec/stats_spec.rb
 - spec/task_loop_spec.rb
@@ -168,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Simple background jobs, queues.
@@ -184,6 +186,7 @@ test_files:
 - spec/queue_parallel_spec.rb
 - spec/queue_spec.rb
 - spec/shared_object_spec.rb
+- spec/slow_queue_spec.rb
 - spec/spec_helper.rb
 - spec/stats_spec.rb
 - spec/task_loop_spec.rb