inari 0.1.0 → 0.1.1

data/Rakefile

@@ -4,10 +4,11 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'inari/version'
+require 'rake/contrib/rubyforgepublisher'
 
 desc 'Run the functional and unit tests.'
 Rake::TestTask.new(:test) do |t|
-  t.test_files = FileList['test/*_test.rb']
+  t.test_files = FileList['test/*_test.rb'] + FileList['test/*/*_test.rb']
   t.verbose = true
 end
 
@@ -23,11 +24,11 @@ end
 
 task :default => :test
 
-Spec = Gem::Specification.new do |s|
+spec = Gem::Specification.new do |s|
   s.name = 'inari'
   s.version = Inari::INARI_VERSION
   s.date = Inari::INARI_RELEASE_DATE
-  s.summary = 'Inari is a ruby system monitoring program.'
+  s.summary = 'Inari is a system monitoring program.'
   s.email = 'alex@helicoid.net'
   s.homepage = Inari::UPSTREAM_URL
   s.rubyforge_project = 'inari'
@@ -38,7 +39,7 @@ Spec = Gem::Specification.new do |s|
   s.files = FileList['lib/**/*.rb', 'bin/*', '[A-Z]*', 'test/**/*'].to_a
   s.test_files = Dir['test/test_*.rb']
   s.requirements = ['logger']  
-  s.post_install_message = <<EOF
+  """s.post_install_message = <<EOF
 
 Welcome to Inari
 ================
@@ -51,12 +52,25 @@ Take a look at README for help on writing configuration files.
 
 http://inari.rubyforge.org
 
-EOF
+EOF"""
 
 end
 
 task :gem => [:test]
-Rake::GemPackageTask.new(Spec) do |p|
+Rake::GemPackageTask.new(spec) do |p|
+  p.gem_spec = spec
   p.need_tar = true
+  p.need_zip = true
 end
 
+desc 'Publish the release files to RubyForge.'
+task :release => [:package] do
+  `rubyforge login`
+
+  for ext in %w(gem tgz zip)
+    pub = Rake::SshFilePublisher.new('alex_young@rubyforge.org',
+                                    '/var/www/gforge-projects/inari',
+                                    "pkg/inari-#{Inari::INARI_VERSION}.#{ext}")
+    pub.upload
+  end
+end

data/lib/inari.rb

@@ -5,10 +5,13 @@ require 'socket'
 require 'net/smtp'
 require 'timeout'
 require 'singleton'
-require 'logger'
+require 'digest'
+require 'digest/md5'
 require 'tmpdir'
+require 'logger'
 
 # Inari's classes and modules
+require 'inari/misc'
 require 'inari/daemon'
 require 'inari/commands'
 require 'inari/task_manager'
@@ -41,4 +44,4 @@ module Inari
       logger.info '*** Inari stopped'
     end
   end
-end
+end

data/lib/inari/commands.rb

@@ -1,6 +1,3 @@
-# The response object
-require 'inari/response'
-
 # The command drivers
 require 'inari/commands/http'
 require 'inari/commands/snmp'
@@ -10,6 +7,9 @@ require 'inari/commands/tcp_simple'
 require 'inari/commands/defaults'
 require 'inari/commands/test'
 
+# Responses are recorded in this format
+Response = Struct.new(:code, :body, :logged, :size)
+
 module Inari
   # This is the configuration API.  These methods can be used from configuration files.
   #
@@ -24,11 +24,11 @@ module Inari
   #
   class Commands
     include Singleton
-    
+   
     # The taskmanager created for this command instance.
     attr_reader :last_response
     attr_accessor :host, :port, :path, :sleep, :timeout
-        
+   
     include HTTP
     include SNMP
     include SMTP
@@ -38,9 +38,9 @@ module Inari
     include TestCommands
     
     def initialize
-      @host = ''
       @port = nil
       @path = ''
+      @host = nil
       
       @sleep = 60
       @timeout = 5
@@ -49,7 +49,6 @@ module Inari
       @downtimers = {}
       @last_downtime = {}
       @responses_limit = 10
-      @last_response = ''
       
       @localhost = 'localhost'
     end
@@ -62,8 +61,10 @@ module Inari
     def current_host ; @host ; end
     
     # The status of the last task against the service.
-    def status ; @last_response.code; end
-    
+    def status ; last_response.code; end
+   
+    def last_response ; @responses[current_host] and @responses[current_host].last ; end
+
     # Set the port the service you're monitoring runs on.
     def port(port) ; @port = port ; end
 
@@ -95,27 +96,27 @@ module Inari
     
     # Get the downtime for this task.
     def down_for
-      if @downtimers[@host].nil?
-        return @last_downtime[@host] || 0
+      if @downtimers[current_host].nil?
+        return @last_downtime[current_host] || 0
       else
-        return time.to_i - @downtimers[@host].to_i
+        return time.to_i - @downtimers[current_host].to_i
       end
     end
 
     # Called when a task has reported a service offline.
     def down
-      if @downtimers[@host].nil?
-        @downtimers[@host] = time
-        @last_downtime[@host] = 0
+      if @downtimers[current_host].nil?
+        @downtimers[current_host] = time
+        @last_downtime[current_host] = 0
         @on_down.call(self) if @on_down
       end
     end
 
     # Called when a task has seen the service come back.
     def up
-      if @downtimers[@host]
-        @last_downtime[@host] = time.to_i - @downtimers[@host].to_i
-        @downtimers[@host] = nil
+      if @downtimers[current_host]
+        @last_downtime[current_host] = time.to_i - @downtimers[current_host].to_i
+        @downtimers[current_host] = nil
         @on_up.call(self) if @on_up
       end
     end
@@ -128,13 +129,11 @@ module Inari
 
     # Store the remote responses in queue.
     def add_response(name, response, down = false)
-      @last_response = response
-      
       down ? self.down : up
       
-      @responses[@host] ||= []
-      @responses[@host].insert 0, {:name => name, :response => response, :time => time, :down => down }
-      @responses[@host].pop if @responses[@host].size > @responses_limit
+      @responses[current_host] ||= []
+      @responses[current_host].insert 0, {:name => name, :response => response, :time => time, :down => down }
+      @responses[current_host].pop if @responses[current_host].size > @responses_limit
     end
 
     def to_seconds(argument)

data/lib/inari/commands/http.rb

@@ -3,40 +3,56 @@ require 'net/http'
 module HTTP
   # HTTP commands
   def page_size(response = nil)
-    response = @last_response if response.nil?
+    response = last_response if response.nil?
     response.body.size rescue 0
   end
 
-  def page_content; @last_response.body; end 
-
-  def get_web_page(page)
-    Timeout::timeout(@timeout) do
-      response = Net::HTTP.get_response(@host, page, @port || 80)
-      add_response(page, response)
-  
-      # Return true when a 200 is returned, in case people use get_web_page as a condition
-      response.code == '200'
-    end
-  rescue
-    add_response(page, Response.new(:code => $!), true)
-    false
+  def page_content(response = nil)
+    response = last_response if response.nil?
+    response.body rescue nil
   end
 
-  def unexpected_page_change
-    @first_response = @last_response if @first_response.nil? and @last_response
+  # Fetches a web page and notifies when a timeout occurs or the page
+  # returns an unexpected status.
+  #
+  # Supply a block to use something instead of Net::HTTP.get_response
+  def get_web_page(page, &block)
+    response, down = get_remote_response(page, &block)
+
+    add_response(page, response, down)
+    response.code == '200'
+  end
 
+  # Raises an alert when a page changes.
+  def watch_for_changes_on_page(page, &block)
     # Fetch a fresh copy of the page and retain the last one
-    page_size(@first_response) == page_size
+    response, down = get_remote_response(page, &block)
+
+    returning (!set_first_response(response) and changed?(response)) do |state|
+      add_response(page, last_response, state)
+    end
   end
 
