daemon-kit 0.1.8rc2 → 0.1.8rc3

data/Rakefile

@@ -14,6 +14,7 @@ begin
     gemspec.authors = ['kenneth.kalmer@gmail.com']
     gemspec.post_install_message = IO.read('PostInstall.txt')
     gemspec.extra_rdoc_files.include '*.txt'
+    gemspec.files.include("lib/generators/**/*", "lib/daemon_kit/vendor/**/*")
 
     gemspec.add_dependency 'eventmachine', '>=0.12.10'
     gemspec.add_development_dependency 'rspec'

data/daemon-kit.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{daemon-kit}
-  s.version = "0.1.8rc2"
+  s.version = "0.1.8rc3"
 
   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{2010-04-14}
+  s.date = %q{2010-08-02}
   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}
@@ -75,37 +75,37 @@ 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/vendor/thor-0.13.6/CHANGELOG.rdoc",
+     "lib/daemon_kit/vendor/thor-0.13.6/LICENSE",
+     "lib/daemon_kit/vendor/thor-0.13.6/README.rdoc",
+     "lib/daemon_kit/vendor/thor-0.13.6/Thorfile",
+     "lib/daemon_kit/vendor/thor-0.13.6/lib/thor.rb",
+     "lib/daemon_kit/vendor/thor-0.13.6/lib/thor/actions.rb",
+     "lib/daemon_kit/vendor/thor-0.13.6/lib/thor/actions/create_file.rb",
+     "lib/daemon_kit/vendor/thor-0.13.6/lib/thor/actions/directory.rb",
+     "lib/daemon_kit/vendor/thor-0.13.6/lib/thor/actions/empty_directory.rb",
+     "lib/daemon_kit/vendor/thor-0.13.6/lib/thor/actions/file_manipulation.rb",
+     "lib/daemon_kit/vendor/thor-0.13.6/lib/thor/actions/inject_into_file.rb",
+     "lib/daemon_kit/vendor/thor-0.13.6/lib/thor/base.rb",
+     "lib/daemon_kit/vendor/thor-0.13.6/lib/thor/core_ext/file_binary_read.rb",
+     "lib/daemon_kit/vendor/thor-0.13.6/lib/thor/core_ext/hash_with_indifferent_access.rb",
+     "lib/daemon_kit/vendor/thor-0.13.6/lib/thor/core_ext/ordered_hash.rb",
+     "lib/daemon_kit/vendor/thor-0.13.6/lib/thor/error.rb",
+     "lib/daemon_kit/vendor/thor-0.13.6/lib/thor/group.rb",
+     "lib/daemon_kit/vendor/thor-0.13.6/lib/thor/invocation.rb",
+     "lib/daemon_kit/vendor/thor-0.13.6/lib/thor/parser.rb",
+     "lib/daemon_kit/vendor/thor-0.13.6/lib/thor/parser/argument.rb",
+     "lib/daemon_kit/vendor/thor-0.13.6/lib/thor/parser/arguments.rb",
+     "lib/daemon_kit/vendor/thor-0.13.6/lib/thor/parser/option.rb",
+     "lib/daemon_kit/vendor/thor-0.13.6/lib/thor/parser/options.rb",
+     "lib/daemon_kit/vendor/thor-0.13.6/lib/thor/rake_compat.rb",
+     "lib/daemon_kit/vendor/thor-0.13.6/lib/thor/runner.rb",
+     "lib/daemon_kit/vendor/thor-0.13.6/lib/thor/shell.rb",
+     "lib/daemon_kit/vendor/thor-0.13.6/lib/thor/shell/basic.rb",
+     "lib/daemon_kit/vendor/thor-0.13.6/lib/thor/shell/color.rb",
+     "lib/daemon_kit/vendor/thor-0.13.6/lib/thor/task.rb",
+     "lib/daemon_kit/vendor/thor-0.13.6/lib/thor/util.rb",
+     "lib/daemon_kit/vendor/thor-0.13.6/lib/thor/version.rb",
      "lib/daemon_kit/xmpp.rb",
      "lib/generators/daemon_kit/amqp/USAGE",
      "lib/generators/daemon_kit/amqp/amqp_generator.rb",
