server-status 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fce21e7bf732e7a2f4202ae90c9eb89c505453986edaf621edcc49f8e734853
-  data.tar.gz: '0985c9a3b5dcddc2b748a9963d98902518d646b0f7178bb1ae57e78b613c819a'
+  metadata.gz: f0f4fcdcb889933f01e168ae9dab52a9ed03169798bbdf663592509193e7e157
+  data.tar.gz: ceb8fd67f311e4e3450d7267379efef16106b7f28a41709fb85977ebbbf93c2c
 SHA512:
-  metadata.gz: 8d744e0a823119f4050b7a350f806714c132629b661bae8504bfe446ed357d6d263102e9fa8b4903ccf88ca341d2c50e93fd188688d9a934ebda218f9f00553d
-  data.tar.gz: ac5355079cadd1fd76c073ac017df47146360f788e9237e68dbb21251c9302918131a2e48562f9e4a5109ec1cd2cb9e2e1f0131a81b2ecbaaa60e6e34e508a8e
+  metadata.gz: e17f11c9c8fe6d2a1719c474c102ee6ba71166aa13b0630e63e52b8fb006ed55f3a058458d067eb05a86bdb9051d80573853bc1d4f7a6703a430e62315f3ae98
+  data.tar.gz: 331bc9f178f3c4b565b80656e4b11fb484719b00ec9b097268942ae5de74e1591ce6696dc9cc64c889cedc09640408a4351a5801f78831a32dcc625d61f36be1

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/report.rb

@@ -88,15 +88,15 @@ 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]
@@ -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,15 +26,15 @@ 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
+      if @options.memory
         parts << "cat /proc/meminfo | grep -P '^(MemTotal|MemFree|Cached|Buffers):'"
       end
 
@@ -42,7 +42,7 @@ module ServerStatus
         parts << "ntpdate -q pool.ntp.org | head -1 | cut -d \" \" -f 6 | sed \"s/.$//\""
       end
 
-      if @options.package_updates
+      if @options.pkg_updates
         parts << "cat /var/lib/update-notifier/updates-available 2>/dev/null || true"
       end
 

data/lib/server-status/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: server-status
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - James Brooks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander