daemonite 0.5.0 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2aefaeee8ed856d896cb663cc2c2d8666f437e948e172d3d4f3bb8f8ac2bad5
-  data.tar.gz: 18face311c11441c3baa56eb74586bd13a2dc2fce37efd4475b4963121ae8b2f
+  metadata.gz: d80e2f0268b9385c864ebe15b2f0f728b2acbb3d4205115722abd3d308b0267d
+  data.tar.gz: 5b90f90695c57d08524b5d64d4579f230faa44981abd457e4291ecf806c45629
 SHA512:
-  metadata.gz: 481799bb690fec6d0090db1ff7e762ebf00ea65248c9b5a21311058b49b5661eb141c5f6dd930850c8e53d8f3809f668aedbe585702f337d8674061fef6fb009
-  data.tar.gz: 015b1b64ebe9e4f954275c8e526c9f5de27a1ee52d5c5b965d0284e7bff355a342db2d2dfda9af62070aff3cbec23444efb42ec3771cc8083f9547a36ac8ee57
+  metadata.gz: 4a6ad8f8b8847dee5cc599e1effc3c68fd5d595688f55cff5db9488a949acb4a176f14197d615d0cb60bd69b1d8cbf96933744085a511cd4bc0124821fcd53aa
+  data.tar.gz: 399d6e45ecbd5055cec2f0ce6ef4a5f6bc9b478938e70523957568a843f4845a2c5d31c65c5ada3a41e92c2e54bad6725e8e766c10312664281a5aef3578c8fc

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.0"
+  s.version          = "0.5.5"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Daemonite - Process.daemon and argparse wrapper for loopies."

data/lib/daemonite.rb

@@ -66,7 +66,7 @@ module Daemonism
             opts.merge!(Psych::load_file(opts[:basepath] + '/' + f))
           end
         }
-        opt.on("--help", "-h", "This text.") { puts opt; exit }
+        opt.on("--help", "-h", "This text.") { puts opt; ::Kernel::exit }
         opt.separator(opt.summary_indent + "start|stop|restart|info".ljust(opt.summary_width+1) + "Do operation start, stop, restart or get information.")
         opts[:runtime_cmds].each do |ro|
           opt.separator(opt.summary_indent + ro[0].ljust(opt.summary_width+1) + ro[1])
@@ -74,9 +74,9 @@ 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
-        exit!
+        ::Kernel::exit
       end
       opts[:cmdl_operation] = ARGV[0]
     end
@@ -98,7 +98,7 @@ module Daemonism
     unless @@daemonism_restart
       if opts[:cmdl_operation] == "info" && status.call == false
         puts "Server #{opts[:cmdl_info].nil? ? '' : '(' + opts[:cmdl_info].to_s + ') '}not running"
-        exit
+        ::Kernel::exit
       end
       if opts[:cmdl_operation] == "info" && status.call == true
         puts "Server #{opts[:cmdl_info].nil? ? '' : '(' + opts[:cmdl_info].to_s + ') '}running as #{pid}"
@@ -110,11 +110,11 @@ module Daemonism
           puts "CPU Time: #{stats.last}"
         rescue
         end
-        exit
+        ::Kernel::exit
       end
       if %w{start}.include?(opts[:cmdl_operation]) && status.call == true
         puts "Server #{opts[:cmdl_info].nil? ? '' : '(' + opts[:cmdl_info].to_s + ') '}already started"
-        exit
+        ::Kernel::exit
       end
     end
 
@@ -133,7 +133,7 @@ module Daemonism
             sleep 0.3
           end
         end
-        exit unless opts[:cmdl_operation] == "restart"
+        ::Kernel::exit unless opts[:cmdl_operation] == "restart"
       end
     end
 
@@ -153,7 +153,7 @@ module Daemonism
       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 +174,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 +196,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 +207,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.0
+  version: 0.5.5
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-27 00:00:00.000000000 Z
+date: 2020-05-29 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.