kennethkalmer-daemon-kit 0.1.7.5 → 0.1.7.7

data/History.txt

@@ -1,3 +1,24 @@
+== 0.1.7.8 2009-06-22
+
+* Optional logging of all exceptions when the daemon process dies
+  unexpectedly
+* Update generated environment.rb to reflect new backtraces option
+
+== 0.1.7.7 2009-06-22
+
+* Fixed compatibility with rufus-scheduler-2.0.0 (or newer) in cron
+  generator
+* Started central eventmachine reactor management code
+* Now depends on eventmachine
+
+== 0.1.7.6 (Not released)
+
+* Support for cucumber
+* Fixed issue in daemon_kit:upgrade task
+* Moved rspec generator into new home
+* Removed conflicting rubigen generator, messed with our script directory
+* Fixed bug where environment.rb overwrites some --config values (reported by Josh Owens)
+
 == 0.1.7.5 2009-06-08
 
 * New AbstractLogger

data/Manifest.txt

@@ -35,6 +35,12 @@ daemon_generators/cron/USAGE
 daemon_generators/cron/cron_generator.rb
 daemon_generators/cron/templates/config/initializers/cron.rb
 daemon_generators/cron/templates/libexec/daemon.rb
+daemon_generators/cucumber/USAGE
+daemon_generators/cucumber/cucumber_generator.rb
+daemon_generators/cucumber/templates/cucumber
+daemon_generators/cucumber/templates/cucumber.rake
+daemon_generators/cucumber/templates/cucumber_environment.rb
+daemon_generators/cucumber/templates/env.rb
 daemon_generators/deploy_capistrano/deploy_capistrano_generator.rb
 daemon_generators/deploy_capistrano/templates/Capfile
 daemon_generators/deploy_capistrano/templates/USAGE
@@ -53,6 +59,12 @@ daemon_generators/nanite_agent/templates/config/initializers/nanite_agent.rb
 daemon_generators/nanite_agent/templates/config/nanite.yml
 daemon_generators/nanite_agent/templates/lib/actors/sample.rb
 daemon_generators/nanite_agent/templates/libexec/daemon.rb
+daemon_generators/rspec/USAGE
+daemon_generators/rspec/rspec_generator.rb
+daemon_generators/rspec/templates/spec.rb
+daemon_generators/rspec/templates/spec/spec.opts
+daemon_generators/rspec/templates/spec/spec_helper.rb
+daemon_generators/rspec/templates/tasks/rspec.rake
 lib/daemon_kit.rb
 lib/daemon_kit/abstract_logger.rb
 lib/daemon_kit/amqp.rb
@@ -62,9 +74,12 @@ lib/daemon_kit/commands/console.rb
 lib/daemon_kit/config.rb
 lib/daemon_kit/console_daemon.rb
 lib/daemon_kit/core_ext.rb
+lib/daemon_kit/core_ext/configurable.rb
 lib/daemon_kit/core_ext/string.rb
 lib/daemon_kit/cron.rb
+lib/daemon_kit/cucumber/world.rb
 lib/daemon_kit/deployment/capistrano.rb
+lib/daemon_kit/em.rb
 lib/daemon_kit/error_handlers/base.rb
 lib/daemon_kit/error_handlers/hoptoad.rb
 lib/daemon_kit/error_handlers/mail.rb
@@ -80,12 +95,6 @@ lib/daemon_kit/tasks/framework.rake
 lib/daemon_kit/tasks/god.rake
 lib/daemon_kit/tasks/log.rake
 lib/daemon_kit/tasks/monit.rake
-rubygems_generators/install_rspec/USAGE
-rubygems_generators/install_rspec/install_rspec_generator.rb
-rubygems_generators/install_rspec/templates/spec.rb
-rubygems_generators/install_rspec/templates/spec/spec.opts
-rubygems_generators/install_rspec/templates/spec/spec_helper.rb
-rubygems_generators/install_rspec/templates/tasks/rspec.rake
 script/console
 script/destroy
 script/generate
@@ -93,6 +102,7 @@ script/txt2html
 spec/abstract_logger_spec.rb
 spec/argument_spec.rb
 spec/config_spec.rb
+spec/configurable_spec.rb
 spec/daemon_kit_spec.rb
 spec/error_handlers_spec.rb
 spec/fixtures/env.yml

data/README.rdoc

