informer 0.1.1 → 0.2.0

data/Informer.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{informer}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Burton"]
-  s.date = %q{2009-10-29}
+  s.date = %q{2009-10-31}
   s.default_executable = %q{informer}
   s.description = %q{Informer is a flexible information gathering and reporting system.}
   s.email = %q{scottburton11@gmail.com}
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
      "features/watcher.feature",
      "lib/informer.rb",
      "lib/informer/basic_watcher.rb",
-     "lib/informer/reporter/led.rb",
+     "lib/informer/reporter/lcd.rb",
      "lib/informer/reporter/standard_output.rb",
      "lib/informer/watcher/hostname.rb",
      "lib/informer/watcher/process.rb",

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/bin/informer

@@ -1,8 +1,157 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby 
+#
+
+# == Synopsis 
+#   Running Informer will watch something, formulate messages about it,  and report back somehow. 
+#   It is useful for extremely simplified reporting on the status of a host system.
+#
+# == Examples
+#
+#   informer -p process-name -p process-name2 -n en1
+#
+# == Usage 
+#   informer [options]
+#
+#   For help use: informer -h
+#
+# == Options
+#   -p, --process proc  Return the status of the process named 'proc'
+#   -n, --hostname if   Return the hostname and IP address of interface 'if'. Default is 'eth0'
+#   -l, --lcd           Use the LCD display at ttyS1; Default is Rackable Systems Roamer device
+#   -h, --help          Displays help message
+#   -v, --version       Display the version, then exit
+#   -q, --quiet         Output as little as possible, overrides verbose
+#   -V, --verbose       Verbose output
+#
+# == Author
+#   Scott Burton
+#
+# == Copyright
+#   Copyright (c) 2009 Scott Burton. See LICENSE
+# 
+# Ruby command-line skeleton courtesy of http://blog.infinitered.com/entries/show/5
+
+require 'optparse' 
+require 'rdoc/usage'
+require 'ostruct'
+require 'date'
+
 require 'lib/informer'
 
-Informer.watch do
-  process "ruby", :handle => "Ruby"
-  process "irb"
-  hostname "en1"
-end
+class App
+  VERSION = '0.2.0'
+  
+  attr_reader :options
+
+  def initialize(arguments, stdin)
+    @arguments = arguments
+    @stdin = stdin
+    
+    # Set defaults
+    @options = OpenStruct.new
+    @options.verbose = false
+    @options.quiet = false
+    @options.reporter = "standard_output"
+    
+    @options.processes = []
+  end
+
+  # Parse options, check arguments, then process the command
+  def run
+        
+    if parsed_options?
+      
+      puts "Start at #{DateTime.now}\n\n" if @options.verbose
+      
+      output_options if @options.verbose
+            
+      process_arguments            
+      process_command
+      
+      puts "\nFinished at #{DateTime.now}" if @options.verbose
+      
+    else
+      output_usage
+    end
+      
+  end
+  
+  protected
+  
+    def parsed_options?
+      
+      # Specify options
+      opts = OptionParser.new 
+      opts.on('-v', '--version')    { output_version ; exit 0 }
+      opts.on('-h', '--help')       { output_help }
+      opts.on('-V', '--verbose')    { @options.verbose = true }  
+      opts.on('-q', '--quiet')      { @options.quiet = true }
+      opts.on('-l', '--lcd')        { @options.reporter = "lcd"}
+      opts.on('-p label', '--processes label')  { |p| @options.processes << p }
+      opts.on('-n iface', '--hostname interface')   { |i| @options.hostname = true; @options.interface = i }
+            
+      opts.parse!(@arguments) rescue return false
+      
+      process_options
+      true      
+    end
+
+    # Performs post-parse processing on options
+    def process_options
+      @options.verbose = false if @options.quiet
+    end
+    
+    def output_options
+      puts "Options:\n"
+      
+      @options.marshal_dump.each do |name, val|        
+        puts "  #{name} = #{val}"
+      end
+    end
+
+    # True if required arguments were provided
+    def arguments_valid?
+      
+    end
+    
+    # Setup the arguments
+    def process_arguments
+      # @interface = ARGV[0]
+    end
+    
+    def output_help
+      output_version
+      RDoc::usage() #exits app
+    end
+    
+    def output_usage
+      RDoc::usage('usage') # gets usage from comments above
+    end
+    
+    def output_version
+      puts "#{File.basename(__FILE__)} version #{VERSION}"
+    end
+    
+    def process_command
+      
+      informer = Informer.new(@options.reporter)
+      
+      @options.processes.each do |process|
+        informer.watchers << Watcher::Process.new(process)
+      end
+      
+      informer.watchers << Watcher::Hostname.new(@options.interface) if @options.hostname
+      
+      informer.report
+      
+    end
+
+    def process_standard_input
+      input = @stdin.read      
+    end
+end
+
+
+# Create and run the application
+app = App.new(ARGV, STDIN)
+app.run

data/lib/informer.rb

@@ -5,7 +5,7 @@ require 'informer/basic_watcher'
 require 'informer/watcher/hostname'
 require 'informer/watcher/process'
 
-require 'informer/reporter/led'
+require 'informer/reporter/lcd'
 require 'informer/reporter/standard_output'
 
 class Informer

data/lib/informer/watcher/hostname.rb

@@ -3,12 +3,13 @@ module Watcher
 
     attr_reader :ip, :hostname
 
-    def initialize(interface = "eth0")
+    def initialize(interface = "eth0", &block)
+      @custom_message = block if block_given?
       @interface = interface
     end
 
     def report
-      gather
+      return @custom_message.call(self) if @custom_message
       message
     end
 
@@ -16,11 +17,12 @@ module Watcher
       @message ||= "#{hostname}\n#{ip}"
     end
 
-    protected
-
-    def gather
-      @ip = get_ip_address
-      @hostname = get_hostname
+    def ip
+      @ip ||= get_ip_address
+    end
+    
+    def hostname
+      @hostname ||= get_hostname
     end
 
     private

data/lib/informer/watcher/process.rb

@@ -1,26 +1,32 @@
 module Watcher
   class Process < BasicWatcher
-    def initialize(process, options = {})
-      @process = process
-      @handle = options[:handle] || @process
+    
+    attr_reader :handle, :process, :command
+    
+    def initialize(command, options = {}, &block)
+      @custom_message = block if block_given?
+      @command = command
+      @handle = options[:handle] || command
     end
 
     def report
+      return @custom_message.call(self) if @custom_message
       "#{@handle} is #{running? ? '' : 'not '}running"
     end
 
+    def running?
+      process_matcher === processes
+    end
+
     private
 
     def processes
-      `ps aux`.chomp
+      # `ps aux`.chomp
+      `ps -o %cpu -o %mem -o comm -o pid -o user -axc`.chomp
     end
 
-    def process_match
-      %r|#{@process}|
-    end
-
-    def running?
-      process_match === processes
+    def process_matcher
+      %r|^\s+(\d+\.\d+)\s+(\d+\.\d+)\s+#{command}\s+(\d+)\s+(\w+)\s+$|
     end
 
   end

data/spec/helpers/process_helpers.rb

@@ -2,105 +2,130 @@ module ProcessHelpers
   
   def ps_aux
 <<RUBY_HERE
