puma-status 1.4 → 1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22bea1d3a501185590a81878994456d75a4c5375794221bdeb51b3283d65cceb
-  data.tar.gz: a2670a54fdd6c4dae1040c59882f969ba1aff3487076d75962e2fa105da32b59
+  metadata.gz: edca43a85e295ab116159f64a2f938f08ca8bb228d3c9a1858e3e6b1c2af42d5
+  data.tar.gz: ed4e67eef12e37bc463573ab8e1b2e2f7d7b04654e23615ff68461822e2af74e
 SHA512:
-  metadata.gz: '09d1cfd981ee0c5092e9bda66009e2a4b517f3bfe3987559cfb571a9a4aa0c880e6ca45061cbd0a0c8bbc5016d2a11ba3410facc67b9924ab7643512110b2711'
-  data.tar.gz: 023b10377d8567d59c3b75028c4cd54c2f3db12d686bcf41d5a6fcd69aabf45c6e5a89b3c956afa8e98d7ec696c5ef85801fd6a8625adf6b9d42a1aea9a584fc
+  metadata.gz: 0ac75cb6ba28f5e69856fc93144cd0cd06543281da12654ea15d95e1281b571e6c4caf9d81f466cdd48b21819f4e47f6d205ccffc95130c1a17a55d58ae46f15
+  data.tar.gz: 1ab7b9ee34dd4674bea3398f6d4c69431e4c64cac105d4651bf0f0dcad113223727be6984373b1ee7f8a678c4b91db36ba3f7d117696aac57e39b433582d4cf6

data/lib/core.rb

@@ -76,11 +76,13 @@ def hydrate_stats(stats, puma_state, state_file_path)
 end
 
 def format_stats(stats)
-  master_line = "#{stats.pid} (#{stats.state_file_path}) Uptime: #{seconds_to_human(stats.uptime)}"
+  master_line = "#{stats.pid} (#{stats.state_file_path})"
+  master_line += " Version: #{stats.version} |" if stats.version
+  master_line += " Uptime: #{seconds_to_human(stats.uptime)}"
   master_line += " | Phase: #{stats.phase}" if stats.phase
 
   if stats.booting?
-    master_line += " #{warn("booting")}"
+    master_line += " #{yellow("booting")}"
   else
     master_line += " | Load: #{color(75, 50, stats.load, asciiThreadLoad(stats.running_threads, stats.spawned_threads, stats.max_threads))}"
     master_line += " | Req: #{stats.requests_count}" if stats.requests_count
@@ -90,15 +92,15 @@ def format_stats(stats)
     worker_line = " └ #{wstats.pid.to_s.rjust(5, ' ')} CPU: #{color(75, 50, wstats.pcpu, wstats.pcpu.to_s.rjust(5, ' '))}% Mem: #{color(1000, 750, wstats.mem, wstats.mem.to_s.rjust(4, ' '))} MB Uptime: #{seconds_to_human(wstats.uptime)}"
 
     if wstats.booting?
-      worker_line += " #{warn("booting")}"
+      worker_line += " #{yellow("booting")}"
     elsif wstats.killed?
-      worker_line += " #{error("killed")}"
+      worker_line += " #{red("killed")}"
     else
       worker_line += " | Load: #{color(75, 50, wstats.load, asciiThreadLoad(wstats.running_threads, wstats.spawned_threads, wstats.max_threads))}"
-      worker_line += " | Phase: #{error(wstats.phase)}" if wstats.phase != stats.phase
+      worker_line += " | Phase: #{red(wstats.phase)}" if wstats.phase != stats.phase
       worker_line += " | Req: #{wstats.requests_count}" if wstats.requests_count
-      worker_line += " Queue: #{error(wstats.backlog.to_s)}" if wstats.backlog > 0
-      worker_line += " Last checkin: #{error(wstats.last_checkin)}" if wstats.last_checkin >= 10
+      worker_line += " Queue: #{red(wstats.backlog.to_s)}" if wstats.backlog > 0
+      worker_line += " Last checkin: #{red(wstats.last_checkin)}" if wstats.last_checkin >= 10
     end
 
     worker_line

data/lib/helpers.rb

@@ -4,11 +4,11 @@ def debug(str)
   puts str if ENV.key?('DEBUG')
 end
 
-def warn(str)
+def yellow(str)
   colorize(str, :yellow)
 end
 
-def error(str)
+def red(str)
   colorize(str, :red)
 end
 

data/lib/puma-status.rb

@@ -19,22 +19,22 @@ def run
       format_stats(get_stats(state_file_path))
     rescue Errno::ENOENT => e
       if e.message =~ /#{state_file_path}/
-        errors << "#{warn(state_file_path)} doesn't exists"
+        errors << "#{yellow(state_file_path)} doesn't exists"
       elsif e.message =~ /connect\(2\) for [^\/]/
-        errors << "#{warn("Relative Unix socket")}: the Unix socket of the control app has a relative path. Please, ensure you are running from the same folder has puma."
+        errors << "#{yellow("Relative Unix socket")}: the Unix socket of the control app has a relative path. Please, ensure you are running from the same folder has puma."
       else
-        errors << "#{error(state_file_path)} an unhandled error occured: #{e.inspect}"
+        errors << "#{red(state_file_path)} an unhandled error occured: #{e.inspect}"
       end
       nil
     rescue Errno::EISDIR => e
       if e.message =~ /#{state_file_path}/
-        errors << "#{warn(state_file_path)} isn't a state file"
+        errors << "#{yellow(state_file_path)} isn't a state file"
       else
-        errors << "#{error(state_file_path)} an unhandled error occured: #{e.inspect}"
+        errors << "#{red(state_file_path)} an unhandled error occured: #{e.inspect}"
       end
       nil
     rescue => e
-      errors << "#{error(state_file_path)} an unhandled error occured: #{e.inspect}"
+      errors << "#{red(state_file_path)} an unhandled error occured: #{e.inspect}"
       nil
     end
   end

data/lib/stats.rb

@@ -154,4 +154,10 @@ class Stats
   def load
     running_threads/total_threads.to_f*100
   end
+
+  def version
+    return nil unless @stats.key?('versions')
+
+    "#{@stats['versions']['puma']}/#{@stats['versions']['ruby']['engine']}#{@stats['versions']['ruby']['version']}p#{@stats['versions']['ruby']['patchlevel']}"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puma-status
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: '1.6'
 platform: ruby
 authors:
 - Yoann Lecuyer
@@ -119,14 +119,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
+rubygems_version: 3.4.0.dev
 signing_key:
 specification_version: 4
 summary: Command-line tool for puma to display information about running request/process