-  #def when_http_status_is(status, invert = false, &block)
-  #  response = Net::HTTP.get_response(@host, @path)
-  #  if status.to_i == response.code.to_i and not invert
-  #    instance_eval(&block) if block
-  #  end
-  #end
-  #
-  #def when_http_status_is_not(status, &block)
-  #  when_http_status_is(status, true, &block)
-  #end
+  def set_first_response(response)
+    @first_response ||= {}
+    returning @first_response[current_host].nil? do |added|
+      @first_response[current_host] = response unless !added
+    end
+  end
+
+  def first_response ; @first_response[current_host] ; end
+
+  private
+
+    def changed?(response)
+      Digest::MD5::hexdigest(page_content(first_response).to_s) != Digest::MD5::hexdigest(page_content(response).to_s) 
+    end
+
+    def get_remote_response(page, &block)
+      Timeout::timeout(@timeout) do
+        [block ? yield : Net::HTTP.get_response(@host, page, @port || 80), false]
+      end
+    rescue
+      [Response.new($!), true]
+    end
 end

data/lib/inari/commands/smtp.rb

@@ -6,11 +6,11 @@ module SMTP
     response = Response.new
     begin
       Net::SMTP.start(@host, port=@port, helo=@localhost, user=nil, secret=nil, authtype=nil)
-      add_response('helo', Response.new(:code => 'Connection accepted'))
+      add_response('helo', Response.new('Connection accepted'))
       true
     rescue
-      add_response('helo', Response.new(:code => $!), true)
+      add_response('helo', Response.new($!), true)
       false
     end
   end
-end
+end

data/lib/inari/commands/tcp_simple.rb

@@ -8,11 +8,11 @@ module TCPSimple
       Timeout::timeout(@timeout) do
         t = TCPSocket.new(@host, @port)
         state = true
-        add_response(name, Response.new(:code => 'Up'))
+        add_response(name, Response.new('Up'))
       end
     rescue
       Inari::logger.error "TCP error: #{$!} for host: #{@host}, port: #{@port}"
-      add_response(name, Response.new(:code => $!), true)
+      add_response(name, Response.new($!), true)
     ensure
       t.close if defined? t
     end
@@ -21,4 +21,4 @@ module TCPSimple
   end
   
   def down? ; !up? ; end
-end
+end

data/lib/inari/commands/test.rb

@@ -1,9 +1,9 @@
 module TestCommands
   def run_test(probability)
     if rand(100) > probability
-      add_response('Test', Response.new(:code => '200'))
+      add_response('Test', Response.new('200'))
     else
-      add_response('Test', Response.new(:code => '404'), true)
+      add_response('Test', Response.new('404'), true)
     end
   end
 end

data/lib/inari/misc.rb

@@ -0,0 +1,6 @@
+class Object
+  def returning(value)
+    yield(value)
+    value
+  end
+end

data/lib/inari/version.rb

@@ -2,8 +2,8 @@
 module Inari
   APP_NAME = 'Inari'
   
-  INARI_VERSION = '0.1.0'
+  INARI_VERSION = '0.1.1'
   INARI_RELEASE_DATE = '2007/02/06'
 
   UPSTREAM_URL = 'http://inari.rubyforge.org'
-end
+end

data/test/abstract_test.rb

@@ -2,3 +2,7 @@
 
 require 'test/unit'
 require 'inari'
+
+module InariTest
+  def self.default_host ; 'alexyoung.org' ; end
+end

data/test/commands/http_test.rb

@@ -0,0 +1,22 @@
+require 'test/abstract_test'
+
+class CommandsTest::HTTP < Test::Unit::TestCase
+  def setup
+    @commands = Inari::Commands.instance
+  end
+  
+  def test_get_web_page
+    @commands.host = InariTest::default_host
+    assert @commands.get_web_page('/')
+  end
+
+  def test_watch_for_changes_on_page
+    @commands.host = 'test_watch_for_changes_on_page'
+    assert !@commands.watch_for_changes_on_page('/') { Response.new('200', 'Test') }
+    assert !@commands.watch_for_changes_on_page('/') { Response.new('200', 'Test') }
+    assert !@commands.watch_for_changes_on_page('/') { Response.new('200', 'Test') }
+
+    # This should be considered different
+    assert @commands.watch_for_changes_on_page('/') { Response.new('200', 'Page changed') }
+  end
+end

