collective 0.2.0 → 0.2.1

data/.gitignore

@@ -3,3 +3,4 @@
 .bundle
 coverage
 Gemfile.lock
+pkg

data/README

@@ -5,3 +5,5 @@ A pool contains several workers.
 Workers are processes which run jobs.
 
 Jobs are simple tasks.
+
+Collective was originally known as Hive.

data/lib/collective/configuration.rb

@@ -76,16 +76,42 @@ class Collective::Configuration
   attr :verbose, true
   attr :dry_run, true
   attr :args, true
+  attr :before_forks
   attr :after_forks
 
   attr :defaults
-  attr :jobs
+  attr :pools
+
+  # I'm not sure why this is so complicated.
+  class PoolEnumerator
+    def initialize pools
+      @pools = pools
+    end
+    include Enumerable
+    def each(&block)
+      them = @pools.each
+      it = nil
+      loop do
+        begin
+          it = them.next
+        rescue StopIteration => x
+          break
+        end
+        policy = Collective::Policy.resolve(it.last)
+        yield([ it.first, policy ])
+      end
+    end
+  end
+
+  def policies
+    PoolEnumerator.new(pools)
+  end
 
   def initialize( filename = nil )
     @verbose  = 0
     @dry_run  = false
     @defaults = {}
-    @jobs     = {}
+    @pools    = {}
     load_file(filename) if filename
   end
 
@@ -186,13 +212,20 @@ class Collective::Configuration
     options.each { |k,v| set_default(k,v) }
   end
   
-  def add_pool(name,options)
-    options = defaults.merge(options)
-    jobs[name] = options
+  def add_pool( name, options = {} )
+    before_forks = (options[:before_forks] || []) + (self.before_forks || [])
+    after_forks  = (options[:after_forks] || []) + (self.after_forks || [])
+    options      = defaults.merge(options).merge before_forks: before_forks, after_forks: after_forks
+    pools[name]  = options
     log "Added pool for #{name}" if verbose == 1
     log "Added pool for #{name} with #{options}" if verbose >= 2
   end
 
+  def before_fork(&block)
+    @before_forks ||= []
+    @before_forks << block
+  end
+
   def after_fork(&block)
     @after_forks ||= []
     @after_forks << block

data/lib/collective/monitor.rb

@@ -8,8 +8,8 @@ class Collective::Monitor
   attr :pools
 
   def initialize( configuration )
-    @pools = configuration.jobs.map do |kind,options|
-      pool = Collective::Pool.new( kind, Collective::Policy.resolve(options) )
+    @pools = configuration.policies.map do |kind,policy|
+      pool = Collective::Pool.new( kind, policy )
     end
   end
 

data/lib/collective/policy.rb

@@ -46,6 +46,14 @@ class Collective::Policy
       @options.dup
     end
 
+    def before_fork
+      (before_forks || []).each { |f| f.call }
+    end
+
+    def after_fork
+      (after_forks || []).each { |f| f.call }
+    end
+
   end # Instance
 
   class << self

data/lib/collective/version.rb

@@ -1,3 +1,3 @@
 module Collective
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/collective/worker.rb

@@ -21,10 +21,9 @@ class Collective::Worker
     registry = options[:registry] || Collective::Registry.new( name, storage )
 
     foptions = { stdout: "/tmp/debug.log" }
+    policy.before_fork
     Collective::Utilities::Process.fork_and_detach( foptions ) do
-      if after_forks = policy.after_forks then
-        after_forks.each { |af| af.call }
-      end
+      policy.after_fork
       # $0 = "$0 #{name}"
       worker = new( prototype_job, options )
       trap("TERM") { worker.quit! }

data/spec/configuration_spec.rb

@@ -15,10 +15,36 @@ describe Collective::Configuration do
       set_env  "the_env"
       set_name "a_name"
       chdir    "."
+      before_fork() { true }
+      after_fork() { true }
     EOT
     c = Collective::Configuration.parse ["--dry-run", "--script", script]
     c.env.should eq("the_env")
     c.name.should eq("a_name")
+    c.before_forks.size.should eq(1)
+    c.after_forks.size.should eq(1)
+  end
+
+  it "enumerates pool names and policies" do
+    script = <<-EOT.gsub(/^ +/,'')
+      add_pool "Test", pool_max_workers: 1
+    EOT
+    c = Collective::Configuration.parse ["--dry-run", "--script", script]
+    c.policies.first.first.should eq("Test")
+    c.policies.first.last.pool_max_workers.should eq(1)
+  end
+
+  it "adds blocks to pools" do
+    script = <<-EOT.gsub(/^ +/,'')
+      before_fork() { true }
+      after_fork() { false }
+      add_pool "Test"
+    EOT
+    c = Collective::Configuration.parse ["--dry-run", "--script", script]
+    c.policies.to_a.size.should eq(1)
+    pool = c.policies.to_a.first.last
+    pool.before_forks.first.call.should eq(true)
+    pool.after_forks.first.call.should eq(false)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collective
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: !!null 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable: !!null
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70125036305720 !ruby/object:Gem::Requirement
+  requirement: &70335485309520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70125036305720
+  version_requirements: *70335485309520
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70125036305300 !ruby/object:Gem::Requirement
+  requirement: &70335485309100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70125036305300
+  version_requirements: *70335485309100
 description: !!null 
 email:
 - mark.lanett@gmail.com