@@ -53,6 +53,7 @@ The AMQP generator creates a simple daemon that has all the stub code and config
 == Requirements
 
 * Ruby 1.8.6
+* eventmachine-0.12.8[http://rubyeventmachine.com]
 * rspec (for writing/running your specs)
 
 == Generator Requirements

data/Rakefile

@@ -10,7 +10,8 @@ $hoe = Hoe.new('daemon-kit', DaemonKit::VERSION) do |p|
   p.post_install_message = IO.read( 'PostInstall.txt' ) # TODO remove if post-install message not required
   p.rubyforge_name       = 'kit' # TODO this is default value
   p.extra_deps = [
-                  ['rubigen', '>= 1.5.2']
+                  ['rubigen', '>= 1.5.2'],
+                  ['eventmachine', '>=0.12.8']
                  ]
   p.extra_dev_deps = [
                       ['newgem', ">= #{::Newgem::VERSION}"]

data/TODO.txt

@@ -1,8 +1,19 @@
-DaemonKit TODO List
-===================
+= DaemonKit TODO List
 
 This is purely a drop in the bucket of what has to come...
 
+== Eye on 0.2
+
+* Support for dropping privileges
+* Support for chroot'ing
+* Altering process names (fully and temporary appending)
+* bleak_house support
+* Support for tweaking REE environment variables prior to launch (bash wrapper)
+* Clustering support (run multiple workers out of same project)
+* Full 1.9 support in the framework
+
+== Later
+
 * [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:
@@ -12,9 +23,6 @@ This is purely a drop in the bucket of what has to come...
   * Queue (SQS, AMQP, etc) pollers
 * Rake tasks for generating:
   * Sys-V style init scripts
-* Support for dropping privileges
-* Support for chroot'ing
-* Improved and cleaned up logging, support logrotating (via HUP)
 * Plenty of docs, seriously a lot of docs
 * Specs & features, tons of them too
 * Integration tests for the specific daemons
@@ -25,9 +33,5 @@ This is purely a drop in the bucket of what has to come...
   * Some activesupport-esque functions until activesupport 3.0 hits the streets
 * DRY up the following:
   * Loading configuration files for the daemons
-* Altering process names (fully and temporary appending)
-* bleak_house support
-* Support for tweaking REE environment variables prior to launch (bash wrapper)
-* Clustering support (run multiple workers out of same project)
 
 * DON'T FORGET 1.9 SUPPORT

data/app_generators/daemon_kit/daemon_kit_generator.rb

@@ -12,6 +12,7 @@ class DaemonKitGenerator < RubiGen::Base
   attr_reader :daemon_name
   attr_reader :installer
   attr_reader :deployer
+  attr_reader :cucumber
 
   def initialize(runtime_args, runtime_options = {})
     super
@@ -87,7 +88,10 @@ class DaemonKitGenerator < RubiGen::Base
       m.directory "tasks"
 
       # Tests
-      m.dependency "install_rspec", [daemon_name], :destination => destination_root, :collision => :force
+      m.dependency "rspec", [daemon_name], :destination => destination_root, :collision => :force
+      if cucumber
+        m.dependency "cucumber", [], :destination => destination_root, :collision => :force
+      end
 
       # Deployers
       unless deployer == 'none'
@@ -98,9 +102,6 @@ class DaemonKitGenerator < RubiGen::Base
       m.directory "log"
       m.directory "tmp"
       m.directory "vendor"
-
-      m.dependency "install_rubigen_scripts", [destination_root, 'daemon_kit'],
-        :shebang => options[:shebang], :collision => :force
     end
   end
 
@@ -136,6 +137,11 @@ EOS
         options[:deployer] = deploy
       end
 
+      opts.on("--cucumber",
+              "Install cucumber.") do
+        options[:cucumber] = true
+      end
+
       opts.on("-r", "--ruby=path", String,
               "Path to the Ruby binary of your choice (otherwise scripts use env, dispatchers current path).",
               "Default: #{DEFAULT_SHEBANG}") { |x| options[:shebang] = x }
@@ -149,6 +155,7 @@ EOS
       # @author = options[:author]
       @installer = options[:installer] || 'default'
       @deployer  = (options[:deployer] || 'none').strip
+      @cucumber  = options[:cucumber]  || false
     end
 
 end

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

@@ -11,12 +11,12 @@ DaemonKit::Initializer.run do |config|
   # The name of the daemon as reported by process monitoring tools
   config.daemon_name = '<%= daemon_name %>'
 
-  # Uncomment to allow multiple instances to run
-  # config.mulitple = true
-
   # Force the daemon to be killed after X seconds from asking it to
   # config.force_kill_wait = 30
 
+  # Log backraces when a thread/daemon dies (Recommended)
+  # config.backtraces = true
+
   # Configure the safety net (see DaemonKit::Safety)
   # config.safety_net.handler = :mail # (or :hoptoad )
   # config.safety_net.mail.host = 'localhost'

data/app_generators/daemon_kit/templates/config/environments/development.rb

@@ -0,0 +1,2 @@
+# This is the same context as the environment.rb file, it is only
+# loaded afterwards and only in the development environment

data/app_generators/daemon_kit/templates/config/environments/production.rb

@@ -0,0 +1,2 @@
+# This is the same context as the environment.rb file, it is only
+# loaded afterwards and only in the production environment

data/app_generators/daemon_kit/templates/config/environments/test.rb

@@ -0,0 +1,2 @@
+# This is the same context as the environment.rb file, it is only
+# loaded afterwards and only in the test environment

data/app_generators/daemon_kit/templates/script/generate

@@ -10,5 +10,5 @@ end
 require 'rubigen/scripts/generate'
 
 ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:daemon, :test_unit]
+RubiGen::Base.use_component_sources! [:daemon]
 RubiGen::Scripts::Generate.new.run(ARGV)

data/bin/daemon_kit

@@ -13,7 +13,6 @@ require 'rubigen/scripts/generate'
 RubiGen::Base.use_application_sources! :rubygems
 RubiGen::Base.prepend_sources(*[
   RubiGen::PathSource.new(:app, File.join(File.dirname(__FILE__), "..", "app_generators")),
-  RubiGen::PathSource.new(:app, File.join(File.dirname(__FILE__), "..", "daemon_generators")),
-  RubiGen::PathSource.new(:app, File.join(File.dirname(__FILE__), "..", "rubygems_generators"))
+  RubiGen::PathSource.new(:app, File.join(File.dirname(__FILE__), "..", "daemon_generators"))
 ])
 RubiGen::Scripts::Generate.new.run(ARGV, :generator => 'daemon_kit')

data/daemon_generators/cron/templates/config/initializers/cron.rb

@@ -1,7 +1,11 @@
 begin
-  require 'rufus-scheduler'
+  require 'rufus/scheduler'
 rescue LoadError => e
   $stderr.puts "Missing rufus-scheduler gem. Please run 'gem install rufus-scheduler'."
   exit 1
 end
 
+if Rufus::Scheduler::VERSION < "2.0.0"
+  $stderr.puts "Requires rufus-scheduler-2.0.0 or later"
+  exit 1
+end

data/daemon_generators/cron/templates/libexec/daemon.rb

@@ -15,13 +15,17 @@ end
 # An instance of the scheduler is available through
 # DaemonKit::Cron.scheduler
 
+# To make use of the EventMachine-powered scheduler, uncomment the
+# line below *before* adding any schedules.
+# DaemonKit::EM.run
+
 # Some samples to get you going:
 
 # Will call #regenerate_monthly_report in 3 days from starting up
 #DaemonKit::Cron.scheduler.in("3d") do
 #  regenerate_monthly_report()
 #end
-# 
+#
 #DaemonKit::Cron.scheduler.every "10m10s" do
 #  check_score(favourite_team) # every 10 minutes and 10 seconds
 #end
@@ -35,5 +39,5 @@ DaemonKit::Cron.scheduler.every("1m") do
   DaemonKit.logger.debug "Scheduled task completed at #{Time.now}"
 end
 
-# Run our 'cron' daeon
+# Run our 'cron' dameon, suspending the current thread
 DaemonKit::Cron.run

data/daemon_generators/cucumber/USAGE

@@ -0,0 +1,11 @@
+Description:
+    Sets up Cucumber in your daemon-kit project. After running this generator you will
+    get a new rake task called features.
+    
+    This also generates the necessary files in the features directory.
+    
+    Also see the feature generator, which you can use to generate skeletons
+    for new features.
+    
+Examples:
+    `./script/generate cucumber`

data/daemon_generators/cucumber/cucumber_generator.rb

@@ -0,0 +1,38 @@
+require 'rbconfig'
+require 'cucumber/version'
+
+# This generator bootstraps a Rails project for use with Cucumber
+class CucumberGenerator < RubiGen::Base
+  DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
+                              Config::CONFIG['ruby_install_name'])
+
+  def manifest
+    record do |m|
+      m.directory 'features/step_definitions'
+      m.template  'cucumber_environment.rb', 'config/environments/cucumber.rb',
+        :assigns => { :cucumber_version => ::Cucumber::VERSION::STRING }
+
+      m.directory 'features/support'
+
+      #if options[:spork]
+      #  m.template  'spork_env.rb',     'features/support/env.rb'
+      #else
+      m.template  'env.rb',           'features/support/env.rb'
+      #end
+
+      m.directory 'tasks'
+      m.template  'cucumber.rake',    'tasks/cucumber.rake'
+
+      m.file      'cucumber',         'script/cucumber', {
+        :chmod => 0755, :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang]
+      }
+    end
+  end
+
+protected
+
+  def banner
+    "Usage: #{$0} cucumber"
+  end
+
+end

