daemon-kit 0.1.8rc3 → 0.1.8

data/History.txt

@@ -1,4 +1,4 @@
-== 0.1.18 (WIP)
+== 0.1.18 2010-08-03
 
 * Generators rewritten to use Thor
 * Evented XMPP now handled by blather
@@ -8,6 +8,9 @@
 * Fix various argument handling bugs
 * Removed support for exception emails
 * Improved log rotation support [mperham]
+* Initial 1.9.2 support
+* Exception handling for scheduled tasks (cron)
+* Updates for ruote-amqp versions 2.1 and later
 
 == 0.1.7.12 2009-12-04
 

data/README.rdoc

@@ -66,8 +66,8 @@ The ruote[http://openwfe.rubyforge.org] remote participant generator speeds up t
 
 == Requirements
 
-* Ruby 1.8.6 or later (developed on 1.9.1)
-* eventmachine-0.12.8[http://rubyeventmachine.com]
+* Ruby 1.8.7 or later (developed on REE/1.9.1)
+* eventmachine-0.12.10[http://rubyeventmachine.com]
 * rspec (for writing/running your specs)
 
 == Generator Requirements
@@ -94,6 +94,10 @@ Stable versions, when released are available directly from Gemcutter:
 
   $ gem install daemon-kit
 
+== Upgrading
+
+When upgrading daemons generated from earlier versions of daemon-kit, it is easier in most cases to re-generate the daemon. Since 0.1.8 the generators use Thor, which allows you to review a diff of each file before deciding to overwrite it.
+
 == Further reading
 
 * Configuration.txt

data/daemon-kit.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{daemon-kit}
-  s.version = "0.1.8rc3"
+  s.version = "0.1.8"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kenneth.kalmer@gmail.com"]
-  s.date = %q{2010-08-02}
+  s.date = %q{2010-08-03}
   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}

data/lib/daemon_kit.rb

@@ -9,11 +9,11 @@ require 'eventmachine'
 require File.dirname(__FILE__) + '/daemon_kit/core_ext'
 require File.dirname(__FILE__) + '/daemon_kit/exceptions'
 
-$:.unshift( File.dirname(__FILE__).to_absolute_path ) unless
-  $:.include?( File.dirname(__FILE__).to_absolute_path )
+$LOAD_PATH.unshift( File.dirname(__FILE__).to_absolute_path ) unless
+  $LOAD_PATH.include?( File.dirname(__FILE__).to_absolute_path )
 
 module DaemonKit
-  VERSION = '0.1.8rc3'
+  VERSION = '0.1.8'
 
   autoload :Initializer,    'daemon_kit/initializer'
   autoload :Application,    'daemon_kit/application'
@@ -36,6 +36,7 @@ module DaemonKit
   autoload :XMPP,                   'daemon_kit/xmpp'
 
   class << self
+
     def logger
       @logger
     end

data/lib/daemon_kit/cron.rb

@@ -1,7 +1,9 @@
 module DaemonKit
 
   # Thin wrapper around rufus-scheduler gem, specifically designed to ease
-  # configuration of a scheduler and provide some added simplicity.
+  # configuration of a scheduler and provide some added simplicity. It also
+  # logs any exceptions that occur inside the scheduled blocks, ensuring your
+  # code isn't running blind.
   #
   # For more information on rufus-scheduler, please visit the RDoc's
   # at http://rufus.rubyforge.org/rufus-scheduler/
@@ -18,15 +20,16 @@ module DaemonKit
 
     class << self
 
-      # Access to the scheduler instance
       def instance
         @instance ||= new
       end
 
+      # Access to the scheduler instance
       def scheduler
         instance.scheduler
       end
 
+      # Define a block for receiving exceptions from inside the scheduler
       def handle_exception( &block )
         instance.exception_handler = block
       end

data/lib/daemon_kit/initializer.rb

@@ -3,13 +3,9 @@ require 'pathname'
 DAEMON_ENV = (ENV['DAEMON_ENV'] || 'development').dup unless defined?(DAEMON_ENV)
 
 # Absolute paths to the daemon_kit libraries added to $:
-incdir = ( File.dirname(__FILE__) + '/..' )
-absincdir = if RUBY_PLATFORM =~ /(:?mswin|mingw)/
-              File.expand_path( incdir )
-            else
-              File.expand_path( Pathname.new( incdir ).realpath.to_s )
-            end
-$:.unshift absincdir unless $:.include?( absincdir )
+require File.dirname(__FILE__) + '/core_ext'
+$LOAD_PATH.unshift( File.expand_path('../', __FILE__).to_absolute_path ) unless
+  $LOAD_PATH.include?( File.expand_path('../', __FILE__).to_absolute_path )
 
 require 'daemon_kit'
 

data/lib/generators/daemon_kit/app/templates/Rakefile

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/config/boot'
+require File.expand_path('../config/boot',  __FILE__)
 
 require 'rake'
 require 'daemon_kit/tasks'

data/lib/generators/daemon_kit/app/templates/bin/daemon.tt

@@ -2,6 +2,6 @@
 # Stub executable for <%= app_name %>
 #
 
-require File.dirname(__FILE__) + '/../config/environment'
+require File.expand_path('../../config/environment',  __FILE__)
 
 DaemonKit::Application.exec( DAEMON_ROOT + '/libexec/<%= app_name %>-daemon.rb' )

data/lib/generators/daemon_kit/app/templates/script/console

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'daemon_kit/commands/console'

data/lib/generators/daemon_kit/cron/templates/libexec/%app_name%-daemon.rb

@@ -31,9 +31,14 @@ end
 #end
 #
 #DaemonKit::Cron.scheduler.cron "0 22 * * 1-5" do
-#  log.info "activating security system..."
+#  DaemonKit.logger.info "activating security system..."
 #  activate_security_system()
 #end
+#
+# Example error handling (NOTE: all exceptions in scheduled tasks are logged)
+#DaemonKit::Cron.handle_exception do |job, exception|
+#  DaemonKit.logger.error "Caught exception in job #{job.job_id}: '#{exception}'"
+#end
 
 DaemonKit::Cron.scheduler.every("1m") do
   DaemonKit.logger.debug "Scheduled task completed at #{Time.now}"

data/lib/generators/daemon_kit/rspec/templates/tasks/rspec.rake

@@ -9,11 +9,13 @@ EOS
 end
 
 begin
+  require 'spec/rake/spectask'
+
   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']
   end
-rescue NameError
+rescue NameError, LoadError
   # No loss, warning printed already
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: daemon-kit
 version: !ruby/object:Gem::Version 
-  hash: 1679823647
-  prerelease: true
+  hash: 11
+  prerelease: false
   segments: 
   - 0
   - 1
-  - 8rc3
-  version: 0.1.8rc3
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - kenneth.kalmer@gmail.com
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-02 00:00:00 +02:00
+date: 2010-08-03 00:00:00 +02:00
 default_executable: daemon-kit
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -289,14 +289,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: