daemon-kit 0.1.7.10 → 0.1.7.11

data/daemon_generators/nanite_agent/templates/config/nanite.yml

@@ -17,8 +17,8 @@
 # * actors    - Comma separated list of actors to load (all ruby files in actors directory by default)
 
 defaults: &defaults
-  username: nanite
-  password: testing
+  user: nanite
+  pass: testing
   host: localhost
   vhost: /nanite
 # tag:

data/daemon_generators/rspec/templates/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+DAEMON_ENV = 'test' unless defined?( DAEMON_ENV )
+
 begin
   require 'spec'
 rescue LoadError
@@ -15,7 +17,7 @@ Spec::Runner.configure do |config|
   # RSpec uses it's own mocking framework by default. If you prefer to
   # use mocha, flexmock or RR, uncomment the appropriate line:
   #
-  config.mock_with :mocha
+  # config.mock_with :mocha
   # config.mock_with :flexmock
   # config.mock_with :rr
 end

data/daemon_generators/rspec/templates/tasks/rspec.rake

@@ -1,21 +1,19 @@
 begin
   require 'spec'
-rescue LoadError
-  require 'rubygems'
-  require 'spec'
-end
-begin
   require 'spec/rake/spectask'
 rescue LoadError
   puts <<-EOS
 To use rspec for testing you must install rspec gem:
     gem install rspec
 EOS
-  exit(0)
 end
 
-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']
+begin
+  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
+  # No loss, warning printed already
 end

data/daemon_generators/test_unit/USAGE

@@ -0,0 +1,5 @@
+Description:
+  
+  
+Usage:
+  

data/daemon_generators/test_unit/templates/tasks/test_unit.rake