-USER       PID %CPU %MEM    VSZ   RSS TTY      STAT START   TIME COMMAND
-root         1  0.0  0.2   5236   576 ?        Ss   Oct27   0:01 /sbin/init
-root         2  0.0  0.0      0     0 ?        S<   Oct27   0:00 [kthreadd]
-root         3  0.0  0.0      0     0 ?        S<   Oct27   0:00 [migration/0]
-root         4  0.0  0.0      0     0 ?        S<   Oct27   0:00 [ksoftirqd/0]
-root         5  0.0  0.0      0     0 ?        S<   Oct27   0:00 [watchdog/0]
-root         6  0.0  0.0      0     0 ?        S<   Oct27   0:00 [events/0]
-root         7  0.0  0.0      0     0 ?        S<   Oct27   0:00 [khelper]
-root         8  0.0  0.0      0     0 ?        S<   Oct27   0:00 [kstop/0]
-root         9  0.0  0.0      0     0 ?        S<   Oct27   0:00 [kintegrityd/0]
-root        10  0.0  0.0      0     0 ?        S<   Oct27   0:00 [kblockd/0]
-root        11  0.0  0.0      0     0 ?        S<   Oct27   0:00 [kacpid]
-root        12  0.0  0.0      0     0 ?        S<   Oct27   0:00 [kacpi_notify]
-root        13  0.0  0.0      0     0 ?        S<   Oct27   0:00 [cqueue]
-root        14  0.0  0.0      0     0 ?        S<   Oct27   0:17 [ata/0]
-root        15  0.0  0.0      0     0 ?        S<   Oct27   0:00 [ata_aux]
-root        16  0.0  0.0      0     0 ?        S<   Oct27   0:00 [ksuspend_usbd]
-root        17  0.0  0.0      0     0 ?        S<   Oct27   0:00 [khubd]
-root        18  0.0  0.0      0     0 ?        S<   Oct27   0:00 [kseriod]
-root        19  0.0  0.0      0     0 ?        S<   Oct27   0:00 [kmmcd]
-root        20  0.0  0.0      0     0 ?        S<   Oct27   0:00 [btaddconn]
-root        21  0.0  0.0      0     0 ?        S<   Oct27   0:00 [btdelconn]
-root        22  0.0  0.0      0     0 ?        S    Oct27   0:00 [pdflush]
-root        23  0.0  0.0      0     0 ?        S    Oct27   0:00 [pdflush]
-root        24  0.0  0.0      0     0 ?        S<   Oct27   0:00 [kswapd0]
-root        25  0.0  0.0      0     0 ?        S<   Oct27   0:00 [aio/0]
-root        26  0.0  0.0      0     0 ?        S<   Oct27   0:00 [ecryptfs-kthrea]
-root        29  0.0  0.0      0     0 ?        S<   Oct27   0:00 [pciehpd]
-root        30  0.0  0.0      0     0 ?        S<   Oct27   0:00 [scsi_eh_0]
-root        31  0.0  0.0      0     0 ?        S<   Oct27   0:00 [scsi_eh_1]
-root        32  0.0  0.0      0     0 ?        S<   Oct27   0:00 [kstriped]
-root        33  0.0  0.0      0     0 ?        S<   Oct27   0:00 [kmpathd/0]
-root        34  0.0  0.0      0     0 ?        S<   Oct27   0:00 [kmpath_handlerd]
-root        35  0.0  0.0      0     0 ?        S<   Oct27   0:00 [ksnapd]
-root        36  0.0  0.0      0     0 ?        S<   Oct27   0:00 [kondemand/0]
-root        37  0.0  0.0      0     0 ?        S<   Oct27   0:00 [krfcommd]
-root       220  0.0  0.0      0     0 ?        S<   Oct27   0:00 [mpt_poll_0]
-root       334  0.0  0.0      0     0 ?        S<   Oct27   0:00 [scsi_eh_2]
-root       753  0.0  0.0      0     0 ?        S<   Oct27   0:00 [kjournald]
-root       873  0.0  0.1  16660   368 ?        S<s  Oct27   0:00 /sbin/udevd --daemon
-root      1056  0.0  0.0      0     0 ?        S<   Oct27   0:00 [kgameportd]
-root      1189  0.0  0.0      0     0 ?        S<   Oct27   0:00 [kpsmoused]
-root      2344  0.0  0.1   3944   488 tty4     Ss+  Oct27   0:00 /sbin/getty 38400 tty4
-root      2345  0.0  0.1   3944   488 tty5     Ss+  Oct27   0:00 /sbin/getty 38400 tty5
-root      2346  0.0  0.2   4024   608 ?        Ss   Oct27   0:00 /bin/sh /etc/init.d/rc 2
-root      2351  0.0  0.1   3944   488 tty2     Ss+  Oct27   0:00 /sbin/getty 38400 tty2
-root      2355  0.0  0.1   3944   488 tty3     Ss+  Oct27   0:00 /sbin/getty 38400 tty3
-root      2356  0.0  0.1   3944   488 tty6     Ss+  Oct27   0:00 /sbin/getty 38400 tty6
-root      2418  0.0  0.2   3944   576 ?        Ss   Oct27   0:00 /usr/sbin/acpid -c /etc/acpi/events -s /var/run/acpid.socket
-syslog    2452  0.0  0.2  12376   560 ?        Ss   Oct27   0:00 /sbin/syslogd -u syslog
-root      2470  0.0  0.1   8204   460 ?        S    Oct27   0:00 /bin/dd bs 1 if /proc/kmsg of /var/run/klogd/kmsg
-klog      2472  0.0  0.1   6612   468 ?        Ss   Oct27   0:00 /sbin/klogd -P /var/run/klogd/kmsg
-103       2491  0.0  0.3  21388   944 ?        Ss   Oct27   0:00 /bin/dbus-daemon --system
-lp        2700  0.0  0.1  12432   344 ?        Ss   Oct27   0:00 /usr/sbin/lpd -s
-root      2761  0.0  0.2  66292   648 ?        Ss   Oct27   0:00 /usr/sbin/winbindd
-root      2783  0.0  0.2  66292   552 ?        S    Oct27   0:00 /usr/sbin/winbindd
-root      2791  0.0  1.2  41912  3028 ?        Ssl  Oct27   0:01 /usr/sbin/console-kit-daemon
-avahi     2979  0.0  0.5  31884  1344 ?        Ss   Oct27   0:00 avahi-daemon: running [minibuntu.local]
-avahi     2980  0.0  0.1  31764   436 ?        Ss   Oct27   0:00 avahi-daemon: chroot helper
-daemon    3030  0.0  0.1  16524   432 ?        Ss   Oct27   0:00 /usr/sbin/atd
-root      3055  0.0  0.3  19972   744 ?        Ss   Oct27   0:00 /usr/sbin/cron
-root      3081  0.0  0.2   4024   636 ?        S    Oct27   0:00 /bin/sh /etc/rc2.d/S99rc.local start
-root      3085  0.0  0.2   4024   556 ?        S    Oct27   0:00 /bin/sh -e /etc/rc.local
-scott     3086  0.0  0.3  41904   952 ?        S    Oct27   0:00 su - scott -c startx
-scott     3094  0.0  0.4  10864  1096 ?        S    Oct27   0:00 /bin/bash /usr/bin/startx
-scott     3125  0.0  0.2  15384   732 ?        S    Oct27   0:00 xinit /etc/X11/xinit/xinitrc -- /etc/X11/xinit/xserverrc :0 -auth /tmp/serverauth.zhFytCmJHA
-root      3129  0.0  7.8 113644 19372 tty7     Ss+  Oct27   0:04 /usr/bin/X11/X -nolisten tcp
-scott     3285  0.0  1.1 147216  2776 ?        S    Oct27   0:00 x-session-manager
-scott     3300  0.0  2.5  61232  6356 ?        S    Oct27   0:00 xterm
-scott     3309  0.0  0.0      0     0 ?        Z    Oct27   0:00 [sh] <defunct>
-scott     3312  0.0  0.2  35940   604 ?        Ss   Oct27   0:00 /usr/bin/ssh-agent /usr/bin/dbus-launch --exit-with-session x-session-manager
-scott     3315  0.0  0.2  23824   608 ?        S    Oct27   0:00 /usr/bin/dbus-launch --exit-with-session x-session-manager
-scott     3316  0.0  0.2  21256   616 ?        Ss   Oct27   0:00 //bin/dbus-daemon --fork --print-pid 5 --print-address 7 --session
-scott     3317  0.0  1.3  20856  3316 pts/0    Ss   Oct27   0:00 bash
-scott     3331  0.0  0.5  26536  1256 ?        S    Oct27   0:00 /usr/lib/xfconfd
-scott     3343  0.0  3.9 146812  9572 ?        S    Oct27   0:02 xfwm4
-scott     3344  0.0  0.9 121080  2432 ?        S    Oct27   0:00 xfsettingsd
-scott     3346  0.0  1.3 132040  3228 ?        S    Oct27   0:00 xfce4-panel
-scott     3348  0.0  1.3 155268  3204 ?        S    Oct27   0:00 Thunar --daemon
-scott     3350  0.0  6.3 218876 15500 ?        S    Oct27   0:01 xfdesktop
-scott     3365  0.0  1.2 154408  3112 ?        S    Oct27   0:00 xfce4-settings-helper
-scott     3380  0.0  0.3  17544   888 ?        S    Oct27   0:00 /usr/lib/gamin/gam_server
-105      11449  0.0  1.5  35392  3808 ?        Ss   Oct27   0:01 /usr/sbin/hald
-root     11450  0.0  0.4  15816  1212 ?        S    Oct27   0:00 hald-runner
-root     11481  0.0  0.8  28484  2032 ?        S    Oct27   0:00 hald-addon-input: Listening on /dev/input/event1 /dev/input/event0 /dev/input/event3
-root     11544  0.0  0.8  28484  2044 ?        S    Oct27   0:01 hald-addon-storage: polling /dev/sr0 (every 2 sec)
-root     11547  0.0  0.8  28484  2020 ?        S    Oct27   0:00 hald-addon-storage: no polling on /dev/fd0 because it is explicitly disabled
-105      11552  0.0  0.8  32392  2016 ?        S    Oct27   0:00 hald-addon-acpi: listening on acpid socket /var/run/acpid.socket
-root     11629  0.0  0.0      0     0 ?        S<   Oct27   0:00 [vmhgfs]
-root     11647  0.0  0.0      0     0 ?        S<   Oct27   0:00 [vmmemctl]
-root     11761  0.0  0.5  23112  1440 ?        Ss   Oct27   0:19 /usr/lib/vmware-tools/sbin64/vmware-guestd --background /var/run/vmware-guestd.pid
-root     29894  0.0  0.2   6488   676 ?        Ss   12:36   0:00 dhclient3 -e IF_METRIC=100 -pf /var/run/dhclient.eth0.pid -lf /var/lib/dhcp3/dhclient.eth0.leases eth0
-root     29960  0.0  0.8  18964  2020 pts/0    S+   12:37   0:00 -bash
-root     30190  0.0  0.4  48940  1204 ?        Ss   12:39   0:00 /usr/sbin/sshd
-root     30211  0.0  1.3  80804  3372 ?        Ss   12:39   0:00 sshd: scott [priv]
-scott    30219  0.0  0.7  80804  1740 ?        S    12:39   0:00 sshd: scott@pts/1
-scott    30235  0.0  1.4  20860  3672 pts/1    Ss   12:39   0:00 -bash
-root     30268  0.0  0.8  18992  2040 pts/1    S    12:39   0:00 -bash
-root     31641  2.0  0.4  15172  1136 pts/1    R+   14:00   0:00 ps aux
+%CPU %MEM COMM               PID USER
+  0.0  0.0 launchd              1 root    
+  0.0  0.1 kextd               10 root    
+  0.0  0.1 DirectoryService    11 root    
+  0.0  0.0 notifyd             12 root    
+  0.0  0.1 configd             15 root    
+  0.0  0.0 distnoted           20 daemon  
+  0.0  0.0 mDNSResponder       27 _mdnsresponder
+  0.0  0.1 securityd           37 root    
+  0.0  0.0 ntpd                66 root    
+  0.0  0.1 httpd               67 root    
+  0.0  0.0 usbmuxd             68 _usbmuxd
+  0.0  0.0 update              69 root    
+  0.0  0.0 SystemStarter       70 root    
+  0.0  9.4 mds                 74 root    
+ 13.9  0.2 loginwindow         75 scott   
+  0.0  0.0 KernelEventAgent    76 root    
+  0.0  0.0 kdcmond             77 root    
+  0.0  0.0 hidd                79 root    
+  0.0  0.0 fseventsd           80 root    
+  0.0  0.0 dynamic_pager       82 root    
+  0.0  0.0 diskarbitrationd    85 root    
+  0.0  0.1 blued               89 root    
+  0.0  0.0 autofsd             90 root    
+  0.0  0.0 socketfilterfw      92 root    
+  0.0  0.0 daemondo            94 root    
+  0.0  0.0 daemondo            95 root    
+  0.0  0.0 sh                  97 _mysql  
+  0.0  0.0 DigidesignFireWi    98 root    
+  0.0  0.0 memcached          111 nobody  
+  1.9  3.2 WindowServer       117 _windowserver
+  0.0  0.0 krb5kdc            124 root    
+  0.0  0.9 coreservicesd      128 root    
+  0.0  0.0 postgres           130 postgres
+  0.0  1.4 mysqld             156 _mysql  
+  0.0  0.0 Mbox2CS            434 root    
+  0.0  0.0 globalSAN          441 root    
+  0.0  0.1 qmasterd           446 root    
+  0.0  0.0 hpusbmond          654 root    
+  0.0  0.1 qmasterd           685 root    
+  0.0  0.0 HPIO Trap Monito   694 root    
+  0.0  0.0 vmnet-natd         740 root    
+  0.0  0.0 vmnet-dhcpd        750 root    
+  0.0  0.0 ApplicationPoolS   757 root    
+  0.2  0.4 Passenger spawn    758 root    
+  0.0  0.1 httpd              759 _www    
+  0.0  0.0 vmnet-netifup      760 root    
+  0.0  0.0 vmnet-netifup      763 root    
+  0.0  0.0 vmnet-dhcpd        766 root    
+  0.0  0.0 vmnet-bridge       770 root    
+  0.0  0.1 aksusbd            781 root    
+  0.0  0.0 postgres: writer   799 postgres
+  0.0  0.0 postgres: wal wr   800 postgres
+  0.0  0.0 postgres: autova   801 postgres
+  0.0  0.0 postgres: stats    802 postgres
+  0.0  0.0 launchd            805 scott   
+  0.0  0.5 Spotlight          815 scott   
+  0.0  0.1 UserEventAgent     816 scott   
+  0.0  0.0 pboard             817 scott   
+  0.0  0.3 Dock               818 scott   
+  0.0  0.2 ATSServer          819 scott   
+  0.0  0.2 coreaudiod         821 root    
+  1.7  0.5 SystemUIServer     822 scott   
+  0.0  1.2 Finder             824 scott   
+  0.0  0.1 HPEventHandler     830 scott   
+  0.0  0.1 iTunesHelper       838 scott   
+  0.0  1.0 Quicksilver        926 scott   
+  0.0  0.4 GrowlHelperApp    1140 scott   
+  0.0  0.0 check_afp         1252 root    
+  0.0  0.1 AppleSpell        1679 scott   
+  0.0  0.8 Preview           1899 scott   
+  0.0  1.3 TextMate          2404 scott   
+  0.0  0.0 ssh-agent         2590 scott   
+  0.0  0.0 ssh-agent         2687 scott   
+  0.0  0.0 ssh-agent         2773 scott   
+  0.0  0.0 ssh-agent         2872 scott   
+  0.0  0.0 ssh-agent         2906 scott   
+  0.0  0.0 ssh-agent         2950 scott   
+  0.0  0.0 ssh-agent         2965 scott   
+  0.0  0.0 ssh-agent         2998 scott   
+  0.0  0.0 ssh-agent         3086 scott   
+  0.0  0.0 ssh-agent         3167 scott   
+  0.0  0.0 ssh-agent         3190 scott   
+  0.0  0.0 ssh-agent         3658 scott   
+  0.0  0.0 ssh-agent         3701 scott   
+  0.0  0.0 ssh-agent         3724 scott   
+  0.0  0.0 ssh-agent         4302 scott   
+  0.0  0.0 ssh-agent         4354 scott   
+  0.0  0.0 ssh-agent         4829 scott   
+  0.0  0.0 ssh-agent         4843 scott   
+  0.0  0.0 syslogd           5096 root    
+  0.0  0.0 ssh-agent         5309 scott   
+  0.0  0.1 httpd             7996 _www    
+  0.0  0.6 compressord       8793 scott   
+  0.0  0.3 qmasterqd         8794 scott   
+  0.0  0.0 ssh-agent         8956 scott   
+  1.0  0.5 Terminal         10296 scott   
+  0.0  0.1 mdworker         10336 _spotlight
+  0.0  2.8 firefox-bin      10719 scott   
+  0.0  0.3 mdworker         10882 scott   
+  0.0  0.6 backupd          10890 root    
+  0.5  0.1 diskimages-helpe 11032 root    
+  0.0  2.1 iTunes           11039 scott   
+  0.0  0.0 hdiejectd        11044 root    
+  0.0  0.1 AppleMobileDevic 11057 scott   
+  0.0  0.1 PlugSuit Agent   11616 scott   
+  0.0  0.0 ssh-agent        11870 scott   
+  0.0  0.0 login            11520 root    
+  0.0  0.0 -zsh             11521 scott   
+  1.4  0.5 ruby             12093 scott   
+  0.0  0.0 login            10297 root    
+  0.0  0.0 -zsh             10299 scott   
+  0.0  0.0 login            10300 root    
+  0.0  0.0 -zsh             10303 scott   
+  0.0  0.0 login            12043 root    
+  0.0  0.0 -zsh             12045 scott   
+  0.0  0.0 man              12058 scott   
+  0.0  0.0 sh               12061 scott   
+  0.0  0.0 sh               12062 scott   
+  0.0  0.0 sh               12067 scott   
+  0.0  0.0 less             12068 scott   
+  0.0  0.0 login            12071 root    
+  0.0  0.0 -zsh             12072 scott   
+  0.0  0.0 ps               12100 root
 RUBY_HERE
   end
   

