breeder 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/breeder/breeding_strategy/forks.rb

@@ -0,0 +1,58 @@
+module Breeder
+  module BreedingStrategy
+    class Forks 
+
+      def initialize(worker_factory, initial_workers)
+        @children = []
+        @worker_factory = worker_factory
+        @initial_workers = initial_workers
+      end
+
+      def start!
+        @initial_workers.times { spawn! }
+      end
+
+      def stop!
+        @children.size.times { reap! }
+      end
+
+      def create_worker
+        raise "No worker factory specified" unless !!@worker_factory
+        worker = @worker_factory.call
+        unless [:run, :stop!, :stop?].all? { |method| worker.respond_to?(method) }
+          raise "object from worker factory doesn't quack like a worker"
+        end
+        worker
+      end
+
+      def spawn!
+        t = Thread.new do
+          if pid = Process.fork
+            #parent
+            @children << pid
+          else
+            worker = create_worker
+            #child
+            trap('HUP') do
+              worker.stop!
+            end
+            trap('INT', 'DEFAULT')
+            worker.run
+          end
+        end
+        t.join
+      end
+
+      def reap!
+        if !@children.empty?
+          pid = @children.pop
+          Process.kill('HUP', pid)
+          sleep 1
+          Process.kill(9, pid)
+        end
+      end
+
+    end
+  end
+end
+

data/lib/breeder/breeding_strategy/threads.rb

@@ -0,0 +1,47 @@
+module Breeder
+  module BreedingStrategy
+    class Threads
+
+      def initialize(worker_factory, initial_workers)
+        @threads = []
+        @workers = []
+        @worker_factory = worker_factory
+        @initial_workers = initial_workers
+      end
+
+      def start!
+        @initial_workers.times { spawn! }
+      end
+
+      def stop!
+        @workers.size.times { reap! }
+      end
+
+      def create_worker
+        raise "No worker factory specified" unless !!@worker_factory
+        worker = @worker_factory.call
+        unless [:run, :stop!, :stop?].all? { |method| worker.respond_to?(method) }
+          raise "object from worker factory doesn't quack like a worker"
+        end
+        worker
+      end
+
+      def spawn!
+        worker = create_worker
+        @workers << worker
+        @threads << Thread.new { worker.run }
+      end
+
+      def reap!
+        if !@workers.empty?
+          thread = @threads.pop
+          worker = @workers.pop
+          worker.stop!
+          sleep 1
+          thread.kill
+        end
+      end
+
+    end
+  end
+end

data/lib/breeder/breeding_strategy.rb

@@ -0,0 +1,8 @@
+require 'breeder/breeding_strategy/threads'
+require 'breeder/breeding_strategy/forks'
+
+module Breeder
+  module BreedingStrategy
+
+  end
+end

data/lib/breeder/core.rb

@@ -10,8 +10,6 @@ module Breeder
     attr_accessor :initial_workers
     
     def initialize
-      @workers = []
-      @threads = []
       self.interval = 5
       self.initial_workers = 4
     end
@@ -38,45 +36,31 @@ module Breeder
       worker_factory { worker }
     end
 
-    def run
-      # start the workers
-      self.initial_workers.times { spawn! }
+    def init_strategy
+      @strategy = Breeder::BreedingStrategy::Forks.new(@worker_factory, initial_workers)
 
       # catch Ctrl+C and cleanup
       trap('INT') do
-        puts 'INTERRUPT caught, killing threads and exiting...'
-        @threads.each { |thread| thread.kill }
+        puts 'INTERRUPT caught, killing workers and exiting...'
+        @strategy.stop!
+        @polling_thread.kill rescue nil
       end
-
-      # wait for the workers to finish
-      @threads.each { |thread| thread.join }
     end
 
-    def create_worker
-      raise "No worker factory specified" unless !!@worker_factory
-      worker = @worker_factory.call
-      unless [:run, :stop!, :stop?].all? { |method| worker.respond_to?(method) }
-        raise "object from worker factory doesn't quack like a worker"
-      end
-      worker
-    end
-
-    private
+    def run
+      # setup the breeding strategy
+      init_strategy
 
-    def spawn!
-      worker = create_worker
-      @workers << worker
-      @threads << Thread.new { worker.run }
-    end
+      # start the workers
+      @strategy.start!
 
-    def reap!
-      if @threads.size >= 1
-        thread = @threads.pop
-        worker = @workers.pop
-        worker.stop!
-        sleep 1
-        thread.kill
+      @polling_thread = Thread.new do
+        # TODO polling 
+        loop do
+          sleep interval
+        end
       end
+      @polling_thread.join
     end
 
   end

data/lib/breeder.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: breeder
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-19 00:00:00.000000000Z
+date: 2011-10-20 00:00:00.000000000Z
 dependencies: []
 description: 
 email: 
@@ -28,6 +28,9 @@ files:
 - lib/breeder/worker.rb
 - lib/breeder/core.rb
 - lib/breeder/watcher.rb
+- lib/breeder/breeding_strategy.rb
+- lib/breeder/breeding_strategy/forks.rb
+- lib/breeder/breeding_strategy/threads.rb
 - spec/worker_spec.rb
 - spec/core_spec.rb
 - spec/breeder_spec.rb