@@ -0,0 +1,7 @@
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/*_test.rb']
+  t.verbose = true
+end

data/daemon_generators/test_unit/templates/test/test.rb

@@ -0,0 +1,9 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class Test<%= module_name %> < Test::Unit::TestCase
+
+  def test_missing
+    assert false, "daemons should be tested"
+  end
+end
+

data/daemon_generators/test_unit/templates/test/test_helper.rb

@@ -0,0 +1,6 @@
+DAEMON_ENV = 'test' unless defined?( DAEMON_ENV )
+
+require 'test/unit'
+
+require File.dirname(__FILE__) + '/../config/environment'
+DaemonKit::Application.running!

data/daemon_generators/test_unit/test_unit_generator.rb

@@ -0,0 +1,51 @@
+class TestUnitGenerator < RubiGen::Base
+
+  attr_reader :gem_name, :module_name
+
+  def initialize(runtime_args, runtime_options = {})
+    super
+    @destination_root = File.expand_path(destination_root)
+    @gem_name = base_name
+    @module_name  = @gem_name.camelcase
+    extract_options
+  end
+
+  def manifest
+    record do |m|
+      # Ensure appropriate folder(s) exists
+      m.directory 'test'
+      m.directory 'tasks'
+
+      m.template 'test/test.rb', "test/#{gem_name}_test.rb"
+      m.template_copy_each %w( test_helper.rb ), 'test'
+      m.file_copy_each     %w( test_unit.rake ), 'tasks'
+    end
+  end
+
+  protected
+    def banner
+      <<-EOS
+Creates a ...
+
+USAGE: #{$0} #{spec.name} name
+EOS
+    end
+
+    def add_options!(opts)
+      # opts.separator ''
+      # opts.separator 'Options:'
+      # For each option below, place the default
+      # at the top of the file next to "default_options"
+      # opts.on("-a", "--author=\"Your Name\"", String,
+      #         "Some comment about this option",
+      #         "Default: none") { |o| options[:author] = o }
+      # opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
+    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

data/lib/daemon_kit.rb

@@ -1,6 +1,14 @@
 # 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.
+# 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
+end
 require 'eventmachine'
 
 require File.dirname(__FILE__) + '/daemon_kit/core_ext'
@@ -10,7 +18,7 @@ $:.unshift( File.dirname(__FILE__).to_absolute_path ) unless
   $:.include?( File.dirname(__FILE__).to_absolute_path )
 
 module DaemonKit
-  VERSION = '0.1.7.10'
+  VERSION = '0.1.7.11'
 
   autoload :Initializer,    'daemon_kit/initializer'
   autoload :Application,    'daemon_kit/application'

data/lib/daemon_kit/abstract_logger.rb

@@ -63,6 +63,12 @@ module DaemonKit
       end
     end
 
+    # Write unformatted message to logging device, mostly useful for Logger interface
+    # compatibility and debugging soap4r (possibly others)
+    def <<( msg ) #:nodoc:
+      self.logger.write( msg ) if self.logger && self.logger.respond_to?( :write )
+    end
+
     def debug( msg )
       add( :debug, msg )
     end

data/lib/daemon_kit/application.rb

@@ -104,6 +104,7 @@ module DaemonKit
       protected
 
       def parse_arguments( args )
+        Arguments.parser_available = true
         DaemonKit.arguments = Arguments.new
         DaemonKit.arguments.parse( args )
       end

data/lib/daemon_kit/arguments.rb

@@ -19,10 +19,15 @@ module DaemonKit
                  'run'
                 ]
 
+    # We don't parse arguments by default
+    @parser_available = false
+
     class << self
 
       attr_reader :default_command, :commands
 
+      attr_accessor :parser_available
+
       # Parse the argument values and return an array with the command
       # name, config values and argument values
       def parse( argv )

data/lib/daemon_kit/error_handlers/hoptoad.rb

@@ -19,8 +19,8 @@ module DaemonKit
         data = clean_exception( exception )
 
         response = begin
-                     http.post( url.path, data.to_yaml, headers )
-                   rescue TimoutError => e
+                     http.post( url.path, {"notice" => data}.to_yaml, headers )
+                   rescue TimeoutError => e
                      DaemonKit.logger.error("Timeout while contacting the Hoptoad server.")
                      nil
                    end
@@ -43,8 +43,8 @@ module DaemonKit
           :error_message => "#{exception.class.name}: #{exception.message}",
           :backtrace     => exception.backtrace,
           :environment   => ENV.to_hash,
-          :request       => [],
-          :session       => []
+          :request       => {},
+          :session       => {}
         }
 
         stringify_keys( data )

data/lib/daemon_kit/exceptions.rb

@@ -5,4 +5,11 @@ module DaemonKit
 
   # Raised when no class is registered to process a ruote workitem
   class MissingParticipant < Exception; end
+
+  # Raised when the daemon itself cannot be found.
+  class DaemonNotFound < Exception
+    def initialize( file )
+      super "No daemon found at the path '#{file}'"
+    end
+  end
 end

data/lib/daemon_kit/initializer.rb

@@ -64,7 +64,7 @@ module DaemonKit
       initializer.after_daemonize
     end
 
-    def self.shutdown( clean = false )
+    def self.shutdown( clean = false, do_exit = false )
       return unless $daemon_kit_shutdown_hooks_ran.nil?
       $daemon_kit_shutdown_hooks_ran = true
 
@@ -81,7 +81,8 @@ module DaemonKit
       log_exceptions if DaemonKit.configuration.backtraces && !clean
 
       DaemonKit.logger.warn "Shutting down #{DaemonKit.configuration.daemon_name}"
-      exit
+
+      exit if do_exit
     end
 
     def initialize( configuration )
@@ -114,10 +115,10 @@ module DaemonKit
 
       if DaemonKit.configuration.user || DaemonKit.configuration.group
         euid = Process.euid
-	egid = Process.egid
-	uid = Process.uid
-	gid = Process.gid
-      	DaemonKit.logger.info( "DaemonKit dropped privileges to: #{euid} (EUID), #{egid} (EGID), #{uid} (UID), #{gid} (GID)"  )
+        egid = Process.egid
+        uid = Process.uid
+        gid = Process.gid
+        DaemonKit.logger.info( "DaemonKit dropped privileges to: #{euid} (EUID), #{egid} (EGID), #{uid} (UID), #{gid} (GID)"  )
       end
     end
 
@@ -191,7 +192,8 @@ module DaemonKit
     end
 
     def initialize_signal_traps
-      term_proc = Proc.new { DaemonKit::Initializer.shutdown( true ) }
+      # Only exit the process if we're not in the 'test' environment
+      term_proc = Proc.new { DaemonKit::Initializer.shutdown( true, DAEMON_ENV != 'test' ) }
       configuration.trap( 'INT', term_proc )
       configuration.trap( 'TERM', term_proc )
       at_exit { DaemonKit::Initializer.shutdown }
@@ -212,7 +214,7 @@ module DaemonKit
     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_file = File.join( DaemonKit.root, 'log', "backtrace-#{Time.now.strftime('%Y%m%d%H%M%S')}-#{Process.pid}.log" )
       trace_log = Logger.new( trace_file )
 
       # Find the last exception
@@ -252,7 +254,7 @@ module DaemonKit
     attr_accessor :logger
 
     # The log level to use, defaults to DEBUG
-    attr_accessor :log_level
+    attr_reader :log_level
 
     # Path to the log file, defaults to 'log/<environment>.log'
     configurable :log_path
@@ -286,7 +288,7 @@ module DaemonKit
 
     # Our safety net (#Safety) instance
     attr_accessor :safety_net
-    
+
     # :nodoc: Shutdown hooks
     attr_reader :shutdown_hooks
 
@@ -326,6 +328,12 @@ module DaemonKit
     def trap( signal, proc = nil, &block )
       return if proc.nil? && !block_given?
 
+      # One step towards running on windows, not enough though
+      unless Signal.list.include?( signal )
+        DaemonKit.logger.warn( "Trapping #{signal} signals not supported on this platform" )
+        return
+      end
+
       unless @signal_traps.has_key?( signal )
         set_trap( signal )
       end
@@ -344,6 +352,12 @@ module DaemonKit
       @pid_file ||= "#{File.dirname(self.log_path)}/#{self.daemon_name}.pid"
     end
 
+    # Set the log level
+    def log_level=( level )
+      @log_level = level
+      DaemonKit.logger.level = @log_level if DaemonKit.logger
+    end
+
     protected
 
     def run_traps( signal )
@@ -430,7 +444,7 @@ module DaemonKit
     # arguments to be parsed cause they will interfere with the
     # script encapsulating DaemonKit, like capistrano
     def own_args?
-      ![ 'cap' ].include?( File.basename( $0 ) )
+      Arguments.parser_available
     end
   end
 

data/lib/daemon_kit/nanite/agent.rb

@@ -1,3 +1,24 @@
+module Nanite
+  class Agent
+
+    attr_accessor :init_block
+
+    def load_actors_with_daemon_kit_changes( &block )
+      actors = @options[:actors]
+      Dir["#{DaemonKit.root}/lib/actors/*.rb"].each do |actor|
+        next if actors && !actors.include?( File.basename(actor, '.rb') )
+        Nanite::Log.info( "[setup] loading #{actor}" )
+        require actor
+      end
+
+      self.init_block.call( self )
+    end
+
+    alias_method :load_actors_without_daemon_kit_changes, :load_actors
+    alias_method :load_actors, :load_actors_with_daemon_kit_changes
+  end
+end
+
 module DaemonKit
   module Nanite
     # Pull support into a daemon for being a nanite agent.
@@ -29,22 +50,22 @@ module DaemonKit
         # Ensure graceful shutdown of the connection to the broker
         DaemonKit.trap('INT') { ::EM.stop }
         DaemonKit.trap('TERM') { ::EM.stop }
+        ::Nanite::Log.logger = DaemonKit.logger
 
         # Start our mapper
         mapper_thread = Thread.new do
           EM.run do
-            agent = ::Nanite.start_agent( @config )
-            block.call( agent ) if block
+            agent = ::Nanite::Agent.new( @config )
+            agent.init_block = block
+            agent.run
           end
         end
 
-        #block.call if block
-
         mapper_thread.join
       end
 
       private
-      
+
       # Make sure to fine tune the agent config to be DK friendly
       def config_agent
         @config[:root] = DAEMON_ROOT

data/lib/daemon_kit/ruote_workitem.rb

@@ -42,6 +42,9 @@ module DaemonKit
 
         work = parse( workitem )
 
+        # Invalid JSON... mmm
+        return if work.nil?
+
         DaemonKit.logger.warn "Processing workitem that has timed out!" if work.timed_out?
 
         target, method = parse_command( work )
@@ -94,7 +97,12 @@ module DaemonKit
       end
 
       def parse( workitem )
-        new( JSON.parse( workitem ) )
+        begin
+          return new( JSON.parse( workitem ) )
+        rescue JSON::ParserError => e
+          DaemonKit.logger.error "No valid JSON payload found in #{workitem}"
+          return nil
+        end
       end
     end
 

data/lib/daemon_kit/tasks/god.rake

@@ -26,7 +26,7 @@ namespace :god do
       f.write( ERB.new( t ).result( binding )  )
     end
 
-    puts "Monit config generated in config/#{name}.god"
+    puts "god config generated in config/#{name}.god"
   end
 
   desc "Load the god file into god"

data/lib/daemon_kit/xmpp.rb

@@ -0,0 +1,31 @@
+module DaemonKit
+  # Thin wrapper around the blather DSL
+  class XMPP
+    include ::Blather::DSL
+
+    class << self
+
+      def run( &block )
+        DaemonKit::EM.run
+
+        xmpp = new
+
+        xmpp.instance_eval( &block )
+
+        xmpp.run
+      end
+    end
+
+    def initialize
+      @config = DaemonKit::Config.load('jabber')
+
+      jid = if @config.resource
+        "#{@config.jabber_id}/#{@config.resource}"
+      else
+        @config.jabber_id
+      end
+
+      setup jid, @config.password
+    end
+  end
+end