kennethkalmer-daemon-kit 0.1.5.1 → 0.1.6

data/History.txt

@@ -1,3 +1,12 @@
+== 0.1.6 2009-05-13
+
+* DaemonKit::Safety class to handle the trapping and logging of
+  exceptions, as well as email notifications or Hoptoad notifications.
+* New config/pre-daemonize and config/post-daemonize structure
+* New tasks to simplify upgrading daemon-kit projects
+* Fixed some other annoyances and bugs
+* Bigger TODO list
+
 == 0.1.5 2009-05-07
 
 * DaemonKit::Config class to easy the use of YAML configs internally,

data/Manifest.txt

@@ -14,7 +14,8 @@ app_generators/daemon_kit/templates/config/environment.rb
 app_generators/daemon_kit/templates/config/environments/development.rb
 app_generators/daemon_kit/templates/config/environments/production.rb
 app_generators/daemon_kit/templates/config/environments/test.rb
-app_generators/daemon_kit/templates/config/initializers/readme
+app_generators/daemon_kit/templates/config/post-daemonize/readme
+app_generators/daemon_kit/templates/config/pre-daemonize/readme
 app_generators/daemon_kit/templates/lib/daemon.rb
 app_generators/daemon_kit/templates/libexec/daemon.erb
 bin/daemon_kit
@@ -43,12 +44,17 @@ lib/daemon_kit/amqp.rb
 lib/daemon_kit/application.rb
 lib/daemon_kit/config.rb
 lib/daemon_kit/cron.rb
+lib/daemon_kit/error_handlers/base.rb
+lib/daemon_kit/error_handlers/hoptoad.rb
+lib/daemon_kit/error_handlers/mail.rb
 lib/daemon_kit/initializer.rb
 lib/daemon_kit/jabber.rb
 lib/daemon_kit/nanite.rb
 lib/daemon_kit/nanite/agent.rb
 lib/daemon_kit/patches/force_kill_wait.rb
+lib/daemon_kit/safety.rb
 lib/daemon_kit/tasks.rb
+lib/daemon_kit/tasks/environment.rake
 lib/daemon_kit/tasks/framework.rake
 rubygems_generators/install_rspec/USAGE
 rubygems_generators/install_rspec/install_rspec_generator.rb

data/TODO.txt

@@ -4,7 +4,7 @@ DaemonKit TODO List
 This is purely a drop in the bucket of what has to come...
 
 * [DONE] Easy way to trap signals
-* Error handling to the degree Rails does
+* [IN PROGRESS] Error handling to the degree Rails does
 * Easy configuration of an ORM of choice, including patching it if needed (ActiveRecord *cough*)
 * Improved generators for creating skeleton daemons:
   * [DONE] Jabber bot
@@ -14,6 +14,7 @@ This is purely a drop in the bucket of what has to come...
   * Queue (SQS, AMQP, etc) pollers
 * Rake tasks for generating:
   * god configs
+  * Sys-V style init scripts
 * Pre-built capistrano configs for easy deployment
 * Support for dropping privileges
 * Support for chroot'ing

data/app_generators/daemon_kit/daemon_kit_generator.rb

@@ -60,15 +60,19 @@ class DaemonKitGenerator < RubiGen::Base
       m.template  "config/environment.rb", "config/environment.rb"
       m.directory "config/environments"
       %w{ development test production }.each { |f| m.file "config/environments/#{f}.rb", "config/environments/#{f}.rb" }
-      m.directory "config/initializers"
-      m.file      "config/initializers/readme", "config/initializers/readme"
+      m.directory "config/pre-daemonize"
+      m.file      "config/pre-daemonize/readme", "config/pre-daemonize/readme"
+      m.directory "config/post-daemonize"
+      m.file      "config/post-daemonize/readme", "config/post-daemonize/readme"
 
       # Libraries
       m.directory "lib"
       m.file "lib/daemon.rb", "lib/#{daemon_name}.rb"
 
-      # Tests
+      # Tasks
       m.directory "tasks"
+
+      # Tests
       m.dependency "install_rspec", [daemon_name], :destination => destination_root, :collision => :force
 
       # Others

data/app_generators/daemon_kit/templates/config/environment.rb

@@ -16,4 +16,8 @@ DaemonKit::Initializer.run do |config|
 
   # Force the daemon to be killed after X seconds from asking it to
   # config.force_kill_wait = 30
