raad 0.3.3 → 0.4.0

data/CHANGELOG.md

@@ -5,4 +5,8 @@
 - reworked runner stop sequence & signals trapping
 - force kill + pid removal bug
 - wrong exit code bug
-- comments & cosmetics
+- comments & cosmetics
+
+# 0.4, 09-05-2011
+- using SignalTrampoline for safe signal handling
+- JRuby support

data/LICENSE.md

@@ -70,6 +70,15 @@ Authored by Colin Surprenant, [@colinsurprenant][twitter], [colin.surprenant@nee
   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
   OTHER DEALINGS IN THE SOFTWARE.
 
+-------------------------------------------------------------------------------
+
+  Portions of this code are from the Spoon project https://github.com/headius/spoon) and under the following license:
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
 
 [needium]: colin.surprenant@needium.com
 [gmail]: colin.surprenant@gmail.com

data/README.md

@@ -1,8 +1,8 @@
-# Raad v0.3.3
+# Raad v0.4.0
 
 Raad - Ruby as a daemon lightweight service wrapper.
 
-Raad is a non-intrusive, lightweight, simple Ruby daemon maker. Basically A simple class which implements
+Raad is a non-intrusive, lightweight, simple Ruby daemon wrapper. Basically A simple class which implements
 the start and stop methods, can be used seamlessly as a daemon or a normal console app.
 
 Raad provides daemon control using the start/stop commands. Your code can optionnally use the Raad
@@ -18,7 +18,7 @@ gem install raad
 gem "raad", :git => "git://github.com/praized/raad.git", :branch => "master"
 
 #### Released gem
-gem "raad", "~> 0.3.3"
+gem "raad", "~> 0.4.0"
 
 ## Example
 Create a class with a start and a stop method. Just by requiring 'raad', your class will be 
@@ -52,8 +52,9 @@ wrapped by Raad and daemonizable.
 
 ## Documentation
 
-### Supported rubies
-Raad has only been tested on MRI 1.8 and 1.9. 
+### Supported rubies and environments
+Raad has been tested on MRI 1.8.7, MRI 1.9.2, REE 1.8.7, JRuby 1.6.4 under OSX 10.6.8 and Linux Ubuntu 10.04
+
 
 ### Command line options
     usage: ruby <service>.rb [options] start|stop
@@ -62,41 +63,66 @@ Raad has only been tested on MRI 1.8 and 1.9.
         -e, --environment NAME           set the execution environment (default: development)
         -l, --log FILE                   log to file (default: in console mode: no, daemonized: <service>.log)
         -s, --stdout                     log to stdout (default: in console mode: true, daemonized: false)
+        -v, --verbose                    enable verbose logging (default: false)
+            --pattern PATTERN            log4r log formatter pattern
         -c, --config FILE                config file (default: ./config/<service>.rb)
         -d, --daemonize                  run daemonized in the background (default: false)
         -P, --pid FILE                   pid file when daemonized (default: <service>.pid)
         -r, --redirect FILE              redirect stdout to FILE when daemonized (default: no)
         -n, --name NAME                  daemon process name (default: <service>)
-        -v, --verbose                    enable verbose logging (default: false)
+            --timeout SECONDS            seconds to wait before force stopping the service (default: 60)
         -h, --help                       display help message
 
 Note that the command line options will always override any config file settings if present.
-### Config file usage
+### Configuration and options
 tbd.
 
-### Logging
+### Adding custom command line options
 tbd.
 
-### Adding custom command line options
+### Logging
 tbd.
 
 ### Stop sequence details
 tbd.
 
+### Testing
+There are specs and a validation suite which ca be run in the current ruby environment:
+
+- rake spec
+- rake validation
+
+Also, specs and validations can be run in all currently tested Ruby environement. For this [RVM][rvm] is required and the following rubies must be installed: 
+
+- ruby-1.8.7
+- ree-1.8.7
+- ruby-1.9.2
+- jruby-1.6.4
+
+In each of these rubies, the gemset @raad containing log4r (~> 1.1.9), rake (~> 0.9.2) and rspec (~> 2.6.0) must be created.
+
+This RVM environment can be created/updated using:
+
+- rake rvm_setup
+
+To launch the tests for all rubies use:
+
+- rake specs
+- rake validations
+
 ## TODO
-- better doc, more examples
-- specs
-- JRuby support
+- better doc
+- more examples
 
 ## Dependencies
-The Log4r gem (~> 1.1.9) is required.
+- For normal usage, the log4r gem (~> 1.1.9) is required.
+- For testings, the rspec (~> 2.6.0), rake (~> 0.9.2) gems and [RVM][rvm] are required.
 
 ## Author
-Authored by Colin Surprenant, [@colinsurprenant][twitter], [colin.surprenant@needium.com][needium], [colin.surprenant@gmail.com][gmail], [http://github.com/colinsurprenant][github]
+Colin Surprenant, [@colinsurprenant][twitter], [colin.surprenant@needium.com][needium], [colin.surprenant@gmail.com][gmail], [http://github.com/colinsurprenant][github]
 
 ## Acknowledgements
-Thanks to the Thin ([https://github.com/macournoyer/thin][thin]), Goliath ([https://github.com/postrank-labs/goliath/][goliath]) 
-and Sinatra ([https://github.com/bmizerany/sinatra][sinatra]) projects for providing inspiration and/or code!
+Thanks to the Thin ([https://github.com/macournoyer/thin][thin]), Goliath ([https://github.com/postrank-labs/goliath][goliath]), Sinatra ([https://github.com/bmizerany/sinatra][sinatra]) and Spoon ([https://github.com/headius/spoon][spoon]) projects for providing inspiration and/or code!
 
 ## License
 Raad is distributed under the Apache License, Version 2.0. See the LICENSE.md file.
@@ -106,5 +132,7 @@ Raad is distributed under the Apache License, Version 2.0. See the LICENSE.md fi
 [twitter]: http://twitter.com/colinsurprenant
 [github]: http://github.com/colinsurprenant
 [thin]: https://github.com/macournoyer/thin
-[goliath]: https://github.com/postrank-labs/goliath/
+[goliath]: https://github.com/postrank-labs/goliath
 [sinatra]: https://github.com/bmizerany/sinatra
+[spoon]: https://github.com/headius/spoon
+[rvm]: http://beginrescueend.com/

data/lib/raad.rb

@@ -3,5 +3,6 @@ require 'raad/env'
 require 'raad/logger'
 require 'raad/configuration'
 require 'raad/unix_daemon'
+require 'raad/signal_trampoline'
 require 'raad/runner'
 require 'raad/service'

data/lib/raad/env.rb

@@ -1,15 +1,17 @@
+require 'rbconfig'
+
 module Raad
   
   @env = :development
 
-  # Retrieves the current environment
+  # retrieves the current environment
   #
   # @return [Symbol] the current environment
   def env
     @env
   end
 
-  # Sets the current environment
+  # sets the current environment
   #
   # @param [String or Symbol] env the environment [development|production|stage|test]
   def env=(env)
@@ -28,27 +30,41 @@ module Raad
     @env == :production
   end
 
-  # Determines if we are in the development environment
+  # are we in the development environment
   #
   # @return [Boolean] true if current environemnt is development, false otherwise
   def development?
     @env == :development
   end
 
-  # Determines if we are in the staging environment
+  # are we in the staging environment
   #
   # @return [Boolean] true if current environemnt is staging, false otherwise
   def stage?
     @env == :stage
   end
 
-  # Determines if we are in the test environment
+  # are we in the test environment
   #
   # @return [Boolean] true if current environemnt is test, false otherwise
   def test?
     @env == :test
   end
 
-  module_function :env, :env=, :production?, :development?, :stage?, :test?
+  # are we running inside jruby
+  #
+  # @return [Boolean] true if runnig inside jruby
+  def jruby?
+    defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+  end
+
+  # absolute path of current interpreter
+  #
+  # @return [String] absolute path of current interpreter
+  def ruby_path
+    File.join(Config::CONFIG["bindir"], Config::CONFIG["RUBY_INSTALL_NAME"] + Config::CONFIG["EXEEXT"])
+  end
+
+  module_function :env, :env=, :production?, :development?, :stage?, :test?, :jruby?, :ruby_path
 
 end

data/lib/raad/logger.rb

@@ -10,12 +10,14 @@ module Raad
     def setup(options = {})
       @log = Log4r::Logger.new('raad')
 
-      log_format = Log4r::PatternFormatter.new(:pattern => "[#{Process.pid}:%l] %d :: %m")
+      # select only :pattern, :date_pattern, :date_method and flush nils
+      formatter_options = {:pattern => "[#{Process.pid}:%l] %d :: %m"}.merge(options.reject{|k, v| !([:pattern, :date_pattern, :date_method].include?(k) && !v.nil?)})
+
+      log_format = Log4r::PatternFormatter.new(formatter_options)
       setup_file_logger(@log, log_format, options[:file]) if options[:file]
       setup_stdout_logger(@log, log_format) if options[:stdout]
 
       @verbose = !!options[:verbose]
-
       @log.level = @verbose ? Log4r::DEBUG : Log4r::INFO
       @log
     end

data/lib/raad/runner.rb

@@ -1,14 +1,11 @@
 require 'optparse'
-require 'thread'
-require 'monitor'
 
 module Raad
   class Runner
     include Daemonizable
 
     SECOND = 1
-    SOFT_STOP_TIMEOUT = 58 * SECOND
-    HARD_STOP_TIMEOUT = 60 * SECOND
+    STOP_TIMEOUT = 60 * SECOND
 
     attr_accessor :service, :pid_file, :options
 
@@ -17,11 +14,12 @@ module Raad
     # @param argv [Array] command line arguments
     # @param service [Object] service to execute
     def initialize(argv, service)
+      @argv = argv.dup # lets keep a copy for jruby double-launch
       create_options_parser(service).parse!(argv)
 
       # start/stop 
       @options[:command] = argv[0].to_s.downcase
-      unless ['start', 'stop'].include?(options[:command])
+      unless ['start', 'stop', 'post_fork'].include?(options[:command])
         puts(">> start|stop command is required")
         exit!(false)
       end
@@ -31,9 +29,6 @@ module Raad
       @logger_options = nil
       @pid_file = nil
 
-      # signals handling
-      @signals = []
-      @monitor = Monitor.new
       @stop_signaled = false
     end
 
@@ -51,31 +46,37 @@ module Raad
         options[:log_stdout] = !options[:daemonize]
       end
       @logger_options = {
-        :file => options.delete(:log_file),
-        :stdout => options.delete(:log_stdout),
-        :verbose => options.delete(:verbose),
+        :file => options.delete(:log_file) || Configuration.log_file,
+        :stdout => options.delete(:log_stdout) || Configuration.log_stdout,
+        :verbose => options.delete(:verbose) || Configuration.verbose,
+        :pattern => options.delete(:log_pattern) || Configuration.log_pattern,
       }
       @pid_file = options.delete(:pid_file) || "./#{@service_name}.pid"
+      @stop_timeout = (options.delete(:stop_timeout) || Configuration.stop_timeout || STOP_TIMEOUT).to_i
 
       # check for stop command, @pid_file must be set
       if options[:command] == 'stop'
         puts(">> Raad service wrapper v#{VERSION} stopping")
-        success = send_signal('TERM', HARD_STOP_TIMEOUT) # if not stopped afer HARD_STOP_TIMEOUT, SIGKILL will be sent
-        exit!(success)
+        # first send the TERM signal which will invoke the daemon wait_or_will method which will timeout after @stop_timeout
+        # if still not stopped afer @stop_timeout + 2, KILL -9 will be sent.
+        success = send_signal('TERM', @stop_timeout + 2) 
+        exit(success)
       end
 
       # setup logging
       Logger.setup(@logger_options)
       Logger.level = Configuration.log_level if Configuration.log_level
 
-      puts(">> Raad service wrapper v#{VERSION} starting")
-
       Dir.chdir(File.expand_path(File.dirname("./"))) unless Raad.test?
 
-      jruby = (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby')
-      raise("daemonize not supported in JRuby") if options[:daemonize] && jruby
-      
-      options[:daemonize] ? daemonize(@service_name, options[:redirect]) {run_service} : run_service
+      if options[:command] == 'post_fork'
+        # we've been spawned and re executed, finish setup
+        post_fork_setup(@service_name, options[:redirect])
+        run_service
+      else
+        puts(">> Raad service wrapper v#{VERSION} starting")
+        options[:daemonize] ? daemonize(@argv, @service_name, options[:redirect]) {run_service} : run_service
+      end
     end
 
     private
@@ -90,28 +91,9 @@ module Raad
         Logger.info(">> Raad service wrapper stopped")
       end
 
-      # store received signals into the @signal queue. here we want to avoid
-      # doing anything complex from within the trap block. 
-      [:INT, :TERM, :QUIT].each do |sig|
-        trap(sig) {@monitor.synchronize{@signals << :STOP}}
-      end
-
-      # launch the signal handler thread. the idea here is to handle signal outside the 
-      # trap block. the trap block will simply store the signal which this thread will 
-      # retrieve and do whatever is required. 
-      signals_thread = Thread.new do
-        Thread.current.abort_on_exception = true
-        loop do
-          signals = @monitor.synchronize{s = @signals.dup; @signals.clear; s}
-
-          if signals.include?(:STOP)
-            @stop_signaled = true
-            stop_service
-            break
-          end
-
-          sleep(0.5)
-        end
+      # do not trap :QUIT because its not supported in jruby
+      [:INT, :TERM].each do |sig|
+        SignalTrampoline.trap(sig) {@stop_signaled = true; stop_service}
       end
 
       # launch the service thread and call start. we expect start not to return
@@ -119,7 +101,7 @@ module Raad
       service_thread = Thread.new do
         Thread.current.abort_on_exception = true
         service.start
-        stop_service unless @stop_signaled # don't stop twice if already called from the signals_thread
+        stop_service unless @stop_signaled # don't stop twice if already called from the signal handler
       end
 
       # use exit and not exit! to make sure the at_exit hooks are called, like the pid cleanup, etc.
@@ -133,7 +115,7 @@ module Raad
 
     # try to do a timeout join periodically on the given thread. if the join succeed then the stop
     # sequence is successful and return true.
-    # Otherwise, on timeout if stop has beed signaled, wait a maximum of SOFT_STOP_TIMEOUT on the
+    # Otherwise, on timeout if stop has beed signaled, wait a maximum of @stop_timeout on the
     # thread and kill it if the timeout is reached and return false in that case.
     #
     # @return [Boolean] true if the thread normally terminated, false if a kill was necessary
@@ -143,9 +125,9 @@ module Raad
         if @stop_signaled
           # but if stop has been signalled, start "the final countdown" ♫
           try = 0; join = nil
-          while (try += 1) <= SOFT_STOP_TIMEOUT && join.nil? do
+          while (try += 1) <= @stop_timeout && join.nil? do
             join = thread.join(SECOND)
-            Logger.debug("waiting for service to stop #{try}/#{SOFT_STOP_TIMEOUT}") if join.nil?
+            Logger.debug("waiting for service to stop #{try}/#{@stop_timeout}") if join.nil?
           end
           if join.nil?
             Logger.error("stop timeout exhausted, killing service thread")
@@ -184,13 +166,15 @@ module Raad
 
         opts.on('-l', '--log FILE', "log to file (default: in console mode: no, daemonized: <service>.log)") { |file| @options[:log_file] = file }
         opts.on('-s', '--stdout', "log to stdout (default: in console mode: true, daemonized: false)") { |v| @options[:log_stdout] = v }
+        opts.on('-v', '--verbose', "enable verbose logging (default: #{@options[:verbose]})") { |v| @options[:verbose] = v }
+        opts.on('--pattern PATTERN', "log4r log formatter pattern") { |v| @options[:log_pattern] = v }
 
         opts.on('-c', '--config FILE', "config file (default: ./config/<service>.rb)") { |v| @options[:config] = v }
         opts.on('-d', '--daemonize', "run daemonized in the background (default: #{@options[:daemonize]})") { |v| @options[:daemonize] = v }
         opts.on('-P', '--pid FILE', "pid file when daemonized (default: <service>.pid)") { |file| @options[:pid_file] = file }
         opts.on('-r', '--redirect FILE', "redirect stdout to FILE when daemonized (default: no)") { |v| @options[:redirect] = v }
         opts.on('-n', '--name NAME', "daemon process name (default: <service>)") { |v| @options[:name] = v }
-        opts.on('-v', '--verbose', "enable verbose logging (default: #{@options[:verbose]})") { |v| @options[:verbose] = v }
+        opts.on('--timeout SECONDS', "seconds to wait before force stopping the service (default: 60)") { |v| @options[:stop_timeout] = v }
 
         opts.on('-h', '--help', 'display help message') { show_options(opts) }
       end

data/lib/raad/signal_trampoline.rb

@@ -0,0 +1,39 @@
+require 'thread'
+
+module SignalTrampoline
+
+  module_function
+
+  SIGNALS = {
+    :EXIT => 0, :HUP => 1, :INT => 2, :QUIT => 3, :ILL => 4, :TRAP => 5, :IOT => 6, :ABRT => 6, :FPE => 8, :KILL => 9,
+    :BUS => 7, :SEGV => 11, :SYS => 31, :PIPE => 13, :ALRM => 14, :TERM => 15, :URG => 23, :STOP => 19, :TSTP => 20, 
+    :CONT => 18, :CHLD => 17, :CLD => 17, :TTIN => 21, :TTOU => 22, :IO => 29, :XCPU => 24, :XFSZ => 25, :VTALRM => 26, 
+    :PROF => 27, :WINCH => 28, :USR1 => 10, :USR2 => 12, :PWR => 30, :POLL => 29
+  }
+
+  @signal_q = Queue.new
+  @handlers = {}
+  @handler_thread = nil
+
+  # using threads to bounce signal using a thread-safe queue seem the most robust way to handle signals.
+  # it minimizes the code in the trap block and reissue the signal and its handling in the normal Ruby
+  # flow, within normal threads. 
+
+  def trap(signal, &block)
+    raise("unknown signal") unless SIGNALS.has_key?(signal)
+    @handler_thread ||= detach_handler_thread
+    @handlers[signal] = block
+    Kernel.trap(signal) {Thread.new{@signal_q << signal}}
+  end
+
+  def detach_handler_thread
+    Thread.new do
+      Thread.current.abort_on_exception = true
+      loop do
+        s = @signal_q.pop
+        @handlers[s].call if @handlers[s]
+      end
+    end
+  end
+
+end

data/lib/raad/spoon.rb

@@ -0,0 +1,46 @@
+require 'ffi'
+
+# spoon code taken from Charles Oliver Nutter's spoon gem https://github.com/headius/spoon
+# also see http://blog.headius.com/2009/05/fork-and-exec-on-jvm-jruby-to-rescue.html
+
+module Spoon
+  extend FFI::Library
+  ffi_lib 'c'
+  
+  # int
+  # posix_spawn(pid_t *restrict pid, const char *restrict path,
+  #     const posix_spawn_file_actions_t *file_actions,
+  #     const posix_spawnattr_t *restrict attrp, char *const argv[restrict],
+  #     char *const envp[restrict]);
+  
+  attach_function :_posix_spawn, :posix_spawn, [:pointer, :string, :pointer, :pointer, :pointer, :pointer], :int
+  attach_function :_posix_spawnp, :posix_spawnp, [:pointer, :string, :pointer, :pointer, :pointer, :pointer], :int
+  
+  def self.spawn(*args)
+    spawn_args = _prepare_spawn_args(args)
+    _posix_spawn(*spawn_args)
+    spawn_args[0].read_int
+  end
+
+  def self.spawnp(*args)
+    spawn_args = _prepare_spawn_args(args)
+    _posix_spawnp(*spawn_args)
+    spawn_args[0].read_int
+  end
+  
+  private
+  
+  def self._prepare_spawn_args(args)
+    pid_ptr = FFI::MemoryPointer.new(:pid_t, 1)
+
+    args_ary = FFI::MemoryPointer.new(:pointer, args.length + 1)
+    str_ptrs = args.map {|str| FFI::MemoryPointer.from_string(str)}
+    args_ary.put_array_of_pointer(0, str_ptrs)
+
+    env_ary = FFI::MemoryPointer.new(:pointer, ENV.length + 1)
+    env_ptrs = ENV.map {|key,value| FFI::MemoryPointer.from_string("#{key}=#{value}")}
+    env_ary.put_array_of_pointer(0, env_ptrs)
+    
+    [pid_ptr, args[0], nil, nil, args_ary, env_ary]
+  end
+end

data/lib/raad/unix_daemon.rb

@@ -1,6 +1,8 @@
 require 'etc'
 require 'timeout'
 
+require 'raad/spoon' if Raad.jruby?
+
 module Process
 
   def running?(pid)
@@ -24,30 +26,42 @@ module Daemonizable
     File.exist?(@pid_file) ? open(@pid_file).read.to_i : nil
   end
   
-  def daemonize(name, stdout_file)
+  def daemonize(argv, name, stdout_file = nil)
     remove_stale_pid_file
     pwd = Dir.pwd
 
-    # do the double fork dance
-    Process.fork do
-      Process.setsid
-      exit if fork
-      $0 = name # set process name
+    if Raad.jruby?
+      # in jruby the process is to posix-spawn a new process and re execute ourself using Spoon.
+      # swap command 'start' for 'post_fork' to signal the second exec
+      spawn_argv = argv.map{|arg| arg == 'start' ? 'post_fork' : arg}
+      Spoon.spawnp(Raad.ruby_path, $0, *spawn_argv)
+    else
+      # do the double fork dance
+      Process.fork do
+        Process.setsid
+        exit if fork # exit parent
+ 
+        Dir.chdir(pwd)
+        post_fork_setup(name, stdout_file)
+
+        yield
+      end
+    end
+  end
 
-      File.umask(0000) # file mode creation mask to 000 to allow creation of files with any required permission late
-      Dir.chdir(pwd)
-      write_pid_file
+  def post_fork_setup(name, stdout_file = nil)
+    $0 = name # set process name, does not work with jruby
 
-      # redirect stdout into a log
-      STDIN.reopen('/dev/null')
-      stdout_file ? STDOUT.reopen(stdout_file, "a") : STDOUT.reopen('/dev/null', 'a')
-      STDERR.reopen(STDOUT)
+    File.umask(0000) # file mode creation mask to 000 to allow creation of files with any required permission late
+    write_pid_file
 
-      at_exit do
-        remove_pid_file
-      end
+    # redirect stdin, stdout, stderr
+    STDIN.reopen('/dev/null')
+    stdout_file ? STDOUT.reopen(stdout_file, "a") : STDOUT.reopen('/dev/null', 'a')
+    STDERR.reopen(STDOUT)
 
-      yield
+    at_exit do
+      remove_pid_file
     end
   end
 
@@ -103,7 +117,6 @@ module Daemonizable
   end
 
   def write_pid_file
-    puts(">> writing pid to #{@pid_file}")
     open(@pid_file,"w") { |f| f.write(Process.pid) }
     File.chmod(0644, @pid_file)
   end

data/lib/raad/version.rb

@@ -1,3 +1,3 @@
 module Raad
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end unless defined?(Raad::VERSION)

metadata

@@ -1,65 +1,74 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: raad
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.4.0
   prerelease: 
-  version: 0.3.3
 platform: ruby
-authors: 
+authors:
 - Colin Surprenant
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-13 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rubyforge
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152610040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *2152610040
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: &2152609480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2152609480
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2152608960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.5.0
+      - !ruby/object:Gem::Version
+        version: 0.9.2
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: log4r
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2152608960
+- !ruby/object:Gem::Dependency
+  name: log4r
+  requirement: &2152608480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.1.9
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *2152608480
 description: Ruby as a Daemon lightweight service wrapper
-email: 
+email:
 - colin.surprenant@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/raad/configuration.rb
 - lib/raad/env.rb
 - lib/raad/logger.rb
 - lib/raad/runner.rb
 - lib/raad/service.rb
+- lib/raad/signal_trampoline.rb
+- lib/raad/spoon.rb
 - lib/raad/unix_daemon.rb
 - lib/raad/version.rb
 - lib/raad.rb
@@ -68,30 +77,26 @@ files:
 - LICENSE.md
 homepage: http://github.com/praized/raad
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.0
 requirements: []
-
 rubyforge_project: raad
-rubygems_version: 1.8.9
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby as a Daemon
 test_files: []
-