data/daemon_generators/cucumber/templates/cucumber

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+begin
+  load File.expand_path(File.dirname(__FILE__) + "/../vendor/plugins/cucumber/bin/cucumber")
+rescue LoadError => e
+  raise unless e.to_s =~ /cucumber/  
+  require "rubygems"
+  load File.join(Gem.bindir, "cucumber")
+end

data/daemon_generators/cucumber/templates/cucumber.rake

@@ -0,0 +1,13 @@
+begin
+  require 'cucumber/rake/task'
+
+  Cucumber::Rake::Task.new(:features) do |t|
+    t.fork = true
+    t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'pretty')]
+  end
+rescue LoadError
+  desc 'Cucumber rake task not available'
+  task :features do
+    abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
+  end
+end

data/daemon_generators/cucumber/templates/cucumber_environment.rb

@@ -0,0 +1,2 @@
+gem "cucumber", ">=<%= cucumber_version %>"
+gem "rspec", ">=1.2.6"

data/daemon_generators/cucumber/templates/env.rb

@@ -0,0 +1,7 @@
+# Sets up the DaemonKit environment for Cucumber
+ENV["DAEMON_ENV"] ||= "cucumber"
+require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
+require 'daemon_kit/cucumber/world'
+
+# Comment out the next line if you don't want Cucumber Unicode support
+require 'cucumber/formatter/unicode'