data/test/commands/tcp_simple_test.rb

@@ -0,0 +1,13 @@
+require 'test/abstract_test'
+
+class CommandsTest::TCPSimple < Test::Unit::TestCase
+  def setup
+    @commands = Inari::Commands.instance
+  end
+  
+  def test_up_down
+    @commands.host = InariTest::default_host
+    @commands.port = 80 
+    assert @commands.up?
+  end
+end

data/test/configuration_test.rb

@@ -5,11 +5,6 @@ class ConfigurationTest < Test::Unit::TestCase
     @configuration = Inari::Configuration.instance
   end
   
-  # Check if any of the load paths make sense
-  def test_default_load_path_exists
-    assert File.directory?(@configuration.default_load_path)
-  end
-  
   def test_loads
     @configuration.load_paths.push 'test/fixtures/'
     assert_nil @configuration.load('test_config.rb')

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.8.10
 specification_version: 1
 name: inari
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2007-02-06 00:00:00 +00:00
-summary: Inari is a ruby system monitoring program.
+  version: 0.1.1
+date: 2007-02-06
+summary: Inari is a system monitoring program.
 require_paths: 
 - lib
 email: alex@helicoid.net
@@ -23,52 +23,39 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
       version: 0.0.0
   version: 
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: |+
-  
-  Welcome to Inari
-  ================
-  
-  Inari is a small and extenable system monitor, intended for us with
-  web applications.  To start using it, tailor /usr/local/etc/inari.conf
-  to your requirements.
-  
-  Take a look at README for help on writing configuration files.
-  
-  http://inari.rubyforge.org
-  
 authors: []
 
 files: 
 - lib/inari.rb
-- lib/inari/commands.rb
+- lib/inari/task_process.rb
 - lib/inari/configuration.rb
+- lib/inari/commands.rb
 - lib/inari/daemon.rb
-- lib/inari/response.rb
-- lib/inari/task_manager.rb
-- lib/inari/task_process.rb
 - lib/inari/version.rb
+- lib/inari/task_manager.rb
+- lib/inari/misc.rb
 - lib/inari/commands/defaults.rb
-- lib/inari/commands/http.rb
-- lib/inari/commands/reporting.rb
-- lib/inari/commands/smtp.rb
 - lib/inari/commands/snmp.rb
-- lib/inari/commands/tcp_simple.rb
+- lib/inari/commands/http.rb
 - lib/inari/commands/test.rb
+- lib/inari/commands/tcp_simple.rb
+- lib/inari/commands/smtp.rb
+- lib/inari/commands/reporting.rb
 - bin/inari
-- CHANGES
-- InstalledFiles
 - LICENSE
 - Rakefile
-- README
+- CHANGES
 - THANKS
-- test/abstract_test.rb
-- test/commands_test.rb
-- test/configuration_test.rb
+- README
 - test/fixtures
 - test/task_manager_test.rb
+- test/commands_test.rb
+- test/abstract_test.rb
+- test/commands
+- test/configuration_test.rb
 - test/fixtures/test_config.rb
+- test/commands/http_test.rb
+- test/commands/tcp_simple_test.rb
 test_files: []
 
 rdoc_options: []

data/InstalledFiles

@@ -1 +0,0 @@
-/usr/local/lib/ruby/site_ruby/1.8/inari.rb

data/lib/inari/response.rb

@@ -1,9 +0,0 @@
-class Response
-  attr_accessor :code
-  attr_accessor :size
-  attr_accessor :logged
-  
-  def initialize(*args)
-    args.each { |field, value| self.send(field, value) } if args.is_a? Hash
-  end
-end