daemonite 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65942d0e1766aaaefd265802b2da578889f1f23e
-  data.tar.gz: 621e08d9f66f3c7f771d442550ac528434916020
+  metadata.gz: 110be5d9b8265d48d494af41bbf77147f4e3888d
+  data.tar.gz: 3e5a0e19ce757b0ef8b9c0ed330c730b210825da
 SHA512:
-  metadata.gz: b010e060ec3fcd4f45724f7a3104cf633be36b6a624b36f1d4ca57db198e8a433986e86e1890602e4444ac1b79095261bfc3da9c415e42a2be7384cc65cfbb74
-  data.tar.gz: 6d5ab3d54e5ff67d233c069094d7491245859a80b1256b4ecc48418f641e1c97d8874ca2dd8eb4cb19ac455c9953bc0c9ca2044032234f83ee05e59ddc7471c4
+  metadata.gz: 1fc91737dab032004750c06f03c7da6df133657ecda5a88a0b52e431999e86ea60d3b92e914bc6fba74ee68af11da5eb39b8902a23f3a9d5c8993e04a5573bc4
+  data.tar.gz: 25df84c14bd7d4f429be0e37faffe4bee2262d86d87f86d445b8a41747a845825457ee37738d19055c2168f6207d519bb1b73f84c03000fd0d0a6481cca97ab4

data/Rakefile

@@ -15,5 +15,5 @@ task :push => :gem do |r|
 end
 
 task :install => :gem do |r|
-  `sudo gem install pkg/daemonite.gem`
+  `gem install pkg/daemonite.gem`
 end

data/daemonite.gemspec

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

data/lib/daemonite.rb

@@ -18,58 +18,65 @@
 require 'optparse'
 require 'psych'
 
-class Daemonite
-  OPTS = {
+module Daemonism
+  DAEMONISM_DEFAULT_OPTS = {
     :mode            => :debug,
     :verbose         => false,
     :basepath        => File.expand_path(File.dirname($0)),
     :pidfile         => File.basename($0,'.rb') + '.pid',
     :pidwrite        => true,
     :conffile        => File.basename($0,'.rb') + '.conf',
-    :runtime_options => [],
+    :runtime_cmds    => [],
+    :runtime_opts    => [],
+    :runtime_proc    => nil,
+    :cmdl_info       => nil,
     :cmdl_parsing    => true,
     :cmdl_operation  => 'start'
   }
 
-  def initialize(opts={},&block)
-    @opts = OPTS.merge(opts)
-
-    if File.exists?(@opts[:basepath] + '/' + @opts[:conffile])
-      @opts.merge!(Psych::load_file(@opts[:basepath] + '/' + @opts[:conffile]))
+  def daemonism(opts={},&block)
+    if File.exists?(opts[:basepath] + '/' + opts[:conffile])
+      opts.merge!(Psych::load_file(opts[:basepath] + '/' + opts[:conffile]))
     end
+    Dir.chdir(opts[:basepath])
+
+    # set more default options and do other stuff
+    instance_exec(opts,&block) if block_given?
 
     ########################################################################################################################
     # parse arguments
     ########################################################################################################################
-    if @opts[:cmdl_parsing]
-      @opts[:cmdl_operation] = "start"
+    if opts[:cmdl_parsing]
+      opts[:cmdl_operation] = "start"
       ARGV.options { |opt|
         opt.summary_indent = ' ' * 4
-        opt.banner = "Usage:\n#{opt.summary_indent}ruby #{$PROGRAM_NAME} [options] start|stop|restart|info" + (@opts[:runtime_options].length > 0 ? '|' : '') + @opts[:runtime_options].map{|ro| ro[0]}.join('|') + "\n"
-        opt.on("--verbose", "-v", "Do not daemonize. Write ouput to console.") { @opts[:verbose] = true }
+        opt.banner = "Usage:\n#{opt.summary_indent}ruby #{$PROGRAM_NAME} [options] start|stop|restart|info" + (opts[:runtime_cmds].length > 0 ? '|' : '') + opts[:runtime_cmds].map{|ro| ro[0]}.join('|') + "\n"
+        opts[:runtime_opts].each do |ro|
+          opt.on(*ro)
+        end
+        opt.on("--verbose", "-v", "Do not daemonize. Write ouput to console.") { opts[:verbose] = true }
         opt.on("--help", "-h", "This text.") { puts opt; 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_options].each do |ro|
+        opts[:runtime_cmds].each do |ro|
           opt.separator(opt.summary_indent + ro[0].ljust(opt.summary_width+1) + ro[1])
         end
         opt.parse!
       }
-      unless (%w{start stop restart info} + @opts[:runtime_options].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
       end
-      @opts[:cmdl_operation] = ARGV[0]
+      opts[:cmdl_operation] = ARGV[0]
       @at_exit = nil
     end
     ########################################################################################################################
-
-    @opts[:repeat] = nil
-    instance_exec(@opts,&block) if block_given?
+    opts[:repeat] = nil
+    opts[:runtime_proc].call(opts) unless opts[:runtime_proc].nil?
 
     ########################################################################################################################
     # status and info
     ########################################################################################################################
-    pid = File.read(@opts[:basepath] + '/' + @opts[:pidfile]).to_i rescue pid = -1
+    pid = File.read(opts[:basepath] + '/' + opts[:pidfile]).to_i rescue pid = -1
     status = Proc.new do
       begin
         Process.getpgid pid
@@ -78,12 +85,12 @@ class Daemonite
         false
       end
     end
-    if @opts[:cmdl_operation] == "info" && status.call == false
-      puts "Server not running"
+    if opts[:cmdl_operation] == "info" && status.call == false
+      puts "Server #{opts[:cmdl_info].nil? ? ' ' : '(' + opts[:cmdl_info].to_s + ') '}not running"
       exit
     end
-    if @opts[:cmdl_operation] == "info" && status.call == true
-      puts "Server running as #{pid}"
+    if opts[:cmdl_operation] == "info" && status.call == true
+      puts "Server #{opts[:cmdl_info].nil? ? ' ' : '(' + opts[:cmdl_info].to_s + ') '}running as #{pid}"
       begin
         stats = `ps -o "vsz,rss,lstart,time" -p #{pid}`.split("\n")[1].strip.split(/ +/)
         puts "Virtual:  #{"%0.2f" % (stats[0].to_f/1024)} MiB"
@@ -94,51 +101,61 @@ class Daemonite
       end
       exit
     end
-    if %w{start}.include?(@opts[:cmdl_operation]) && status.call == true
-      puts "Server already started"
+    if %w{start}.include?(opts[:cmdl_operation]) && status.call == true
+      puts "Server #{opts[:cmdl_info].nil? ? ' ' : '(' + opts[:cmdl_info].to_s + ') '}already started"
       exit
     end
 
     ########################################################################################################################
     # stop/restart server
     ########################################################################################################################
-    if %w{stop restart}.include?(@opts[:cmdl_operation])
+    if %w{stop restart}.include?(opts[:cmdl_operation])
       if status.call == false
-        puts "Server maybe not started?"
+        puts "Server #{opts[:cmdl_info].nil? ? ' ' : '(' + opts[:cmdl_info].to_s + ') '}maybe not started?"
       else
-        puts "Server stopped"
+        puts "Server #{opts[:cmdl_info].nil? ? ' ' : '(' + opts[:cmdl_info].to_s + ') '}stopped"
         puts "Waiting while server goes down ..."
         while status.call
           Process.kill "SIGTERM", pid
           sleep 0.3
         end
       end
-      exit unless @opts[:cmdl_operation] == "restart"
+      exit unless opts[:cmdl_operation] == "restart"
     end
 
     ########################################################################################################################
     # go through user defined startup thingis
     ########################################################################################################################
-    @opts[:runtime_options].each do |ro|
-      ro[2].call(status.call) if @opts[:cmdl_operation] == ro[0]
+    opts[:runtime_cmds].each do |ro|
+      ro[2].call(status.call) if opts[:cmdl_operation] == ro[0]
     end
 
-    puts "Server started as PID:#{Process.pid}"
-    Process.daemon(@opts[:basepath]) unless @opts[:verbose]
-    File.write(@opts[:basepath] + '/' + @opts[:pidfile],Process.pid) # after daemon, so that we get the forked pid
-    Dir.chdir(@opts[:basepath])
+    puts "Server #{opts[:cmdl_info].nil? ? ' ' : '(' + opts[:cmdl_info].to_s + ') '}started as PID:#{Process.pid}"
+    Process.daemon(opts[:basepath]) unless opts[:verbose]
+    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])
+      File.unlink(opts[:basepath] + '/' + opts[:pidfile])
       @at_exit.call if @at_exit
     end
   end
 
-  def run(&block)
-    @opts[:repeat] = block
-  end
   def at_exit(&blk)
     @at_exit = blk
   end
+end
+
+class Daemonite
+  include Daemonism
+
+  def initialize(opts={},&blk)
+    @opts = DAEMONISM_DEFAULT_OPTS.merge(opts)
+    daemonism @opts, &blk
+  end
+
+  def run(&block)
+    @opts[:repeat] = block
+  end
 
   def loop!
     begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daemonite
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-04 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies: []
 description: Daemonite - Process.daemon and argparse wrapper for loopies.
 email: juergen.mangler@gmail.com