data/{rubygems_generators/install_rspec/install_rspec_generator.rb → daemon_generators/rspec/rspec_generator.rb}

@@ -1,10 +1,8 @@
 
-class InstallRspecGenerator < RubiGen::Base
-  
-  default_options :author => nil
-  
+class RspecGenerator < RubiGen::Base
+
   attr_reader :gem_name, :module_name
-  
+
   def initialize(runtime_args, runtime_options = {})
     super
     @destination_root = File.expand_path(destination_root)
@@ -20,7 +18,7 @@ class InstallRspecGenerator < RubiGen::Base
       m.directory 'tasks'
 
       m.template           'spec.rb', "spec/#{gem_name}_spec.rb"
-      
+
       m.template_copy_each %w( spec.opts spec_helper.rb ), 'spec'
       m.file_copy_each     %w( rspec.rake ), 'tasks'
     end
@@ -29,7 +27,7 @@ class InstallRspecGenerator < RubiGen::Base
   protected
     def banner
       <<-EOS
-Install rspec BDD testing support. 
+Install rspec BDD testing support.
 
 Includes a rake task (tasks/rspec.rake) to be loaded by the root Rakefile,
 which provides a "spec" task.
@@ -47,11 +45,11 @@ EOS
       #         "Some comment about this option",
       #         "Default: none") { |x| options[:author] = x }
     end
-    
+
     def extract_options
       # for each option, extract it into a local variable (and create an "attr_reader :author" at the top)
       # Templates can access these value via the attr_reader-generated methods, but not the
       # raw instance variable value.
       # @author = options[:author]
     end
-end
+end

data/{rubygems_generators/install_rspec → daemon_generators/rspec}/templates/spec/spec_helper.rb

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

data/lib/daemon_kit.rb

@@ -1,13 +1,15 @@
 # TODO: Strip this out eventually so we can run without rubygems
 require 'rubygems'
 
