workforce 0.1.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.2

data/bin/workforce

@@ -4,10 +4,9 @@ require "optparse"
 require "workforce"
 
 config = Workforce::Config.instance
-files_to_require = []
 
 optparser = OptionParser.new do |opts|
-  opts.banner = "Usage: #{$0} [options] path/to/worker.rb #{Workforce::Controller::ACTIONS.join("|")}"
+  opts.banner = "Usage: #{$0} [options] #{Workforce::Controller::ACTIONS.join("|")} [WORKER]"
 
   opts.separator ""
   opts.separator "Options:"
@@ -16,6 +15,10 @@ optparser = OptionParser.new do |opts|
     config.load_file(config_path)
   end
   
+  opts.on("--workers-dir WORKERS_DIR", "Directory containing the workers definitions", "Default: #{config.workers_dir}") do |workers_dir|
+    config.workers_dir = workers_dir
+  end
+  
   opts.on("--pid-dir PID_DIR", "Store pids on directory PID_DIR", "Default: #{config.pid_dir}") do |pid_dir|
     config.pid_dir = pid_dir
   end
@@ -23,21 +26,15 @@ optparser = OptionParser.new do |opts|
   opts.on("--log-dir LOG_DIR", "Store logs on directory LOG_DIR", "Default: #{config.log_dir}") do |log_dir|
     config.log_dir = log_dir
   end
-  
-  opts.on("--require FILE", "Require FILE before executing action") do |file_path|
-    files_to_require << file_path
-  end
 end
 
 optparser.parse!
-worker_path, action = ARGV
+action, *args = ARGV
 
-unless worker_path && action
-  puts optparser
-  exit(1)
-end
+$:.unshift(config.workers_dir)
 
-files_to_require.each { |path| require(path) }
-require worker_path
-worker_class = File.basename(worker_path, ".rb").camelcase
-Workforce::Controller.instance.dispatch(worker_class, action)
+begin
+  Workforce::Controller.instance.dispatch(action, *args)
+rescue ArgumentError
+  puts optparser
+end

data/lib/workforce/configuration.rb

@@ -22,12 +22,30 @@ module Workforce
     
     def initialize
       yield self if block_given?
+      @before_callbacks = Hash.new { |h,k| h[k] = [] }
+      @after_callbacks  = Hash.new { |h,k| h[k] = [] }
     end
     
     def load_file(file_path)
       instance_eval(File.read(file_path), file_path)
     end
 
+    def before(event, &block)
+      if block_given?
+        @before_callbacks[event] << block
+      else
+        @before_callbacks[event]
+      end
+    end
+    
+    def after(event, &block)
+      if block_given?
+        @after_callbacks[event] << block
+      else
+        @after_callbacks[event]
+      end
+    end
+
     config_attr :pid_dir do
       "./pid"
     end
@@ -35,5 +53,9 @@ module Workforce
     config_attr :log_dir do
       "./log"
     end
+    
+    config_attr :workers_dir do
+      "./workers"
+    end
   end
 end

data/lib/workforce/controller.rb

@@ -3,16 +3,24 @@ require "workforce/manager"
 
 module Workforce
   class Controller
-    ACTIONS = %w(run start stop restart status schedule dispose)
+    ACTIONS = %w(list run status start stop restart schedule dispose)
     include Singleton
     
-    def dispatch(worker_klass, action)
+    def dispatch(action, *args)
       unless ACTIONS.include?(action.to_s)
         puts "Invalid action #{action}"
         exit(1)
       end
       
-      send(action, worker_klass)
+      send(action, *args)
+    end
+    
+    def list
+      puts "Available workers:"
+      Dir["#{Config.get(:workers_dir)}/*"].each do |file|
+        worker_name = Inflector.camelcase(File.basename(file, ".rb"))
+        puts "  * #{worker_name}"
+      end
     end
     
     def run(worker_klass)
@@ -21,10 +29,20 @@ module Workforce
         exit(1)
       end
       
-      manager = Workforce::Manager.new(get_klass(worker_klass))
-      store_pid(worker_klass, Process.pid)
-      manager.run
-      remove_pid_file(worker_klass)
+      run_callbacks(:start) do
+        manager = Workforce::Manager.new(get_klass(worker_klass))
+        store_pid(worker_klass, Process.pid)
+        manager.run
+        remove_pid_file(worker_klass)
+      end
+    end
+    
+    def status(worker_klass)
+      if running?(worker_klass)
+        puts "Running (#{running_pid(worker_klass)})"
+      else
+        puts "Not running"
+      end
     end
     
     def start(worker_klass)
