jober 0.3.30 → 0.3.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7ffebeb0c28297bb8898cfed98c2b865a7930ea
-  data.tar.gz: bcd0d4b2496c31a8546b67127750309d4a0b11e5
+  metadata.gz: 68d2b76b5ce65c40e2dd400e56da949542b58ad1
+  data.tar.gz: b1bf5509a4eb9046d54a8f210543608b9cd7c685
 SHA512:
-  metadata.gz: c66d7db2864706bc7314844b1c8ec443507a4207a998dd6a3fd08cd802909bb5fbb95a61f459bc60edc664bd140454b6ad53c1b1882881bc4339d25dab8453cd
-  data.tar.gz: 03402f170459a3713768578fc41ecaf0909ab0262735cd2f31ffaf25ee1b71bda815a83cc34afb78472aaddc1c86bd38e886118d8d1b1228ca6fcff766dd1971
+  metadata.gz: b85813cff723ce9c897b5737c949c53f223621df6a17aceda7d717e868eeb83dedbb43f5c39897a540ba602a44bf69562a6f2b2a92e5324a73ec633ae0aadde4
+  data.tar.gz: 9aedb0ffbe32e15120d4f6ba5036a5f7a93b00487c987114b54b63a8a2ff16654d3da141f77b1a0254f641fa4281711967aac83697530969c8767c77eba66304

data/.gitignore

@@ -16,3 +16,4 @@ mkmf.log
 *.swp
 todo
 *.db
+*.db*

data/lib/jober.rb

@@ -48,6 +48,10 @@ module Jober
       @classes ||= []
     end
 
+    def auto_classes
+      classes.reject &:manual?
+    end
+
     def names
       classes.map { |k| underscore(k.to_s.gsub('Jober::', '')) }
     end
@@ -94,7 +98,7 @@ module Jober
 
     def llens
       h = {}
-      @classes.each do |klass|
+      auto_classes.each do |klass|
         next unless klass.ancestors.include?(Jober::Queue)
         h[klass.queue_name_base] = klass.len
       end
@@ -103,7 +107,7 @@ module Jober
 
     def stats
       h = {}
-      @classes.each do |klass|
+      auto_classes.each do |klass|
         started = klass.read_timestamp(:started)
         finished = klass.read_timestamp(:finished)
         crashed = klass.read_timestamp(:crashed)

data/lib/jober/abstract_task.rb

@@ -21,6 +21,14 @@ class Jober::AbstractTask
       @workers || 1
     end
 
+    def manual!
+      @manual = true
+    end
+
+    def manual?
+      @manual
+    end
+
     attr_accessor :short_name
   end
 
@@ -40,8 +48,8 @@ class Jober::AbstractTask
     @stopped = false
     trap("QUIT") { @stopped = true }
     trap("INT")  { @stopped = true }
-    @worker_id = opts[:worker_id] || 0
-    @workers_count = opts[:workers_count] || 1
+    @worker_id = (opts[:worker_id] || 0).to_i
+    @workers_count = (opts[:workers_count] || 1).to_i
     @skip_delay = opts[:skip_delay]
   end
 

data/lib/jober/ar_loop.rb

@@ -16,7 +16,7 @@ class Jober::ARLoop < Jober::Task
   def run
     prox = proxy
 
-    prefix = ''
+    prefix = log_prefix
 
     if @worker_id && @workers_count && @workers_count > 1 && !@opts[:no_auto_proxy]
       cond = "id % #{@workers_count} = #{@worker_id}"
@@ -31,13 +31,16 @@ class Jober::ARLoop < Jober::Task
       _last_batch_id
     end
 
-    prox = prox.where(@opts[:where]) if @opts[:where]
+    if @opts[:where]
+      prox = prox.where(@opts[:where])
+      prefix += "(cwhere) "
+    end
 
     cnt = 0
     count = last_batch_id ? prox.where("id > ?", last_batch_id).count : prox.count
     info { "#{prefix}full count to process #{count}" }
 
-    h = {:batch_size => self.class.get_batch_size}
+    h = { :batch_size => self.class.get_batch_size }
     h[:start] = last_batch_id + 1 if last_batch_id
 
     t1 = Time.now
@@ -61,6 +64,10 @@ class Jober::ARLoop < Jober::Task
     info { "#{prefix}processed total #{cnt} #{summary_info}" }
   end
 
+  def log_prefix
+    ''
+  end
+
   def summary_info
     nil
   end

data/lib/jober/threaded_manager.rb

@@ -11,7 +11,7 @@ class Jober::ThreadedManager
   end
 
   def initialize(klasses = nil, opts = {})
-    @klasses = Array(klasses || Jober.classes)
+    @klasses = Array(klasses || Jober.auto_classes)
     @stopped = false
     @objects = @klasses.map do |klass|
       if klass.is_a?(String)

data/lib/jober/version.rb

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

data/spec/ar_loop_spec.rb

@@ -76,6 +76,12 @@ describe "ARLoop" do
     SO["names"].last.should == "unknown 96"
   end
 
+  it "use auto proxy sharding, work with string values" do
+    MyAR.new(:worker_id => '1', :workers_count => '4').execute
+    SO["names"].size.should == 10
+    SO["names"].last.should == "unknown 96"
+  end
+
   it "where" do
     MyAR.new(:where => "years < 24").execute
     SO["names"].size.should == 15

data/spec/jober_spec.rb

@@ -6,6 +6,9 @@ class A3 < Jober::QueueBatch; end
 class A4 < Jober::UniqueQueue; end
 
 class Jober::B1 < Jober::Task; end
+class Manual < Jober::Task;
+  manual!
+end
 
 describe "Jober" do
   it "classes" do
@@ -22,4 +25,9 @@ describe "Jober" do
     Jober.find_class("B2").should == nil
     Jober.find_class("Jober::B2").should == nil
   end
+
+  it "auto_classes" do
+    Jober.classes.should include(Manual)
+    Jober.auto_classes.should_not include(Manual)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jober
 version: !ruby/object:Gem::Version
-  version: 0.3.30
+  version: 0.3.37
 platform: ruby
 authors:
 - "'Konstantin Makarchev'"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-17 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis