daemons 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 860b58ef469300cda2269a45f189796af8f36bcb
-  data.tar.gz: 29894094754c8013a9901f918f9e9ca2d700258f
+  metadata.gz: 87cdbadcf8ce1d77533557b7d0f359dc5a750fe5
+  data.tar.gz: 00ca7e0da7abb35af6ca5ed389c9903f5212ee4c
 SHA512:
-  metadata.gz: cd7e03dbc97d7dcaa21b582b868cea9b5610e52b975737b8c8309ce71f803647d3a87444e04a79b63feb2da895b0ee5ab8624985540c4a5dfba0be916f23d55a
-  data.tar.gz: c42a97021220ffbbe114349c8fe2ebeff0894b265cd4c2a960cf9efbdce5b0bcf873d92dd393b54fdde336b4d53c8ea4c53d827f567d0313829fd0f4f23c7cdb
+  metadata.gz: '092c646fb307604e652b88e00444b55b1cc332add1657e0351fee23093e86caec7413f507e599538b3cfcf28e28de5ec16003e225505fb0661cc837af622a57b'
+  data.tar.gz: 87e93b5cf8209905b2d9aa0404461f35ef06ab7e6c653195402112fea17583cd8e2c135429d354a8899da86bf691d4c70c127418f8029d05cd6747b89c0988f7

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2016 Thomas Uehlinger, 2014-2016 Aaron Stone
+Copyright (c) 2005-2017 Thomas Uehlinger, 2014-2016 Aaron Stone
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/README.md

@@ -1,6 +1,6 @@
 Ruby Daemons
 ============
-[![Code Climate](https://codeclimate.com/github/acuppy/daemons/badges/gpa.svg)](https://codeclimate.com/github/acuppy/daemons)[![Test Coverage](https://circleci.com/gh/acuppy/daemons.svg?style=shield&circle-token=a4f96fd41f7682661d6543e30207427ac8870c0d)](https://circleci.com/gh/acuppy/daemons)
+[![Build Status](https://travis-ci.org/thuehlinger/daemons.svg?branch=master)](https://travis-ci.org/thuehlinger/daemons)[![Code Climate](https://codeclimate.com/github/acuppy/daemons/badges/gpa.svg)](https://codeclimate.com/github/acuppy/daemons)[![Test Coverage](https://circleci.com/gh/acuppy/daemons.svg?style=shield&circle-token=a4f96fd41f7682661d6543e30207427ac8870c0d)](https://circleci.com/gh/acuppy/daemons)
 
 Daemons provides an easy way to wrap existing ruby scripts (for example a self-written server)
 to be _run as a daemon_ and to be _controlled by simple start/stop/restart commands_.
@@ -204,4 +204,4 @@ Daemons.run('myserver.rb', { show_status_callback: :custom_show_status })
 Author
 ------
 
-Written 2005-2016 by Thomas Uehlinger, 2014-2016 by Aaron Stone.
+Written 2005-2017 by Thomas Uehlinger, 2014-2016 by Aaron Stone.

data/Releases

@@ -1,5 +1,10 @@
 = Daemons Release History
 
+== Release 1.2.5: October 22, 2017
+
+* In Application#stop, call zap, not cleanup on the pidfile (thanks to wevanscfi)
+* Use File.expand_path on and output and log files (thanks to Dave Harris)
+
 == Release 1.2.4: August 1, 2016
 
 * add :shush option

data/lib/daemons.rb

@@ -238,23 +238,26 @@ module Daemons
   #   end
   #
   def call(options = {}, &block)
-    unless block_given?
-      fail 'Daemons.call: no block given'
-    end
+    new_app = Daemons.new(options, &block)
+    new_app.start
+    new_app
+  end
+  module_function :call
 
-    options[:proc] = block
-    options[:mode] = :proc
+  # Create a new Daemon application, like <tt>Daemons.call</tt>, but will not start it automatically
+  def new(options = {}, &block)
+    fail 'Daemons.call: no block given' unless block_given?
 
     options[:app_name] ||= 'proc'
+    options[:proc] = Proc.new
+    options[:mode] = :proc
+    options[:dir_mode] = :normal
 
     @group ||= ApplicationGroup.new(options[:app_name], options)
 
-    new_app = @group.new_application(options)
-    new_app.start
-
-    new_app
+    @group.new_application(options)
   end
-  module_function :call
+  module_function :new
 
   # Daemonize the currently runnig process, i.e. the calling process will become a daemon.
   #

data/lib/daemons/application.rb

@@ -28,6 +28,10 @@ module Daemons
       @options = group.options.dup
       @options.update(add_options)
 
+      ['dir', 'log_dir', 'logfilename', 'output_logfilename'].each do |k|
+        @options[k] = File.expand_path(@options[k]) if @options.key?(k)
+      end
+        
       @dir_mode = @dir = @script = nil
 
       @force_kill_waittime = @options[:force_kill_waittime] || 20
@@ -416,7 +420,7 @@ module Daemons
       unless Pid.running?(pid)
         # We try to remove the pid-files by ourselves, in case the application
         # didn't clean it up.
-        begin; @pid.cleanup; rescue ::Exception; end
+        zap!
 
         @report.stopped_process(group.app_name, pid)
         $stdout.flush

data/lib/daemons/application_group.rb

@@ -23,19 +23,22 @@ module Daemons
       @app_name = app_name
       @options = options
 
-      if options[:script]
-        @script = File.expand_path(options[:script])
+      if @options[:script]
+        @script = File.expand_path(@options[:script])
       end
 
       @monitor = nil
 
-      @multiple = options[:multiple] || false
+      @multiple = @options[:multiple] || false
 
-      @dir_mode = options[:dir_mode] || :script
-      @dir = options[:dir] || ''
+      @dir_mode = @options[:dir_mode] || :script
+      ['dir'].each do |k|
+        @options[k] = File.expand_path(@options[k]) if @options.key?(k)
+      end
+      @dir = @options[:dir] || ''
 
-      @keep_pid_files = options[:keep_pid_files] || false
-      @no_pidfiles = options[:no_pidfiles] || false
+      @keep_pid_files = @options[:keep_pid_files] || false
+      @no_pidfiles = @options[:no_pidfiles] || false
 
       @applications = []
     end

data/lib/daemons/controller.rb

@@ -61,7 +61,7 @@ module Daemons
           @group.stop_all(@options[:no_wait])
         when 'restart'
           unless @group.applications.empty?
-            @group.stop_all
+            @group.stop_all(@options[:no_wait])
             sleep(1)
             @group.start_all
           else

data/lib/daemons/monitor.rb

@@ -107,7 +107,7 @@ module Daemons
           end
       rescue ::Exception => e
         $stderr.puts "exception while trying to stop monitor process #{pid}: #{e}"
-        $stderr.puts 'deleting pid-file.'
+        $stderr.puts "deleting pid-file."
       end
 
       # We try to remove the pid-files by ourselves, in case the monitor

data/lib/daemons/pidfile.rb

@@ -100,9 +100,9 @@ module Daemons
     end
 
     def zap
-      File.delete(filename)
+      File.delete(filename) if exist?
     end
-    
+
     def pid
       begin
         File.open(filename) do |f|

data/lib/daemons/version.rb

@@ -1,3 +1,3 @@
 module Daemons
-  VERSION = '1.2.4'
+  VERSION = '1.2.5'
 end

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: daemons
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Thomas Uehlinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2017-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 description: |2
       Daemons provides an easy way to wrap existing ruby scripts (for example a
       self-written server)  to be run as a daemon and to be controlled by simple
@@ -137,17 +137,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A toolkit to create and control daemons in different ways