@@ -33,25 +51,23 @@ module Workforce
         exit(1)
       end
       
-      manager = Workforce::Manager.new(get_klass(worker_klass))
-      store_pid(worker_klass, manager.launch)
+      run_callbacks(:start) do
+        manager = Workforce::Manager.new(get_klass(worker_klass))
+        store_pid(worker_klass, manager.launch)
+      end
     end
       
     def stop(worker_klass)
-      Process.kill(:QUIT, running_pid(worker_klass))
-      remove_pid_file(worker_klass)
+      run_callbacks(:stop) do      
+        Process.kill(:QUIT, running_pid(worker_klass))
+        remove_pid_file(worker_klass)
+      end
     end
     
     def restart(worker_klass)
-      stop(worker_klass) if running?(worker_klass)
-      start(worker_klass)
-    end
-    
-    def status(worker_klass)
-      if running?(worker_klass)
-        puts "Running (#{running_pid(worker_klass)})"
-      else
-        puts "Not running"
+      run_callbacks(:restart) do
+        stop(worker_klass) if running?(worker_klass)
+        start(worker_klass)
       end
     end
     
@@ -61,7 +77,9 @@ module Workforce
         exit(1)
       end
       
-      Process.kill(:USR1, running_pid(worker_klass))
+      run_callbacks(:schedule) do
+        Process.kill(:USR1, running_pid(worker_klass))
+      end
     end
     
     def dispose(worker_klass)
@@ -70,18 +88,26 @@ module Workforce
         exit(1)
       end
       
-      Process.kill(:USR2, running_pid(worker_klass))
+      run_callbacks(:dispose) do
+        Process.kill(:USR2, running_pid(worker_klass))
+      end
     end
     
   protected
     def get_klass(klass)
-      return klass unless klass.is_a?(String) || klass.is_a?(Symbol)
+      require Inflector.underscore(klass)
       
       klass.to_s.split(/::/).inject(Object) do |namespace, const_name|  
         namespace.const_get(const_name)
       end
     end
     
+    def run_callbacks(event)
+      Config.instance.before(:event).each { |callback| callback.call }
+      yield
+      Config.instance.after(:event).each { |callback| callback.call }
+    end
+    
     def pid_file(worker_klass)
       "#{Workforce::Config.get(:pid_dir)}/#{Workforce::Inflector.underscore(worker_klass)}.pid"
     end

data/workforce.gemspec

@@ -0,0 +1,66 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{workforce}
+  s.version = "0.2.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Rodrigo Kochenburger"]
+  s.date = %q{2010-05-31}
+  s.default_executable = %q{workforce}
+  s.description = %q{Workforce is an attempt to create a framework to develop background processes and controlling the execution of these processes in a distributed environment}
+  s.email = %q{divoxx@gmail.com}
+  s.executables = ["workforce"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.md"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.md",
+     "Rakefile",
+     "VERSION",
+     "bin/workforce",
+     "config_sample.rb",
+     "lib/workforce.rb",
+     "lib/workforce/configuration.rb",
+     "lib/workforce/controller.rb",
+     "lib/workforce/inflector.rb",
+     "lib/workforce/manager.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb",
+     "workers/simple_daemon.rb",
+     "workers/sleep_daemon.rb",
+     "workforce.gemspec"
+  ]
+  s.homepage = %q{http://github.com/divoxx/workforce}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Framework and a distributed runtime manager to creating and running background processes}
+  s.test_files = [
+    "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<yard>, [">= 0.5.5"])
+    else
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<yard>, [">= 0.5.5"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<yard>, [">= 0.5.5"])
+  end
+end
+

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Rodrigo Kochenburger
@@ -68,9 +68,11 @@ files:
 - lib/workforce/controller.rb
 - lib/workforce/inflector.rb
 - lib/workforce/manager.rb
-- sleep_daemon.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- workers/simple_daemon.rb
+- workers/sleep_daemon.rb
+- workforce.gemspec
 has_rdoc: true
 homepage: http://github.com/divoxx/workforce
 licenses: []