daemon-kit 0.1.8.1 → 0.1.8.2

data/spec/initializer_spec.rb

@@ -19,8 +19,8 @@ describe DaemonKit::Configuration do
   end
 
   it "should set a default umask" do
-    File.umask.should_not be(0)
-    File.umask.should be(18)
+    File.umask.should_not eq(0)
+    File.umask.should eq(18)
   end
 
 end

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
-gem 'rspec'
-require 'spec'
+require 'rspec'
 
 require 'mocha'
 require 'fileutils'
@@ -11,7 +10,7 @@ DAEMON_ROOT = "#{File.dirname(__FILE__)}/../tmp"
 $:.unshift( File.dirname(__FILE__) + '/../lib' )
 require 'daemon_kit'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   # == Mock Framework
   #
   # RSpec uses it's own mocking framework by default. If you prefer to

data/tasks/rspec.rake

@@ -1,16 +1,15 @@
 begin
-  require 'spec'
+  require 'rspec'
 rescue LoadError
   require 'rubygems'
-  require 'spec'
+  require 'rspec'
 end
 begin
-  require 'spec/rake/spectask'
+  require 'rspec/core/rake_task'
 
   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']
+  RSpec::Core::RakeTask.new do |t|
+    t.rspec_opts = ['--options', "spec/spec.opts"]
   end
 rescue LoadError
   puts <<-EOS

metadata

@@ -1,44 +1,53 @@
 --- !ruby/object:Gem::Specification 
 name: daemon-kit
 version: !ruby/object:Gem::Version 
-  hash: 101
-  prerelease: false
+  hash: 99
+  prerelease: 
   segments: 
   - 0
   - 1
   - 8
-  - 1
-  version: 0.1.8.1
+  - 2
+  version: 0.1.8.2
 platform: ruby
 authors: 
-- kenneth.kalmer@gmail.com
+- Kenneth Kalmer
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-08-04 00:00:00 +02:00
-default_executable: daemon-kit
+date: 2011-10-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: eventmachine
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 3
         segments: 
         - 0
-        - 12
-        - 10
-        version: 0.12.10
-  type: :runtime
-  version_requirements: *id001
+        version: "0"
+  prerelease: false
+  requirement: *id001
+  type: :development
+  name: bundler
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: *id002
+  type: :development
+  name: rake
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -47,12 +56,59 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  requirement: *id003
+  type: :development
+  name: rdoc
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 6
+        version: "2.6"
+  prerelease: false
+  requirement: *id004
   type: :development
-  version_requirements: *id002
+  name: rspec
 - !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 0
+        - 10
+        - 0
+        version: 0.10.0
+  prerelease: false
+  requirement: *id005
+  type: :development
   name: cucumber
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 0
+        - 9
+        - 12
+        version: 0.9.12
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: *id006
+  type: :development
+  name: mocha
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -61,10 +117,45 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  requirement: *id007
   type: :development
-  version_requirements: *id003
+  name: SyslogLogger
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 12
+        - 10
+        version: 0.12.10
+  prerelease: false
+  requirement: *id008
+  type: :runtime
+  name: eventmachine
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 0
+        - 3
+        - 1
+        version: 0.3.1
+  prerelease: false
+  requirement: *id009
+  type: :runtime
+  name: safely
 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
+email: 
+- kenneth.kalmer@gmail.com
 executables: 
 - daemon-kit
 extensions: []
@@ -82,6 +173,8 @@ files:
 - .gitignore
 - Configuration.txt
 - Deployment.txt
+- Gemfile
+- Gemfile.lock
 - History.txt
 - Logging.txt
 - PostInstall.txt
@@ -89,6 +182,7 @@ files:
 - Rakefile
 - RuoteParticipants.txt
 - TODO.txt
+- Upgrading.md
 - bin/daemon-kit
 - config/website.yml
 - daemon-kit.gemspec
@@ -109,8 +203,6 @@ files:
 - lib/daemon_kit/deployment/capistrano.rb
 - lib/daemon_kit/dk_amqp.rb
 - lib/daemon_kit/em.rb
-- lib/daemon_kit/error_handlers/base.rb
-- lib/daemon_kit/error_handlers/hoptoad.rb
 - lib/daemon_kit/exceptions.rb
 - lib/daemon_kit/generators.rb
 - lib/daemon_kit/generators/base.rb
@@ -122,7 +214,6 @@ files:
 - lib/daemon_kit/ruote_participants.rb
 - lib/daemon_kit/ruote_pseudo_participant.rb
 - lib/daemon_kit/ruote_workitem.rb
-- lib/daemon_kit/safety.rb
 - lib/daemon_kit/tasks.rb
 - lib/daemon_kit/tasks/environment.rake
 - lib/daemon_kit/tasks/framework.rake
@@ -160,6 +251,7 @@ files:
 - 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/version.rb
 - lib/daemon_kit/xmpp.rb
 - lib/generators/daemon_kit/amqp/USAGE
 - lib/generators/daemon_kit/amqp/amqp_generator.rb
@@ -180,6 +272,7 @@ files:
 - 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/config/pre-daemonize/safely.rb
 - 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
@@ -242,7 +335,6 @@ files:
 - spec/config_spec.rb
 - spec/configurable_spec.rb
 - spec/daemon_kit_spec.rb
-- spec/error_handlers_spec.rb
 - spec/fixtures/env.yml
 - spec/fixtures/noenv.yml
 - spec/initializer_spec.rb
@@ -263,7 +355,6 @@ files:
 - test/test_nanite_agent_generator.rb
 - test/test_ruote_generator.rb
 - test/test_test_unit_generator.rb
-has_rdoc: true
 homepage: http://github.com/kennethkalmer/daemon-kit
 licenses: []
 
@@ -274,8 +365,8 @@ post_install_message: |+
   To get started quickly run 'daemon-kit' without any arguments
   
   
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -299,26 +390,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Opinionated framework for Ruby daemons
-test_files: 
-- spec/abstract_logger_spec.rb
-- spec/argument_spec.rb
-- spec/config_spec.rb
-- spec/configurable_spec.rb
-- spec/daemon_kit_spec.rb
-- spec/error_handlers_spec.rb
-- spec/initializer_spec.rb
-- spec/spec_helper.rb
-- test/test_amqp_generator.rb
-- test/test_cron_generator.rb
-- test/test_daemon-kit_generator.rb
-- test/test_daemon_kit_config.rb
-- test/test_deploy_capistrano_generator.rb
-- test/test_generator_helper.rb
-- test/test_helper.rb
-- test/test_nanite_agent_generator.rb
-- test/test_ruote_generator.rb
-- test/test_test_unit_generator.rb
+test_files: []
+

data/lib/daemon_kit/error_handlers/base.rb

@@ -1,32 +0,0 @@
-module DaemonKit
-  module ErrorHandlers
-    # Error handlers in DaemonKit are used by the #Safety class. Any
-    # error handler has to support the interface provided by this
-    # class. It's also required that safety handlers implement a
-    # singleton approach (handled by default by #Base).
-    class Base
-
-      class << self
-
-        @instance = nil
-
-        def instance
-          @instance ||= new
-        end
-        private :new
-
-        # When we're inherited, immediately register the handler with
-        # the safety net
-        def inherited( child ) #:nodoc:
-          Safety.register_error_handler( child )
-        end
-      end
-
-      # Error handlers should overwrite this method and implement
-      # their own reporting method.
-      def handle_exception( exception )
-        raise NoMethodError, "Error handler doesn't support #handle_exception"
-      end
-    end
-  end
-end

data/lib/daemon_kit/error_handlers/hoptoad.rb

