daemonite 0.5.2 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09519e4d9603836ae7592a8eec1dc4adb05d1b0e0f9ef272cabc8031465dd5d5'
-  data.tar.gz: 36b52b06a8ef226e9a3a31da22c3ccaff5f952d0622b5a3774187bff6f45721b
+  metadata.gz: 62d8dd46ec738b5e6b246c86ceead1b03682b1579dd40a44048dbb316694bc5f
+  data.tar.gz: 3f25d52e80286edc9f6957b437edb53dcbe74deba57482237700358a2d801305
 SHA512:
-  metadata.gz: 6d88c1f1283ae40234daaf2fd47af083325836cd8a852ed2284946b19dc115998289be44f2a642da2b69f0727c3efe20f98970f4063d626a5ff06c40f1d74fd8
-  data.tar.gz: 478ff16c0a73a6fa855da7a47fe28065b6cd805cb7ee60189d7db6b8d233332137a6aef3e5c5a9eb59ff567eccb10e7b1d38dc6b6d54a0796bf1bf21a3480cbd
+  metadata.gz: 20c8c017f7f846fad18be36e40a2b5f32f2b285ed5fad2e83aa675756bcb0f0c55935e1ef04b15cda50b1283037e46d6903bc12519d21cbfbf0f1111c60b7ec3
+  data.tar.gz: 78a442b97feaa7d013fb4c46f8ded4264cffb199f0c5b9a55ad5470936e52a16bf8870678cf9d5361060b169ddb03cfea1ea8830b8541c351d578097c12b271a

data/Rakefile

@@ -1,19 +1,22 @@
 require 'rake'
 require 'rubygems/package_task'
-require 'rake/testtask'
+require 'fileutils'
 
 spec = eval(File.read('daemonite.gemspec'))
 Gem::PackageTask.new(spec) do |pkg|
   pkg.need_zip = true
   pkg.need_tar = true
-  `rm pkg/* -rf`
-  `ln -sf #{pkg.name}.gem pkg/daemonite.gem`
+  FileUtils.mkdir 'pkg' rescue nil
+  FileUtils.rm_rf Dir.glob('pkg/*')
+  FileUtils.ln_sf "#{pkg.name}.gem", "pkg/#{spec.name}.gem"
 end
 
+task :default => :gem
+
 task :push => :gem do |r|
-  `gem push pkg/daemonite.gem`
+  `gem push pkg/#{spec.name}.gem`
 end
 
 task :install => :gem do |r|
-  `gem install pkg/daemonite.gem`
+  `gem install pkg/#{spec.name}.gem`
 end

data/daemonite.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "daemonite"
-  s.version          = "0.5.2"
+  s.version          = "0.5.7"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Daemonite - Process.daemon and argparse wrapper for loopies."

data/lib/daemonite.rb

@@ -33,7 +33,8 @@ module Daemonism
     :runtime_proc    => nil,
     :cmdl_info       => nil,
     :cmdl_parsing    => true,
-    :cmdl_operation  => 'start'
+    :cmdl_operation  => 'start',
+    :kill_amount     => 1000
   }
 
   def daemonism(opts={},&block)
@@ -74,7 +75,7 @@ module Daemonism
         opt.parse!
       }
 
-      unless (%w{start stop restart} + opts[:runtime_cmds].map{|ro| ro[0] }).include?(ARGV[0])
+      unless (%w{start stop restart info} + opts[:runtime_cmds].map{|ro| ro[0] }).include?(ARGV[0])
         puts ARGV.options
         ::Kernel::exit
       end
@@ -128,8 +129,14 @@ module Daemonism
         else
           puts "Server #{opts[:cmdl_info].nil? ? '' : '(' + opts[:cmdl_info].to_s + ') '}stopped"
           puts "Waiting while server goes down ..."
+          count = 0
           while status.call
-            Process.kill "SIGTERM", pid
+            if count > opts[:kill_amount]
+              Process.kill "SIGKILL", pid
+            else
+              Process.kill "SIGTERM", pid
+            end
+            count += 1
             sleep 0.3
           end
         end
@@ -147,13 +154,13 @@ module Daemonism
       @@daemonism_restart = true
 
       retain = $stdout.dup
-      Process.daemon(opts[:basepath]) unless opts[:verbose]
+      Process.daemon unless opts[:verbose]
       retain.puts "Server #{opts[:cmdl_info].nil? ? '' : '(' + opts[:cmdl_info].to_s + ') '}started as PID:#{Process.pid}"
       File.write(opts[:basepath] + '/' + opts[:pidfile],Process.pid) # after daemon, so that we get the forked pid
       Dir.chdir(opts[:basepath])
       ::Kernel::at_exit do
         File.unlink(opts[:basepath] + '/' + opts[:pidfile])
-        @at_exit.call if @at_exit
+        @at_exit.call(opts) if @at_exit
       end
     end
   end
@@ -174,6 +181,9 @@ module Daemonism
   def on_startup(&blk)
     on :startup, &blk
   end
+  def use(blk)
+    instance_eval(&blk)
+  end
   alias_method :at, :on
   alias_method :at_exit, :on_exit
   alias_method :at_startup, :on_startup
@@ -193,7 +203,7 @@ class Daemonite
 
   def go!
     begin
-      @at_startup.call if @at_startup
+      @at_startup.call(@opts) if @at_startup
       @opts[:block].call(@opts)
     rescue SystemExit, Interrupt
       puts "Server stopped due to interrupt (PID:#{Process.pid})"
@@ -204,7 +214,7 @@ class Daemonite
 
   def loop!
     begin
-      @at_startup.call if @at_startup
+      @at_startup.call(@opts) if @at_startup
       loop do
         @opts[:block].call(@opts)
       end unless @opts[:block].nil?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daemonite
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.7
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-27 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies: []
 description: Daemonite - Process.daemon and argparse wrapper for loopies.
 email: juergen.mangler@gmail.com
@@ -44,8 +44,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Daemonite - Process.daemon and argparse wrapper for loopies.