+require 'eventmachine'
+
 require File.dirname(__FILE__) + '/daemon_kit/core_ext'
 
 $:.unshift( File.dirname(__FILE__).to_absolute_path ) unless
   $:.include?( File.dirname(__FILE__).to_absolute_path )
 
 module DaemonKit
-  VERSION = '0.1.7.5'
+  VERSION = '0.1.7.7'
 
   autoload :Initializer,    'daemon_kit/initializer'
   autoload :Application,    'daemon_kit/application'
@@ -16,6 +18,8 @@ module DaemonKit
   autoload :Safety,         'daemon_kit/safety'
   autoload :PidFile,        'daemon_kit/pid_file'
   autoload :AbstractLogger, 'daemon_kit/abstract_logger'
+  autoload :EM,             'daemon_kit/em'
+  autoload :Configurable,   'daemon_kit/core_ext/configurable'
 
   autoload :Cron,   'daemon_kit/cron'
   autoload :Jabber, 'daemon_kit/jabber'

data/lib/daemon_kit/application.rb

@@ -79,7 +79,11 @@ module DaemonKit
           end
         end
 
-        @pid_file.cleanup
+        if @pid_file.running?
+          puts "Process still running, leaving pidfile behind! Consider using configuration.force_kill_wait."
+        else
+          @pid_file.cleanup
+        end
       end
 
       # Call this from inside a daemonized process to complete the

data/lib/daemon_kit/core_ext/configurable.rb

