what 0.2.5 → 0.2.6

data/bin/whatch

@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'optparse'
+require 'what/version'
+require 'what/ch'
+
+options = Struct.new(:interval, :all).new
+
+opts = OptionParser.new do |opts|
+  opts.banner = "Usage: what [options] module_name1 [ module_name2 ... ]"
+  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('-c', '--config FILE', 'Specify the location of the YAML config file.') do |fn|
+    What::Config.load(fn)
+  end
+
+  opts.on('-n', '--interval SECS', 'Run module check every SECS seconds.') do |secs|
+    options.interval = secs
+  end
+
+  opts.on_tail('-a', '--all', 'Load all modules specified in config option (which must be present too).') do
+    options.all = true
+  end
+
+end
+opts.parse!(ARGV)
+
+What::Ch.run(ARGV, options)

data/lib/what/ch.rb

@@ -0,0 +1,65 @@
+## Impletments the whatsch CLI for running modules from the command line
+
+require 'what/config'
+require 'what/modules'
+require 'what/monitor'
+
+module What
+  class Ch
+
+    def self.run(module_names, opts)
+      new(module_names, opts).run
+    end
+
+    def initialize(module_names, opts)
+      if opts.all && !Config.loaded?
+        self.error "Use all: No config given to read for module names"
+      end
+
+      if 0 == module_names.size && !opts.all
+        self.error "No module names given"
+      end
+
+      @modules = if What::Config.loaded?
+                   if opts.all
+                     What::Config['modules']
+                   else
+                     What::Config['modules'].select{|m| module_names.include?(m['name'])}
+                   end          
+                 else
+                   What::Config.set_defaults
+                   module_names.uniq.map{|mn| {'type' => mn, 'name' => mn} }
+                 end
+      
+      if 0 == @modules.size
+        self.error "No modules to use"
+      end      
+
+      @interval = (opts.interval || 10).to_i
+    end
+
+    def run
+      @modules.each do |m|
+        unless Modules.load_module(m['type'])
+          self.error("Unknown module #{m['type']}")
+        end
+      end
+      @monitor = Monitor.new(@modules)
+      @monitor.go!
+      @monitor.do_it(@interval) do |health, statuses|
+        self.report health, statuses
+      end
+    end
+
+    def report(health, statuses)
+      $stdout.puts health
+      $stdout.puts statuses.inspect
+    end
+
+    def error(message)
+      $stderr.puts message
+      exit(1)
+    end
+
+  end
+end

data/lib/what/config.rb

@@ -1,3 +1,6 @@
+
+require 'yaml'
+
 module What
   class Config
     DEFAULTS = {
@@ -11,12 +14,17 @@ module What
     @config = {}
 
     def self.load(fn)
+      set_defaults
       load_primary(fn)
       load_secondary(@config['configs'])
     end
 
+    def self.set_defaults
+      @config = DEFAULTS
+    end
+
     def self.load_primary(fn)
-      @config = DEFAULTS.merge(YAML.load_file(fn))
+      @config.merge!(YAML.load_file(fn))
       @config['base'] ||= File.expand_path(File.dirname(fn))
       @loaded = true
     end

data/lib/what/modules/memory.rb

@@ -0,0 +1,53 @@
+module What
+  class Modules::Memory < Modules::Base
+    DEFAULTS = {
+      'warning' => '80%',
+      'alert'   => '90%'
+    }
+
+    def check!
+      fields = self.memory_details
+      @info = if fields.size == 2
+                {
+                  'size'     => fields[0],
+                  'used'     => fields[0] - fields[1],
+                  'avail'    => fields[1],
+                  'use%'     => ((1.0 - (fields[1].to_f / fields[0])) * 100).round,
+                  'warning%' => @config['warning'].to_i,
+                  'alert%'   => @config['alert'].to_i
+                }
+              end
+    end
+
+    def health
+      if @info.nil?
+        'alert'
+      elsif @info['use%'] >= @info['alert%']
+        'alert'
+      elsif @info['use%'] >= @info['warning%']
+        'warning'
+      else
+        'ok'
+      end
+    end
+
+    def details
+      @info
+    end
+
+    protected
+
+    # [total, free]
+    def memory_details
+      if RUBY_PLATFORM.match 'darwin'
+        line = `top -l 1 | grep PhysMem:`
+        used = line.match(/(\d+)\D+?used/)[1].to_i
+        free = line.match(/(\d+)\D+?free/)[1].to_i
+        [used + free, free]
+      else
+        `cat /proc/meminfo`.split("\n")[0..1].map{|line| line.match(/(\d+)/)[1].to_i}
+      end
+    end
+
+  end
+end

data/lib/what/modules.rb

@@ -1,28 +1,58 @@
+require 'what/config'
+
 module What
   module Modules
+
+    def self.default_modules_full_path
+      File.join(File.dirname(__FILE__), 'modules')
+    end
+
+    def self.config_module_full_paths
+      (Config['module_paths'] || []).map do |p|
+        if p.match(%r(^/))
+          p
+        else
+          File.join(Config['base'], p)
+        end
+      end
+    end
+
     # load all modules defined in what/modules, in addition to any paths
     # specified in the config file.
     def self.load_all
       require 'what/modules/base'
 
-      default_modules_path = File.join(File.dirname(__FILE__), 'modules')
-      require_dir(default_modules_path)
+      require_dir(self.default_modules_full_path)
 
-      Config['module_paths'].each do |module_path|
-        path = if module_path.match(%r(^/))
-                 module_path
-               else
-                 File.join(Config['base'], module_path)
-               end
+      self.config_module_full_paths.each do |path|
         require_dir(path)
       end
     end
 
-    private
-      def self.require_dir(path)
-        Dir[File.join(path, '*.rb')].each do |fn|
-          require fn
+    def self.load_module(module_name)
+      require 'what/modules/base'
+
+      loaded = false
+
+      short_module_name = module_name.sub(/\.rb$/, '')
+
+      ([self.default_modules_full_path] + self.config_module_full_paths).each do |path|
+        candidate = File.join(path, short_module_name)
+        if File.exists?("#{candidate}.rb")
+          loaded = require candidate
         end
       end
+
+      loaded
+    end
+
+    private
+
+    def self.require_dir(path)
+      Dir[File.join(path, '*.rb')].each do |fn|
+        require fn
+      end
+    end
+
   end
 end

data/lib/what/monitor.rb

@@ -1,12 +1,20 @@
+
+require 'what/modules'
+require 'what/helpers'
+
 module What
   class Monitor
+
     # don't worry, these method names are ironic
-    def self.go!
-      @modules = Config['modules'].map do |mod|
+
+    def initialize(modules)
+      @modules = modules.map do |mod|
         name = Helpers.camelize(mod.delete('type'))
         Modules.const_get(name).new(mod)
       end
+    end
 
+    def go!
       Thread.abort_on_exception = true
       @threads = @modules.collect do |mod|
         Thread.new do
@@ -17,12 +25,9 @@ module What
           end
         end
       end
-
-      Thread.new { self.do_it }
     end
 
-    def self.do_it
-      Status['details'] = []
+    def do_it(interval)
       loop do
         statuses = []
         healths = []
@@ -32,10 +37,21 @@ module What
             statuses << th[:status]
           end
         end
-        Status['health'] = Helpers.overall_health(healths)
-        Status['details'] = statuses
-        sleep Config['interval']
+        yield Helpers.overall_health(healths), statuses
+        sleep interval
       end
     end
+
+    def self.go!
+      monitor = new Config['modules']
+      monitor.go!
+      Thread.new do 
+        monitor.do_it(Config['interval']) do |health, statuses|
+          Status['health'] = health
+          Status['details'] = statuses          
+        end
+      end
+    end
+
   end
 end

data/lib/what/version.rb

@@ -1,3 +1,3 @@
 module What
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: what
 version: !ruby/object:Gem::Version
-  version: 0.2.5
   prerelease: 
+  version: 0.2.6
 platform: ruby
 authors:
 - Ryan Fitzgerald
@@ -11,56 +11,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-18 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.2
+    none: false
+  name: rack
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.2
-- !ruby/object:Gem::Dependency
-  name: excon
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.13.4
+    none: false
+  name: excon
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.13.4
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: json
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 description: ! 'What uses WEBrick to serve a JSON object representing the state of
   services
 
@@ -77,6 +77,7 @@ email:
 - colin.t.curtin@gmail.com
 executables:
 - what
+- whatch
 - whatsup
 extensions: []
 extra_rdoc_files: []
@@ -87,10 +88,12 @@ files:
 - README.md
 - Rakefile
 - bin/what
+- bin/whatch
 - bin/whatsup
 - example/modules/custom_module.rb
 - example/what.yml
 - lib/what.rb
+- lib/what/ch.rb
 - lib/what/config.rb
 - lib/what/formatter.rb
 - lib/what/formatters.rb
@@ -102,6 +105,7 @@ files:
 - lib/what/modules/base.rb
 - lib/what/modules/disk.rb
 - lib/what/modules/existence.rb
+- lib/what/modules/memory.rb
 - lib/what/modules/process.rb
 - lib/what/modules/unicorn.rb
 - lib/what/modules/what.rb
@@ -118,21 +122,22 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: what
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Simple server monitoring tool
 test_files: []
+has_rdoc: