daemon-kit 0.3.1 → 0.3.2

data/.travis.yml

@@ -1,17 +1,24 @@
 language: ruby
+
 rvm:
-  - 2.0.0
+  - 2.2
+  - 2.1
+  - 2.0
   - 1.9.3
   - 1.9.2
   - rbx-19mode
   - 1.8.7
-  - ree
+
 matrix:
   allow_failures:
+    - rvm: 2.2
     - rvm: jruby-19mode
     - rvm: rbx-19mode
     - rvm: 1.8.7
-    - rvm: ree
+
 before_install: umask 0022
+
 gemfile:
   - gemfiles/Gemfile.ci
+
+sudo: false

data/{History.txt → CHANGELOG.md}

@@ -1,8 +1,43 @@
-== 0.3.0 (In progress)
+# Changelog
+
+DaemonKit endures to use semantic versioning, at least since the 0.3.0 release.
+Below is a curated list of important changes/fixes/improvements. You can use
+GitHub's excellent compare view to get the nitty gritty details.
+
+## 0.3.2 2015-03-16
+
+* No longer close IO we don't own when daemonizing. [#85](https://github.com/kennethkalmer/daemon-kit/issues/85)
+* Fix missing ERB require. [#89](https://github.com/kennethkalmer/daemon-kit/issues/89)
+* Ruby 2.2 compat fix. [#91](https://github.com/kennethkalmer/daemon-kit/issues/91)
+
+## 0.3.1 2014-07-21
+
+* Removed the dependency on the i18n gem
+* Locked rufus-scheduler dependency to 2.0.x #79
+* Pass YAML files through ERB #80
+* Ensure proper shutdown of AMQP connections #84
+
+## 0.3.0 2014-05-15
+
+* No changes, released final version
+
+## 0.3.0.rc2 2013-09-23
+
+* [safely](https://github.com/kennethkalmer/safely) usage is now optional, although included by default. #73
+* XMPP abstractions fixed and now requires Blather ~> 0.8.0
+* Removed support for "freezing" daemon-kit into vendor/daemon-kit
+* Added new "--edge" generator, creating a Gemfile that depends on daemon-kit's Github repo
+
+## 0.3.0.rc1 2013-09-11
 
 * Removed nanite support, nanite hasn't released in years.
+* Switched generators from Rubigen to Thor
+* Added Travis builds
+* Added Relish documentation for us
+* Switched example specs to use "pending" instead of "violated"
+* Running `daemon-kit` without arguments now shows help
 
-== 0.2.0 2012-09-30
+## 0.2.0 2012-09-30
 
 * Depend on the 'safely' gem for the safely method and logging backtraces
 * Fixed compatibility with ruote-amqp 2.2.0
@@ -13,15 +48,15 @@
 * Various load/require fixes by @ktrix
 * SQS generator by @marcbowes
 
-== 0.1.8.2 2011-05-18
+## 0.1.8.2 2011-05-18
 
 * Convert to use Bundler
 
-== 0.1.18.1 2010-08-04
+## 0.1.18.1 2010-08-04
 
 * Fixed issue with our own amqp.rb file causing havoc on Ruby 1.8.7
 
-== 0.1.18 2010-08-03
+## 0.1.18 2010-08-03
 
 * Generators rewritten to use Thor
 * Evented XMPP now handled by blather
@@ -35,11 +70,11 @@
 * Exception handling for scheduled tasks (cron)
 * Updates for ruote-amqp versions 2.1 and later
 
-== 0.1.7.12 2009-12-04
+## 0.1.7.12 2009-12-04
 
 * Bug fix, don't load environment files twice [grockit]
 
-== 0.1.7.11 2009-11-30
+## 0.1.7.11 2009-11-30
 
 * Renamed 'daemon_kit' executable to 'daemon-kit'
 * Fixed some broken links in README.rdoc
@@ -51,7 +86,7 @@
 * Fixed issue with nanite services not being advertised correctly [Wijnand]
 * Fixed some woes with rake if rspec gem is missing
 
-== 0.1.7.10 2009-08-12
+## 0.1.7.10 2009-08-12
 
 * Ruote remote participants
 * Allow process umask to be configured, defaults to 022
@@ -59,25 +94,25 @@
 * Fixed argument parsing bug (reported by Mathijs Kwik (bluescreen303)
 * Support for privilege separation (See Configuration.txt)
 
-== 0.1.7.9 2009-06-22
+## 0.1.7.9 2009-06-22
 
 * Backtraces only logged on unclean shutdown
 * AMQP generator got new keep alive code
 
-== 0.1.7.8 2009-06-22
+## 0.1.7.8 2009-06-22
 
 * Optional logging of all exceptions when the daemon process dies
   unexpectedly
 * Update generated environment.rb to reflect new backtraces option
 
-== 0.1.7.7 2009-06-22
+## 0.1.7.7 2009-06-22
 
 * Fixed compatibility with rufus-scheduler-2.0.0 (or newer) in cron
   generator
 * Started central eventmachine reactor management code
 * Now depends on eventmachine
 
-== 0.1.7.6 (Not released)
+## 0.1.7.6 (Not released)
 
 * Support for cucumber
 * Fixed issue in daemon_kit:upgrade task
@@ -85,14 +120,14 @@
 * Removed conflicting rubigen generator, messed with our script directory
 * Fixed bug where environment.rb overwrites some --config values (reported by Josh Owens)
 
-== 0.1.7.5 2009-06-08
+## 0.1.7.5 2009-06-08
 
 * New AbstractLogger
-** Default Logger backend
-** SysLogLogger support
+  * Default Logger backend
+  * SysLogLogger support
 * More documentation
 
-== 0.1.7.4 2009-06-05
+## 0.1.7.4 2009-06-05
 
 * Fixed bug with control script generator (thanks Sho Fukamachi)
 * Enhanced deploy.rb template to check for current dk gem verion,
@@ -101,23 +136,23 @@
 * Added log:truncate rake task
 * Error mails now handled by TMail
 
-== 0.1.7.3 2009-05-31
+## 0.1.7.3 2009-05-31
 
 * Removed dependency on daemons gem, now handled in house
 * New argument management
 * Some more docs
 
-== 0.1.7.1 2009-05-28
+## 0.1.7.1 2009-05-28
 
 * Fixed some minor issue with Capistrano support
 * Added support for generating dog/monit configuration files via rake
 * Initial implementation of ./script/* utilities
 
-== 0.1.7 2009-05-26
+## 0.1.7 2009-05-26
 
 * Capistrano deployment support
 
-== 0.1.6 2009-05-13
+## 0.1.6 2009-05-13
 
 * DaemonKit::Safety class to handle the trapping and logging of
   exceptions, as well as email notifications or Hoptoad notifications.
@@ -126,22 +161,22 @@
 * Fixed some other annoyances and bugs
 * Bigger TODO list
 
-== 0.1.5 2009-05-07
+## 0.1.5 2009-05-07
 
 * DaemonKit::Config class to easy the use of YAML configs internally,
   and in generated daemons
 
-== 0.1.2 2009-04-28
+## 0.1.2 2009-04-28
 
 * Added missing rubigen dependency
 
-== 0.1.1 2009-04-27
+## 0.1.1 2009-04-27
 
 * AMQP consumer generator added
 * 'cron' style generator added
 * Allow configuring dir_mode and dir (pid file location) (Jim Lindley)
 
-== 0.1.0 2009-01-08
+## 0.1.0 2009-01-08
 
 * Ability to freeze the gem/edge copies of DaemonKit
 * Simple non-evented Jabber generator

data/daemon-kit.gemspec

@@ -28,7 +28,7 @@ $ daemon-kit -h
   gem.extra_rdoc_files = [
                           "Configuration.txt",
                           "Deployment.txt",
-                          "History.txt",
+                          "CHANGELOG.md",
                           "Logging.txt",
                           "README.md",
                           "RuoteParticipants.txt",

data/lib/daemon_kit/application.rb

@@ -30,9 +30,8 @@ module DaemonKit
       # Run the daemon in the foreground without daemonizing
       def run( file )
         self.chroot
-        self.clean_fd
         self.redirect_io( true )
-        
+
         DaemonKit.configuration.log_stdout = true
 
         require file
@@ -43,7 +42,6 @@ module DaemonKit
         self.drop_privileges
         self.daemonize
         self.chroot
-        self.clean_fd
         self.redirect_io
 
         require file
@@ -177,21 +175,6 @@ module DaemonKit
         File.umask 0000
       end
 
-      # Make sure all file descriptors are closed (with the exception
-      # of STDIN, STDOUT & STDERR)
-      def clean_fd
-        ObjectSpace.each_object(IO) do |io|
-          unless [STDIN, STDOUT, STDERR].include?(io)
-            begin
-              unless io.closed?
-                io.close
-              end
-            rescue ::Exception
-            end
-          end
-        end
-      end
-
       # Redirect our IO
       # TODO: make this configurable
       def redirect_io( simulate = false )

data/lib/daemon_kit/config.rb

@@ -17,6 +17,7 @@ module DaemonKit
   class Config
 
     require "yaml"
+    require "erb"
     
     class << self
 

data/lib/daemon_kit/initializer.rb

@@ -334,9 +334,9 @@ module DaemonKit
       @shutdown_hooks << ( proc || block )
     end
 
-    def pid_file( instance = instance )
+    def pid_file( an_instance = instance )
       @pid_file ||=
-        File.join( File.dirname(self.default_log_path), "#{self.daemon_name}.#{instance}.pid" )
+        File.join( File.dirname(self.default_log_path), "#{self.daemon_name}.#{an_instance}.pid" )
     end
 
     def instance

data/lib/daemon_kit/version.rb

@@ -1,7 +1,7 @@
 module DaemonKit
 
   def version
-    '0.3.1'
+    '0.3.2'
   end
 
   module_function :version

metadata

@@ -1,60 +1,68 @@
 --- !ruby/object:Gem::Specification
 name: daemon-kit
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
+  prerelease: 
 platform: ruby
 authors:
 - Kenneth Kalmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,20 +110,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: SyslogLogger
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: safely
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -125,29 +142,33 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.12.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.12.10
 description: daemon-kit aims to simplify creating Ruby daemons by providing a sound
@@ -161,7 +182,7 @@ extensions: []
 extra_rdoc_files:
 - Configuration.txt
 - Deployment.txt
-- History.txt
+- CHANGELOG.md
 - Logging.txt
 - README.md
 - RuoteParticipants.txt
@@ -170,10 +191,10 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- CHANGELOG.md
 - Configuration.txt
 - Deployment.txt
 - Gemfile
-- History.txt
 - Logging.txt
 - README.md
 - Rakefile
@@ -340,34 +361,45 @@ files:
 homepage: http://github.com/kennethkalmer/daemon-kit
 licenses:
 - MIT
-metadata: {}
-post_install_message: |2+
+post_install_message: ! '
 
   For more information on daemon-kit, see http://kit.rubyforge.org/daemon-kit
 
+
   For usage options, run:
 
+
   $ daemon-kit -h
 
 
+
+'
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1230751779493899701
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1230751779493899701
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Opinionated framework for Ruby daemons
 test_files:
 - features/amqp_generator.feature

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: a80980f289f305af7ca3a5a5628221ea3c78a590
-  data.tar.gz: 600acd170f77223f90945b3fe735b485453c576a
-SHA512:
-  metadata.gz: a7ec6e458f488effa6b031a71a36c4fa68683b437720a08a9336595956f3c802874f421fafbf23c0812f6557eb0a82793957d41c3136231c509a540dc6d175e0
-  data.tar.gz: c3851199037850ebf8b38d1f2eb9806c2d3d31be5c94a4f22744d0f0f043a9bbd31dced2a0d9c7af3e85df35ea5f6214f3af95ecc28057e014399e8cd36dcb75