daemon-kit 0.1.7.12 → 0.1.8pre

data/History.txt

@@ -1,3 +1,10 @@
+== 0.1.18 (WIP)
+
+* Generators rewritten to use Thor
+* Evented XMPP now handled by blather
+* Boot script fixes
+* Removed Jabber generator, deprecating Jabber class (use XMPP)
+
 == 0.1.7.12 2009-12-04
 
 * Bug fix, don't load environment files twice [grockit]

data/Manifest.txt

@@ -79,6 +79,10 @@ daemon_generators/test_unit/templates/tasks/test_unit.rake
 daemon_generators/test_unit/templates/test/test.rb
 daemon_generators/test_unit/templates/test/test_helper.rb
 daemon_generators/test_unit/test_unit_generator.rb
+daemon_generators/xmpp/templates/config/initializers/xmpp.rb
+daemon_generators/xmpp/templates/config/xmpp.yml
+daemon_generators/xmpp/templates/libexec/daemon.rb
+daemon_generators/xmpp/xmpp_generator.rb
 lib/daemon_kit.rb
 lib/daemon_kit/abstract_logger.rb
 lib/daemon_kit/amqp.rb

data/README.rdoc

@@ -13,7 +13,7 @@ Using simple built-in generators it is easy to created evented and non-evented d
 
 Supported generators:
 
-* XMPP bot (non-evented)
+* XMPP bot (evented)
 * AMQP consumer (evented)
 * Nanite agent
 * Cron-style daemon
@@ -34,19 +34,19 @@ Get some help
 
 The above command generates a skeleton daemon environment for you to adapt.
 
-  $ daemon-kit [/path/to/your/daemon] -i jabber
+  $ daemon-kit [/path/to/your/daemon] -i xmpp
 
-Use the 'jabber' generator instead of the default one.
+Use the 'xmpp' generator instead of the default one.
 
 == Generators
 
-Currently six generators exist: default, jabber, amqp, cron, nanite & ruote
+Currently six generators exist: default, xmpp, amqp, cron, nanite & ruote
 
 The default generator creates a simple daemon with an infinite loop inside that you can adapt.
 
-=== Jabber Generator
+=== XMPP Generator
 
-The jabber generator creates a simple daemon that leverages the xmpp4r-simple[http://xmpp4r-simple.rubyforge.org/] gem to process inbound messages. The daemon will manage the roster and other little tasks, leaving you to provide the hooks for processing messages, presence notifications and subscription request.
+The jabber generator creates a simple daemon that leverages the blather[http://blather.squishtech.com/] gem to process inbound messages. The daemon will manage the roster and other little tasks, leaving you to provide the hooks for processing messages, presence notifications and subscription request.
 
 === Cron Generator
 
@@ -66,7 +66,7 @@ The ruote[http://openwfe.rubyforge.org] remote participant generator speeds up t
 
 == Requirements
 
-* Ruby 1.8.6
+* Ruby 1.8.6 or later (developed on 1.9.1)
 * eventmachine-0.12.8[http://rubyeventmachine.com]
 * rspec (for writing/running your specs)
 
@@ -74,18 +74,20 @@ The ruote[http://openwfe.rubyforge.org] remote participant generator speeds up t
 
 Depending on the generator you choose for your daemon, it might require additional gems to run.
 
-* jabber - xmpp4r-simple[http://xmpp4r-simple.rubyforge.org]
+* xmpp - blather[http://blather.squishtech.com/]
 * cron - rufus-scheduler[http://github.com/jmettraux/rufus-scheduler] (at least version 2.0.0)
 * amqp - amqp[http://github.com/tmm1/amqp]
 * nanite - nanite[http://github.com/ezmobius/nanite]
 * ruote - none, although ruote[http://openwfe.rubyforge.org] should probably be running somewhere
 
+The generators are all written using Thor[http://rdoc.info/rdoc/wycats/thor], which is bundled with daemon-kit and not needed for running any of the generators.
+
 == Install
 
 Currently recommended to stick to the git repo:
 
   $ git clone git://github.com/kennethkalmer/daemon-kit.git
-  $ rake gem
+  $ rake build
   $ gem install pkg/daemon-kit-X.X.X.gem
 
 Stable versions, when released are available directly from Gemcutter:

data/Rakefile

@@ -16,7 +16,6 @@ begin
     gemspec.extra_rdoc_files.include '*.txt'
 
     gemspec.add_dependency 'eventmachine', '>=0.12.8'
-    gemspec.add_dependency 'rubigen', '>=1.5.2'
     gemspec.add_development_dependency 'rspec'
     gemspec.add_development_dependency 'cucumber'
   end

data/TODO.txt

@@ -11,10 +11,9 @@ This is purely a drop in the bucket of what has to come...
   * Support for custom error handlers in the project
 * Easy configuration of an ORM of choice, including patching it if needed (ActiveRecord *cough*)
 * Improved generators for creating skeleton daemons:
-  * Evented jabber bot
   * Empty periodic event loop
   * Empty periodic loop (non-evented)
-  * Queue (SQS, AMQP, etc) pollers
+  * Queue (SQS, etc) pollers
 * Rake tasks for generating:
   * Sys-V style init scripts
 * Plenty of docs, seriously a lot of docs

data/bin/daemon-kit

@@ -1,18 +1,18 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
-require 'rubigen'
+begin
+  require 'daemon_kit'
+rescue LoadError
+  $:.unshift File.expand_path( '../../lib', __FILE__ )
+  require 'daemon_kit'
+end
 
 if %w(-v --version).include? ARGV.first
-  require 'daemon_kit'
-  puts "#{File.basename($0)} #{DaemonKit::VERSION}"
+  puts "#{File.basename($0)} #{DaemonKit::VERSION} (http://github.com/kennethkalmer/daemon-kit)"
   exit(0)
 end
 
-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::Scripts::Generate.new.run(ARGV, :generator => 'daemon_kit')
+require 'daemon_kit/generators'
+require 'generators/daemon_kit/app/app_generator'
+
+DaemonKit::Generators::AppGenerator.start

data/daemon-kit.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{daemon-kit}
-  s.version = "0.1.7.12"
+  s.version = "0.1.8pre"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["kenneth.kalmer@gmail.com"]
-  s.date = %q{2009-12-04}
+  s.date = %q{2010-02-05}
   s.default_executable = %q{daemon-kit}
   s.description = %q{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.}
   s.email = %q{kenneth.kalmer@gmail.com}
@@ -37,85 +37,17 @@ Gem::Specification.new do |s|
      "Rakefile",
      "RuoteParticipants.txt",
      "TODO.txt",
-     "app_generators/daemon_kit/USAGE",
-     "app_generators/daemon_kit/daemon_kit_generator.rb",
-     "app_generators/daemon_kit/templates/README",
-     "app_generators/daemon_kit/templates/Rakefile",
-     "app_generators/daemon_kit/templates/bin/daemon.erb",
-     "app_generators/daemon_kit/templates/config/arguments.rb",
-     "app_generators/daemon_kit/templates/config/boot.rb",
-     "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/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",
-     "app_generators/daemon_kit/templates/script/console",
-     "app_generators/daemon_kit/templates/script/destroy",
-     "app_generators/daemon_kit/templates/script/generate",
      "bin/daemon-kit",
      "config/website.yml",
      "daemon-kit.gemspec",
-     "daemon_generators/amqp/USAGE",
-     "daemon_generators/amqp/amqp_generator.rb",
-     "daemon_generators/amqp/templates/config/amqp.yml",
-     "daemon_generators/amqp/templates/config/initializers/amqp.rb",
-     "daemon_generators/amqp/templates/libexec/daemon.rb",
-     "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",
-     "daemon_generators/deploy_capistrano/templates/config/deploy.rb",
-     "daemon_generators/deploy_capistrano/templates/config/deploy/production.rb",
-     "daemon_generators/deploy_capistrano/templates/config/deploy/staging.rb",
-     "daemon_generators/deploy_capistrano/templates/config/environments/staging.rb",
-     "daemon_generators/jabber/USAGE",
-     "daemon_generators/jabber/jabber_generator.rb",
-     "daemon_generators/jabber/templates/config/initializers/jabber.rb",
-     "daemon_generators/jabber/templates/config/jabber.yml",
-     "daemon_generators/jabber/templates/libexec/daemon.rb",
-     "daemon_generators/nanite_agent/USAGE",
-     "daemon_generators/nanite_agent/nanite_agent_generator.rb",
-     "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",
-     "daemon_generators/ruote/USAGE",
-     "daemon_generators/ruote/ruote_generator.rb",
-     "daemon_generators/ruote/templates/config/amqp.yml",
-     "daemon_generators/ruote/templates/config/initializers/ruote.rb",
-     "daemon_generators/ruote/templates/config/ruote.yml",
-     "daemon_generators/ruote/templates/lib/daemon.rb",
-     "daemon_generators/ruote/templates/lib/sample.rb",
-     "daemon_generators/ruote/templates/libexec/daemon.rb",
-     "daemon_generators/test_unit/USAGE",
-     "daemon_generators/test_unit/templates/tasks/test_unit.rake",
-     "daemon_generators/test_unit/templates/test/test.rb",
-     "daemon_generators/test_unit/templates/test/test_helper.rb",
-     "daemon_generators/test_unit/test_unit_generator.rb",
      "lib/daemon_kit.rb",
      "lib/daemon_kit/abstract_logger.rb",
      "lib/daemon_kit/amqp.rb",
      "lib/daemon_kit/application.rb",
      "lib/daemon_kit/arguments.rb",
      "lib/daemon_kit/commands/console.rb",
+     "lib/daemon_kit/commands/destroy.rb",
+     "lib/daemon_kit/commands/generate.rb",
      "lib/daemon_kit/config.rb",
      "lib/daemon_kit/console_daemon.rb",
      "lib/daemon_kit/core_ext.rb",
@@ -129,6 +61,8 @@ Gem::Specification.new do |s|
      "lib/daemon_kit/error_handlers/hoptoad.rb",
      "lib/daemon_kit/error_handlers/mail.rb",
      "lib/daemon_kit/exceptions.rb",
+     "lib/daemon_kit/generators.rb",
+     "lib/daemon_kit/generators/base.rb",
      "lib/daemon_kit/initializer.rb",
      "lib/daemon_kit/jabber.rb",
      "lib/daemon_kit/nanite.rb",
@@ -144,7 +78,109 @@ Gem::Specification.new do |s|
      "lib/daemon_kit/tasks/god.rake",
      "lib/daemon_kit/tasks/log.rake",
      "lib/daemon_kit/tasks/monit.rake",
+     "lib/daemon_kit/vendor/thor-0.12.3/CHANGELOG.rdoc",
+     "lib/daemon_kit/vendor/thor-0.12.3/LICENSE",
+     "lib/daemon_kit/vendor/thor-0.12.3/README.rdoc",
+     "lib/daemon_kit/vendor/thor-0.12.3/Thorfile",
+     "lib/daemon_kit/vendor/thor-0.12.3/lib/thor.rb",
+     "lib/daemon_kit/vendor/thor-0.12.3/lib/thor/actions.rb",
+     "lib/daemon_kit/vendor/thor-0.12.3/lib/thor/actions/create_file.rb",
+     "lib/daemon_kit/vendor/thor-0.12.3/lib/thor/actions/directory.rb",
+     "lib/daemon_kit/vendor/thor-0.12.3/lib/thor/actions/empty_directory.rb",
+     "lib/daemon_kit/vendor/thor-0.12.3/lib/thor/actions/file_manipulation.rb",
+     "lib/daemon_kit/vendor/thor-0.12.3/lib/thor/actions/inject_into_file.rb",
+     "lib/daemon_kit/vendor/thor-0.12.3/lib/thor/base.rb",
+     "lib/daemon_kit/vendor/thor-0.12.3/lib/thor/core_ext/file_binary_read.rb",
+     "lib/daemon_kit/vendor/thor-0.12.3/lib/thor/core_ext/hash_with_indifferent_access.rb",
+     "lib/daemon_kit/vendor/thor-0.12.3/lib/thor/core_ext/ordered_hash.rb",
+     "lib/daemon_kit/vendor/thor-0.12.3/lib/thor/error.rb",
+     "lib/daemon_kit/vendor/thor-0.12.3/lib/thor/group.rb",
+     "lib/daemon_kit/vendor/thor-0.12.3/lib/thor/invocation.rb",
+     "lib/daemon_kit/vendor/thor-0.12.3/lib/thor/parser.rb",
+     "lib/daemon_kit/vendor/thor-0.12.3/lib/thor/parser/argument.rb",
+     "lib/daemon_kit/vendor/thor-0.12.3/lib/thor/parser/arguments.rb",
+     "lib/daemon_kit/vendor/thor-0.12.3/lib/thor/parser/option.rb",
+     "lib/daemon_kit/vendor/thor-0.12.3/lib/thor/parser/options.rb",
+     "lib/daemon_kit/vendor/thor-0.12.3/lib/thor/rake_compat.rb",
+     "lib/daemon_kit/vendor/thor-0.12.3/lib/thor/runner.rb",
+     "lib/daemon_kit/vendor/thor-0.12.3/lib/thor/shell.rb",
+     "lib/daemon_kit/vendor/thor-0.12.3/lib/thor/shell/basic.rb",
+     "lib/daemon_kit/vendor/thor-0.12.3/lib/thor/shell/color.rb",
+     "lib/daemon_kit/vendor/thor-0.12.3/lib/thor/task.rb",
+     "lib/daemon_kit/vendor/thor-0.12.3/lib/thor/util.rb",
+     "lib/daemon_kit/vendor/thor-0.12.3/lib/thor/version.rb",
      "lib/daemon_kit/xmpp.rb",
+     "lib/generators/daemon_kit/amqp/USAGE",
+     "lib/generators/daemon_kit/amqp/amqp_generator.rb",
+     "lib/generators/daemon_kit/amqp/templates/config/amqp.yml",
+     "lib/generators/daemon_kit/amqp/templates/config/pre-daemonize/amqp.rb",
+     "lib/generators/daemon_kit/amqp/templates/libexec/%app_name%-daemon.rb",
+     "lib/generators/daemon_kit/app/USAGE",
+     "lib/generators/daemon_kit/app/app_generator.rb",
+     "lib/generators/daemon_kit/app/templates/Gemfile",
+     "lib/generators/daemon_kit/app/templates/README",
+     "lib/generators/daemon_kit/app/templates/Rakefile",
+     "lib/generators/daemon_kit/app/templates/bin/daemon.tt",
+     "lib/generators/daemon_kit/app/templates/config/arguments.rb",
+     "lib/generators/daemon_kit/app/templates/config/boot.rb",
+     "lib/generators/daemon_kit/app/templates/config/environment.rb.tt",
+     "lib/generators/daemon_kit/app/templates/config/environments/development.rb",
+     "lib/generators/daemon_kit/app/templates/config/environments/production.rb",
+     "lib/generators/daemon_kit/app/templates/config/environments/test.rb",
+     "lib/generators/daemon_kit/app/templates/config/post-daemonize/readme",
+     "lib/generators/daemon_kit/app/templates/config/pre-daemonize/readme",
+     "lib/generators/daemon_kit/app/templates/lib/%app_name%.rb",
+     "lib/generators/daemon_kit/app/templates/libexec/%app_name%-daemon.rb",
+     "lib/generators/daemon_kit/app/templates/script/console",
+     "lib/generators/daemon_kit/app/templates/script/destroy",
+     "lib/generators/daemon_kit/app/templates/script/generate",
+     "lib/generators/daemon_kit/capistrano/capistrano_generator.rb",
+     "lib/generators/daemon_kit/capistrano/templates/Capfile",
+     "lib/generators/daemon_kit/capistrano/templates/USAGE",
+     "lib/generators/daemon_kit/capistrano/templates/config/deploy.rb.tt",
+     "lib/generators/daemon_kit/capistrano/templates/config/deploy/production.rb.tt",
+     "lib/generators/daemon_kit/capistrano/templates/config/deploy/staging.rb.tt",
+     "lib/generators/daemon_kit/capistrano/templates/config/environments/staging.rb",
+     "lib/generators/daemon_kit/cron/USAGE",
+     "lib/generators/daemon_kit/cron/cron_generator.rb",
+     "lib/generators/daemon_kit/cron/templates/config/pre-daemonize/cron.rb",
+     "lib/generators/daemon_kit/cron/templates/libexec/%app_name%-daemon.rb",
+     "lib/generators/daemon_kit/cucumber/USAGE",
+     "lib/generators/daemon_kit/cucumber/cucumber_generator.rb",
+     "lib/generators/daemon_kit/cucumber/templates/config/environments/cucumber.rb",
+     "lib/generators/daemon_kit/cucumber/templates/features/step_definitions/.empty_directory",
+     "lib/generators/daemon_kit/cucumber/templates/features/support/env.rb",
+     "lib/generators/daemon_kit/cucumber/templates/script/cucumber",
+     "lib/generators/daemon_kit/cucumber/templates/tasks/cucumber.rake",
+     "lib/generators/daemon_kit/nanite_agent/USAGE",
+     "lib/generators/daemon_kit/nanite_agent/nanite_agent_generator.rb",
+     "lib/generators/daemon_kit/nanite_agent/templates/config/nanite.yml",
+     "lib/generators/daemon_kit/nanite_agent/templates/config/pre-daemonize/nanite_agent.rb",
+     "lib/generators/daemon_kit/nanite_agent/templates/lib/actors/sample.rb",
+     "lib/generators/daemon_kit/nanite_agent/templates/libexec/%app_name%-daemon.rb",
+     "lib/generators/daemon_kit/rspec/USAGE",
+     "lib/generators/daemon_kit/rspec/rspec_generator.rb",
+     "lib/generators/daemon_kit/rspec/templates/spec/%app_name%_spec.rb",
+     "lib/generators/daemon_kit/rspec/templates/spec/spec.opts",
+     "lib/generators/daemon_kit/rspec/templates/spec/spec_helper.rb",
+     "lib/generators/daemon_kit/rspec/templates/tasks/rspec.rake",
+     "lib/generators/daemon_kit/ruote/USAGE",
+     "lib/generators/daemon_kit/ruote/ruote_generator.rb",
+     "lib/generators/daemon_kit/ruote/templates/config/amqp.yml",
+     "lib/generators/daemon_kit/ruote/templates/config/pre-daemonize/ruote.rb",
+     "lib/generators/daemon_kit/ruote/templates/config/ruote.yml",
+     "lib/generators/daemon_kit/ruote/templates/lib/%app_name%.rb",
+     "lib/generators/daemon_kit/ruote/templates/lib/sample.rb",
+     "lib/generators/daemon_kit/ruote/templates/libexec/%app_name%-daemon.rb",
+     "lib/generators/daemon_kit/test_unit/USAGE",
+     "lib/generators/daemon_kit/test_unit/templates/tasks/test_unit.rake",
+     "lib/generators/daemon_kit/test_unit/templates/test/%app_name%_test.rb.tt",
+     "lib/generators/daemon_kit/test_unit/templates/test/test_helper.rb",
+     "lib/generators/daemon_kit/test_unit/test_unit_generator.rb",
+     "lib/generators/daemon_kit/xmpp/templates/config/pre-daemonize/xmpp.rb",
+     "lib/generators/daemon_kit/xmpp/templates/config/xmpp.yml",
+     "lib/generators/daemon_kit/xmpp/templates/libexec/%app_name%-daemon.rb",
+     "lib/generators/daemon_kit/xmpp/xmpp_generator.rb",
      "script/console",
      "script/destroy",
      "script/generate",
@@ -172,7 +208,6 @@ Gem::Specification.new do |s|
      "test/test_deploy_capistrano_generator.rb",
      "test/test_generator_helper.rb",
      "test/test_helper.rb",
-     "test/test_jabber_generator.rb",
      "test/test_nanite_agent_generator.rb",
      "test/test_ruote_generator.rb",
      "test/test_test_unit_generator.rb",
@@ -233,7 +268,6 @@ To get started quickly run 'daemon-kit' without any arguments
      "test/test_deploy_capistrano_generator.rb",
      "test/test_generator_helper.rb",
      "test/test_helper.rb",
-     "test/test_jabber_generator.rb",
      "test/test_nanite_agent_generator.rb",
      "test/test_ruote_generator.rb",
      "test/test_test_unit_generator.rb"
@@ -245,18 +279,15 @@ To get started quickly run 'daemon-kit' without any arguments
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.8"])
-      s.add_runtime_dependency(%q<rubigen>, [">= 1.5.2"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
     else
       s.add_dependency(%q<eventmachine>, [">= 0.12.8"])
-      s.add_dependency(%q<rubigen>, [">= 1.5.2"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
     end
   else
     s.add_dependency(%q<eventmachine>, [">= 0.12.8"])
-    s.add_dependency(%q<rubigen>, [">= 1.5.2"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
   end

data/lib/daemon_kit.rb

@@ -1,13 +1,8 @@
-# TODO: Strip this out eventually so we can run without rubygems
-require 'rubygems'
-
-# Seems in 1.9 we need to load openssl before em or there is failures all around.
+# Seems we need to load openssl before em or there are failures all around.
 # But we need to consider that people might not have ssl in the first place.
-if RUBY_VERSION >= "1.9"
-  begin
-    require 'openssl'
-  rescue LoadError
-  end
+begin
+  require 'openssl'
+rescue LoadError
 end
 require 'eventmachine'
 
@@ -18,7 +13,7 @@ $:.unshift( File.dirname(__FILE__).to_absolute_path ) unless
   $:.include?( File.dirname(__FILE__).to_absolute_path )
 
 module DaemonKit
-  VERSION = '0.1.7.12'
+  VERSION = '0.1.8pre'
 
   autoload :Initializer,    'daemon_kit/initializer'
   autoload :Application,    'daemon_kit/application'
@@ -29,6 +24,7 @@ module DaemonKit
   autoload :AbstractLogger, 'daemon_kit/abstract_logger'
   autoload :EM,             'daemon_kit/em'
   autoload :Configurable,   'daemon_kit/core_ext/configurable'
+  autoload :Generators,     'daemon_kit/generators'
 
   autoload :Cron,                   'daemon_kit/cron'
   autoload :Jabber,                 'daemon_kit/jabber'
@@ -37,6 +33,7 @@ module DaemonKit
   autoload :RuoteParticipants,      'daemon_kit/ruote_participants'
   autoload :RuoteWorkitem,          'daemon_kit/ruote_workitem'
   autoload :RuotePseudoParticipant, 'daemon_kit/ruote_pseudo_participant'
+  autoload :XMPP,                   'daemon_kit/xmpp'
 
   class << self
     def logger

data/lib/daemon_kit/abstract_logger.rb

@@ -69,60 +69,63 @@ module DaemonKit
       self.logger.write( msg ) if self.logger && self.logger.respond_to?( :write )
     end
 
-    def debug( msg )
-      add( :debug, msg )
+    def debug( msg = nil, &block )
+      add( :debug, msg, &block )
     end
 
     def debug?
       self.level == :debug
     end
 
-    def info( msg )
-      add( :info, msg )
+    def info( msg = nil, &block )
+      add( :info, msg, &block )
     end
 
     def info?
       self.level == :info
     end
 
-    def warn( msg )
-      add( :warn, msg )
+    def warn( msg = nil, &block )
+      add( :warn, msg, &block )
     end
 
     def warn?
       self.level == :warn
     end
 
-    def error( msg )
-      add( :error, msg )
+    def error( msg = nil, &block )
+      add( :error, msg, &block )
     end
 
     def error?
       self.level == :error
     end
 
-    def fatal( msg )
-      add( :fatal, msg )
+    def fatal( msg = nil, &block )
+      add( :fatal, msg, &block )
     end
 
     def fatal?
       self.level == :fatal
     end
 
-    def unknown( msg )
-      add( :unknown, msg )
+    def unknown( msg = nil, &block )
+      add( :unknown, msg, &block )
     end
 
     def unknown?
       self.level == :unknown
     end
 
+    # Conveniently log an exception and the backtrace
     def exception( e )
       message = "EXCEPTION: #{e.message}: #{clean_trace( e.backtrace )}"
       self.add( :error, message, true )
     end
 
-    def add( severity, message, skip_caller = false )
+    def add( severity, message = nil, skip_caller = false, &block )
+      message = yield if block_given?
+
       message = "#{called(caller)}: #{message}" unless skip_caller
 
       self.logger.add( self.class.severities[ severity ] ) { message }
@@ -175,7 +178,12 @@ module DaemonKit
       l = trace.detect('unknown:0') { |l| l.index('abstract_logger.rb').nil? }
       file, num, _ = l.split(':')
 
-      [ File.basename(file), num ].join(':')
+      if file =~ /daemon[\-_]kit/
+        "[daemon-kit]"
+
+      else
+        [ File.basename(file), num ].join(':')
+      end
     end
 
     def create_logger