daemonz 0.3.6 → 0.3.7

data/Gemfile

@@ -2,15 +2,15 @@ source :rubygems
 
 gem 'posix-spawn', '>= 0.3.6'
 gem 'simple-daemon', '>= 0.1.2'
-gem 'rails', '>= 3.2.0'
+gem 'rails', '>= 3.2.8'
 gem 'zerg_support', '>= 0.1.5'
 
 group :development do
-  gem 'bundler', '>= 1.0.21'
-  gem 'flexmock', '>= 0.9.0'
-  gem 'jeweler', '>= 1.8.3'
+  gem 'bundler', '>= 1.2.0'
+  gem 'flexmock', '>= 1.0.2'
+  gem 'jeweler', '>= 1.8.4'
   gem 'rake', '>= 0.9.2.2'
   gem 'rcov', '>= 0', :platform => :mri_18
   gem 'simplecov', '>= 0', :platform => :mri_19
-  gem 'sqlite3', '>= 1.3.5'
+  gem 'sqlite3', '>= 1.3.6'
 end

data/Gemfile.lock

@@ -1,111 +1,111 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.1)
-      actionpack (= 3.2.1)
-      mail (~> 2.4.0)
-    actionpack (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
+    actionmailer (3.2.8)
+      actionpack (= 3.2.8)
+      mail (~> 2.4.4)
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
+      journey (~> 1.0.4)
       rack (~> 1.4.0)
-      rack-cache (~> 1.1)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
-    activerecord (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      arel (~> 3.0.0)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-    activesupport (3.2.1)
+    activeresource (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+    activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (3.0.0)
-    builder (3.0.0)
+    arel (3.0.2)
+    builder (3.0.3)
     erubis (2.7.0)
-    flexmock (0.9.0)
+    flexmock (1.0.2)
     git (1.2.5)
     hike (1.2.1)
-    i18n (0.6.0)
-    jeweler (1.8.3)
+    i18n (0.6.1)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
-    journey (1.0.1)
-    json (1.6.5)
-    mail (2.4.1)
+    journey (1.0.4)
+    json (1.7.5)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.0.4)
+    mime-types (1.19)
+    multi_json (1.3.6)
     polyglot (0.3.3)
     posix-spawn (0.3.6)
     rack (1.4.1)
-    rack-cache (1.1)
+    rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.1)
-      actionmailer (= 3.2.1)
-      actionpack (= 3.2.1)
-      activerecord (= 3.2.1)
-      activeresource (= 3.2.1)
-      activesupport (= 3.2.1)
+    rails (3.2.8)
+      actionmailer (= 3.2.8)
+      actionpack (= 3.2.8)
+      activerecord (= 3.2.8)
+      activeresource (= 3.2.8)
+      activesupport (= 3.2.8)
       bundler (~> 1.0)
-      railties (= 3.2.1)
-    railties (3.2.1)
-      actionpack (= 3.2.1)
-      activesupport (= 3.2.1)
+      railties (= 3.2.8)
+    railties (3.2.8)
+      actionpack (= 3.2.8)
+      activesupport (= 3.2.8)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
+      thor (>= 0.14.6, < 2.0)
     rake (0.9.2.2)
     rcov (1.0.0)
     rdoc (3.12)
       json (~> 1.4)
     simple-daemon (0.1.2)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    sprockets (2.1.2)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
-    thor (0.14.6)
+    sqlite3 (1.3.6)
+    thor (0.16.0)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
+    tzinfo (0.3.33)
     zerg_support (0.1.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.0.21)
-  flexmock (>= 0.9.0)
-  jeweler (>= 1.8.3)
+  bundler (>= 1.2.0)
+  flexmock (>= 1.0.2)
+  jeweler (>= 1.8.4)
   posix-spawn (>= 0.3.6)
-  rails (>= 3.2.0)
+  rails (>= 3.2.8)
   rake (>= 0.9.2.2)
   rcov
   simple-daemon (>= 0.1.2)
   simplecov
-  sqlite3 (>= 1.3.5)
+  sqlite3 (>= 1.3.6)
   zerg_support (>= 0.1.5)

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

data/daemonz.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "daemonz"
-  s.version = "0.3.6"
+  s.version = "0.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = "2012-02-11"
+  s.date = "2012-09-14"
   s.description = "Works with Facebook."
   s.email = "victor@costan.us"
   s.extra_rdoc_files = [
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/costan/daemonz"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.24"
   s.summary = "User authentication for Rails 3 applications."
 
   if s.respond_to? :specification_version then
@@ -58,40 +58,40 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<posix-spawn>, [">= 0.3.6"])
       s.add_runtime_dependency(%q<simple-daemon>, [">= 0.1.2"])
-      s.add_runtime_dependency(%q<rails>, [">= 3.2.0"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.2.8"])
       s.add_runtime_dependency(%q<zerg_support>, [">= 0.1.5"])
-      s.add_development_dependency(%q<bundler>, [">= 1.0.21"])
-      s.add_development_dependency(%q<flexmock>, [">= 0.9.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.8.3"])
+      s.add_development_dependency(%q<bundler>, [">= 1.2.0"])
+      s.add_development_dependency(%q<flexmock>, [">= 1.0.2"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.8.4"])
       s.add_development_dependency(%q<rake>, [">= 0.9.2.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<sqlite3>, [">= 1.3.5"])
+      s.add_development_dependency(%q<sqlite3>, [">= 1.3.6"])
     else
       s.add_dependency(%q<posix-spawn>, [">= 0.3.6"])
       s.add_dependency(%q<simple-daemon>, [">= 0.1.2"])
-      s.add_dependency(%q<rails>, [">= 3.2.0"])
+      s.add_dependency(%q<rails>, [">= 3.2.8"])
       s.add_dependency(%q<zerg_support>, [">= 0.1.5"])
-      s.add_dependency(%q<bundler>, [">= 1.0.21"])
-      s.add_dependency(%q<flexmock>, [">= 0.9.0"])
-      s.add_dependency(%q<jeweler>, [">= 1.8.3"])
+      s.add_dependency(%q<bundler>, [">= 1.2.0"])
+      s.add_dependency(%q<flexmock>, [">= 1.0.2"])
+      s.add_dependency(%q<jeweler>, [">= 1.8.4"])
       s.add_dependency(%q<rake>, [">= 0.9.2.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<sqlite3>, [">= 1.3.5"])
+      s.add_dependency(%q<sqlite3>, [">= 1.3.6"])
     end
   else
     s.add_dependency(%q<posix-spawn>, [">= 0.3.6"])
     s.add_dependency(%q<simple-daemon>, [">= 0.1.2"])
-    s.add_dependency(%q<rails>, [">= 3.2.0"])
+    s.add_dependency(%q<rails>, [">= 3.2.8"])
     s.add_dependency(%q<zerg_support>, [">= 0.1.5"])
-    s.add_dependency(%q<bundler>, [">= 1.0.21"])
-    s.add_dependency(%q<flexmock>, [">= 0.9.0"])
-    s.add_dependency(%q<jeweler>, [">= 1.8.3"])
+    s.add_dependency(%q<bundler>, [">= 1.2.0"])
+    s.add_dependency(%q<flexmock>, [">= 1.0.2"])
+    s.add_dependency(%q<jeweler>, [">= 1.8.4"])
     s.add_dependency(%q<rake>, [">= 0.9.2.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<sqlite3>, [">= 1.3.5"])
+    s.add_dependency(%q<sqlite3>, [">= 1.3.6"])
   end
 end
 

data/lib/daemonz.rb

@@ -1,5 +1,5 @@
 module Daemonz
-  
+
 end
 
 require 'daemonz/config.rb'

data/lib/daemonz/config.rb

@@ -4,7 +4,7 @@ require 'yaml'
 module Daemonz
   class << self
     attr_reader :config
-    
+
     # Set by the rake tasks.
     attr_accessor :keep_daemons_at_exit
   end
@@ -14,7 +14,7 @@ module Daemonz
     return config[:cached_disabled] if config.has_key? :cached_disabled
     config[:cached_disabled] = disabled_without_cache!
   end
-  
+
   def self.disabled_without_cache!
     return true if config[:disabled]
     return true if config[:disabled_in].include? Rails.env.to_s
@@ -22,11 +22,11 @@ module Daemonz
       suffix == $0[-suffix.length, suffix.length]
     end
   end
-  
-  # figure out the plugin's configuration 
+
+  # figure out the plugin's configuration
   def self.configure(config_file, options = {})
     load_configuration config_file
-    
+
     config[:root_path] ||= Rails.root
     if options[:force_enabled]
       config[:disabled] = false
@@ -39,7 +39,7 @@ module Daemonz
     end
     config[:disabled] = false if config[:disabled] == 'false'
     config[:master_file] ||= Rails.root.join "tmp", "pids", "daemonz.master.pid"
-    
+
     config[:logger] &&= options[:override_logger]
     self.configure_logger
 
@@ -49,7 +49,7 @@ module Daemonz
       config[:is_master] = Daemonz.claim_master
     end
   end
-    
+
   # load and parse the config file
   def self.load_configuration(config_file)
     if File.exist? config_file
@@ -57,15 +57,16 @@ module Daemonz
       erb_result = ERB.new(file_contents).result
       @config = YAML.load erb_result
       @config[:daemons] ||= {}
-      
+
       config_dir = File.join(File.dirname(config_file), 'daemonz')
       if File.exist? config_dir
         Dir.entries(config_dir).each do |entry|
-          daemons_file = File.join(config_dir, entry) 
+          next unless entry =~ /^\w/  # Avoid temporary files.
+          daemons_file = File.join(config_dir, entry)
           next unless File.file? daemons_file
-          
+
           file_contents = File.read daemons_file
-          erb_result = ERB.new(file_contents).result          
+          erb_result = ERB.new(file_contents).result
           daemons = YAML.load erb_result
           daemons.keys.each do |daemon|
             if @config[:daemons].has_key? daemon
@@ -80,19 +81,19 @@ module Daemonz
       @config = { :disabled => true }
     end
   end
-  
+
   class << self
     attr_reader :daemons
   end
-  
+
   # process the daemon configuration
-  def self.configure_daemons    
+  def self.configure_daemons
     @daemons = []
     config[:daemons].each do |name, daemon_config|
       next if daemon_config[:disabled]
       daemon = { :name => name }
-            
-      # compute the daemon startup / stop commands 
+
+      # compute the daemon startup / stop commands
       ['start', 'stop'].each do |command|
         daemon_binary = daemon_config[:binary] || daemon_config["#{command}_binary".to_sym]
         if daemon_config[:absolute_binary]
@@ -108,7 +109,7 @@ module Daemonz
           logger.error "Daemonz ignoring #{name}; the #{command} file is missing"
           break
         end
-        
+
         unless daemon_config[:absolute_binary]
           begin
             binary_perms = File.stat(daemon_path).mode
@@ -121,16 +122,16 @@ module Daemonz
             logger.info e.backtrace.join("\n") + "\n"
           end
         end
-        
+
         daemon_args = daemon_config[:args] || daemon_config["#{command}_args".to_sym]
         daemon_cmdline = "#{daemon_path} #{daemon_args}"
         daemon[command.to_sym] = {:path => daemon_path, :cmdline => daemon_cmdline}
       end
       next unless daemon[:stop]
-      
+
       # kill patterns
       daemon[:kill_patterns] = daemon_config[:kill_patterns] || [daemon[:start][:path]]
-      
+
       # pass-through params
       daemon[:pids] = daemon_config[:pids]
       unless daemon[:pids]
@@ -139,10 +140,10 @@ module Daemonz
       end
       daemon[:delay_before_kill] = daemon_config[:delay_before_kill] || 0.2
       daemon[:start_order] = daemon_config[:start_order]
-      
+
       @daemons << daemon
     end
-    
+
     # sort by start_order, then by name
     @daemons.sort! do |a, b|
       if a[:start_order]

data/lib/daemonz/generators/config/config_generator.rb

@@ -2,19 +2,19 @@
 module Daemonz
 # :nodoc: namespace
 module Generators
-  
+
 class ConfigGenerator < Rails::Generators::Base
   def self.source_root
     @source_root ||= File.expand_path 'templates', File.dirname(__FILE__)
   end
-    
+
   def create_configuration
     copy_file 'config.yml', 'config/daemonz.yml'
-    
+
     empty_directory 'config/daemonz'
     copy_file 'prepackaged/ferret.yml', 'config/daemonz/ferret.yml'
     copy_file 'prepackaged/starling.yml', 'config/daemonz/starling.yml'
-  end  
+  end
 end  # class Daemonz::Generators::ConfigGenerator
 
 end  # namespace Daemonz::Generators

data/lib/daemonz/generators/config/templates/config.yml

@@ -1,7 +1,7 @@
 # Configuration file for the daemonz plugin.
 
 ---
-:daemons: 
+:daemons:
   # Daemon configurations placed here will be read as if they were in a file in
   # config/daemonz. This is more maintainable if you only have one daemon.
 
@@ -21,7 +21,7 @@
 
 # Daemons will not be started / stopped when the name of the binary that's
 # loading Rails ($0) is one of the following.
-:disabled_for: 
+:disabled_for:
 - 'rake'
 - 'script/generate'
 - 'script/destroy'
@@ -31,6 +31,6 @@
 # rake daemons:start / rake daemons:stop, or you can remove the line below.
 - 'irb'
 
-# Daemons will not be started for the following environments. 
+# Daemons will not be started for the following environments.
 :disabled_in:
 - 'test'

data/lib/daemonz/generators/config/templates/prepackaged/ferret.yml

@@ -1,6 +1,6 @@
 # Daemonz example: configuration for ferret.
 #
-# daemonz starts the daemons according to the alphabetic order of their 
+# daemonz starts the daemons according to the alphabetic order of their
 # configuration file names. start_order can be used to override this order.
 # Daemons will be stopped in the reverse order of their starting order.
 #
@@ -12,7 +12,7 @@
 #                    configuration
 #   * PID files: if the daemon has .pid files, daemonz tries to read the file
 #                and find the corresponding processes, then tree-kills them
-#   * Process table: if possible, daemonz dumps the process table, looks for the 
+#   * Process table: if possible, daemonz dumps the process table, looks for the
 #                    processes that look like the daemon, and tree-kills them
 #   * Pattern matching: processes whose command lines have the same arguments as
 #                       those given to daemon "look like" that daemon
@@ -23,7 +23,7 @@
 
 ---
 ferret:
-  # Ferret uses different binaries to be started and stopped. 
+  # Ferret uses different binaries to be started and stopped.
   :start_binary: script/ferret_server
   :stop_binary: script/ferret_server
   # The arguments to be given to the start and stop commands.

data/lib/daemonz/generators/config/templates/prepackaged/starling.yml

@@ -1,6 +1,6 @@
 # Daemonz example: configuration for running starling.
 #
-# daemonz starts the daemons according to the alphabetic order of their 
+# daemonz starts the daemons according to the alphabetic order of their
 # configuration file names. start_order can be used to override this order.
 # Daemons will be stopped in the reverse order of their starting order.
 #
@@ -12,7 +12,7 @@
 #                    configuration
 #   * PID files: if the daemon has .pid files, daemonz tries to read the file
 #                and find the corresponding processes, then tree-kills them
-#   * Process table: if possible, daemonz dumps the process table, looks for the 
+#   * Process table: if possible, daemonz dumps the process table, looks for the
 #                    processes that look like the daemon, and tree-kills them
 #   * Pattern matching: processes whose command lines have the same arguments as
 #                       those given to daemon "look like" that daemon

data/lib/daemonz/generators/daemon/daemon_generator.rb

@@ -2,19 +2,19 @@
 module Daemonz
 # :nodoc: namespace
 module Generators
-  
+
 class DaemonGenerator < Rails::Generators::NamedBase
   def self.source_root
     @source_root ||= File.expand_path 'templates', File.dirname(__FILE__)
   end
-  
+
   def create_harness
     empty_directory 'config/daemonz'
     template "config.yml", "config/daemonz/#{file_name}.yml"
-      
+
     empty_directory 'script/background'
     template 'daemon.rb.erb', "script/background/#{file_name}.rb"
-      
+
     empty_directory 'test/integration'
     template 'integration_test.rb.erb', "test/integration/#{file_name}_test.rb"
   end

data/lib/daemonz/generators/daemon/templates/config.yml

@@ -1,6 +1,6 @@
 # Automatically generated daemon configuration for <%= file_name %>.
 #
-# daemonz starts the daemons according to the alphabetic order of their 
+# daemonz starts the daemons according to the alphabetic order of their
 # configuration file names. start_order can be used to override this order.
 # Daemons will be stopped in the reverse order of their starting order.
 #
@@ -12,7 +12,7 @@
 #                    configuration
 #   * PID files: if the daemon has .pid files, daemonz tries to read the file
 #                and find the corresponding processes, then tree-kills them
-#   * Process table: if possible, daemonz dumps the process table, looks for the 
+#   * Process table: if possible, daemonz dumps the process table, looks for the
 #                    processes that look like the daemon, and tree-kills them
 #   * Pattern matching: processes whose command lines have the same arguments as
 #                       those given to daemon "look like" that daemon
@@ -25,15 +25,15 @@
 <%= file_name %>:
   # Pattern for the PID file(s) used by the daemon.
   :pids: tmp/<%= class_name %>.pid
-  # The same binary is used to start and stop <% file_name %>.  
-  :binary: script/background/<%= file_name %>.rb 
+  # The same binary is used to start and stop <% file_name %>.
+  :binary: script/background/<%= file_name %>.rb
   # The arguments to be given to the start and stop commands.
   :start_args: start <%= '<%= Rails.env %' + '>' %>
   :stop_args: stop
-  # Time to wait after sending the stop command, before killing the daemon.    
+  # Time to wait after sending the stop command, before killing the daemon.
   :delay_before_kill: 1.0
   # If this is a consumer of another daemon (like starling), make sure the start
-  # order index is bigger than the other daemons' start order index. 
+  # order index is bigger than the other daemons' start order index.
   :start_order: 1
-  # daemonz will ignore this daemon configuration when this flag is true    
+  # daemonz will ignore this daemon configuration when this flag is true
   :disabled: false

data/lib/daemonz/generators/daemon/templates/daemon.rb.erb

@@ -18,8 +18,8 @@ end
 require 'simple-daemon'
 class <%= class_name %> < SimpleDaemon::Base
   SimpleDaemon::WORKING_DIRECTORY = Rails.root.join 'log'
-  
-  def self.start    
+
+  def self.start
     STDOUT.sync = true
     @logger = Logger.new(STDOUT)
     @logger.level = Rails.env.production?
@@ -28,31 +28,31 @@ class <%= class_name %> < SimpleDaemon::Base
 			# This is handy if your daemon queries the database often.
       ActiveRecord::Base.logger.level = Logger::INFO
     end
-		
-    @logger.info "Starting daemon #{self.name}"		
-        
-    loop do 
+
+    @logger.info "Starting daemon #{self.name}"
+
+    loop do
       begin
         # TODO: execute some tasks in the background repeatedly
-        
+
         # YOUR CODE HERE
-        
+
         # Optional. Sleep between tasks.
         Kernel.sleep 1
       rescue Exception => e
         # This gets thrown when we need to get out.
         raise if e.kind_of? SystemExit
-				
+
         @logger.error "Error in daemon #{self.name} - #{e.class.name}: #{e}"
         @logger.info e.backtrace.join("\n")
-        
+
         # If something bad happened, it usually makes sense to wait for some
         # time, so any external issues can settle.
         Kernel.sleep 5
       end
     end
   end
-  
+
   def self.stop
     @logger.info "Stopping daemon #{self.name}"
   end

data/lib/daemonz/generators/daemon/templates/integration_test.rb.erb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class <%= class_name %>Test < ActionController::IntegrationTest
   fixtures :all
-  
+
   # Normally, Rails runs the entire test in a transaction, so the database
   # changes done in test are isolated from the database changes made by daemons.
   # The line can be removed if the test and the daemon don't communicate via the
@@ -11,7 +11,7 @@ class <%= class_name %>Test < ActionController::IntegrationTest
 
   test "daemon interactions" do
 	  # stuff that should be done before the daemon runs (e.g. database setup)
-		
+
     Daemonz.with_daemons do
 		  # test interactions with the daemon
     end

data/lib/daemonz/killer.rb

@@ -2,7 +2,7 @@ module Daemonz
   # Complex procedure for killing a process or a bunch of process replicas
   # kill_command is the script that's supposed to kill the process / processes (tried first)
   # pid_patters are globs identifying PID files (a file can match any of the patterns)
-  # process_patterns are strings that should show on a command line (a process must match all)  
+  # process_patterns are strings that should show on a command line (a process must match all)
   # options:
   #   :verbose - log what gets killed
   #   :script_delay - the amount of seconds to sleep after launching the kill script
@@ -30,7 +30,7 @@ module Daemonz
         sleep 0.05
       end
     end
-    
+
     # Phase 2: look through PID files and issue kill orders
     pinfo = process_info()
     pid_files = pid_patterns.map { |pattern| Dir.glob(pattern) }.flatten
@@ -39,7 +39,7 @@ module Daemonz
         pid = File.open(fname, 'r') { |f| f.read.strip! }
         process_cmdline = pinfo[pid][:cmdline]
         # avoid killing innocent victims
-        if pinfo[pid].nil? or process_patterns.all? { |pattern| process_cmdline.index pattern } 
+        if pinfo[pid].nil? or process_patterns.all? { |pattern| process_cmdline.index pattern }
           logger.warn "Killing #{pid}: #{process_cmdline}" if options[:verbose]
           Process.kill 'TERM', pid.to_i
         end
@@ -53,7 +53,7 @@ module Daemonz
         # prevents crashing if the file is wiped after we call exists?
       end
     end
-    
+
     # Phase 3: look through the process table and kill anything that looks good
     pinfo = process_info()
     pinfo.each do |pid, info|

data/lib/daemonz/logging.rb

@@ -1,10 +1,10 @@
 module Daemonz
   @logger = Rails.logger
-  
+
   def self.logger
     @logger || Rails.logger
   end
-  
+
   def self.configure_logger
     case config[:logger]
     when 'stdout'
@@ -16,7 +16,7 @@ module Daemonz
     when 'rails'
       @logger = Rails.logger
     else
-      @logger = Rails.logger   
+      @logger = Rails.logger
     end
   end
 end

data/lib/daemonz/manage.rb

@@ -10,18 +10,18 @@ module Daemonz
       safe_stop :force_enabled => true
     end
   end
-  
+
   # Complete startup used by rake:start and at Rails plug-in startup.
   def self.safe_start(options = {})
     daemonz_config = Rails.root.join 'config', 'daemonz.yml'
     Daemonz.configure daemonz_config, options
-    
+
     if Daemonz.config[:is_master]
       Daemonz.configure_daemons
       Daemonz.start_daemons!
     end
   end
-  
+
   # Complete shutdown used by rake:start and at Rails application exit.
   def self.safe_stop(options = {})
     if options[:configure]
@@ -36,36 +36,36 @@ module Daemonz
       Daemonz.release_master_lock
     end
   end
-    
+
   def self.start_daemons!
     @daemons.each { |daemon| start_daemon! daemon }
   end
-  
+
   def self.stop_daemons!
     @daemons.reverse.each { |daemon| stop_daemon! daemon }
   end
-  
+
   def self.start_daemon!(daemon)
     # cleanup before we start
     kill_process_set daemon[:stop][:cmdline], daemon[:pids],
                      daemon[:kill_patterns],
                      :script_delay => daemon[:delay_before_kill],
                      :verbose => true, :force_script => false
-      
+
     logger.info "Daemonz starting #{daemon[:name]}: #{daemon[:start][:cmdline]}"
     child = POSIX::Spawn::Child.new daemon[:start][:cmdline]
-    
+
     unless child.success?
       exit_code = child.status.exitstatus
       logger.warn "Daemonz start script for #{daemon[:name]} failed " +
                   "with code #{exit_code}"
     end
   end
-  
+
   def self.stop_daemon!(daemon)
     kill_process_set daemon[:stop][:cmdline], daemon[:pids],
                      daemon[:kill_patterns],
                      :script_delay => daemon[:delay_before_kill],
                      :verbose => true, :force_script => true
-  end  
+  end
 end

data/lib/daemonz/master.rb

@@ -8,26 +8,26 @@ module Daemonz
       logger.warn "Master lock removed by someone else"
     end
   end
-  
+
   def self.grab_master_lock
     loop do
       File.open(config[:master_file], File::CREAT | File::RDWR) do |f|
         if f.flock File::LOCK_EX
           lock_data = f.read
-          lock_data = lock_data[lock_data.index(/\d/), lock_data.length] if lock_data.index /\d/          
+          lock_data = lock_data[lock_data.index(/\d/), lock_data.length] if lock_data.index /\d/
           master = lock_data.split("\n", 2)
-          
+
           if master.length == 2
-            master_pid = master[0].to_i            
+            master_pid = master[0].to_i
             master_cmdline = master[1]
             if master_pid != 0
               master_pinfo = process_info(master_pid)
               return master_pid if master_pinfo and master_pinfo[:cmdline] == master_cmdline
-             
-              logger.info "Old master (PID #{master_pid}) died; breaking master lock"            
-            end            
+
+              logger.info "Old master (PID #{master_pid}) died; breaking master lock"
+            end
           end
-          
+
           f.truncate 0
           f.write "#{$PID}\n#{process_info($PID)[:cmdline]}"
           f.flush
@@ -36,7 +36,7 @@ module Daemonz
       end
     end
   end
-  
+
   # attempts to claim the master lock
   def self.claim_master
     begin

data/lib/daemonz/process.rb

@@ -28,7 +28,7 @@ begin
   if Sys::ProcTable::VERSION == '0.7.6'
     raise LoadError, 'Buggy sys/proctable, emulate'
   end
-  
+
   module Daemonz::ProcTable
     def self.ps
       # We don't use ps_emulation all the time because sys-proctable is
@@ -42,7 +42,7 @@ begin
   end
 rescue LoadError
   # The accelerated version is not available, use the slow version all the time.
-  
+
   module Daemonz::ProcTable
     def self.ps
       self.ps_emulation
@@ -50,11 +50,11 @@ rescue LoadError
   end
 end
 
-module Daemonz 
+module Daemonz
   # returns information about a process or all the running processes
   def self.process_info(pid = nil)
     info = Hash.new
-    
+
     Daemonz::ProcTable.ps.each do |process|
       item = { :cmdline => process.cmdline, :pid => process.pid.to_s }
 
@@ -64,7 +64,7 @@ module Daemonz
         return item if item[:pid].to_s == pid.to_s
       end
     end
-    
+
     if pid.nil?
       return info
     else

data/lib/daemonz/railtie.rb

@@ -17,9 +17,9 @@ class Railtie < Rails::Railtie
   end
 
   rake_tasks do
-    load 'daemonz/tasks/daemonz_tasks.rake'    
+    load 'daemonz/tasks/daemonz_tasks.rake'
   end
-  
+
   generators do
     require 'daemonz/generators/config/config_generator.rb'
     require 'daemonz/generators/daemon/daemon_generator.rb'

data/lib/daemonz/tasks/daemonz_tasks.rake

@@ -2,13 +2,13 @@ namespace :daemons do
   desc "(testing only) Starts the daemons in config/daemonz.yml"
   task :start => :environment do
     Daemonz.safe_start :force_enabled => true, :override_logger => 'stdout'
-    Daemonz.keep_daemons_at_exit = true 
+    Daemonz.keep_daemons_at_exit = true
   end
 
   desc "(testing only) Stops the daemons in config/daemonz.yml"
   task :stop => :environment do
     Daemonz.safe_stop :force_enabled => true, :configure => true,
                       :override_logger => 'stdout'
-    Daemonz.keep_daemons_at_exit = true                      
-  end  
+    Daemonz.keep_daemons_at_exit = true
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daemonz
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-11 00:00:00.000000000 Z
+date: 2012-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: posix-spawn
-  requirement: &12292480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 0.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *12292480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.6
 - !ruby/object:Gem::Dependency
   name: simple-daemon
-  requirement: &12291500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +37,31 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *12291500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &12307720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.8
   type: :runtime
   prerelease: false
-  version_requirements: *12307720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.8
 - !ruby/object:Gem::Dependency
   name: zerg_support
-  requirement: &12306520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,43 +69,63 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *12306520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &12305380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.21
+        version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *12305380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: &12303700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *12303700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &13456480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *13456480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.8.4
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &13455300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *13455300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &13453860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13453860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &13452680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,18 +165,28 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13452680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &13451240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.3.6
   type: :development
   prerelease: false
-  version_requirements: *13451240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.6
 description: Works with Facebook.
 email: victor@costan.us
 executables: []
@@ -183,7 +238,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1622779978803712396
+      hash: 4130437893997824476
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -192,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: User authentication for Rails 3 applications.