opticon 0.0.2 → 0.0.3

data/.loadpath

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<loadpath>
+	<pathentry path="" type="src"/>
+	<pathentry path="org.rubypeople.rdt.launching.RUBY_CONTAINER" type="con"/>
+</loadpath>

data/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>opticon</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.rubypeople.rdt.core.rubybuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.rubypeople.rdt.core.rubynature</nature>
+	</natures>
+</projectDescription>

data/CHANGELOG.txt

@@ -1,3 +1,12 @@
+=== 0.0.3 :: 2008-03-02
+
+* When a service doesn't respond, a ConnectionFailure is now correctly
+  recorded. You can change how long Opticon will wait for a connection by
+  setting the Opticon.default_timeout value. The timeout is 3 seconds by
+  default.
+* Changed require paths to fix strange loading problems experienced
+  by some people.
+
 === 0.0.2 :: 2007-11-15
 
 * A series of tests on a service can now be specified as a block to the 

data/Manifest.txt

@@ -1,6 +1,7 @@
-Rakefile
-README.txt
+.loadpath
+.project
 CHANGELOG.txt
+History.txt
 Manifest.txt
 README.txt
 Rakefile

data/Rakefile

@@ -20,7 +20,8 @@ HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 DEPS = ['actionmailer']
 
 NAME = "opticon"
-REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
+REV = nil
+#REV = `svn info`[/Revision: (\d+)/, 1] rescue nil
 VERS = ENV['VERSION'] || (Opticon::VERSION::STRING + (REV ? ".#{REV}" : ""))
                           CLEAN.include ['**/.*.sw?', '*.gem', '.config']
 RDOC_OPTS = ['--quiet', '--title', "opticon documentation",

data/examples/sample.rb

@@ -5,7 +5,7 @@ begin
   gem 'opticon'
 rescue Gem::LoadError
   # try to load local copy if gem is not available 
-  $: << 'lib'
+  $: << File.dirname(__FILE__)+'/../lib'
 end
 
 require 'opticon'

data/lib/opticon/http.rb

@@ -1,6 +1,7 @@
 require 'net/http'
 require 'net/https'
 require 'uri'
+require 'timeout'
 
 module Opticon
   module HTTP
@@ -28,11 +29,14 @@ module Opticon
       http.use_ssl = uri.scheme == "https"
       
       response = nil
-      http.start do
-        path = uri.path.empty? ? '/' : uri.path
-        response = http.request_get(path)
+
+      timeout(Opticon.default_timeout) do
+        http.start do
+          path = uri.path.empty? ? '/' : uri.path
+          response = http.request_get(path)
+        end
       end
-      
+
       response
     end
   end

data/lib/opticon/notifier.rb

@@ -1,4 +1,4 @@
-require 'opticon/mailer'
+require File.dirname(File.expand_path(__FILE__))+'/mailer'
 require 'pstore'
 
 module Opticon

data/lib/opticon/service.rb

@@ -1,5 +1,5 @@
 require 'uri'
-require 'opticon/tester'
+require File.dirname(File.expand_path(__FILE__))+'/tester'
 
 module Opticon
   class Service
@@ -62,7 +62,7 @@ module Opticon
         
         debug = "#{@uri} #{tester_type} #{condition.inspect}?"
         
-        if tester.test(condition)
+        if tester.run(condition)
           puts "#{debug} ==> PASSED!" if ARGV.include?("-v")
         else
           puts "#{debug} ==> FAILED!" if ARGV.include?("-v")

data/lib/opticon/tester.rb

@@ -1,5 +1,5 @@
-require 'opticon/http'
-require 'opticon/failure'
+require File.dirname(File.expand_path(__FILE__))+'/http'
+require File.dirname(File.expand_path(__FILE__))+'/failure'
 
 module Opticon
   module Tester
@@ -10,11 +10,12 @@ module Opticon
       include Opticon::HTTP
       
       # Wrapper for calling the test method. 
-      # Generally you'll want to invoke this instead of invoking test directly.
+      # Call this instead of invoking test directly.
       def run(condition)
         begin
           test(condition)
-        rescue SocketError, TimeoutError, Net::HTTPError, Errno::ECONNREFUSED
+        rescue SocketError, TimeoutError, Net::HTTPError, 
+          Errno::ECONNREFUSED, Timeout::Error => e
           @failure = Opticon::Failure::ConnectionFailure.new(uri, condition, nil)
           @failure.exception = $!
           false
@@ -24,6 +25,7 @@ module Opticon
     
     # Tests that the service responds with some given HTTP status code.
     class ResponseCodeTester < Base
+      protected
       def test(condition)
         case condition
         when :ok
@@ -50,14 +52,15 @@ module Opticon
       
       private
       def responds_with_code(codes)
-      
+        r = self.response
+
         if codes.kind_of? Integer
-          result = codes == response.code.to_i
+          result = codes == r.code.to_i
         else
-          result = codes.include? response.code.to_i
+          result = codes.include? r.code.to_i
         end
         
-        @failure = Opticon::Failure::ResponseCodeTestFailure.new(uri, codes, response) unless result
+        @failure = Opticon::Failure::ResponseCodeTestFailure.new(uri, codes, r) unless result
         return result
       end
       
@@ -85,35 +88,38 @@ module Opticon
     # Tests that the service responds with content that matches some given 
     # string or regular expression.
     class ContentTester < Base
+      protected
       def test(condition)
-        unless (200..206).include?(response.code.to_i)
-          @failure = Opticon::Failure::ContentTestFailure.new(uri, condition, response)
-          if (300..307).include?(response.code.to_i)
-            @failure.exception = RuntimeError.new("Request was redirected to #{response['location']}.")
+         r = self.response
+        
+        unless (200..206).include?(r.code.to_i)
+          @failure = Opticon::Failure::ContentTestFailure.new(uri, condition, r)
+          if (300..307).include?(r.code.to_i)
+            @failure.exception = RuntimeError.new("Request was redirected to #{r['location']}.")
           else
-            @failure.exception = RuntimeError.new("Request returned code '#{response.message}'"+
+            @failure.exception = RuntimeError.new("Request returned code '#{r.message}'"+
               " (#{response.code}) but response must be a 2xx HTTP status code.")
           end
           return false
         end
         
-        unless response.class.body_permitted?
-          @failure = Opticon::Failure::ContentTestFailure.new(uri, condition, response)
-          @failure.exception = RuntimeError.new("Response did not include a body (HTTP response: #{response.inspect})")
+        unless r.class.body_permitted?
+          @failure = Opticon::Failure::ContentTestFailure.new(uri, condition, r)
+          @failure.exception = RuntimeError.new("Response did not include a body (HTTP response: #{r.inspect})")
           return false
         end
       
         case condition
         when Regexp
-          result = condition =~ response.body
+          result = condition =~ r.body
         when String
-          result = response.body.include? condition
+          result = r.body.include? condition
         end
         
         if result
           @failure = nil
         else
-          @failure = Opticon::Failure::ContentTestFailure.new(uri, condition, response)
+          @failure = Opticon::Failure::ContentTestFailure.new(uri, condition, r)
         end
         
         result

data/lib/opticon/version.rb

@@ -2,7 +2,7 @@ module Opticon #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/opticon.rb

@@ -13,7 +13,16 @@ module Opticon
   end
   module_function :default_notifiers, 'default_notifiers='
   
+  @@default_timeout = 3
+  def default_timeout
+    @@default_timeout
+  end
+  def default_timeout=(timeout)
+    @@default_timeout = timeout
+  end
+  module_function :default_timeout, 'default_timeout='
+  
 end
 
-require 'opticon/service'
-require 'opticon/notifier'
+require File.dirname(File.expand_path(__FILE__))+'/opticon/service'
+require File.dirname(File.expand_path(__FILE__))+'/opticon/notifier'

data/test/opticon/tester_test.rb

@@ -27,7 +27,7 @@ class Opticon::HTTPTest < Test::Unit::TestCase
   
   def test_response_code_tester_cant_connect
     tester = Opticon::Tester::ResponseCodeTester.new
-    tester.uri = "http://there.is.no.such.server.foobarblah/test"
+    tester.uri = "http://there.is.no.such.server.foobarblah:1234/test"
     
     assert !tester.run(:success)
     assert_kind_of Opticon::Failure::ConnectionFailure, tester.failure

metadata

@@ -1,38 +1,45 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: opticon
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
-date: 2007-11-15 00:00:00 -05:00
-summary: Peace of mind through automated monitoring of your HTTP services.
-require_paths: 
-- lib
-email: matt [at] roughest.net
-homepage: http://opticon.rubyforge.org
-rubyforge_project: opticon
-description: Peace of mind through automated monitoring of your HTTP services.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.0.3
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Matt Zukowski
-files: 
-- Rakefile
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-04-02 00:00:00 -04:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: actionmailer
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: Peace of mind through automated monitoring of your HTTP services.
+email: matt [at] roughest.net
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- CHANGELOG.txt
+- History.txt
+- Manifest.txt
 - README.txt
+files: 
+- .loadpath
+- .project
 - CHANGELOG.txt
+- History.txt
 - Manifest.txt
+- README.txt
+- Rakefile
 - examples/sample.rb
 - lib/opticon.rb
 - lib/opticon/failure.rb
@@ -52,30 +59,37 @@ files:
 - test/opticon/tester_test.rb
 - test/opticon_test.rb
 - test/test_helper.rb
+has_rdoc: true
+homepage: http://opticon.rubyforge.org
+post_install_message: 
+rdoc_options: 
+- --main
+- README.txt
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: opticon
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Peace of mind through automated monitoring of your HTTP services.
 test_files: 
 - test/opticon_test.rb
-- test/opticon/service_test.rb
-- test/opticon/tester_test.rb
 - test/opticon/mailer_test.rb
-- test/opticon/email_notifier_test.rb
 - test/opticon/http_test.rb
-rdoc_options: []
-
-extra_rdoc_files: []
-
-executables: []
-
-extensions: []
-
-requirements: []
-
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: actionmailer
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
+- test/opticon/tester_test.rb
+- test/opticon/email_notifier_test.rb
+- test/opticon/service_test.rb