daemonite 0.5.1 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d55c871c9a80cfec8102f511e3bcfd61d608c7a2a0c79088659a4f81d860bb7b
-  data.tar.gz: bc92c0e6021fe788a5a91a429ef8ed8043a1dfd5d8d011b9db3521787d34b448
+  metadata.gz: b1899e505246fe53e2c35fd6a9bacb56d88054fab42fba2f4b6bdf72a6382e8f
+  data.tar.gz: 6b5689d8dcf5394692aa69f0b6039aabda566a0a7a18cd3662e1eeed17d1b470
 SHA512:
-  metadata.gz: 3eb8cd83899d1d214bbba728ae57b203e1ce58bbe41afd444c31cee1645da9b98e12140f7cd2abe89f45951515ec82b00340c4cd09449f469a0aa268f4c23aa1
-  data.tar.gz: cd5d916982e0b10648869292a5f8c73f4b8f6e0eab8553e4dc6df3d79828742a69e291ed89bea4e07d1d448d55d3b0a0b15f5cd86a7cd42134b2d11b03a95552
+  metadata.gz: 746048311f81405f042ff19cdf6b3a0ee6cd6739dd4afd14498b86a3cf54c25cf9efa6e8f5778944e4452f8912545494adf79e0aad6b345753d8e33e4c3f3d48
+  data.tar.gz: af685fb61f0466f1aacc5643a63107db35d7b3159f343e793d7a567ef55b7a4fb7e0f4158635c6ab497e3b874207243dca8e1f147f8b0a4f4a205db862a01293

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.1"
+  s.version          = "0.5.6"
   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
 
@@ -147,13 +147,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 +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.1
+  version: 0.5.6
 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.