@@ -1,180 +0,0 @@
-require 'net/http'
-
-module DaemonKit
-  module ErrorHandlers
-    # Error reporting via Hoptoad.
-    class Hoptoad < Base
-
-      # Front end to parsing the backtrace for each notice
-      # (Graciously borrowed from http://github.com/thoughtbot/hoptoad_notifier)
-      class Backtrace
-
-        # Handles backtrace parsing line by line
-        # (Graciously borrowed from http://github.com/thoughtbot/hoptoad_notifier)
-        class Line
-
-          INPUT_FORMAT = %r{^([^:]+):(\d+)(?::in `([^']+)')?$}.freeze
-
-          # The file portion of the line (such as app/models/user.rb)
-          attr_reader :file
-
-          # The line number portion of the line
-          attr_reader :number
-
-          # The method of the line (such as index)
-          attr_reader :method
-
-          # Parses a single line of a given backtrace
-          # @param [String] unparsed_line The raw line from +caller+ or some backtrace
-          # @return [Line] The parsed backtrace line
-          def self.parse(unparsed_line)
-            _, file, number, method = unparsed_line.match(INPUT_FORMAT).to_a
-            new(file, number, method)
-          end
-
-          def initialize(file, number, method)
-            self.file   = file
-            self.number = number
-            self.method = method
-          end
-
-          # Reconstructs the line in a readable fashion
-          def to_s
-            "#{file}:#{number}:in `#{method}'"
-          end
-
-          def ==(other)
-            to_s == other.to_s
-          end
-
-          def inspect
-            "<Line:#{to_s}>"
-          end
-
-          def to_xml
-            data = [ method, file, number ].map { |s| URI.escape( s || 'unknown', %q{"'<>&} ) }
-            %q{<line method="%s" file="%s" number="%s" />} % data
-          end
-
-          private
-
-          attr_writer :file, :number, :method
-        end
-
-        # holder for an Array of Backtrace::Line instances
-        attr_reader :lines
-
-        def self.parse(ruby_backtrace, opts = {})
-          ruby_lines = split_multiline_backtrace(ruby_backtrace)
-
-          filters = opts[:filters] || []
-          filtered_lines = ruby_lines.to_a.map do |line|
-            filters.inject(line) do |line, proc|
-              proc.call(line)
-            end
-          end.compact
-
-          lines = filtered_lines.collect do |unparsed_line|
-            Line.parse(unparsed_line)
-          end
-
-          instance = new(lines)
-        end
-
-        def initialize(lines)
-          self.lines = lines
-        end
-
-        def inspect
-          "<Backtrace: " + lines.collect { |line| line.inspect }.join(", ") + ">"
-        end
-
-        def ==(other)
-          if other.respond_to?(:lines)
-            lines == other.lines
-          else
-            false
-          end
-        end
-
-        private
-
-        attr_writer :lines
-
-        def self.split_multiline_backtrace(backtrace)
-          if backtrace.to_a.size == 1
-            backtrace.to_a.first.split(/\n\s*/)
-          else
-            backtrace
-          end
-        end
-      end
-
-      # Your hoptoad API key
-      @api_key = nil
-      attr_accessor :api_key
-
-      def handle_exception( exception )
-        headers = {
-          'Content-type' => 'text/xml',
-          'Accept' => 'text/xml, application/xml'
-        }
-
-        http = Net::HTTP.new( url.host, url.port )
-        data = format_exception( exception )
-        DaemonKit.logger.debug("Sending to Hoptoad: #{data}")
-
-        response = begin
-                     http.post( url.path, data, headers )
-                   rescue TimeoutError => e
-                     DaemonKit.logger.error("Timeout while contacting the Hoptoad server.")
-                     nil
-                   end
-        case response
-        when Net::HTTPSuccess then
-          DaemonKit.logger.info "Hoptoad Success: #{response.class}"
-        else
-          DaemonKit.logger.error "Hoptoad Failure: #{response.class}\n#{response.body if response.respond_to? :body}"
-        end
-      end
-
-      def url
-        URI.parse("http://hoptoadapp.com/notifier_api/v2/notices")
-      end
-
-      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"?>
-<notice version="2.0">
-  <api-key>#{self.api_key}</api-key>
-  <notifier>
-    <name>daemon-kit</name>
-    <version>#{DaemonKit::VERSION}</version>
-    <url>http://github.com/kennethkalmer/daemon-kit</url>
-  </notifier>
-  <error>
-    <class>#{exception.class.name}</class>
-    <message>#{exception_message}</message>
-    <backtrace>
-      #{Backtrace.parse( exception.backtrace ).lines.inject('') { |string,line| string << line.to_xml }}
-    </backtrace>
-  </error>
-  <server-environment>
-    <project-root>#{DaemonKit.root}</project-root>
-    <environment-name>#{DaemonKit.env}</environment-name>
-  </server-environment>
-</notice>
-        EOF
-      end
-    end
-
-  end
-end