sponges 0.0.6 → 0.1.0

data/README.md

@@ -56,15 +56,14 @@ class Worker
 end
 
 Sponges.configure do |config|
-  config.worker        = Worker.new           # mandatory
-  config.worker_name   = "bob"                # mandatory
-  config.worker_method = :run                 # mandatory
-  config.worker_args   = {first: true}        # mandatory
   config.logger        = MyCustomLogger.new   # optionnal
   config.redis         = Redis.new            # optionnal
 end
 
-Sponges.start
+# Register a pool named "worker_name".
+Sponges.start "worker_name" do
+  Worker.new({some: args}).run
+end
 ```
 See the help message :
 ``` bash
@@ -83,7 +82,7 @@ ruby example.rb start -d
 
 Start 8 instances of the worker and daemonize them:
 ``` bash
-ruby example.rb start -d -s 8
+ruby example.rb start -d -s 8 # By default, size equals cpu core's size.
 ```
 
 Retart gracefully 4 instances of the worker and daemonize them:
@@ -118,10 +117,11 @@ Show a list of workers and their children.
 ruby example.rb list
 ```
 
-## TODO
+## Acknowledgements
 
-* More specs.
-* Check on OSX.
+sponges would not have been the same without [Jesse
+Storimer](https://github.com/jstorimer) and his awesome book about
+[Unix](http://workingwithunixprocesses.com/).
 
 ## Copyright
 

data/lib/sponges.rb

@@ -5,7 +5,6 @@ require 'logger'
 require 'nest'
 require 'machine'
 require_relative 'sponges/configuration'
-require_relative 'sponges/worker_builder'
 require_relative 'sponges/supervisor'
 require_relative 'sponges/runner'
 require_relative 'sponges/commander'
@@ -19,7 +18,9 @@ module Sponges
   end
   module_function :configure
 
-  def start(options = ARGV)
+  def start(worker_name, options = ARGV, &block)
+    Sponges::Configuration.worker_name = worker_name
+    Sponges::Configuration.worker = block
     Sponges::Cli.start(options)
   end
   module_function :start

data/lib/sponges/cli.rb

@@ -7,29 +7,24 @@ module Sponges
     option :size,       type: :numeric
     desc "Start workers"
     def start(options = {})
-      worker = Sponges::Runner.new(Sponges::Configuration.worker_name, options)
-      if Sponges::Configuration.worker_args
-        worker.work(Sponges::Configuration.worker, Sponges::Configuration.worker_method,
-             Sponges::Configuration.worker_args)
-      else
-        worker.work(Sponges::Configuration.worker, Sponges::Configuration.worker_method)
-      end
+      Sponges::Runner.new(Sponges::Configuration.worker_name, options,
+                          Sponges::Configuration.worker
+                         ).start
     end
 
     option :gracefully, type: :boolean
     desc "Stop workers"
     def stop(options = {})
-      Sponges::Commander.new(Sponges::Configuration.worker_name, options).
-        stop
+      Sponges::Commander.new(Sponges::Configuration.worker_name, options).stop
     end
 
     option :daemonize,  type: :boolean
     option :size,       type: :numeric
     option :gracefully, type: :boolean
     desc "Restart workers"
-    def restart(options = {})
+    def restart(options = {}, &block)
       stop(options)
-      start(options)
+      start(options, block)
     end
 
     desc "Increment workers pool size"

data/lib/sponges/configuration.rb

@@ -4,7 +4,7 @@ module Sponges
   #
   class Configuration
     class << self
-      ACCESSOR = [:worker_name, :worker, :worker_method, :worker_args, :logger, :redis]
+      ACCESSOR = [:worker_name, :worker, :logger, :redis]
       attr_accessor *ACCESSOR
 
       def configure

data/lib/sponges/runner.rb

@@ -4,20 +4,24 @@ module Sponges
   # watch over the supervisor.
   #
   class Runner
-    def initialize(name, options = {})
-      @name = name
+    def initialize(name, options = {}, block)
+      @name, @block = name, block
       @options = default_options.merge options
       @redis = Nest.new('sponges', Configuration.redis || Redis.new)
+      if running?
+        Sponges.logger.error "Runner #{@name} already started."
+        exit
+      end
       @redis[:hostnames].sadd Socket.gethostname
     end
 
-    def work(worker, method, *args, &block)
+    def start
       if daemonize?
         Sponges.logger.info "Supervisor daemonized."
         Process.daemon
       end
       Sponges.logger.info "Runner #{@name} start message received."
-      @supervisor = fork_supervisor(worker, method, *args, &block)
+      @supervisor = fork_supervisor
       trap_signals
       Sponges.logger.info "Supervisor started with #{@supervisor} pid."
       Process.waitpid(@supervisor) unless daemonize?
@@ -25,6 +29,20 @@ module Sponges
 
     private
 
+    def running?
+      if pid = @redis[Socket.gethostname][:worker][@name][:supervisor].get
+        begin
+          Process.kill 0, pid.to_i
+          true
+        rescue Errno::ESRCH => e
+          @redis[Socket.gethostname][:worker][@name][:supervisor].del
+          false
+        end
+      else
+        false
+      end
+    end
+
     def trap_signals
       Sponges::SIGNALS.each do |signal|
         trap(signal) {|signal| kill_supervisor(signal) }
@@ -42,10 +60,10 @@ module Sponges
       }
     end
 
-    def fork_supervisor(worker, method, *args, &block)
+    def fork_supervisor
       fork do
         $PROGRAM_NAME = "#{@name}_supervisor"
-        Supervisor.new(@name, @options, worker, method, *args, &block).start
+        Supervisor.new(@name, @options, @block).start
       end
     end
 

data/lib/sponges/supervisor.rb

@@ -1,9 +1,8 @@
 # encoding: utf-8
 module Sponges
   class Supervisor
-    def initialize(name, options, worker, method, *args, &block)
-      @name, @options = name, options
-      @worker, @method, @args, @block = worker, method, args, block
+    def initialize(name, options, block)
+      @name, @options, @block = name, options, block
       set_up_redis
       @pids = @redis[:worker][name][:pids]
       @children_seen = 0
@@ -37,7 +36,7 @@ module Sponges
       name = children_name
       pid = fork do
         $PROGRAM_NAME = name
-        Sponges::WorkerBuilder.new(@worker, @method, *@args, &@block).start
+        @block.call
       end
       Sponges.logger.info "Supervisor create a child with #{pid} pid."
       @pids.sadd pid

data/lib/sponges/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Sponges
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sponges
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: boson
@@ -93,7 +93,6 @@ files:
 - lib/sponges/runner.rb
 - lib/sponges/supervisor.rb
 - lib/sponges/version.rb
-- lib/sponges/worker_builder.rb
 homepage: https://github.com/AF83/sponges
 licenses: []
 post_install_message: 

data/lib/sponges/worker_builder.rb

@@ -1,29 +0,0 @@
-# encoding: utf-8
-module Sponges
-  # This class concern is to build a worker instance, set some signals handlers
-  # and make it start its job.
-  #
-  class WorkerBuilder
-    def initialize(worker, method, *args, &block)
-      @worker, @method, @args, @block = worker, method, args, block
-    end
-
-    def start
-      trap_signals
-      at_exit do
-        Sponges.logger.info "Child exits."
-      end
-      @worker.send(@method, *@args, &@block)
-    end
-
-    private
-
-    def trap_signals
-      Sponges::SIGNALS.each do |signal|
-        trap(signal) do
-          exit 0
-        end
-      end
-    end
-  end
-end