server-status 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fce21e7bf732e7a2f4202ae90c9eb89c505453986edaf621edcc49f8e734853
-  data.tar.gz: '0985c9a3b5dcddc2b748a9963d98902518d646b0f7178bb1ae57e78b613c819a'
+  metadata.gz: dd9f04a7b87ff138e93c098fca92ad3e9c365438744368f26de613ef0b15bc84
+  data.tar.gz: 6f54d37a3205ab7040cf823e832ea906e19a25fd8ac23efc400a3ba19324ae8f
 SHA512:
-  metadata.gz: 8d744e0a823119f4050b7a350f806714c132629b661bae8504bfe446ed357d6d263102e9fa8b4903ccf88ca341d2c50e93fd188688d9a934ebda218f9f00553d
-  data.tar.gz: ac5355079cadd1fd76c073ac017df47146360f788e9237e68dbb21251c9302918131a2e48562f9e4a5109ec1cd2cb9e2e1f0131a81b2ecbaaa60e6e34e508a8e
+  metadata.gz: abb151e2e1449928429a778497df87c086a7c214737df71054788bf4bedbbcbcd7c95bb45e0c35b14bcaa459959c24d55d52a76124f4fbbd8070b5a1f9716d08
+  data.tar.gz: d7b327179cd297ccf3ca02d041b3133270d187d880212788e5e97fb379b92873c278c5bfee878962dbb455a7f3df8fb9efcb8043c86ee9b8975ab78261cdf238

data/README.md

@@ -1,8 +1,7 @@
 # Server Status
 
-[![Code Climate](https://codeclimate.com/github/jamesbrooks/server-status/badges/gpa.svg)](https://codeclimate.com/github/jamesbrooks/server-status)
 [![Gem Version](https://badge.fury.io/rb/server-status.svg)](http://badge.fury.io/rb/server-status)
-[![Dependency Status](https://gemnasium.com/jamesbrooks/server-status.svg)](https://gemnasium.com/JamesBrooks/server-status)
+[![Code Climate](https://codeclimate.com/github/jamesbrooks/server-status/badges/gpa.svg)](https://codeclimate.com/github/jamesbrooks/server-status)
 
 Command line tool for quickly fetching and displaying vital host metrics.
 

data/lib/server-status/application.rb

@@ -36,11 +36,11 @@ module ServerStatus
             os:              false,
             uptime:          true,
             load:            true,
-            disk_usage:      true,
-            inode_usage:     true,
-            memory_usage:    true,
+            disk:            true,
+            inode:           true,
+            memory:          true,
             clock_drift:     true,
-            package_updates: true,
+            pkg_updates:     true,
             reboot_required: false
           }.merge(@config.options))
 

data/lib/server-status/host.rb

@@ -38,7 +38,8 @@ module ServerStatus
 
   private
     def execute_command(status_command)
-      stdin, stdout, stderr, wait_thread = Open3.popen3("ssh #{@host} \"bash -s\" << EOF\n#{status_command.to_script}\nEOF")
+      proxy_jump = @config.settings["proxy_jump"]
+      stdin, stdout, stderr, wait_thread = Open3.popen3("ssh -o ConnectTimeout=10 #{"-J #{proxy_jump}" if proxy_jump} #{@host} \"bash -s\" << EOF\n#{status_command.to_script}\nEOF")
 
       if wait_thread.value.success?
         stdout.read

data/lib/server-status/report.rb

@@ -88,21 +88,21 @@ module ServerStatus
       val
     end
 
-    def format_disk_usage(val)
+    def format_disk(val)
       format_percentage(val)
     end
 
-    def format_inode_usage(val)
+    def format_inode(val)
       format_percentage(val)
     end
 
-    def format_memory_usage(val)
+    def format_memory(val)
       # Parse /proc/meminfo values
       meminfo_values = val.scan(/^(.+?):\s+(\d+)\skB/).map { |k,v| [ k, v.to_i ] }
       meminfo = Hash[meminfo_values]
 
       total_memory     = meminfo['MemTotal']
-      available_memory = meminfo['MemFree'] + meminfo['Buffers'] + meminfo['Cached']
+      available_memory = meminfo['MemAvailable'] || (meminfo['MemFree'] + meminfo['Buffers'] + meminfo['Cached'])
 
       format_percentage((total_memory - available_memory) / total_memory.to_f)
     end
@@ -113,7 +113,7 @@ module ServerStatus
       end
 
       # Drift in milliseconds
-      drift = (val.to_f * 1000).round
+      drift = (val.to_f * 1000).round.abs
 
       color = if drift.abs < 2000
         :normal
@@ -126,7 +126,7 @@ module ServerStatus
       "#{drift} ms".colorize(color)
     end
 
-    def format_package_updates(val)
+    def format_pkg_updates(val)
       str = ''
 
       if val =~ /(\d+) packages can be updated/

data/lib/server-status/status_command.rb

@@ -26,24 +26,24 @@ module ServerStatus
         parts << "cat /proc/loadavg | cut -d\" \" -f -3"
       end
 
-      if @options.disk_usage
+      if @options.disk
         parts << "df -h | awk '/\\/$/' | sed 's/ \\+/ /g' | cut -d\" \" -f5"
       end
 
-      if @options.inode_usage
+      if @options.inode
         parts << "df -hi | awk '/\\/$/' | sed 's/ \\+/ /g' | cut -d\" \" -f5"
       end
 
-      if @options.memory_usage
-        parts << "cat /proc/meminfo | grep -P '^(MemTotal|MemFree|Cached|Buffers):'"
+      if @options.memory
+        parts << "cat /proc/meminfo | grep -P '^(MemTotal|MemAvailable|MemFree|Cached|Buffers):'"
       end
 
       if @options.clock_drift
         parts << "ntpdate -q pool.ntp.org | head -1 | cut -d \" \" -f 6 | sed \"s/.$//\""
       end
 
-      if @options.package_updates
-        parts << "cat /var/lib/update-notifier/updates-available 2>/dev/null || true"
+      if @options.pkg_updates
+        parts << "cat /etc/motd || cat /var/run/motd.dynamic || true"
       end
 
       if @options.reboot_required

data/lib/server-status/version.rb

@@ -1,3 +1,3 @@
 module ServerStatus
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/server-status.gemspec

@@ -17,10 +17,10 @@ Gem::Specification.new do |spec|
   spec.executables   = ["server-status"]
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "commander", "~> 4.3"
-  spec.add_dependency "colorize", "~> 0.8"
-  spec.add_dependency "tty-progressbar", "~> 0.10.1"
+  spec.add_dependency "commander", "~> 4.6.0"
+  spec.add_dependency "colorize", "~> 0.8.1"
+  spec.add_dependency "tty-progressbar", "~> 0.18.2"
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", ">= 10.0"
+  spec.add_development_dependency "bundler", "~> 2.2.27"
+  spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: server-status
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - James Brooks
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2021-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -16,70 +16,76 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: 4.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: 4.6.0
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: tty-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.18.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.18.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 2.2.27
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 2.2.27
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.6
 description: Command line tool for quickly fetching and displaying vital host metrics
 email:
 - james@jamesbrooks.net
@@ -113,7 +119,7 @@ files:
 homepage: https://github.com/jamesbrooks/server-status
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -128,9 +134,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Command line tool for quickly fetching and displaying vital host metrics
 test_files: []