server-status 1.0 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af20ee25a465ed5e45e9a0018dcacb9afc3f94e4
-  data.tar.gz: 3110214e2c5ce45799d213a9e97505b5ce82dd6a
+  metadata.gz: c631120c269c1d0110d0874751628df18aba72ae
+  data.tar.gz: e4aa38bb8bfd2b05c69428ec316263f52255427b
 SHA512:
-  metadata.gz: c7c22c4d49b1c6fee75812769db130051a98406729dcc39e96c508e535e06c35bc93a4a64dd2821be07790a47e32ce722f41ea964d8fcbce4d99d30b411547c9
-  data.tar.gz: be97a5537f8c72f8d570fbdab9c8d945baa5aef74f96a85616ba48a58448bdc6899452f8e105579d4f0683e71f3273d1adaa4257f6bc55c7cbedc910a85e8421
+  metadata.gz: fe9874cf9a45db31b80cc4a58ebd477e9a6c8401d677b74922fc74af003207f5eba7c835e497935ca36ea1df016887fc58e3062bf186f1086954a382ba3df0c4
+  data.tar.gz: 211d71252fe2d10305fcb4d498810500ac773cea7b88780004b422947a663e4c0c69d40b3c5f298eac1d474b9a8e5d12a74aec9973c283f27b47d120d4c4faee

data/README.md

@@ -1,11 +1,13 @@
 # Server Status
 
