daemon-kit 0.1.8rc2 → 0.1.8rc3

data/lib/daemon_kit/vendor/{thor-0.12.3 → thor-0.13.6}/lib/thor/task.rb

@@ -1,6 +1,6 @@
 class Thor
   class Task < Struct.new(:name, :description, :usage, :options)
-    FILE_REGEXP = /^#{Regexp.escape(File.expand_path(__FILE__))}:[\w:]+ `run'$/
+    FILE_REGEXP = /^#{Regexp.escape(File.dirname(__FILE__))}/
 
     # A dynamic task that handles method missing scenarios.
     class Dynamic < Task
@@ -9,10 +9,11 @@ class Thor
       end
 
       def run(instance, args=[])
-        unless (instance.methods & [name.to_s, name.to_sym]).empty?
-          raise Error, "could not find Thor class or task '#{name}'"
+        if (instance.methods & [name.to_s, name.to_sym]).empty?
+          super
+        else
+          instance.class.handle_no_task_error(name)
         end
-        super
       end
     end
 
@@ -28,14 +29,14 @@ class Thor
     # By default, a task invokes a method in the thor class. You can change this
     # implementation to create custom tasks.
     def run(instance, args=[])
-      raise UndefinedTaskError, "the '#{name}' task of #{instance.class} is private" unless public_method?(instance)
-      instance.send(name, *args)
+      public_method?(instance) ?
+        instance.send(name, *args) : instance.class.handle_no_task_error(name)
     rescue ArgumentError => e
-      raise e if instance.class.respond_to?(:debugging) && instance.class.debugging
-      parse_argument_error(instance, e, caller)
+      handle_argument_error?(instance, e, caller) ?
+        instance.class.handle_argument_error(self, e) : (raise e)
     rescue NoMethodError => e
-      raise e if instance.class.respond_to?(:debugging) && instance.class.debugging
-      parse_no_method_error(instance, e)
+      handle_no_method_error?(instance, e, caller) ?
+        instance.class.handle_no_task_error(name) : (raise e)
     end
 
     # Returns the formatted usage by injecting given required arguments 
@@ -68,6 +69,10 @@ class Thor
 
     protected
 
+      def not_debugging?(instance)
+        !(instance.class.respond_to?(:debugging) && instance.class.debugging)
+      end
+
       def required_options
         @required_options ||= options.map{ |_, o| o.usage if o.required? }.compact.sort.join(" ")
       end
@@ -78,33 +83,19 @@ class Thor
         (collection & [name.to_s, name.to_sym]).empty?
       end
 
-      # For Ruby <= 1.8.7, we have to match the method name that we are trying to call.
-      # In Ruby >= 1.9.1, we have to match the method run in this file.
-      def backtrace_match?(backtrace) #:nodoc:
-        method_name = /`#{Regexp.escape(name.split(':').last)}'/
-        backtrace =~ method_name || backtrace =~ FILE_REGEXP
+      def sans_backtrace(backtrace, caller) #:nodoc:
+        saned  = backtrace.reject { |frame| frame =~ FILE_REGEXP }
+        saned -= caller
       end
 
-      def parse_argument_error(instance, e, caller) #:nodoc:
-        if e.message =~ /wrong number of arguments/ && backtrace_match?(e.backtrace.first.to_s)
-          if instance.is_a?(Thor::Group)
-            raise e, "'#{name}' was called incorrectly. Are you sure it has arity equals to 0?"
-          else
-            raise InvocationError, "'#{name}' was called incorrectly. Call as " <<
-                                   "'#{formatted_usage(instance.class)}'"
-          end
-        else
-          raise e
-        end
+      def handle_argument_error?(instance, error, caller)
+        not_debugging?(instance) && error.message =~ /wrong number of arguments/ &&
+          sans_backtrace(error.backtrace, caller).empty?
       end
 
-      def parse_no_method_error(instance, e) #:nodoc:
-        if e.message =~ /^undefined method `#{name}' for #{Regexp.escape(instance.to_s)}$/
-          raise UndefinedTaskError, "The #{instance.class.namespace} namespace " <<
-                                    "doesn't have a '#{name}' task"
-        else
-          raise e
-        end
+      def handle_no_method_error?(instance, error, caller)
+        not_debugging?(instance) &&
+          error.message =~ /^undefined method `#{name}' for #{Regexp.escape(instance.to_s)}$/
       end
 
   end

data/lib/daemon_kit/vendor/{thor-0.12.3 → thor-0.13.6}/lib/thor/util.rb

@@ -23,10 +23,7 @@ class Thor
     #
     def self.find_by_namespace(namespace)
       namespace = "default#{namespace}" if namespace.empty? || namespace =~ /^:/
-
-      Thor::Base.subclasses.find do |klass|
-        klass.namespace == namespace
-      end
+      Thor::Base.subclasses.find { |klass| klass.namespace == namespace }
     end
 
     # Receives a constant and converts it to a Thor namespace. Since Thor tasks
@@ -43,10 +40,9 @@ class Thor
     # ==== Returns
     # String:: If we receive Foo::Bar::Baz it returns "foo:bar:baz"
     #
-    def self.namespace_from_thor_class(constant, remove_default=true)
+    def self.namespace_from_thor_class(constant)
       constant = constant.to_s.gsub(/^Thor::Sandbox::/, "")
       constant = snake_case(constant).squeeze(":")
-      constant.gsub!(/^default/, '') if remove_default
       constant
     end
 
@@ -132,24 +128,19 @@ class Thor
     # ==== Parameters
     # namespace<String>
     #
-    # ==== Errors
-    # Thor::Error:: raised if the namespace cannot be found.
-    #
-    # Thor::Error:: raised if the namespace evals to a class which does not
-    #               inherit from Thor or Thor::Group.
-    #
-    def self.namespace_to_thor_class_and_task(namespace, raise_if_nil=true)
-      if namespace.include?(?:)
+    def self.find_class_and_task_by_namespace(namespace, fallback = true)
+      if namespace.include?(?:) # look for a namespaced task
         pieces = namespace.split(":")
         task   = pieces.pop
         klass  = Thor::Util.find_by_namespace(pieces.join(":"))
       end
-
-      unless klass
+      unless klass # look for a Thor::Group with the right name
         klass, task = Thor::Util.find_by_namespace(namespace), nil
       end
-
-      raise Error, "could not find Thor class or task '#{namespace}'" if raise_if_nil && klass.nil?
+      if !klass && fallback # try a task in the default namespace
+        task = namespace
+        klass = Thor::Util.find_by_namespace('')
+      end
       return klass, task
     end
 

data/lib/daemon_kit/vendor/thor-0.13.6/lib/thor/version.rb

@@ -0,0 +1,3 @@
+class Thor
+  VERSION = "0.13.6".freeze
+end

data/lib/generators/daemon_kit/amqp/amqp_generator.rb

@@ -3,7 +3,7 @@ module DaemonKit
     class AmqpGenerator < Base
 
       def update_gemfile
-        append_file 'Gemfile', %q(gem 'amqp')
+        append_file 'Gemfile', "gem 'amqp'\n"
       end
 
       def create_config_files

data/lib/generators/daemon_kit/amqp/templates/config/pre-daemonize/amqp.rb

@@ -2,6 +2,6 @@ begin
   require 'amqp'
   require 'mq'
 rescue LoadError
-  $stderr.puts "Missing amqp gem. Please run 'gem install amqp'."
+  $stderr.puts "Missing amqp gem. Please run 'bundle install'."
   exit 1
 end

data/lib/generators/daemon_kit/app/app_generator.rb

@@ -43,7 +43,7 @@ module DaemonKit
       end
 
       def create_root_files
-        copy_file 'README'
+        template 'README.tt', 'README'
         copy_file 'Rakefile'
         copy_file 'Gemfile'
       end

data/lib/generators/daemon_kit/app/templates/README.tt

@@ -0,0 +1,58 @@
+daemon-kit README
+================
+
+daemon-kit has generated a skeleton Ruby daemon for you to build on. Please read
+through this file to ensure you get going quickly.
+
+Directories
+===========
+
+bin/
+  <%= app_name %> - Stub executable to control your daemon with
+
+config/
+  Environment configuration files
+
+lib/
+  Place for your libraries
+
+libexec/
+  <%= app_name %>.rb - Your daemon code
+
+log/
+  Log files based on the environment name
+
+spec/
+  rspec's home
+
+tasks/
+  Place for rake tasks
+
+vendor/
+  Place for unpacked gems and DaemonKit
+
+tmp/
+  Scratch folder
+
+
+Logging
+=======
+
+One of the biggest issues with writing daemons are getting insight into what your
+daemons are doing. Logging with daemon-kit is simplified as DaemonKit creates log
+files per environment in log.
+
+On all environments except production the log level is set to DEBUG, but you can
+toggle the log level by sending the running daemon SIGUSR1 and SIGUSR2 signals.
+SIGUSR1 will toggle between DEBUG and INFO levels, SIGUSR2 will blatantly set the
+level to DEBUG.
+
+Bundler
+=======
+
+daemon-kit uses bundler to ease the nightmare of dependency loading in Ruby 
+projects. daemon-kit and its generators all create/update the Gemfile in the
+root of the daemon. You can satisfy the project's dependencies by running
+`bundle install` from within the project root.
+
+For more information on bundler, please see http://github.com/carlhuda/bundler

data/lib/generators/daemon_kit/capistrano/capistrano_generator.rb

@@ -2,6 +2,11 @@ module DaemonKit
   module Generators
     class CapistranoGenerator < Base
 
+      def update_gemfile
+        append_file 'Gemfile', "gem 'capistrano'\n"
+        append_file 'Gemfile', "gem 'capistrano-ext'\n"
+      end
+
       def create_capfile
         copy_file 'Capfile'
       end

data/lib/generators/daemon_kit/cron/cron_generator.rb

@@ -3,7 +3,7 @@ module DaemonKit
     class CronGenerator < Base
 
       def update_gemfile
-        append_file 'Gemfile', "gem 'rufus-scheduler', '>= 2.0.3'"
+        append_file 'Gemfile', "gem 'rufus-scheduler', '>= 2.0.3'\n"
       end
 
       def create_initializers

data/lib/generators/daemon_kit/cron/templates/config/pre-daemonize/cron.rb

@@ -1,7 +1,7 @@
 begin
   require 'rufus/scheduler'
 rescue LoadError => e
-  $stderr.puts "Missing rufus-scheduler gem. Please run 'gem install rufus-scheduler'."
+  $stderr.puts "Missing rufus-scheduler gem. Please run 'bundle install'."
   exit 1
 end
 

data/lib/generators/daemon_kit/nanite_agent/nanite_agent_generator.rb

@@ -3,7 +3,7 @@ module DaemonKit
     class NaniteAgentGenerator < Base
 
       def update_gemfile
-        append_file 'Gemfile', "gem 'nanite'"
+        append_file 'Gemfile', "gem 'nanite'\n"
       end
 
       def create_config

data/lib/generators/daemon_kit/nanite_agent/templates/config/pre-daemonize/nanite_agent.rb

@@ -1,6 +1,6 @@
 begin
   require 'nanite'
 rescue LoadError
-  $stderr.puts "Missing nanite gem. Please run 'gem install nanite'."
+  $stderr.puts "Missing nanite gem. Please run 'bundle install'."
   exit 1
 end

data/lib/generators/daemon_kit/ruote/ruote_generator.rb

@@ -3,8 +3,8 @@ module DaemonKit
     class RuoteGenerator < Base
 
       def update_gemfile
-        append_file 'Gemfile', "gem 'amqp'"
-        append_file 'Gemfile', "gem 'json' # Can be replaced with json_pure"
+        append_file 'Gemfile', "gem 'amqp' # Only needed if running the AMQP participant/listener pair\n"
+        append_file 'Gemfile', "gem 'json' # Can be replaced with json_pure\n"
       end
 
       def create_configs

data/lib/generators/daemon_kit/ruote/templates/config/pre-daemonize/ruote.rb

@@ -1,7 +1,7 @@
 begin
   require 'json'
 rescue LoadError
-  $stderr.puts "Missing json gem. Please run 'gem install json'"
+  $stderr.puts "Missing json gem. Please run 'bundle install'"
   exit 1
 end
 
@@ -9,5 +9,5 @@ begin
   require 'amqp'
   require 'mq'
 rescue LoadError
-  $stderr.puts "Missing amqp gem. Please run 'gem install amqp' if you wish to use the AMQP participant/listener pair in ruote"
+  $stderr.puts "Missing amqp gem. Please uncomment the amqp section in the Gemfile and run 'bundle install' if you wish to use the AMQP participant/listener pair in ruote"
 end

data/lib/generators/daemon_kit/xmpp/templates/config/pre-daemonize/xmpp.rb

@@ -1,6 +1,6 @@
 begin
   require 'blather'
 rescue LoadError
-  $stderr.puts "Missing blather gem. Please run 'gem install blather'."
+  $stderr.puts "Missing blather gem. Please run 'bundle install'."
   exit 1
 end

data/lib/generators/daemon_kit/xmpp/xmpp_generator.rb

@@ -3,7 +3,7 @@ module DaemonKit
     class XmppGenerator < Base
 
       def update_gemfile
-        append_file 'Gemfile', "gem 'blather'"
+        append_file 'Gemfile', "gem 'blather'\n"
       end
 
       def create_config

data/tasks/rspec.rake

@@ -6,16 +6,15 @@ rescue LoadError
 end
 begin
   require 'spec/rake/spectask'
+
+  desc "Run the specs under spec/models"
+  Spec::Rake::SpecTask.new do |t|
+    t.spec_opts = ['--options', "spec/spec.opts"]
+    t.spec_files = FileList['spec/**/*_spec.rb']
+  end
 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/models"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/**/*_spec.rb']
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: daemon-kit
 version: !ruby/object:Gem::Version 
-  version: 0.1.8rc2
+  hash: 1679823647
+  prerelease: true
+  segments: 
+  - 0
+  - 1
+  - 8rc3
+  version: 0.1.8rc3
 platform: ruby
 authors: 
 - kenneth.kalmer@gmail.com
@@ -9,39 +15,53 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-14 00:00:00 +02:00
+date: 2010-08-02 00:00:00 +02:00
 default_executable: daemon-kit
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 12
+        - 10
         version: 0.12.10
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 description: 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.
 email: kenneth.kalmer@gmail.com
 executables: 
@@ -108,37 +128,37 @@ files:
 - 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
@@ -148,7 +168,7 @@ files:
 - 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
@@ -258,21 +278,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Opinionated framework for Ruby daemons