+
+  # Configure the safety net (see DaemonKit::Safety)
+  # config.safety_net.handler = :mail # (or :hoptoad )
+  # config.safety_net.mail.host = 'localhost'
 end

data/app_generators/daemon_kit/templates/config/post-daemonize/readme

@@ -0,0 +1,5 @@
+# You can place files in here to be loaded after the code is daemonized.
+#
+# All the files placed here will just be required into the running
+# process. This is the correct place to open any IO objects, establish
+# database connections, etc.

data/app_generators/daemon_kit/templates/config/{initializers → pre-daemonize}/readme

@@ -1,7 +1,8 @@
 # You can place files in here to be loaded before the code is daemonized.
 #
 # DaemonKit looks for a file named '<config.daemon_name>.rb' and loads
-# that file with as if inside a DaemonKit::Initializer block.
+# that file first, and inside a DaemonKit::Initializer block. The
+# remaning files then simply required into the running process.
 # 
 # These files are mostly useful for operations that should fail blatantly
 # before daemonizing, like loading gems.

data/app_generators/daemon_kit/templates/lib/daemon.rb

@@ -1 +1,2 @@
-# Your starting point for daemon specific classes
+# Your starting point for daemon specific classes. This directory is
+# already included in your load path, so no need to specify it.

data/daemon_generators/amqp/amqp_generator.rb

@@ -15,7 +15,7 @@ class AmqpGenerator < RubiGen::Base
     record do |m|
       # Ensure appropriate folder(s) exists
       m.directory ''
-      
+
       # Create stubs
       # m.template           "template.rb.erb", "some_file_after_erb.rb"
       # m.template_copy_each ["template.rb", "template2.rb"]
@@ -32,7 +32,7 @@ class AmqpGenerator < RubiGen::Base
 
       # Copy over our daemon
       m.directory 'libexec'
-      m.template 'libexec/daemon.rb', "libexec/#{name}.rb"
+      m.template 'libexec/daemon.rb', "libexec/#{name}-daemon.rb"
     end
   end
 

data/daemon_generators/cron/cron_generator.rb

@@ -23,7 +23,7 @@ class CronGenerator < RubiGen::Base
       # m.file           "file", "some_file_copied"
       # m.file_copy_each ["path/to/file", "path/to/file2"]
       # m.file_copy_each ["path/to/file", "path/to/file2"], "some/path"
-      
+
       # Copy over configs
       m.directory 'config'
       m.directory 'config/initializers'
@@ -31,7 +31,7 @@ class CronGenerator < RubiGen::Base
 
       # Copy over our daemon
       m.directory 'libexec'
-      m.template 'libexec/daemon.rb', "libexec/#{name}.rb"
+      m.template 'libexec/daemon.rb', "libexec/#{name}-daemon.rb"
     end
   end
 

data/daemon_generators/jabber/jabber_generator.rb

@@ -23,7 +23,7 @@ class JabberGenerator < RubiGen::Base
       # m.file           "file", "some_file_copied"
       # m.file_copy_each ["path/to/file", "path/to/file2"]
       # m.file_copy_each ["path/to/file", "path/to/file2"], "some/path"
-      
+
       # Copy over our configs
       m.directory 'config'
       m.template  'config/jabber.yml', 'config/jabber.yml'
@@ -32,7 +32,7 @@ class JabberGenerator < RubiGen::Base
 
       # Copy over our daemon
       m.directory 'libexec'
-      m.template 'libexec/daemon.rb', "libexec/#{name}.rb"
+      m.template 'libexec/daemon.rb', "libexec/#{name}-daemon.rb"
     end
   end
 

data/daemon_generators/nanite_agent/nanite_agent_generator.rb

@@ -35,7 +35,7 @@ class NaniteAgentGenerator < RubiGen::Base
 
       # Copy over our daemon
       m.directory 'libexec'
-      m.template  'libexec/daemon.rb', "libexec/#{name}.rb"
+      m.template  'libexec/daemon.rb', "libexec/#{name}-daemon.rb"
     end
   end
 

data/lib/daemon_kit/application.rb

@@ -14,8 +14,8 @@ module DaemonKit
         app_name = DaemonKit.configuration.daemon_name || File.basename( file )
         options = { :backtrace => true, :log_output => true, :app_name => app_name }
 