-[![Code Climate](https://codeclimate.com/github/jamesbrooks/server-status.png)](https://codeclimate.com/github/JamesBrooks/git-runner)
-[![Gem Version](https://badge.fury.io/rb/server-status.png)](http://badge.fury.io/rb/git-runner)
-[![Dependency Status](https://gemnasium.com/jamesbrooks/server-status.png)](https://gemnasium.com/JamesBrooks/git-runner)
+[![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)
 
 Command line tool for quickly fetching and displaying vital host metrics.
 
+![Screnshot](https://raw.github.com/jamesbrooks/server-status/master/screenshot.jpg)
+
 ## Installation
 
 `gem install server-status`

data/lib/server-status.rb

@@ -1,6 +1,7 @@
 require 'open3'
 require 'commander'
 require 'colorize'
+require 'tty-progressbar'
 
 require 'server-status/version'
 require 'server-status/application'

data/lib/server-status/application.rb

@@ -27,6 +27,7 @@ module ServerStatus
         c.option '--[no-]disk-usage'
         c.option '--[no-]inode-usage'
         c.option '--[no-]memory-usage'
+        c.option '--[no-]clock-drift'
         c.option '--[no-]package-updates'
         c.option '--[no-]reboot-required'
 
@@ -38,6 +39,7 @@ module ServerStatus
             disk_usage:      true,
             inode_usage:     true,
             memory_usage:    true,
+            clock_drift:     true,
             package_updates: true,
             reboot_required: true
           }.merge(@config.options))

data/lib/server-status/host_set.rb

@@ -1,3 +1,5 @@
+require 'thread'
+
 module ServerStatus
   class HostSet
     attr_accessor :config, :options, :hosts
@@ -10,9 +12,14 @@ module ServerStatus
     end
 
     def fetch_statuses
+      progress_bar = TTY::ProgressBar.new("Querying hosts [:bar]", total: @hosts.size, clear: true, hide_cursor: true)
+      semaphore = Mutex.new
+      completed_hosts = 0
+
       threads = @hosts.map do |host|
         Thread.new do
           host.fetch_status(status_command)
+          semaphore.synchronize { progress_bar.advance }
         end
       end
 

data/lib/server-status/report.rb

@@ -12,15 +12,14 @@ module ServerStatus
     def generate_table
       str = "\n"
 
-      # Report any failures
-      if (failed_hosts = @host_set.hosts.reject(&:feteched_status?)).any?
-        failed_hosts.each do |host|
-          str << "Failure #{host.name} - #{host.status[:error]}\n".colorize(:red)
+      # Gather failures
+      failed_columns = if (failed_hosts = @host_set.hosts.reject(&:feteched_status?)).any?
+        failed_hosts.map do |host|
+          { name: host.name, error: host.status[:error].strip }
         end
-
-        str << "\n"
       end
 
+
       columns = [ :host ] + @host_set.hosts.detect(&:feteched_status?).status.keys
 
       # Process status values
@@ -58,6 +57,18 @@ module ServerStatus
         str << "\n"
       end
 
+      # Display failures at the end
+      if failed_columns
+        str << "\nFAILED HOSTS".colorize(:blue)
+        str << "\n"
+        failed_columns.each do |host|
+          str << host[:name]
+          str << ' ' * (COLUMN_SPACING + column_widths[:host] - host[:name].uncolorize.size)
+          str << host[:error].colorize(:red)
+          str << "\n"
+        end
+      end
+
       str << "\n"
       str
     end
@@ -90,6 +101,25 @@ module ServerStatus
       format_percentage(used / (used + available))
     end
 
+    def format_clock_drift(val)
+      if val == ""
+        return "??? ms".colorize(:red)
+      end
+
+      # Drift in milliseconds
+      drift = (val.to_f * 1000).round
+
+      color = if drift.abs < 2000
+        :normal
+      elsif drift.abs < 30_000
+        :yellow
+      else
+        :red
+      end
+
+      "#{drift} ms".colorize(color)
+    end
+
     def format_package_updates(val)
       str = ''
 

data/lib/server-status/status_command.rb

@@ -5,7 +5,6 @@ module ServerStatus
 
     def initialize(options)
       @options = options
-      @parts   = []
     end
 
     def requested_options
@@ -13,39 +12,45 @@ module ServerStatus
     end
 
     def to_script
+      parts = []
+
       if @options.os
-        @parts << "lsb_release -d | cut -f2"
+        parts << "lsb_release -d | cut -f2"
       end
 
       if @options.uptime
-        @parts << "cat /proc/uptime | cut -d\" \" -f1"
+        parts << "cat /proc/uptime | cut -d\" \" -f1"
       end
 
       if @options.load
-        @parts << "cat /proc/loadavg | cut -d\" \" -f -3"
+        parts << "cat /proc/loadavg | cut -d\" \" -f -3"
       end
 
       if @options.disk_usage
-        @parts << "df -h | awk '/\\/$/' | sed 's/ \\+/ /g' | cut -d\" \" -f5"
+        parts << "df -h | awk '/\\/$/' | sed 's/ \\+/ /g' | cut -d\" \" -f5"
       end
 
       if @options.inode_usage
-        @parts << "df -hi | awk '/\\/$/' | sed 's/ \\+/ /g' | cut -d\" \" -f5"
+        parts << "df -hi | awk '/\\/$/' | sed 's/ \\+/ /g' | cut -d\" \" -f5"
       end
 
       if @options.memory_usage
-        @parts << "free -m | sed -n 3p | sed 's/ \\+/ /g' | cut -d\" \" -f 3-"
+        parts << "free -m | sed -n 3p | sed 's/ \\+/ /g' | cut -d\" \" -f 3-"
+      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"
+        parts << "cat /var/lib/update-notifier/updates-available 2>/dev/null"
       end
 
       if @options.reboot_required
-        @parts << "if [ -f /var/run/reboot-required ]; then echo 1 ; fi"
+        parts << "if [ -f /var/run/reboot-required ]; then echo 1 ; fi"
       end
 
-      @parts.join("\necho '#{SEPARATOR}'\n")
+      parts.join("\necho '#{SEPARATOR}'\n")
     end
   end
 end

data/lib/server-status/version.rb

@@ -1,3 +1,3 @@
 module ServerStatus
-  VERSION = '1.0'
+  VERSION = '1.1'
 end

data/server-status.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "commander", "~> 4.3"
   spec.add_dependency "colorize", "~> 0.7.7"
+  spec.add_dependency "tty-progressbar", "~> 0.10.1"
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: server-status
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
 platform: ruby
 authors:
 - James Brooks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.7
+- !ruby/object:Gem::Dependency
+  name: tty-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,7 @@ files:
 - lib/server-status/report.rb
 - lib/server-status/status_command.rb
 - lib/server-status/version.rb
+- screenshot.jpg
 - server-status.gemspec
 homepage: https://github.com/jamesbrooks/server-status
 licenses: []
@@ -114,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Command line tool for quickly fetching and displaying vital host metrics