data/spec/hostname_spec.rb

@@ -1,57 +1,78 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+include HostHelpers
+
+
 describe Watcher::Hostname do
   
-  include HostHelpers
-  
   before(:each) do
     @watcher = Watcher::Hostname.new
+    @watcher.stub!(:ip).and_return("192.168.157.129")
+    @watcher.stub!(:hostname).and_return("my-hostname")
   end
   
   describe "gathering info on the host system" do
-    before(:each) do
-      @watcher.should_receive(:get_ip_address).and_return("192.168.157.129")
-      @watcher.should_receive(:get_hostname).and_return("localhost")
-    end
     
     it "reports formatted text with the IP and hostname" do
-      @watcher.report.should eql("localhost\n192.168.157.129")
+      @watcher.report.should eql("my-hostname\n192.168.157.129")
     end
   end
   
-  describe "private methods" do
-    describe "get_ip_address method" do
-      before(:each) do
-        @watcher.should_receive(:ifconfig).and_return(ifconfig_eth0)
-      end
-      it "calls ifconfig with a system call" do
-        @watcher.send(:get_ip_address).should eql("192.168.157.129")
-      end
-    end
+end
+
 
-    describe "ifconfig method" do
-      
-      before(:each) do
-        @watcher.should_receive(:`).with("ifconfig eth0").and_return(ifconfig_eth0)
-      end
-      
-      it "calls ifconfig with a system call" do
-        @watcher.send(:ifconfig).should eql(ifconfig_eth0.chomp)
-      end
-      
+describe Watcher::Hostname, "with a custom message" do
+    
+  before(:each) do
+    @watcher = Watcher::Hostname.new { |w| "The hostname is #{w.hostname}\nand the IP address is #{w.ip}"}
+    @watcher.stub!(:ip).and_return("192.168.157.129")
+    @watcher.stub!(:hostname).and_return("my-hostname")
+  end
+
+  it "allows access to the instance data" do
+    @watcher.report.should eql("The hostname is my-hostname\nand the IP address is 192.168.157.129")
+  end
+
+end
+
+
+describe "private methods" do
+  
+  before(:each) do
+    @watcher = Watcher::Hostname.new
+  end
+  
+  describe "get_ip_address method" do
+    before(:each) do
+      @watcher.should_receive(:ifconfig).and_return(ifconfig_eth0)
+    end
+    it "calls ifconfig with a system call" do
+      @watcher.send(:get_ip_address).should eql("192.168.157.129")
     end
+  end
 
-    describe "get_hostname method" do
+  describe "ifconfig method" do
+    
+    before(:each) do
+      @watcher.should_receive(:`).with("ifconfig eth0").and_return(ifconfig_eth0)
+    end
+    
+    it "calls ifconfig with a system call" do
+      @watcher.send(:ifconfig).should eql(ifconfig_eth0.chomp)
+    end
+    
+  end
 
