what 0.2.2 → 0.2.4

data/bin/whatsup

@@ -0,0 +1,49 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'optparse'
+require 'what/version'
+require 'what/sup'
+
+options = Struct.new(:oks, :warnings, :alerts, :servers, :hide).new
+options.alerts = true
+options.servers = []
+
+opts = OptionParser.new do |opts|
+  opts.banner = "Usage: what [options]"
+  opts.separator ""
+
+  opts.on_tail('-v', '--version', 'Show the version number.') do
+    puts What::VERSION
+    exit
+  end
+
+  opts.on_tail('-h', '--help', 'Show this message.') do
+    puts opts
+    exit
+  end
+
+  opts.on('-o', '--ok', 'Show details for ok, warning and alert levels.') do
+    options.oks = true
+  end
+
+  opts.on('-w', '--warning', 'Show details for warning and alert levels.') do
+    options.warnings = true
+  end
+
+  opts.on('-a', '--alert', 'Show details for alert levels (default).') do
+    options.alerts = true
+  end
+
+  opts.on('-s', '--server host:port', 'Show details from What server at host:port (default 127.0.0.1:9428). Multiple servers are supported.') do |s|
+    options.servers << s
+  end
+
+  opts.on('-d', '--hide', 'When showing multiple servers, hide servers who have nothing to show at the level set by -o, -w, or -a') do
+    options.hide = true
+  end
+
+end
+opts.parse!(ARGV)
+
+What::Sup.run(options)

data/lib/what/helpers.rb

@@ -2,17 +2,13 @@ module What
   module Helpers
     # Take an array of healths and determine overall health, on
     # the principle that overall health == the worst sub-health.
+    HEALTH = %w(ok warning alert)
     def self.overall_health(healths)
-      healths.reduce('ok') do |overall, current|
-        case current
-        when 'ok'
-          overall
-        when 'warning'
-          'warning' if overall != 'alert'
-        else
-          'alert'
-        end
-      end
+      worst_health = healths.map do |health|
+        HEALTH.index(health) || HEALTH.index('alert')
+      end.max
+
+      HEALTH[worst_health]
     end
 
     # Stolen from Rails (http://api.rubyonrails.org/classes/ActiveSupport/Inflector.html)

data/lib/what/sup.rb

@@ -0,0 +1,91 @@
+require 'net/http'
+require 'json'
+
+## Impletments the whatsup CLI for querying what servers
+
+module What
+  class Sup
+
+    LEVELS = ['unknown', 'ok', 'warning', 'alert']
+
+    def self.run(opts)
+      new(opts).run
+    end
+
+    def initialize(opts)
+      @opts = opts
+      @statuses = []
+      @servers = if opts.servers.size > 0
+                   opts.servers
+                 else
+                   ['127.0.0.1']
+                 end
+    end
+
+    ##@@ TODO: Make this multi-threaded
+    def fetch_statuses
+      @servers.each do |s|
+        @statuses << self.fetch_status(*s.split(':'))
+      end
+    end
+
+    def fetch_status(host, port='9428')      
+      status = { 'host' => host, 'health' => 'unknown', 'oks' => [], 'warnings' => [], 'alerts' => [] }
+      begin
+        response = JSON.parse(Net::HTTP.get(host, '/', port))
+        #status['details'] = response['details']
+        response['details'].each do |d|
+          if LEVELS.index(d['health']) > LEVELS.index(status['health'])
+            status['health'] = d['health']
+          end
+          status["#{d['health']}s"] << [d['type'], d['details']]
+        end
+      rescue
+      end
+      status
+    end
+
+    def print_status(status)
+      sections_to_show = self.sections_to_show
+      if !@opts.hide || sections_to_show.any?{|s| status[s[1]].size > 0} || (status['health'] == 'unknown')
+        puts "#{status['host']} | #{status['health'].upcase}"
+        puts
+        sections_to_show.each do |s|
+          print_status_section(s[1], status[s[1]])
+        end
+      end
+    end
+
+    def print_status_section(section, details)
+      puts "  #{section}:"
+      details.each do |d|
+        puts "    #{d[0]}"
+        puts "      #{d[1].inspect}"
+      end
+      puts
+    end
+
+    def sections_to_show
+      sections = []
+      if @opts.alerts
+        sections << ['Alerts', 'alerts']
+      end
+      if @opts.warnings || @opts.oks
+        sections << ['Warnings', 'warnings']
+      end
+      if @opts.oks
+        sections << ['OKs', 'oks']
+      end
+      sections
+    end
+
+
+    def run
+      self.fetch_statuses
+      @statuses.each do |status|
+        self.print_status(status)
+      end
+    end
+
+  end
+end

data/lib/what/version.rb

@@ -1,3 +1,3 @@
 module What
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

data/what.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name        = "what"
   s.version     = What::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Ryan Fitzgerald", "Ryan Lower"]
-  s.email       = ["rwfitzge@gmail.com", "rpjlower@gmail.com"]
+  s.authors     = ["Ryan Fitzgerald", "Ryan Lower", "Colin Curtin"]
+  s.email       = ["rwfitzge@gmail.com", "rpjlower@gmail.com", "colin.t.curtin@gmail.com"]
   s.homepage    = "http://academia.edu/"
   s.summary     = %q{Simple server monitoring tool}
   s.description = <<-EOS

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: what
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
 - Ryan Fitzgerald
 - Ryan Lower
+- Colin Curtin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
+date: 2012-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -73,8 +74,10 @@ description: ! 'What uses WEBrick to serve a JSON object representing the state
 email:
 - rwfitzge@gmail.com
 - rpjlower@gmail.com
+- colin.t.curtin@gmail.com
 executables:
 - what
+- whatsup
 extensions: []
 extra_rdoc_files: []
 files:
@@ -84,6 +87,7 @@ files:
 - README.md
 - Rakefile
 - bin/what
+- bin/whatsup
 - example/modules/custom_module.rb
 - example/what.yml
 - lib/what.rb
@@ -104,6 +108,7 @@ files:
 - lib/what/monitor.rb
 - lib/what/server.rb
 - lib/what/status.rb
+- lib/what/sup.rb
 - lib/what/version.rb
 - what.gemspec
 homepage: http://academia.edu/
@@ -131,4 +136,3 @@ signing_key:
 specification_version: 3
 summary: Simple server monitoring tool
 test_files: []
-has_rdoc: