workforce 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/bin/workforce

@@ -26,6 +26,11 @@ 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("-h", "--help", "Show this screen") do
+    puts optparser
+    exit
+  end
 end
 
 optparser.parse!
@@ -35,6 +40,7 @@ $:.unshift(config.workers_dir)
 
 begin
   Workforce::Controller.instance.dispatch(action, *args)
-rescue ArgumentError
+rescue ArgumentError => e
+  puts e.message
   puts optparser
 end

data/lib/workforce/controller.rb

@@ -7,12 +7,11 @@ module Workforce
     include Singleton
     
     def dispatch(action, *args)
-      unless ACTIONS.include?(action.to_s)
-        puts "Invalid action #{action}"
-        exit(1)
+      if ACTIONS.include?(action.to_s)
+        send(action, *args)
+      else
+        raise ArgumentError, "Invalid action"
       end
-      
-      send(action, *args)
     end
     
     def list

data/lib/workforce/manager.rb

@@ -89,10 +89,9 @@ module Workforce
         ensure_running!
       
         logger.info "Shutting down child processes"
-        @pids.each do |pid|
-          Process.kill(:QUIT, pid)
-        end
-      
+        @pids.each { |pid| Process.kill(:QUIT, pid) }
+        Process.waitall
+                
         @pipe_out.write(1)
       end
     end

data/{config_sample.rb → sample/config_sample.rb}

@@ -1,4 +1,5 @@
 base_path = File.dirname(__FILE__)
 
+workers_dir "#{base_path}/workers"
 pid_dir "#{base_path}/pid"
-log_dir "#{base_path}/log"
+log_dir "#{base_path}/log"

data/workforce.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{workforce}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rodrigo Kochenburger"]
@@ -26,16 +26,15 @@ Gem::Specification.new do |s|
      "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",
+     "sample/config_sample.rb",
+     "sample/workers/sleep_daemon.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}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Rodrigo Kochenburger
@@ -62,16 +62,15 @@ files:
 - 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
+- sample/config_sample.rb
+- sample/workers/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