breeder 0.0.2 → 0.0.3

data/lib/breeder/breeding_strategy/forks.rb

@@ -8,6 +8,10 @@ module Breeder
         @initial_workers = initial_workers
       end
 
+      def num_workers
+        @children.size
+      end
+
       def start!
         @initial_workers.times { spawn! }
       end
@@ -38,6 +42,7 @@ module Breeder
             end
             trap('INT', 'DEFAULT')
             worker.run
+            Process.exit
           end
         end
         t.join

data/lib/breeder/breeding_strategy/threads.rb

@@ -9,6 +9,10 @@ module Breeder
         @initial_workers = initial_workers
       end
 
+      def num_workers
+        @threads.size
+      end
+
       def start!
         @initial_workers.times { spawn! }
       end

data/lib/breeder/core.rb

@@ -1,6 +1,6 @@
 module Breeder
   class Core
-    # the poll interval in seconds
+    # the poll interval in seconds (default is 60)
     attr_accessor :interval
 
     # an instance with spawn? and reap? methods to determine when to spawn and reap
@@ -10,13 +10,13 @@ module Breeder
     attr_accessor :initial_workers
     
     def initialize
-      self.interval = 5
+      self.interval = 6
       self.initial_workers = 4
     end
 
     def watcher=(watcher)
-      unless watcher.respond_to?(:spawn?) && watcher.respond_to?(:reap?)
-        raise "Watcher must implement spawn? and reap?"
+      unless watcher.respond_to?(:check)
+        raise "Watcher must implement 'check' method"
       end
       
       @watcher = watcher
@@ -54,9 +54,20 @@ module Breeder
       # start the workers
       @strategy.start!
 
+      warn "No Watcher specified, will not spawn or reap workers" if @watcher.nil?
+
       @polling_thread = Thread.new do
-        # TODO polling 
         loop do
+          if !!@watcher
+            decision = @watcher.check(@strategy.num_workers)
+            if :spawn == decision
+              @strategy.spawn!
+              puts "Spawned worker, now running #{@strategy.num_workers} workers"
+            elsif :reap == decision
+              @strategy.reap!
+              puts "Reaped worker, now running #{@strategy.num_workers} workers"
+            end
+          end
           sleep interval
         end
       end

data/lib/breeder/watcher/base.rb

@@ -0,0 +1,11 @@
+module Breeder
+  class Base 
+
+    # Check whether to spawn, reap, or do nothing
+    # Returns :spawn or :reap or nil
+    def check(num_workers)
+      raise NotImplementedError
+    end
+
+  end
+end

data/lib/breeder/watcher/beanstalk.rb

@@ -0,0 +1,30 @@
+module Breeder
+  module Watcher
+    class Beanstalk < Base
+
+      def initialize(client, tube, max_workers)
+        raise "max_workers must be at least 1" if max_workers < 1
+        @client, @tube, @max_workers = client, tube, max_workers
+        @last_check = nil
+      end
+
+      def check(num_workers)
+        num = jobs_ready
+        if !!@last_check && num > @last_check && num_workers <= @max_workers
+          decision = :spawn
+        elsif !!@last_check && num < 0.5 * @last_check
+          decision = :reap
+        else
+          decision = nil
+        end
+        @last_check = num
+        decision
+      end
+
+      def jobs_ready
+        @client.stats_tube(@tube)['current-jobs-ready']
+      end
+
+    end
+  end
+end

data/lib/breeder/watcher.rb

@@ -1,16 +1,7 @@
-module Breeder
-
-  # A watcher has a spawn? and reap? method that indicate when to 
-  # spawn and reap more threads
-  class Watcher
-
-    def spawn?(num_workers)
-      raise NotImplementedError
-    end
-
-    def reap?(num_workers)
-      raise NotImplementedError
-    end
+require 'breeder/watcher/base'
+require 'breeder/watcher/beanstalk'
 
+module Breeder
+  module Watcher
   end
 end

data/lib/breeder.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
-require 'bundler/setup'
 require 'metaclass'
+require 'beanstalk-client'
 require 'breeder/breeding_strategy'
 require 'breeder/core'
 require 'breeder/watcher'

data/spec/core_spec.rb

@@ -15,26 +15,16 @@ module Breeder
 
       context 'when the argument is a valid watcher' do
         it 'sets the watcher' do
-          watcher = Breeder::Watcher.new
+          watcher = Breeder::Watcher::Beanstalk.new(mock('stalk'), 'tube', 8)
           @core.watcher = watcher
           @core.watcher.should == watcher
         end
       end
     end
 
-    describe '#worker=' do
-      context 'when the argument is not a valid worker' do
-        it 'raises an error' do
-          lambda { @core.worker= 42 }.should raise_error
-        end
-      end
-
-      context 'when the argument is a valid worker' do
-        it 'sets the worker' do
-          test_worker = Breeder::Worker.new
-          @core.worker_factory { test_worker }
-          @core.create_worker.should == test_worker
-        end
+    describe '#worker_factory' do
+      it 'sets the worker factory' do
+        pending
       end
     end
 
@@ -47,6 +37,7 @@ module Breeder
 
       context 'when a block of work is supplied' do
         it 'creates a worker with the block as its workload' do
+          pending 'no create_watcher method'
           task_done = false
           @core.task { task_done = true }
           @core.create_worker.do_work

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
 require 'rubygems'
 $:.unshift(File.dirname(__FILE__) + '/../lib/')
 require 'breeder'
+require 'rspec'
+require 'rcov'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: breeder
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-20 00:00:00.000000000Z
+date: 2011-10-21 00:00:00.000000000Z
 dependencies: []
 description: 
 email: 
@@ -29,6 +29,8 @@ files:
 - lib/breeder/core.rb
 - lib/breeder/watcher.rb
 - lib/breeder/breeding_strategy.rb
+- lib/breeder/watcher/base.rb
+- lib/breeder/watcher/beanstalk.rb
 - lib/breeder/breeding_strategy/forks.rb
 - lib/breeder/breeding_strategy/threads.rb
 - spec/worker_spec.rb