-      before(:each) do
-        @watcher.should_receive(:`).with("hostname").and_return("localhost")
-      end
-      
-      it "calls hostname with a system call" do
-        @watcher.send(:get_hostname).should eql("localhost")
-      end
+  describe "get_hostname method" do
 
+    before(:each) do
+      @watcher.should_receive(:`).with("hostname").and_return("localhost")
     end
     
+    it "calls hostname with a system call" do
+      @watcher.send(:get_hostname).should eql("localhost")
+    end
+
   end
+  
 end

data/spec/process_spec.rb

@@ -1,8 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe Watcher::Process do
+include ProcessHelpers
 
-  include ProcessHelpers
+describe Watcher::Process do
   
   before(:each) do
     @watcher = Watcher::Process.new('process-name', :handle => 'Process Handle')
@@ -34,25 +34,45 @@ describe Watcher::Process do
       
     end
     
-    describe "privately" do
-      
-      it "calls 'ps aux' with a system call" do
-        @watcher.should_receive(:`).with("ps aux").and_return(ps_aux)
-        @watcher.send(:processes).should eql(ps_aux.chomp)
-      end
-      
-      it "says that :running? is true when the process exists" do
-        @watcher.should_receive(:processes).and_return("process-1\nprocess-2\nprocess-name")
-        @watcher.should be_running
-      end
-      
-      it "says that :running? is false when the process doesn't exist" do
-        @watcher.should_receive(:processes).and_return("process-1\nprocess-2")
-        @watcher.should_not be_running
-      end
-      
+  end
+  
+end
+
+describe Watcher::Process, "with a custom message" do
+  
+  before(:each) do
+    @watcher = Watcher::Process.new('process-name', :handle => 'Process Handle') do |p|
+      "#{p.handle}: #{p.running? ? %q{Active}: %q{Inactive}}"
     end
-    
+    @watcher.stub!(:running?).and_return(true)
+  end
+  
+  it "has access to instance data" do
+    @watcher.report.should eql("Process Handle: Active")
+  end
+end
+
+
+
+describe Watcher::Process, "privately" do
+  
+  before(:each) do
+    @watcher = Watcher::Process.new('process-name', :handle => 'Process Handle')
+  end
+  
+  it "calls 'ps aux' with a system call" do
+    @watcher.should_receive(:`).with("ps -o %cpu -o %mem -o comm -o pid -o user -axc").and_return(ps_aux)
+    @watcher.send(:processes).should eql(ps_aux.chomp)
+  end
+  
+  it "says that :running? is true when the process exists" do
+    @watcher.stub!(:command).and_return("ruby")
+    @watcher.should be_running
+  end
+  
+  it "says that :running? is false when the process doesn't exist" do
+    @watcher.stub!(:command).and_return("not-ruby")
+    @watcher.should_not be_running
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: informer
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Scott Burton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-29 00:00:00 -07:00
+date: 2009-10-31 00:00:00 -07:00
 default_executable: informer
 dependencies: []
 
@@ -40,7 +40,7 @@ files:
 - features/watcher.feature
 - lib/informer.rb
 - lib/informer/basic_watcher.rb
-- lib/informer/reporter/led.rb
+- lib/informer/reporter/lcd.rb
 - lib/informer/reporter/standard_output.rb
 - lib/informer/watcher/hostname.rb
 - lib/informer/watcher/process.rb