@@ -115,7 +115,7 @@ Gem::Specification.new do |s|
      "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/README.tt",
      "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",
@@ -220,7 +220,7 @@ To get started quickly run 'daemon-kit' without any arguments
 }
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Opinionated framework for Ruby daemons}
   s.test_files = [
     "spec/abstract_logger_spec.rb",
@@ -247,7 +247,7 @@ To get started quickly run 'daemon-kit' without any arguments
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.10"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])

data/lib/daemon_kit.rb

@@ -13,7 +13,7 @@ $:.unshift( File.dirname(__FILE__).to_absolute_path ) unless
   $:.include?( File.dirname(__FILE__).to_absolute_path )
 
 module DaemonKit
-  VERSION = '0.1.8rc2'
+  VERSION = '0.1.8rc3'
 
   autoload :Initializer,    'daemon_kit/initializer'
   autoload :Application,    'daemon_kit/application'

data/lib/daemon_kit/amqp.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'mq'
 
 module DaemonKit
   # Thin wrapper around the amqp gem, specifically designed to ease

data/lib/daemon_kit/cron.rb

@@ -11,8 +11,10 @@ module DaemonKit
   class Cron
 
     @instance = nil
+    @exception_handler = nil
 
     attr_reader :scheduler
+    attr_accessor :exception_handler
 
     class << self
 
@@ -25,6 +27,10 @@ module DaemonKit
         instance.scheduler
       end
 
+      def handle_exception( &block )
+        instance.exception_handler = block
+      end
+
       private :new
 
       # Once the scheduler has been configured, call #run to block the
@@ -43,6 +49,16 @@ module DaemonKit
 
     def initialize
       @scheduler = Rufus::Scheduler.start_new
+
+      def @scheduler.handle_exception( job, exception )
+        DaemonKit::Cron.instance.handle_exception( job, exception )
+      end
+    end
+
+    def handle_exception( job, exception )
+      DaemonKit.logger.error( "Cron: job #{job.job_id} caught exception: '#{exception}'" )
+      DaemonKit.logger.exception( exception )
+      @exception_handler.call( job, exception ) unless @exception_handler.nil?
     end
   end
 end

data/lib/daemon_kit/deployment/capistrano.rb

@@ -67,6 +67,11 @@ _cset(:run_method)        { fetch(:use_sudo, true) ? :sudo : :run }
 # standalone case, or during deployment.
 _cset(:latest_release) { exists?(:deploy_timestamped) ? release_path : current_release }
 
+# =========================================================================
+# Variables for bundler
+# =========================================================================
+_cset(:use_bundler, true)
+
 # =========================================================================
 # These are helper methods that will be available to your recipes.
 # =========================================================================
@@ -198,11 +203,16 @@ namespace :deploy do
     control software you are using (it defaults to :subversion), and the \
     :deploy_via variable to the strategy you want to use to deploy (it \
     defaults to :checkout).
+
+    Your bundles will also be installed/updated as part of this step. \
+    You can disable bundler on remote reployments with the :user_bundler \
+    variable.
   DESC
   task :update_code, :except => { :no_release => true } do
     on_rollback { run "rm -rf #{release_path}; true" }
     strategy.deploy!
     finalize_update
+    bundler.bundle_new_release if fetch(:use_bundler, true)
   end
 
   desc <<-DESC
@@ -398,6 +408,8 @@ namespace :deploy do
   task :check, :except => { :no_release => true } do
     dependencies = strategy.check!
 
+    depend( :remote, :gem, "bundler", ">= 0.9.26" ) if fetch(:use_bundler, true)
+
     other = fetch(:dependencies, {})
     other.each do |location, types|
       types.each do |type, calls|
@@ -480,3 +492,25 @@ namespace :deploy do
     end
   end
 end
+
+namespace :bundler do
+  task :create_symlink, :roles => :app do
+    shared_dir = File.join(shared_path, 'bundle')
+    release_dir = File.join(current_release, '.bundle')
+    run("mkdir -p #{shared_dir} && ln -s #{shared_dir} #{release_dir}")
+  end
+
+  task :bundle_new_release, :roles => :app do
+    bundler.create_symlink
+    run "cd #{release_path} && bundle install .bundle --without test"
+  end
+
+  task :lock, :roles => :app do
+    run "cd #{current_release} && bundle lock;"
+  end
+
+  task :unlock, :roles => :app do
+    run "cd #{current_release} && bundle unlock;"
+  end
+end
+

data/lib/daemon_kit/error_handlers/hoptoad.rb

@@ -52,7 +52,7 @@ module DaemonKit
           end
 
           def to_xml
-            data = [ method, file, number ].map { |s| URI.escape( s, %q{"'<>&} ) }
+            data = [ method, file, number ].map { |s| URI.escape( s || 'unknown', %q{"'<>&} ) }
             %q{<line method="%s" file="%s" number="%s" />} % data
           end
 
@@ -144,6 +144,12 @@ module DaemonKit
 
       def format_exception( exception )
         lines = Backtrace.parse( exception.backtrace )
+        exception_message= exception.message
+        exception_message.gsub!("\"","&quot;")
+        exception_message.gsub!("'","&apos;")
+        exception_message.gsub!("&","&amp;")
+        exception_message.gsub!("<","&lt;")
+        exception_message.gsub!(">","&gt;")
 
         <<-EOF
 <?xml version="1.0" encoding="UTF-8"?>
@@ -156,7 +162,7 @@ module DaemonKit
   </notifier>
   <error>
     <class>#{exception.class.name}</class>
-    <message>#{exception.message}</message>
+    <message>#{exception_message}</message>
     <backtrace>
       #{Backtrace.parse( exception.backtrace ).lines.inject('') { |string,line| string << line.to_xml }}
     </backtrace>

data/lib/daemon_kit/generators.rb

@@ -1,5 +1,5 @@
 # TODO: Don't always depend on bundled thor
-$:.unshift File.dirname(__FILE__) + '/vendor/thor-0.12.3/lib'
+$:.unshift File.dirname(__FILE__) + '/vendor/thor-0.13.6/lib'
 
 require 'daemon_kit/generators/base'
 

data/lib/daemon_kit/generators/base.rb

@@ -1,4 +1,4 @@
-require 'thor'
+require 'thor/group'
 
 module DaemonKit
   module Generators

data/lib/daemon_kit/ruote_participants.rb

@@ -35,6 +35,7 @@ module DaemonKit
     def initialize
       @transports = []
       @participants = {}
+      @runtime_queues = []
 
       @configuration = Config.load('ruote')
     end
@@ -80,12 +81,17 @@ module DaemonKit
       run_amqp! if @transports.include?( :amqp )
     end
 
+    # Subscribe to additional queues not specified in ruote.yml
+    def subscribe_to( queue )
+      @runtime_queues << queue
+    end
+
     private
 
     def run_amqp!
       AMQP.run do
         mq = ::MQ.new
-        queues = @configuration['amqp']['queues'].to_a
+        queues = @configuration['amqp']['queues'].to_a | @runtime_queues
 
         queues.each do |q|
           DaemonKit.logger.debug("Subscribing to #{q} for workitems")

data/lib/daemon_kit/ruote_workitem.rb

@@ -7,10 +7,10 @@ module DaemonKit
 
     class << self
 
-      # = Process incoming commands via an AMQP queue
+       # = Process incoming commands via an AMQP queue
       #
       # Expects a JSON workitem from ruote that has these fields set in
-      # attributes key:
+      # fields key:
       #
       #   {
       #     'reply_queue'    => 'queue to send replies to',
@@ -52,15 +52,16 @@ module DaemonKit
         if target.nil? || method.nil?
           msg = "Missing target/method in command parameter, or command parameter missing"
           DaemonKit.logger.error( msg )
-          work["daemon_kit"] = { "error" => msg }
+          work["__error__"] = msg
 
-        elsif target.public_methods.include?( method )
-          target.perform( method, work )
+        elsif target.public_methods.map { |m| m.to_s }.include?( method ) # 1.8.x => [ 'foo' ]
+          target.perform( method, work )                                  # 1.9.x => [ :foo ]
 
         else
-          msg = "Workitem cannot be processes: #{method} not exposed by #{target.inspect}"
+          msg = "Workitem cannot be processes: '#{method}' not exposed by #{target.inspect}"
           DaemonKit.logger.error( msg )
-          work["daemon_kit"] = { "error" => msg }
+          p [ :work, work.inspect ]
+          work["__error__"] = msg
         end
 
         reply_to_engine( transport, work )
@@ -90,8 +91,7 @@ module DaemonKit
 
       def reply_via_amqp( response )
         DaemonKit.logger.debug("Replying to engine via AMQP with #{response.inspect}")
-
-        ::MQ.queue( response['reply_queue'] ).publish( response.to_json )
+        ::MQ.queue( response['params']['reply_queue'] ).publish( response.to_json )
 
         response
       end
@@ -111,7 +111,7 @@ module DaemonKit
     end
 
     def fei
-      @workitem['flow_expression_id']
+      @workitem['fei']
     end
 
     def short_fei
@@ -119,8 +119,8 @@ module DaemonKit
         '(' + [
                'fei', self.fei['owfe_version'], self.fei['engine_id'],
                self.fei['workflow_definition_url'], self.fei['workflow_definition_name'],
-               self.fei['workflow_definition_revision'], self.fei['workflow_instance_id'],
-               self.fei['expression_name'], self.fei['expression_id']
+               self.fei['workflow_definition_revision'], self.fei['wfid'],
+               self.fei['expression_name'], self.fei['expid']
               ].join(' ') + ')'
     end
 
@@ -136,16 +136,26 @@ module DaemonKit
       @workitem['participant_name']
     end
 
-    def attributes
-      @workitem['attributes']
+    def has_field?(a)
+      self.fields.keys.include?( a )
+    end
+
+    def fields
+      @workitem['fields'] ||= @workitem['attributes']
     end
 
+    # backwards compatible..
+
+    alias :attributes :fields
+    alias :has_attribute? :has_field?
+
+
     def []( key )
-      self.attributes[ key ]
+      self.fields[ key ]
     end
 
     def []=( key, value )
-      self.attributes[ key ] = value
+      self.fields[ key ] = value
     end
 
     def to_json
@@ -156,9 +166,9 @@ module DaemonKit
     # has timed out or not. This method will only ever work if you used the
     # +:timeout: parameter was set for the expression.
     def timed_out?
-      key = fei['workflow_instance_id'] + '__' + fei['expression_id']
+      key = fei['wfid'] + '__' + fei['expid']
 
-      if self.attributes["__timeouts__"] && timeout = self.attributes["__timeouts__"][ key ]
+      if self.fields["__timeouts__"] && timeout = self.fields["__timeouts__"][ key ]
         return Time.at( timeout.last ) < Time.now
       end
 
@@ -166,8 +176,8 @@ module DaemonKit
     end
 
     def method_missing( method_name, *args )
-      if self.attributes.keys.include?( method_name.to_s )
-        return self.attributes[ method_name.to_s ]
+      if self.fields.keys.include?( method_name.to_s )
+        return self.fields[ method_name.to_s ]
       end
 
       super

data/lib/daemon_kit/tasks/environment.rake

@@ -2,6 +2,7 @@ task :environment do
   $daemon_kit_rake_task = true
 
   require 'config/environment'
+  DaemonKit::Application.running!
 end
 
 task "Execute system commands in other tasks with sudo"

data/lib/daemon_kit/vendor/{thor-0.12.3 → thor-0.13.6}/CHANGELOG.rdoc

@@ -1,5 +1,14 @@
+== 0.13, released 2010-02-03
+
+* Several bug fixes
+* Decoupled Thor::Group and Thor, so it's easier to vendor
+* Added check_unknown_options! in case you want error messages to be raised in valid switches.
+* run(command) should return the results of command
+
 == 0.12, released 2010-01-02
 
+* Methods generated by attr_* are automatically not marked as tasks
+* inject_into_file does not add the same content twice, unless :force is set
 * Removed rr in favor to rspec mock framework
 * Improved output for thor -T
 * [#7] Do not force white color on status