-        options[:dir_mode]        = DaemonKit.configuration.dir_mode || :normal
-        options[:dir]             = DaemonKit.configuration.dir      || "log"
+        options[:dir_mode]        = DaemonKit.configuration.dir_mode
+        options[:dir]             = DaemonKit.configuration.dir
         options[:multiple]        = DaemonKit.configuration.multiple
         options[:force_kill_wait] = DaemonKit.configuration.force_kill_wait if DaemonKit.configuration.force_kill_wait
 
@@ -26,6 +26,8 @@ module DaemonKit
       # initialization process
       def running!
         DaemonKit::Initializer.continue!
+
+        yield DaemonKit.configuration if block_given?
       end
 
     end

data/lib/daemon_kit/config.rb

@@ -29,6 +29,11 @@ module DaemonKit
         new( YAML.load_file( path ) )
       end
 
+      # Return the +config+.yml file as a raw hash.
+      def hash( config, symbolize = false )
+        self.load( config ).to_h( symbolize )
+      end
+
     end
 
     # Expects a hash, looks for DAEMON_ENV key

data/lib/daemon_kit/error_handlers/base.rb

@@ -0,0 +1,32 @@
+module DaemonKit
+  module ErrorHandlers
+    # Error handlers in DaemonKit are used by the #Safety class. Any
+    # error handler has to support the interface provided by this
+    # class. It's also required that safety handlers implement a
+    # singleton approach (handled by default by #Base).
+    class Base
+
+      class << self
+        
+        @instance = nil
+
+        def instance
+          @instance ||= new
+        end
+        private :new
+        
+        # When we're inherited, immediately register the handler with
+        # the safety net
+        def inherited( child ) #:nodoc:
+          Safety.register_error_handler( child )
+        end
+      end
+      
+      # Error handlers should overwrite this method and implement
+      # their own reporting method.
+      def handle_exception( exception )
+        raise NoMethodError, "Error handler doesn't support #handle_exception"
+      end
+    end
+  end
+end

data/lib/daemon_kit/error_handlers/hoptoad.rb

@@ -0,0 +1,61 @@
+require 'net/http'
+
+module DaemonKit
+  module ErrorHandlers
+    # Error reporting via Hoptoad.
+    class Hoptoad < Base
+
+      # Your hoptoad API key
+      @api_key = nil
+      attr_accessor :api_key
+
+      def handle_exception( exception )
+        headers = {
+          'Content-type' => 'application/x-yaml',
+          'Accept' => 'text/xml, application/xml'
+        }
+
+        http = Net::HTTP.new( url.host, url.port )
+        data = clean_exception( exception )
+
+        response = begin
+                     http.post( url.path, data.to_yaml, headers )
+                   rescue TimoutError => e
+                     DaemonKit.logger.error("Timeout while contacting the Hoptoad server.")
+                     nil
+                   end
+        case response
+        when Net::HTTPSuccess then
+          DaemonKit.logger.info "Hoptoad Success: #{response.class}"
+        else
+          DaemonKit.logger.error "Hoptoad Failure: #{response.class}\n#{response.body if response.respond_to? :body}"
+        end
+      end
+
+      def url
+        URI.parse("http://hoptoadapp.com/notices/")
+      end
+
+      def clean_exception( exception )
+        data = {
+          :api_key       => self.api_key,
+          :error_class   => exception.class.name,
+          :error_message => "#{exception.class.name}: #{exception.message}",
+          :backtrace     => exception.backtrace,
+          :environment   => ENV.to_hash,
+          :request       => [],
+          :session       => []
+        }
+
+        stringify_keys( data )
+      end
+
+      def stringify_keys(hash) #:nodoc:
+        hash.inject({}) do |h, pair|
+          h[pair.first.to_s] = pair.last.is_a?(Hash) ? stringify_keys(pair.last) : pair.last
+          h
+        end
+      end
+    end
+  end
+end

data/lib/daemon_kit/error_handlers/mail.rb

@@ -0,0 +1,48 @@
+require 'net/smtp'
+
+module DaemonKit
+  module ErrorHandlers
+    # Send an email notification of the exception via SMTP
+    class Mail < Base
+      
+      # SMTP hostname
+      @host = 'localhost'
+      attr_accessor :host
+      
+      # Recipients of the notification
+      @recipients = []
+      attr_accessor :recipients
+
+      # Subject prefix
+      @prefix = '[DAEMON-KIT]'
+      attr_accessor :prefix
+
+      # Sender address
+      @sender = 'daemon-kit'
+      attr_accessor :sender
+
+      def handle_exception( exception )
+        email = <<EOF
+To: #{self.recipients.map { |r| '<' + r + '>' }.join(', ')}
+From: <#{self.sender}>
+Subject: #{self.prefix} #{exception.message}
+Date: #{Time.now}
+
+DaemonKit caught an exception inside #{DaemonKit.configuration.daemon_name}.
+
+Message: #{exception.message}
+Backtrace:
+#{exception.backtrace.join("\n  ")}
+
+Environment: #{ENV.inspect}
+EOF
+        begin
+          Net::SMTP.start( self.host ) do |smtp|
+            smtp.send_message( email, self.sender, self.recipients )
+          end
+        rescue
+        end
+      end
+    end
+  end
+end

data/lib/daemon_kit/initializer.rb

@@ -29,16 +29,23 @@ module DaemonKit
     def trap( *args, &block )
       self.configuration.trap( *args, &block )
     end
-    
+
+    def framework_root
+      File.join( File.dirname(__FILE__), '..', '..' )
+    end
+
+    def root
+      DAEMON_ROOT
+    end
   end
-  
+
 
   # This class does all the nightmare work of setting up a working
   # environment for your daemon.
   class Initializer
 
     attr_reader :configuration
-    
+
     def self.run( configuration = Configuration.new )
       yield configuration if block_given?
       initializer = new configuration
@@ -55,25 +62,29 @@ module DaemonKit
       DaemonKit.logger.warn "Shutting down"
       exit
     end
-    
+
     def initialize( configuration )
       @configuration = configuration
     end
 
     def before_daemonize
       DaemonKit.configuration = @configuration
-      
+
       set_load_path
       load_gems
       load_patches
       load_environment
+      load_predaemonize_configs
     end
 
     def after_daemonize
       initialize_logger
       initialize_signal_traps
+
+      include_core_lib
+      load_postdaemonize_configs
     end
-    
+
     def set_load_path
       configuration.load_paths.each do |d|
         $:.unshift( "#{DAEMON_ROOT}/#{d}" ) if File.directory?( "#{DAEMON_ROOT}/#{d}" )
@@ -81,7 +92,7 @@ module DaemonKit
     end
 
     def load_gems
-      
+
     end
 
     def load_patches
@@ -93,22 +104,36 @@ module DaemonKit
     def load_environment
       return if @environment_loaded
       @environment_loaded = true
-      
+
       config = configuration
-      
+
       eval(IO.read(configuration.environment_path), binding, configuration.environment_path)
-      
+
       eval(IO.read(configuration.daemon_initializer), binding, configuration.daemon_initializer) if File.exist?( configuration.daemon_initializer )
     end
 
+    def load_predaemonize_configs
+      Dir[ File.join( DAEMON_ROOT, 'config', 'pre-daemonize', '*.rb' ) ].each do |f|
+        next if File.basename( f ) == File.basename( configuration.daemon_initializer )
+
+        require f
+      end
+    end
+
+    def load_postdaemonize_configs
+      Dir[ File.join( DAEMON_ROOT, 'config', 'post-daemonize', '*.rb' ) ].each do |f|
+        require f
+      end
+    end
+
     def initialize_logger
       return if DaemonKit.logger
-      
+
       unless logger = configuration.logger
         logger = Logger.new( configuration.log_path )
         logger.level = configuration.log_level
       end