@@ -0,0 +1,96 @@
+module DaemonKit
+
+  # Provide some advanced helpers for managing access to instance variables.
+  module Configurable
+
+    def self.included(base) #:nodoc:
+      base.class_eval <<-EOF
+        @configurables = {}
+        @configurable_defaults = {}
+
+        class << self
+          attr_reader :configurables, :configurable_defaults
+        end
+      EOF
+
+      base.extend( ClassMethods )
+      base.send( :include, InstanceMethods )
+    end
+
+    module ClassMethods
+
+      # Create a configurable value on any instance, which can contain
+      # a default value, and/or be locked.
+      #
+      # Create a standard getter/setter without a default value
+      #
+      #   configurable :foo
+      #
+      # Create a getter/setter with a default value
+      #
+      #   configurable :foo, true
+      #
+      # The final argument can be an options hash, which currently
+      # respects only one key: +locked+ (false by default). Locking a
+      # configurable means the value can only be set once by the
+      # setter method.
+      #
+      #   configurable :foo, :locked => true
+      #
+      # As long as the getter method (+foo+) returns nil, the standard
+      # setter method will work. As soon as the getter returns a
+      # non-nil value the setter won't set a new value. To set a new
+      # value you'll have to explicitly use the #set instance method.
+      def configurable( name, *args )
+        opts = args.last.is_a?( Hash ) ? args.pop : {}
+        opts = { :locked => false }.merge( opts )
+
+        default = args.size <= 1 ? args.pop : args
+
+        name = name.to_sym
+
+        self.configurables[ name ] = opts
+        self.configurable_defaults[ name ] = default
+
+        class_eval( <<-EOF, __FILE__, __LINE__ )
+          def #{name}                                    # def foo
+            if _configurables[:#{name}].nil?             #   if _configurables[:foo].nil?
+              self.class.configurable_defaults[:#{name}] #     self.class.configurable_defaults[:foo]
+            else                                         #   else
+              _configurables[:#{name}]                   #     _configurables[:foo]
+            end                                          #   end
+          end                                            #
+
+          def #{name}=( value )                              # def foo=( value )
+            if #{name}.nil? ||                               #   if foo.nil? ||
+                !self.class.configurables[:#{name}][:locked] #       !self.class.configurables[:foo][:locked]
+                                                             #
+              _configurables[:#{name}] = value               #     _configurables[:foo] = value
+            end                                              #   end
+          end                                                # end
+        EOF
+      end
+
+    end
+
+    module InstanceMethods
+
+      # Force the value of a configurable to be set without any
+      # respect for it's locked status.
+      def set( name, value )
+        name = name.to_sym
+
+        if self.class.configurables.has_key?( name )
+          _configurables[ name ] = value
+        end
+      end
+
+      private
+
+      def _configurables
+        @_configurables ||= {}
+      end
+
+    end
+  end
+end

data/lib/daemon_kit/cron.rb

@@ -1,15 +1,22 @@
 module DaemonKit
-  
+
   # Thin wrapper around rufus-scheduler gem, specifically designed to ease
   # configuration of a scheduler and provide some added simplicity.
+  #
+  # For more information on rufus-scheduler, please visit the RDoc's
+  # at http://rufus.rubyforge.org/rufus-scheduler/
+  #
+  # To use the evented scheduler, call #DaemonKit::EM.run prior to
+  # setting up your first schedule.
   class Cron
 
-    @@instance = nil
+    @instance = nil
 
     attr_reader :scheduler
-    
+
     class << self
-      
+
+      # Access to the scheduler instance
       def instance
         @instance ||= new
       end
@@ -17,16 +24,19 @@ module DaemonKit
       def scheduler
         instance.scheduler
       end
-      
+
       private :new
 
+      # Once the scheduler has been configured, call #run to block the
+      # current thread and keep the process alive for the scheduled
+      # tasks to run
       def run
         DaemonKit.logger.info "Starting rufus-scheduler"
 
-        begin
+        if instance.is_a?( Rufus::Scheduler::PlainScheduler )
           instance.scheduler.join
-        rescue Interrupt
-          DaemonKit.logger.warn "Scheduler interrupted"
+        else
+          Thread.stop
         end
       end
     end

data/lib/daemon_kit/cucumber/world.rb

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+# Based on code from Brian Takita, Yurii Rashkovskii, Ben Mabey and Aslak Hellesøy
+# Adapted by Kenneth Kalmer for daemon-kit
+
+begin
+  require 'test/unit/testresult'
+rescue LoadError => e
+  e.message << "\nYou must gem install test-unit. For more info see https://rspec.lighthouseapp.com/projects/16211/tickets/292"
+  raise e
+end
+
+# So that Test::Unit doesn't launch at the end - makes it think it has already been run.
+Test::Unit.run = true if Test::Unit.respond_to?(:run=)
+
+$__cucumber_toplevel = self
+
+module DaemonKit
+  module Cucumber
+    # All scenarios will execute in the context of a new instance of World.
+    class World
+      def initialize #:nodoc:
+        @_result = Test::Unit::TestResult.new
+      end
+    end
+
+    $__cucumber_toplevel.Before do
+      # Placeholder
+    end
+
+    $__cucumber_toplevel.After do
+      # Placeholder
+    end
+  end
+end
+
+World do
+  DaemonKit::Cucumber::World.new
+end

data/lib/daemon_kit/em.rb

@@ -0,0 +1,43 @@
+module DaemonKit
+
+  # EventMachine forms a critical part of the daemon-kit toolset, and
+  # especially of daemon process developers.
+  #
+  # This class abstracts away the difficulties of managing multiple
+  # libraries that all utilize the event reactor.
+  class EM
+
+    class << self
+
+      # Start a reactor, just like classical EM.run. If the block is
+      # provided, the method will block and call the provided block
+      # argument inside the running reactor. If the block argument is
+      # not provided the reactor will be started in a separate thread
+      # and the program will continue to run after the method. All the
+      # signal traps are configured to shutdown the reactor when the
+      # daemon exists.
+      def run(&block)
+        if ::EM.reactor_running?
+          DaemonKit.logger.warn "EventMachine reactor already running"
+          block.call if block_given?
+
+        else
+          if block_given?
+            ::EM.run { block.call }
+          else
+            Thread.main[:_dk_reactor] = Thread.new { EM.run {} }
+            DaemonKit.trap( 'INT' ) { DaemonKit::EM.stop  }
+            DaemonKit.trap( 'TERM' ) { DaemonKit::EM.stop }
+          end
+        end
+      end
+
+      # Stop the reactor
+      def stop
+        ::EM.stop_event_loop if ::EM.reactor_running?
+        Thread.main[:_dk_reactor].join
+      end
+    end
+
+  end
+end

data/lib/daemon_kit/initializer.rb

@@ -61,6 +61,10 @@ module DaemonKit
     end
 
     def self.shutdown
+      DaemonKit.logger.info "Running shutdown hooks"
+
+      log_exceptions if DaemonKit.configuration.backtraces
+
       DaemonKit.logger.warn "Shutting down #{DaemonKit.configuration.daemon_name}"
       exit
     end
@@ -85,6 +89,7 @@ module DaemonKit
 
       include_core_lib
       load_postdaemonize_configs
+      configure_backtraces
 
       set_process_name
 
@@ -160,6 +165,7 @@ module DaemonKit
       term_proc = Proc.new { DaemonKit::Initializer.shutdown }
       configuration.trap( 'INT', term_proc )
       configuration.trap( 'TERM', term_proc )
+      at_exit { DaemonKit::Initializer.shutdown }
     end
 
     def include_core_lib
@@ -168,13 +174,45 @@ module DaemonKit
       end
     end
 
+    def configure_backtraces
+      Thread.abort_on_exception = configuration.backtraces
+    end
+
     def set_process_name
       $0 = configuration.daemon_name
     end
+
+    def self.log_exceptions
+      trace_file = File.join( DaemonKit.root, "backtrace-#{Time.now.strftime('%Y%m%d%H%M%S')}-#{Process.pid}.log" )
+      trace_log = Logger.new( trace_file )
+
+      # Find the last exception
+      e = nil
+      ObjectSpace.each_object {|o|
+        if ::Exception === o
+          e = o
+        end
+      }
+
+      trace_log.info "*** Below you'll find the most recent exception thrown, this will likely (but not certainly) be the exception that made #{DaemonKit.configuration.daemon_name} exit abnormally ***"
+      trace_log.error e
+
+      trace_log.info "*** Below you'll find all the exception objects in memory, some of them may have been thrown in your application, others may just be in memory because they are standard exceptions ***"
+      ObjectSpace.each_object {|o|
+        if ::Exception === o
+          trace_log.error o
+        end
+      }
+
+      trace_log.close
+    end
   end
 
   # Holds our various configuration values
   class Configuration
+
+    include Configurable
+
     # Root to the daemon
     attr_reader :root_path
 
@@ -188,7 +226,7 @@ module DaemonKit
     attr_accessor :log_level
 
     # Path to the log file, defaults to 'log/<environment>.log'
-    attr_accessor :log_path
+    configurable :log_path
 
     # Duplicate log data to stdout
     attr_accessor :log_stdout
@@ -197,10 +235,13 @@ module DaemonKit
     attr_accessor :pid_file
 
     # The application name
-    attr_accessor :daemon_name
+    configurable :daemon_name, :locked => true
 
     # Use the force kill patch? Give the number of seconds
-    attr_accessor :force_kill_wait
+    configurable :force_kill_wait
+
+    # Should be log backtraces
+    configurable :backtraces, false
 
     # Collection of signal traps
     attr_reader :signal_traps

data/lib/daemon_kit/tasks/framework.rake

@@ -87,7 +87,7 @@ namespace :daemon_kit do
   namespace :upgrade do
     # Upgrade the initializers
     task :initializers do
-      copy_framework_template( 'config/boot.rb', 'config/boot.rb' )
+      copy_framework_template( 'config', 'boot.rb' )
 
       if File.directory?( File.join(DaemonKit.root, 'config', 'initializers') )
         mv File.join(DaemonKit.root, 'config', 'initializers'), File.join(DAEMON_ROOT, 'config', 'pre-daemonize')

data/spec/configurable_spec.rb

@@ -0,0 +1,56 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+class FooConfig
+  include DaemonKit::Configurable
+
+  configurable :has_default, true
+  configurable :no_default
+  configurable :has_lock, :locked => true
+end
+
+describe DaemonKit::Configurable do
+
+  before(:each) do
+    @foo = FooConfig.new
+  end
+
+  it "should support default values" do
+    lambda {
+      @foo.has_default.should be_true
+    }.should_not raise_error( NoMethodError )
+  end
+
+  it "should support overwriting unlocked defaults" do
+    lambda {
+      @foo.has_default = false
+      @foo.has_default.should be_false
+    }.should_not raise_error
+  end
+
+  it "should support no default values" do
+    lambda {
+      @foo.no_default.should be_nil
+    }.should_not raise_error( NoMethodError )
+  end
+
+  it "should allow setting locked values once" do
+    lambda {
+      @foo.has_lock = 1
+      @foo.has_lock.should == 1
+
+      @foo.has_lock = 2
+      @foo.has_lock.should == 1
+    }.should_not raise_error
+  end
+
+  it "should allow bypassing the lock explicitly" do
+    lambda {
+      @foo.has_lock = 1
+      @foo.has_lock.should == 1
+
+      @foo.set(:has_lock, 2)
+      @foo.has_lock.should == 2
+    }.should_not raise_error
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kennethkalmer-daemon-kit
 version: !ruby/object:Gem::Version 
-  version: 0.1.7.5
+  version: 0.1.7.7
 platform: ruby
 authors: 
 - Kenneth Kalmer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-08 00:00:00 -07:00
+date: 2009-06-22 00:00:00 -07:00
 default_executable: daemon_kit
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.5.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.12.8
+    version: 
 - !ruby/object:Gem::Dependency 
   name: newgem
   type: :development
@@ -96,6 +106,12 @@ files:
 - daemon_generators/cron/cron_generator.rb
 - daemon_generators/cron/templates/config/initializers/cron.rb
 - daemon_generators/cron/templates/libexec/daemon.rb
+- daemon_generators/cucumber/USAGE
+- daemon_generators/cucumber/cucumber_generator.rb
+- daemon_generators/cucumber/templates/cucumber
+- daemon_generators/cucumber/templates/cucumber.rake
+- daemon_generators/cucumber/templates/cucumber_environment.rb
+- daemon_generators/cucumber/templates/env.rb
 - daemon_generators/deploy_capistrano/deploy_capistrano_generator.rb
 - daemon_generators/deploy_capistrano/templates/Capfile
 - daemon_generators/deploy_capistrano/templates/USAGE
@@ -114,6 +130,12 @@ files:
 - daemon_generators/nanite_agent/templates/config/nanite.yml
 - daemon_generators/nanite_agent/templates/lib/actors/sample.rb
 - daemon_generators/nanite_agent/templates/libexec/daemon.rb
+- daemon_generators/rspec/USAGE
+- daemon_generators/rspec/rspec_generator.rb
+- daemon_generators/rspec/templates/spec.rb
+- daemon_generators/rspec/templates/spec/spec.opts
+- daemon_generators/rspec/templates/spec/spec_helper.rb
+- daemon_generators/rspec/templates/tasks/rspec.rake
 - lib/daemon_kit.rb
 - lib/daemon_kit/abstract_logger.rb
 - lib/daemon_kit/amqp.rb
@@ -123,9 +145,12 @@ files:
 - lib/daemon_kit/config.rb
 - lib/daemon_kit/console_daemon.rb
 - lib/daemon_kit/core_ext.rb
+- lib/daemon_kit/core_ext/configurable.rb
 - lib/daemon_kit/core_ext/string.rb
 - lib/daemon_kit/cron.rb
+- lib/daemon_kit/cucumber/world.rb
 - lib/daemon_kit/deployment/capistrano.rb
+- lib/daemon_kit/em.rb
 - lib/daemon_kit/error_handlers/base.rb
 - lib/daemon_kit/error_handlers/hoptoad.rb
 - lib/daemon_kit/error_handlers/mail.rb
@@ -141,12 +166,6 @@ files:
 - lib/daemon_kit/tasks/god.rake
 - lib/daemon_kit/tasks/log.rake
 - lib/daemon_kit/tasks/monit.rake
-- rubygems_generators/install_rspec/USAGE
-- rubygems_generators/install_rspec/install_rspec_generator.rb
-- rubygems_generators/install_rspec/templates/spec.rb
-- rubygems_generators/install_rspec/templates/spec/spec.opts
-- rubygems_generators/install_rspec/templates/spec/spec_helper.rb
-- rubygems_generators/install_rspec/templates/tasks/rspec.rake
 - script/console
 - script/destroy
 - script/generate
@@ -154,6 +173,7 @@ files:
 - spec/abstract_logger_spec.rb
 - spec/argument_spec.rb
 - spec/config_spec.rb
+- spec/configurable_spec.rb
 - spec/daemon_kit_spec.rb
 - spec/error_handlers_spec.rb
 - spec/fixtures/env.yml
@@ -236,11 +256,11 @@ specification_version: 2
 summary: Daemon Kit aims to simplify creating Ruby daemons by providing a sound application skeleton (through a generator), task specific generators (jabber bot, etc) and robust environment management code.
 test_files: 
 - test/test_generator_helper.rb
-- test/test_jabber_generator.rb
 - test/test_cron_generator.rb
-- test/test_amqp_generator.rb
 - test/test_nanite_agent_generator.rb
 - test/test_daemon_kit_config.rb
 - test/test_helper.rb
+- test/test_amqp_generator.rb
 - test/test_daemon-kit_generator.rb
 - test/test_deploy_capistrano_generator.rb
+- test/test_jabber_generator.rb