servitude 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8797f541827e4accebaddbbd1a40e78603225489
-  data.tar.gz: 48b73b9c1630653ff2fcee45ee335d11e09cbebd
+  metadata.gz: 23ea7d595cc4e6e6f693d8d26fa47f6f7e4eea3b
+  data.tar.gz: b3f2bf6a2a41d2b8b597d05e428d7d6f9fad1175
 SHA512:
-  metadata.gz: 6e4af9fe689fc799ab4be67dbb66138f1f797860b7c99be30066bb7deba1fc6e7490456104b94c23af7d466e03b0bd6d56c4a17a8a872f33df01bf61ffd1f7f7
-  data.tar.gz: 6cad6cbcc17dfd3861fd65b630fe58cdf29c35a8630e56a8c3632246fd72293264a5ac709a836997c293551edd366d9dc256155e5a5fdae7196b20a5b383c93f
+  metadata.gz: 2ffe8ff8c1acad5c4109655d7a272c230358616789bb765a71ffdef6fb5677ca3d31cd57d16def6ade56d747df92ac35064e2d6023d3ae7b1b997d7abcc62893
+  data.tar.gz: 6a4f1bf29bdf089f79efac41a815796750a517f088aa5930ff8d49b2b1c22303f76b791b58edf74c8f70d00e774271f48aff48fe658bf56658622e1e0684c83a

data/lib/servitude/cli/service.rb

@@ -54,6 +54,7 @@ module Servitude
 
       desc "status", "Check the status of the server daemon"
       pid_option
+      method_option :quiet, type: :boolean, aliases: '-q', desc: "Do not prompt to remove an old PID file", default: false
       def status
         result = Servitude::Daemon.new( options.merge( use_config: Servitude::USE_CONFIG )).status
         at_exit { exit result }

data/lib/servitude/daemon.rb

@@ -59,7 +59,7 @@ module Servitude
         true
       else
         puts "#{Servitude::APP_NAME} process does not exist"
-        prompt_and_remove_pid_file if pid_file_exists?
+        prompt_and_remove_pid_file if pid_file_exists? && !options[:quiet]
         false
       end
     end
@@ -67,9 +67,9 @@ module Servitude
   protected
 
     def prompt_and_remove_pid_file
-      puts "PID file still exists at '#{pid_path}', would you like to remove it (y/n)?"
+      $stdout.write "PID file still exists at '#{pid_path}'. Remove it [y/N]? "
       answer = $stdin.gets.strip
-      if answer == 'y'
+      if answer =~ /^y(es)?$/i
         remove_pid
         puts "Removed PID file"
       end
@@ -89,16 +89,21 @@ module Servitude
     end
 
     def get_pid
-      return nil unless File.file?( pid_path )
-
-      pid = nil
-
-      File.open( @pid_path, 'r' ) do |f|
-        pid = f.readline.to_s.gsub( /[^0-9]/, '' )
-      end
-
-      pid.to_i
-    rescue Errno::ENOENT
+      pid = begin
+              File.read( pid_path ).chomp
+            rescue Errno::ENOENT # No such file or directory
+              return nil
+            rescue Errno::EACCES # Permission denied
+              $stderr.puts "No permission to read #{pid_path}"
+              return nil
+            rescue => e
+              $stderr.puts "Unable to read #{pid_path}\n\t(#{e.class.name}) #{e.message}"
+              return nil
+            end
+
+      return pid.to_i if ( pid =~ /^[1-9][0-9]*$/ )
+
+      $stderr.puts "#{pid_path} does not contain a PID"
       nil
     end
 
@@ -147,6 +152,9 @@ module Servitude
     rescue Errno::EPERM
       $stderr.puts "No permission to query #{pid}!";
       false
+    rescue => e
+      $stderr.puts "Unable to query #{pid}\n\t(#{e.class.name}) #{e.message}"
+      false
     end
 
     def redirect_output!

data/lib/servitude/version.rb

@@ -1,3 +1,3 @@
 module Servitude
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servitude
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Jason Harrelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -229,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: A set of utilities to aid in building multithreaded Ruby servers utilizing