-      
+
       DaemonKit.logger = logger
 
       configuration.trap("USR1") {
@@ -128,9 +153,14 @@ module DaemonKit
       configuration.trap( 'INT', term_proc )
       configuration.trap( 'TERM', term_proc )
     end
-    
+
+    def include_core_lib
+      if File.exists?( core_lib = File.join( DAEMON_ROOT, 'lib', configuration.daemon_name + '.rb' ) )
+        require core_lib
+      end
+    end
   end
-  
+
   # Holds our various configuration values
   class Configuration
     # Root to the daemon
@@ -145,7 +175,7 @@ module DaemonKit
     # Path to the log file, defaults to 'log/<environment>.log'
     attr_accessor :log_path
 
-    # :system, 
+    # :system,
     attr_accessor :dir_mode
 
     # Path to the log file, defaults to 'log/<environment>.log'
@@ -166,9 +196,13 @@ module DaemonKit
     # Collection of signal traps
     attr_reader :signal_traps
 
+    # Our safety net (#Safety) instance
+    attr_accessor :safety_net
+
     def initialize
       set_root_path!
-      
+      set_daemon_defaults!
+
       self.load_paths = default_load_paths
       self.log_level  = default_log_level
       self.log_path   = default_log_path
@@ -176,6 +210,8 @@ module DaemonKit
       self.multiple = false
       self.force_kill_wait = false
 
+      self.safety_net = DaemonKit::Safety.instance
+
       @signal_traps = {}
     end
 
@@ -192,25 +228,25 @@ module DaemonKit
     def daemon_initializer
       "#{root_path}/config/initializers/#{self.daemon_name}.rb"
     end
-    
+
     # Add a trap for the specified signal, can be code block or a proc
     def trap( signal, proc = nil, &block )
       return if proc.nil? && !block_given?
-      
+
       unless @signal_traps.has_key?( signal )
         set_trap( signal )
       end
-      
+
       @signal_traps[signal].unshift( proc || block )
     end
-    
+
     protected
 
     def run_traps( signal )
       DaemonKit.logger.info "Running signal traps for #{signal}"
       self.signal_traps[ signal ].each { |trap| trap.call }
     end
-    
+
     private
 
     def set_trap( signal )
@@ -218,7 +254,7 @@ module DaemonKit
       @signal_traps[ signal ] = []
       Signal.trap( signal, Proc.new { self.run_traps( signal ) } )
     end
-    
+
     def set_root_path!
       raise "DAEMON_ROOT is not set" unless defined?(::DAEMON_ROOT)
       raise "DAEMON_ROOT is not a directory" unless defined?(::DAEMON_ROOT)
@@ -238,10 +274,15 @@ module DaemonKit
       ::DAEMON_ROOT.replace @root_path
     end
 
+    def set_daemon_defaults!
+      self.dir_mode = :normal
+      self.dir      = File.join( DAEMON_ROOT, 'log' )
+    end
+
     def default_load_paths
       [ 'lib' ]
     end
-    
+
     def default_log_path
       File.join(root_path, 'log', "#{environment}.log")
     end
@@ -250,6 +291,6 @@ module DaemonKit
       environment == 'production' ? Logger::INFO : Logger::DEBUG
     end
   end
-  
-  
+
+
 end

data/lib/daemon_kit/nanite/agent.rb

@@ -20,7 +20,7 @@ module DaemonKit
       end
 
       def initialize
-        @config = DaemonKit::Config.load( 'nanite' )
+        @config = DaemonKit::Config.load( 'nanite' ).to_h( true )
 
         config_agent
       end
@@ -33,7 +33,7 @@ module DaemonKit
         # Start our mapper
         mapper_thread = Thread.new do
           EM.run do
-            agent = ::Nanite.start_agent( @config.to_h( true ) )
+            agent = ::Nanite.start_agent( @config )
             block.call( agent ) if block
           end
         end

data/lib/daemon_kit/safety.rb

@@ -0,0 +1,85 @@
+module DaemonKit
+  # Provides a wrapper for running code inside a 'safety net' Any
+  # exceptions raised inside a safety net is handled and reported via
+  # loggers, email or Hoptoad.
+  #
+  # The safety net can be configured via DaemonKit.config.safety,
+  # which holds the only instance of the safety net.
+  class Safety
+
+    # Who get's notified.
+    @handler = nil
+    attr_accessor :handler
+
+    # Registered error handlers
+    @error_handlers = {}
+    attr_reader :error_handlers
+
+    class << self
+
+      # Singleton
+      @instance = nil
+
+      def instance
+        @instance ||= new
+      end
+      private :new
+
+      # Run the provided block inside a safety net.
+      def run(&block)
+        self.instance.run(&block)
+      end
+
+      def register_error_handler( klass )
+        name = klass.to_s.split('::').last.downcase
+
+        DaemonKit.logger.debug( "Registering error handler '#{name}' (#{klass})" ) if DaemonKit.logger
+
+        instance.instance_eval( <<-EOF, __FILE__, __LINE__ )
+        def #{name}
+          @#{name} ||= #{klass}.instance
+        end
+        EOF
+      end
+    end
+
+    # Run the provided block inside a safety net.
+    def run(&block)
+      begin
+        block.call
+      rescue => e
+        # Log
+        DaemonKit.logger.fatal "Safety net caught exception: #{e.message}"
+        DaemonKit.logger.fatal "Backtrace: #{e.backtrace.join("\n    ")}"
+
+        get_handler.handle_exception( e ) if get_handler
+      end
+    end
+
+    def get_handler
+      if @handler && self.respond_to?( @handler )
+        h = send( @handler )
+        return h if h.class.ancestors.include?( DaemonKit::ErrorHandlers::Base )
+      end
+
+      return nil
+    end
+  end
+end
+
+class Object
+  class << self
+    def safely(&block)
+      DaemonKit::Safety.run(&block)
+    end
+  end
+
+  def safely(&block)
+    DaemonKit::Safety.run(&block)
+  end
+end
+
+# Load our error handlers
+require 'daemon_kit/error_handlers/base'
+require 'daemon_kit/error_handlers/mail'
+require 'daemon_kit/error_handlers/hoptoad'

data/lib/daemon_kit/tasks/environment.rake

@@ -0,0 +1,9 @@
+task :environment do
+  # This relies on the fact that rake changes the currect working
+  # directory to the directory where the Rakefile is located, thus
+  # implying DAEMON_ROOT.
+  DAEMON_ROOT = '.'
+  $daemon_kit_rake_task = true
+
+  require 'config/environment'
+end

data/lib/daemon_kit/tasks/framework.rake

@@ -46,10 +46,10 @@ namespace :daemon_kit do
 
       rm_rf   "vendor/daemon_kit"
       mkdir_p "vendor/daemon_kit"
-      
+
       chdir 'vendor/daemon_kit' do
         latest_revision = YAML.load(open(commits))["commits"].first["id"]
-        
+
         puts "Downloading DaemonKit from #{url}"
         File.open('daemon-kit.zip', 'wb') do |dst|
           open url do |src|
@@ -70,6 +70,37 @@ namespace :daemon_kit do
         touch "REVISION_#{latest_revision}"
       end
     end
-    
+
+  end
+
+  desc "Upgrade your local files for a daemon after upgrading daemon-kit"
+  task :upgrade => 'environment' do
+    # Run these
+    %w{ initializers }.each do |t|
+      Rake::Task["daemon_kit:upgrade:#{t}"].invoke
+    end
+
+    puts
+    puts "#{DaemonKit.configuration.daemon_name} has been upgraded."
   end
+
+  namespace :upgrade do
+    # Upgrade the initializers
+    task :initializers do
+      if File.directory?( File.join(DaemonKit.root, 'config', 'initializers') )
+        mv File.join(DaemonKit.root, 'config', 'initializers'), File.join(DAEMON_ROOT, 'config', 'pre-daemonize')
+        copy_framework_template( 'config', 'pre-daemonize', 'readme' )
+      end
+
+      unless File.directory?( File.join(DAEMON_ROOT, 'config', 'post-daemonize') )
+        mkdir_p File.join(DAEMON_ROOT, 'config', 'post-daemonize')
+        copy_framework_template( 'config', 'post-daemonize', 'readme' )
+      end
+    end
+  end
+end
+
+def copy_framework_template( *args )
+  src_dir = File.join(DaemonKit.framework_root, 'app_generators', 'daemon_kit', 'templates')
+  cp File.join( src_dir, *args ), File.join( DaemonKit.root, *args )
 end

data/lib/daemon_kit.rb

@@ -4,7 +4,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 require 'rubygems'
 
 module DaemonKit
-  VERSION = '0.1.5.1'
+  VERSION = '0.1.6'
 
   autoload :Initializer, 'daemon_kit/initializer'
   autoload :Application, 'daemon_kit/application'
@@ -13,4 +13,5 @@ module DaemonKit
   autoload :Jabber,      'daemon_kit/jabber'
   autoload :AMQP,        'daemon_kit/amqp'
   autoload :Nanite,      'daemon_kit/nanite'
+  autoload :Safety,      'daemon_kit/safety'
 end

data/rubygems_generators/install_rspec/templates/spec/spec_helper.rb

@@ -7,6 +7,7 @@ rescue LoadError
 end
 
 require File.dirname(__FILE__) + '/../config/boot'
+DaemonKit::Application.running!
 require '<%= gem_name %>'
 
 Spec::Runner.configure do |config|

data/rubygems_generators/install_rspec/templates/tasks/rspec.rake

@@ -14,7 +14,7 @@ EOS
   exit(0)
 end
 
-desc "Run the specs under spec/models"
+desc "Run the specs under spec/"
 Spec::Rake::SpecTask.new do |t|
   t.spec_opts = ['--options', "spec/spec.opts"]
   t.spec_files = FileList['spec/**/*_spec.rb']

data/test/test_amqp_generator.rb

@@ -33,7 +33,7 @@ class TestAmqpGenerator < Test::Unit::TestCase
     assert_directory_exists "config/initializers"
     assert_generated_file   "config/amqp.yml"
     assert_generated_file   "config/initializers/myapp.rb"
-    assert_generated_file   "libexec/myapp.rb"
+    assert_generated_file   "libexec/myapp-daemon.rb"
   end
 
   private

data/test/test_daemon-kit_generator.rb

@@ -40,8 +40,10 @@ class TestDaemonKitGenerator < Test::Unit::TestCase
     assert_generated_file   "config/environments/development.rb"
     assert_generated_file   "config/environments/test.rb"
     assert_generated_file   "config/environments/production.rb"
-    assert_directory_exists "config/initializers"
-    assert_generated_file   "config/initializers/readme"
+    assert_directory_exists "config/pre-daemonize"
+    assert_generated_file   "config/pre-daemonize/readme"
+    assert_directory_exists "config/post-daemonize"
+    assert_generated_file   "config/post-daemonize/readme"
     assert_directory_exists "lib"
     assert_generated_file   "lib/#{daemon_name}.rb"
     assert_directory_exists "libexec"

data/test/test_jabber_generator.rb

@@ -34,7 +34,7 @@ class TestJabberGenerator < Test::Unit::TestCase
     assert_directory_exists "config/initializers"
     assert_generated_file   "config/initializers/myapp.rb"
     assert_directory_exists "libexec"
-    assert_generated_file   "libexec/myapp.rb"
+    assert_generated_file   "libexec/myapp-daemon.rb"
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kennethkalmer-daemon-kit
 version: !ruby/object:Gem::Version 
-  version: 0.1.5.1
+  version: 0.1.6
 platform: ruby
 authors: 
 - Kenneth Kalmer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-11 00:00:00 -07:00
+date: 2009-05-13 00:00:00 -07:00
 default_executable: daemon_kit
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,7 +81,8 @@ files:
 - app_generators/daemon_kit/templates/config/environments/development.rb
 - app_generators/daemon_kit/templates/config/environments/production.rb
 - app_generators/daemon_kit/templates/config/environments/test.rb
-- app_generators/daemon_kit/templates/config/initializers/readme
+- app_generators/daemon_kit/templates/config/post-daemonize/readme
+- app_generators/daemon_kit/templates/config/pre-daemonize/readme
 - app_generators/daemon_kit/templates/lib/daemon.rb
 - app_generators/daemon_kit/templates/libexec/daemon.erb
 - bin/daemon_kit
@@ -110,12 +111,17 @@ files:
 - lib/daemon_kit/application.rb
 - lib/daemon_kit/config.rb
 - lib/daemon_kit/cron.rb
+- lib/daemon_kit/error_handlers/base.rb
+- lib/daemon_kit/error_handlers/hoptoad.rb
+- lib/daemon_kit/error_handlers/mail.rb
 - lib/daemon_kit/initializer.rb
 - lib/daemon_kit/jabber.rb
 - lib/daemon_kit/nanite.rb
 - lib/daemon_kit/nanite/agent.rb
 - lib/daemon_kit/patches/force_kill_wait.rb
+- lib/daemon_kit/safety.rb
 - lib/daemon_kit/tasks.rb
+- lib/daemon_kit/tasks/environment.rake
 - lib/daemon_kit/tasks/framework.rake
 - rubygems_generators/install_rspec/USAGE
 - rubygems_generators/install_rspec/install_rspec_generator.rb