outpost 0.2.0 → 0.2.1

data/CHANGELOG.rdoc

@@ -1,3 +1,11 @@
+== 0.2.1
+* Features
+ * Support for :warning status (by github.com/sryche)
+ * Subclassing Outpost::Application is no longer required.
+ * HTTP Scout responds to response_time now
+ * Added scout data to the report (so you can read acquired data)
+ * Support for creating scouts without any expectations (good if you're
+ interested in the data value but not if they mean system is either up or down)
 
 == 0.2
 * Features

data/Gemfile.lock

@@ -10,7 +10,7 @@ GEM
     faraday (0.5.4)
       addressable (~> 2.2.2)
       multipart-post (~> 1.1.0)
-      rack (>= 1.1.0, < 2)
+      rack (< 2, >= 1.1.0)
     i18n (0.5.0)
     linecache (0.43)
     linecache19 (0.5.11)

data/README.markdown

@@ -73,7 +73,7 @@ reporting "down" in that case).
 
 ## Outpost
 
-Outpost is the description of the system and provides a DSL to do it. 
+Outpost is the description of the system and provides a DSL to do it.
 Check "How it works" section for an example, or check the [integration tests](https://github.com/vinibaggio/outpost/blob/master/test/integration/basic_application_test.rb)
 for more.
 
@@ -110,6 +110,14 @@ method, where you can implement any kind of logic to test whether your system is
 or not. You may also include expectations in order to process the output of your system.
 For more information about expectations, check the section below.
 
+If you're interested in the data the Scouts got through a measurement, you can
+tell Outpost that it must save that data after the measurement is run. That way
+you can inquiry it for further analysis. This way, you can have Scouts without
+any expectations/reports, so you can collect data without telling if the system
+is either up or down. You can check an usage example in the [Reports
+integration
+test](https://github.com/vinibaggio/outpost/blob/master/test/integration/reporting_test.rb).
+
 ## Expectations
 
 Consider the following code snippet, taken from previous examples:
@@ -123,7 +131,7 @@ to get Scout's output and evaluate it, in order to determine a status.
 They must be registered into each Scout that wish to support different types
 of expectations. You can supply a block or an object that respond to #call
 and return true if any of the rules match. It will receive an instance
-of the scout (so you can query current system state) as the first parameter 
+of the scout (so you can query current system state) as the first parameter
 and the state defined in the #report method as the second.
 
 So you can easily create your own expectation. Let's recreate the :response\_code in
@@ -182,6 +190,23 @@ system administrator:
     # down.
     outpost.notify if outpost.down?
 
+## Creating Outpost applications programatically
+
+It is also possible to create Outposts without having to subclass it. Use the
+methods #add_scout and #add_notifier and you're set:
+
+    outpost = Outpost::Application.new
+
+    outpost.add_scout Outpost::Scouts::Http => 'master http server' do
+      options :host => 'localhost', :port => 9595
+      report :up, :response_code => 200
+    end
+
+    outpost.run
+
+This is good when you want to have some sort of template (by inheriting from
+Outpost::Application) and then configure things as you go.
+
 ## TODO
 
 See [TODO](https://github.com/vinibaggio/outpost/blob/master/TODO.md).

data/TODO.md

@@ -2,6 +2,4 @@
 
 * SSH Support
 * Daemon and scheduler
-* New status: :warning
 * Web dashboard
-* Better error reporting

data/lib/outpost/application.rb

@@ -11,14 +11,31 @@ module Outpost
   #    end
   #  end
   #
-  # @abstract
+  # The above example will set templates and every new instance of
+  # ExampleSuccess will have the same behavior. But all the methods
+  # are available to instances, so it is also possible to create Outpost
+  # applications as the following example:
+  #
+  #  my_outpost = Outpost::Application.new
+  #  my_outpost.name = 'Example'
+  #
+  #  my_outpost.using(Outpost::Scouts::Http => 'master http server') do
+  #    options :host => 'localhost', :port => 9595
+  #    report :up, :response_code => 200
+  #  end
   class Application
     class << self
-      # Returns all the registered scouts.
-      attr_reader :scouts
+      def scout_templates
+        @scout_templates || []
+      end
 
-      # Returns all the registered notifiers.
-      attr_reader :notifiers
+      def notifier_templates
+        @notifier_templates || []
+      end
+
+      def name_template
+        @name_template || self.to_s
+      end
 
       # Register a scout in the list of scouts.
       #
@@ -27,15 +44,11 @@ module Outpost
       #
       # @yield Block to be evaluated to configure the current {Scout}.
       def using(scout_description, &block)
-        @scouts ||= Hash.new { |h, k| h[k] = {} }
-
-        config = ScoutConfig.new
-        config.instance_eval(&block)
-
-        scout_description.each do |scout, description|
-          @scouts[scout][:description] = description
-          @scouts[scout][:config]      = config
-        end
+        @scout_templates ||= []
+        @scout_templates << {
+          :scout_description => scout_description,
+          :block => block
+        }
       end
 
       # Register a notifier class in the list of notifications.
@@ -48,8 +61,8 @@ module Outpost
       # @param [Hash, #read] options Options that will be used to configure the
       #   notification class.
       def notify(notifier, options={})
-        @notifiers           ||= {}
-        @notifiers[notifier]   = options
+        @notifier_templates ||= []
+        @notifier_templates << {:notifier => notifier, :options => options}
       end
 
       # Set the name of the scout. Can be used by notifiers in order to have
@@ -58,11 +71,8 @@ module Outpost
       # @param [String, #read] name The name to be given to a Outpost-based
       #   class.
       def name(val=nil)
-        if val
-          @name = val
-        else
-          @name
-        end
+        @name_template = val if val
+        @name_template
       end
     end
 
@@ -72,20 +82,57 @@ module Outpost
     # Returns a list of {Report} containing the last results of the last check.
     attr_reader :reports
 
+    # Returns all the registered scouts.
+    attr_reader :scouts
+
+    # Returns all the registered notifiers.
+    attr_reader :notifiers
+
+    # Reader/setter for the name of this scout
+    attr_accessor :name
+
     # New instance of a Outpost-based class.
     def initialize
-      @reports     = []
+      @reports     = {}
       @last_status = nil
+      @scouts      = Hash.new { |h, k| h[k] = {} }
+      @notifiers   = {}
+      @name        = self.class.name_template
+
+      # Register scouts
+      self.class.scout_templates.each do |template|
+        add_scout(template[:scout_description], &template[:block])
+      end
+
+      self.class.notifier_templates.each do |template|
+        add_notifier(template[:notifier], template[:options])
+      end
+    end
+
+    # @see Application#using
+    def add_scout(scout_description, &block)
+      config = ScoutConfig.new
+      config.instance_eval(&block)
+
+      scout_description.each do |scout, description|
+        @scouts[scout][:description] = description
+        @scouts[scout][:config]      = config
+      end
+    end
+
+    # @see Application#notify
+    def add_notifier(notifier_name, options)
+      @notifiers[notifier_name] = options
     end
 
     # Execute all the scouts associated with an Outpost-based class and returns
     # either :up or :down, depending on the results.
     def run
-      @reports = self.class.scouts.map do |scout, options|
-        run_scout(scout, options)
+      scouts.map do |scout, options|
+        @reports[options[:description]] = run_scout(scout, options)
       end
 
-      statuses = @reports.map { |r| r.status }
+      statuses = @reports.map { |_, r| r.status }
 
       @last_status = Report.summarize(statuses)
     end
@@ -93,7 +140,7 @@ module Outpost
     # Runs all notifications associated with an Outpost-based class.
     def notify
       if reports.any?
-        self.class.notifiers.each do |notifier, options|
+        @notifiers.each do |notifier, options|
           # .dup is NOT reliable
           options_copy = Marshal.load(Marshal.dump(options))
           notifier.new(options_copy).notify(self)
@@ -106,24 +153,21 @@ module Outpost
       @last_status == :up
     end
 
+    # Returns true if the last status is :warning
+    def warning?
+      @last_status == :warning
+    end
+
     # Returns true if the last status is :down
     def down?
       @last_status == :down
     end
 
-    # Returns the name of an Outpost-based class or the class name itself if
-    # not set.
-    #
-    # @return [String] The name of the Outpost
-    def name
-      self.class.name || self.class.to_s
-    end
-
     # Returns the messages of the latest service check.
     #
     # @return [Array<String>] An array containing all report messages.
     def messages
-      reports.map { |r| r.to_s }
+      reports.map { |_, r| r.to_s }
     end
 
     private
@@ -135,7 +179,8 @@ module Outpost
       params = {
         :name        => scout.name,
         :description => options[:description],
-        :status      => scout_instance.run
+        :status      => scout_instance.run,
+        :data        => scout_instance.report_data
       }
       Report.new(params)
     end

data/lib/outpost/expectations/response_code.rb

@@ -11,7 +11,11 @@ module Outpost
 
       # Method that will be used as an expectation to evaluate response code
       def evaluate_response_code(scout, response_code)
-        scout.response_code == response_code.to_i
+        if response_code.is_a?(Array)
+          response_code.include?(scout.response_code)
+        else
+          scout.response_code == response_code.to_i
+        end
       end
     end
   end

data/lib/outpost/report.rb

@@ -16,15 +16,17 @@ module Outpost
     # @return [Symbol] the final status to be considered.
     def self.summarize(status_list)
       return :down if status_list.empty? || status_list.include?(:down)
+      return :warning if status_list.include?(:warning)
       return :up
     end
 
-    attr_reader :name, :description, :status
+    attr_reader :name, :description, :status, :data
 
     def initialize(params)
       @name        = params[:name]
       @description = params[:description]
       @status      = params[:status]
+      @data        = params[:data]
     end
 
     def to_s

data/lib/outpost/scout.rb

@@ -18,6 +18,11 @@ module Outpost
   #     scout.response_code == code
   #   end
   #
+  # Scouts may also report specific data. This is useful to complement
+  # status reporting with the data received from the measurement. After the
+  # scout is run, each report data method will be executed and its calue will be
+  # added to the resulting report.
+  #
   # @example an example of a Scout that parses the HTTP response code
   #   module Outpost
   #     module Scouts
@@ -40,10 +45,40 @@ module Outpost
   #     end
   #   end
   #
+  # @example an example of a Scout that reports the duration of a HTTP request
+  #   module Outpost
+  #     module Scouts
+  #       class TimedHttp < Outpost::Scout
+  #         expect(:response_code) { |scout,code| scout.response_code == code }
+  #
+  #         attr_reader :response_code, :response_time
+  #         report_data :response_time
+  #
+  #         def setup(options)
+  #           @host = options[:host]
+  #           @port = options[:port] || 80
+  #           @path = options[:path] || '/'
+  #         end
+  #
+  #         def execute
+  #           previous_time = Time.now
+  #
+  #           response = Net::HTTP.get_response(@host, @path, @port)
+  #           @response_code = response.code.to_i
+  #
+  #           @response_time = Time.now - response_time
+  #         end
+  #       end
+  #     end
+  #   end
+  #
   # @abstract Subclasses must override {#setup} and {#execute} to be a valid
   #   Scout
   class Scout
+    attr_reader :report_data
+
     class << self
+      attr_reader :reporting_data_methods
 
       # Returns the hash of expectations, where the key is the name of the
       # expectation and the value is the callable Object (object that responds
@@ -51,7 +86,7 @@ module Outpost
       #
       # @return [Hash<Symbol, Object>]
       def expectations
-        @expectations ? @expectations.dup : []
+        @expectations ? @expectations.dup : {}
       end
 
       # Registers a new expectation into the Scout. If the callable does not
@@ -74,6 +109,16 @@ module Outpost
           raise ArgumentError, 'Object must respond to method #call to be a valid expectation.'
         end
       end
+
+      def reporting_data_methods
+        @reporting_data_methods ||= []
+        @reporting_data_methods
+      end
+
+      def report_data(*methods)
+        @reporting_data_methods ||= []
+        @reporting_data_methods += methods
+      end
     end
 
     # @param [String, #read] description A string containing a description of
@@ -83,6 +128,7 @@ module Outpost
     def initialize(description, config)
       @description = description
       @config      = config
+      @report_data = {}
 
       setup(config.options)
     end
@@ -90,7 +136,7 @@ module Outpost
     # Executes the Scout and go through all the registered expectations to find
     # out all expectations that match and return the associated status.
     #
-    # @return [Symbol] the current status of the Scout (:up, :down)
+    # @return [Symbol] the current status of the Scout (:up, :down, :warning)
     # @raise [NotImplementedError] raised when a configured expectation was not
     #   registered in the Scout.
     def run
@@ -100,24 +146,37 @@ module Outpost
       # value.
       # Example: {:response_time => 200}
       #
-      # status is the status (:up or :down, for example) that will be returned
+      # status is the status (:up, :down or :warning, for example) that will be returned
       # in case the expectation match current system status.
-      @config.reports.each do |response_pair, status|
-        response_pair.each do |expectation, value|
-          if self.class.expectations[expectation].nil?
-            message = "expectation '#{expectation}' wasn't implemented by #{self.class.name}"
-            raise NotImplementedError, message
-          end
+      if @config.reports.present?
+        @config.reports.each do |response_pair, status|
+          response_pair.each do |expectation, value|
+            if self.class.expectations[expectation].nil?
+              message = "expectation '#{expectation}' wasn't implemented by #{self.class.name}"
+              raise NotImplementedError, message
+            end
 
-          if self.class.expectations[expectation].call(self, value)
-            statuses << status
+            if self.class.expectations[expectation].call(self, value)
+              statuses << status
+            end
           end
         end
       end
 
+      gather_reporting_data
       Report.summarize(statuses)
     end
 
+    def gather_reporting_data
+      self.class.reporting_data_methods.each do |method|
+        if respond_to?(method)
+          @report_data[method.to_sym] = send(method)
+        else
+          raise ArgumentError,  "Scout #{self.class.name} does not respond to ##{method} reporting data method"
+        end
+      end
+    end
+
     # Called when the scout object is being constructed. Arguments can be
     # everything the developer set in the creation of Outpost.
     #

data/lib/outpost/scout_config.rb

@@ -12,11 +12,8 @@ module Outpost
     # @param [Object] args Any argument that will be passed to the Scout.
     # Rreturn [Object] The associated option
     def options(args=nil)
-      if args.nil?
-        @options
-      else
-        @options = args
-      end
+      @options = args if args
+      @options
     end
 
     # Reads reporting as:

data/lib/outpost/scouts/http.rb

@@ -16,8 +16,10 @@ module Outpost
     class Http < Outpost::Scout
       extend Outpost::Expectations::ResponseCode
       extend Outpost::Expectations::ResponseBody
+      extend Outpost::Expectations::ResponseTime
 
-      attr_reader :response_code, :response_body
+      attr_reader :response_code, :response_body, :response_time
+      report_data :response_code, :response_body, :response_time
 
       # Configure the scout with given options.
       # @param [Hash] Options to setup the scout
@@ -37,12 +39,14 @@ module Outpost
       # Runs the scout, connecting to the host and getting the response code,
       # body and time.
       def execute
+        previous_time = Time.now
         response = @http_class.get_response(@host, @path, @port)
 
+        @response_time = (Time.now - previous_time) * 1000 # Miliseconds
         @response_code = response.code.to_i
         @response_body = response.body
       rescue SocketError, Errno::ECONNREFUSED
-        @response_code = @response_body = nil
+        @response_code = @response_body = @response_time = nil
       end
     end
   end

data/lib/outpost/scouts/ping.rb

@@ -19,7 +19,7 @@ module Outpost
     class Ping < Outpost::Scout
       extend Outpost::Expectations::ResponseTime
       attr_reader :response_time
-
+      report_data :response_time
 
       # Configure the scout with given options.
       # @param [Hash] Options to setup the scout

data/lib/outpost/version.rb

@@ -1,5 +1,5 @@
 module Outpost
-  PATCH = 0
+  PATCH = 1
   MINOR = 2
   MAJOR = 0
   VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}".freeze

data/outpost.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "outpost"
 
-  s.files         = `git ls-files`.split("\n")                                          
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")                
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }   
-  s.require_paths = ["lib"]   
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 end

data/test/integration/basic_application_test.rb

@@ -6,10 +6,7 @@ describe "basic application integration test" do
   before(:each) do
     @server = Server.new
     @server.boot(TestApp)
-
-    while !@server.responsive?
-      sleep 0.1
-    end
+    @server.wait_until_booted
   end
 
   class ExampleSuccess < Outpost::Application
@@ -19,6 +16,13 @@ describe "basic application integration test" do
     end
   end
 
+  class ExampleWarning < Outpost::Application
+    using Outpost::Scouts::Http => 'master http server' do
+      options :host => 'localhost', :port => 9595, :path => '/warning'
+      report :warning, :response_code => 402
+    end
+  end
+
   class ExampleFailure < Outpost::Application
     using Outpost::Scouts::Http => 'master http server' do
       options :host => 'localhost', :port => 9595, :path => '/fail'
@@ -40,10 +44,21 @@ describe "basic application integration test" do
     end
   end
 
+  class ExampleBodyWarning < Outpost::Application
+    using Outpost::Scouts::Http => 'master http server' do
+      options :host => 'localhost', :port => 9595, :path => '/warning'
+      report :warning, :response_body => {:equals => 'Omg need payment'}
+    end
+  end
+
   it "should report up when everything's ok" do
     assert_equal :up, ExampleSuccess.new.run
   end
 
+  it "should report warning when there's a warning" do
+    assert_equal :warning, ExampleWarning.new.run
+  end
+
   it "should report failure when something's wrong" do
     assert_equal :down, ExampleFailure.new.run
   end
@@ -52,6 +67,10 @@ describe "basic application integration test" do
     assert_equal :up, ExampleBodySuccess.new.run
   end
 
+  it "should report success when body have a warning" do
+    assert_equal :warning, ExampleBodyWarning.new.run
+  end
+
   it "should report failure when body is wrong" do
     assert_equal :down, ExampleBodyFailure.new.run
   end

data/test/integration/more_complex_test.rb

@@ -6,10 +6,7 @@ describe "using more complex application integration test" do
   before(:each) do
     @server = Server.new
     @server.boot(TestApp)
-
-    while !@server.responsive?
-      sleep 0.1
-    end
+    @server.wait_until_booted
   end
 
   class ExamplePingAndHttp < Outpost::Application
@@ -36,6 +33,30 @@ describe "using more complex application integration test" do
     end
   end
 
+  class ExampleOneWarningOnePassing < Outpost::Application
+    using Outpost::Scouts::Http => 'master http server' do
+      options :host => 'localhost', :port => 9595, :path => '/'
+      report :up, :response_body => {:match => /Up/}
+    end
+
+    using Outpost::Scouts::Http => 'master http server' do
+      options :host => 'localhost', :port => 9595, :path => '/warning'
+      report :warning, :response_code => 402
+    end
+  end
+
+  class ExampleOneWarningOneFailing < Outpost::Application
+    using Outpost::Scouts::Http => 'master http server' do
+      options :host => 'localhost', :port => 9595, :path => '/warning'
+      report :warning, :response_code => 402
+    end
+
+    using Outpost::Scouts::Ping => 'load balancer' do
+      options :host => 'localhost'
+      report :up, :response_time => {:less_than => 0}
+    end
+  end
+
   class ExampleAllFailing < Outpost::Application
     using Outpost::Scouts::Http => 'master http server' do
       options :host => 'localhost', :port => 9595, :path => '/fail'
@@ -52,8 +73,13 @@ describe "using more complex application integration test" do
     assert_equal :up, ExamplePingAndHttp.new.run
   end
 
+  it "should report warning when at least one scout reports warning" do
+    assert_equal :warning, ExampleOneWarningOnePassing.new.run
+  end
+
   it "should report down when at least one scout reports down" do
     assert_equal :down, ExampleOneFailingOnePassing.new.run
+    assert_equal :down, ExampleOneWarningOneFailing.new.run
   end
 
   it "should report down when all are down" do

data/test/integration/no_subclassing_test.rb

@@ -0,0 +1,54 @@
+require 'test_helper'
+
+require 'outpost/scouts/http'
+require 'outpost/notifiers/email'
+
+describe "creating outpost apps without subclassing" do
+  before(:each) do
+    @server = Server.new
+    @server.boot(TestApp)
+    @server.wait_until_booted
+
+    Mail.defaults do
+      delivery_method :test
+    end
+  end
+
+  after(:each) do
+    Mail::TestMailer.deliveries = []
+  end
+
+  it "should report up when everything's ok" do
+    assert_equal :up, outpost.run
+  end
+
+  it "should notify up when everything's ok" do
+    outpost.add_notifier Outpost::Notifiers::Email, {
+      :from    => 'outpost@example.com',
+      :to      => 'sleep_deprived_admin@example.com',
+      :subject => 'System 1 status'
+    }
+
+    outpost.run
+    outpost.notify
+
+    refute_empty Mail::TestMailer.deliveries
+  end
+
+  it "should not notify when there are no notifiers" do
+    outpost.run
+
+    assert_empty Mail::TestMailer.deliveries
+  end
+
+  private
+
+  def outpost
+    @outpost ||= Outpost::Application.new.tap do |outpost|
+      outpost.add_scout Outpost::Scouts::Http => 'master http server' do
+        options :host => 'localhost', :port => 9595
+        report :up, :response_code => 200
+      end
+    end
+  end
+end

data/test/integration/reporting_test.rb

@@ -0,0 +1,40 @@
+require 'test_helper'
+
+require 'outpost/scouts'
+
+describe "using only report data integration test" do
+  class RetrieveServerData < Outpost::Application
+    using Outpost::Scouts::Http => 'master http server' do
+      options :host => 'localhost', :port => 9595, :path => '/'
+    end
+
+    using Outpost::Scouts::Ping => :load_balancer do
+      options :host => 'localhost'
+      report :up, :response_time => {:less_than => 500}
+    end
+  end
+
+  before(:each) do
+    @server = Server.new
+    @server.boot(TestApp)
+    @server.wait_until_booted
+
+    @outpost = RetrieveServerData.new
+    @outpost.run
+  end
+
+  it "should build report for each scout" do
+    assert_equal 2, @outpost.reports.size
+  end
+
+  it "should build reports with data" do
+    http_report = @outpost.reports['master http server']
+    ping_report = @outpost.reports[:load_balancer]
+
+    report_data = http_report.data
+
+    assert report_data.delete(:response_time) < 500
+    assert_equal({:response_code => 200,
+                  :response_body => 'Up and running!'}, http_report.data)
+  end
+end

data/test/outpost/{dsl_test.rb → application_test.rb}

@@ -5,8 +5,10 @@ describe Outpost::Application do
     class << self
       attr_accessor :status
     end
+
     def initialize(*args); end
     def run              ; self.class.status ; end
+    def report_data;     ; {} ; end
   end
 
   class NotifierMock
@@ -32,7 +34,7 @@ describe Outpost::Application do
   end
 
   before(:each) do
-    @scouts = ExampleOne.scouts
+    @scouts = ExampleOne.new.scouts
   end
 
   it "should create correct scout description" do
@@ -47,10 +49,37 @@ describe Outpost::Application do
   end
 
   it "should create notifiers configuration" do
-    notifiers = ExampleOne.notifiers
+    notifiers = ExampleOne.new.notifiers
     assert_equal({NotifierMock => {:email => 'mail@example.com'}}, notifiers)
   end
 
+  describe "#add_scout" do
+    before(:each) do
+      ScoutMock.status = :up
+    end
+
+    it "should be able to create scouts programatically" do
+      outpost = create_outpost
+
+      assert_equal :up, outpost.run
+    end
+  end
+
+  describe "#add_notifier" do
+    before(:each) do
+      ScoutMock.status = :up
+    end
+
+    it "should be able to create notifications programatically" do
+      outpost = create_outpost
+      outpost.run
+      outpost.notify
+
+      assert_equal "ScoutMock: 'master http server' is reporting up.",
+        NotifierMock.last_messages.first
+    end
+  end
+
   describe "#run" do
     it "should return up when scouts return up" do
       ScoutMock.status = :up
@@ -84,6 +113,7 @@ describe Outpost::Application do
 
       refute NotifierMock.last_messages
     end
+
   end
 
   describe "#up?" do
@@ -106,6 +136,26 @@ describe Outpost::Application do
     end
   end
 
+  describe "#warning?" do
+    before(:each) do
+      @outpost = ExampleOne.new
+    end
+
+    it "should return true when last status is warning" do
+      ScoutMock.status = :warning
+      @outpost.run
+
+      assert @outpost.warning?
+    end
+
+    it "should return false when last status isn't warning" do
+      ScoutMock.status = :up
+      @outpost.run
+
+      refute @outpost.warning?
+    end
+  end
+
   describe "#down?" do
     before(:each) do
       @outpost = ExampleOne.new
@@ -154,4 +204,20 @@ describe Outpost::Application do
         @outpost.messages.first
     end
   end
+
+  describe "#reports" do
+
+  end
+
+  private
+
+  def create_outpost
+    Outpost::Application.new.tap do |outpost|
+      outpost.add_scout ScoutMock => 'master http server' do
+        report :up, :response_code => 200
+      end
+
+      outpost.add_notifier NotifierMock, :email => 'mail@example.com'
+    end
+  end
 end

data/test/outpost/expectations/response_code_test.rb

@@ -36,6 +36,14 @@ describe Outpost::Expectations::ResponseCode do
       SubjectCode.evaluation_method
   end
 
+  it "should return true when response code is included in the list" do
+    assert SubjectCode.evaluate_response_code(scout_stub, [200, 301])
+  end
+
+  it "should refute when response code is not included in the list" do
+    refute SubjectCode.evaluate_response_code(scout_stub, [500, 503])
+  end
+
   private
   def scout_stub
     build_stub(:response_code => 200)

data/test/outpost/report_test.rb

@@ -16,4 +16,16 @@ describe Outpost::Report do
   it "should report down when there are no statuses" do
     assert_equal :down, Outpost::Report.summarize([])
   end
+
+  it "should report warning when all are warning" do
+    assert_equal :warning, Outpost::Report.summarize([:warning, :warning])
+  end
+
+  it "should report warning when mixed up and warning" do
+    assert_equal :warning, Outpost::Report.summarize([:warning, :up, :up])
+  end
+
+  it "should report down when mixed down and warning" do
+    assert_equal :down, Outpost::Report.summarize([:warning, :down, :up])
+  end
 end

data/test/outpost/scout_test.rb

@@ -11,6 +11,39 @@ describe Outpost::Scout do
     def execute(*args); end
   end
 
+  class ReportingScoutExample < Outpost::Scout
+    attr_accessor :response
+    report_data :translated_response_code
+    expect :response, lambda {|scout, status| scout.response == status }
+
+    def setup(*args); end
+    def execute(*args); end
+
+    def translated_response_code
+      "Page Not Found"
+    end
+  end
+
+  class BrokenScoutExample < Outpost::Scout
+    attr_accessor :response
+    report_data :reportive
+    expect :response, lambda {|scout, status| scout.response == status }
+
+    def setup(*args); end
+    def execute(*args); end
+  end
+
+  class MultipleReportsScoutExample < Outpost::Scout
+    attr_accessor :response
+    expect :response, lambda {|scout, status| scout.response == status }
+    def response_time; 10; end
+    def response_code; 200; end
+    def setup(*args); end
+    def execute(*args); end
+
+    report_data :response_time, :response_code
+  end
+
   it "should report up when status match" do
     scout = ScoutExample.new("a scout", config_mock)
     scout.response = true
@@ -75,6 +108,36 @@ describe Outpost::Scout do
     end
   end
 
+  it "should complain when a scout does not respond to the method supplied" do
+    assert_raises(ArgumentError, 'Scout BrokenScoutExample does not respond to #reportive reporting method') do
+
+      scout = BrokenScoutExample.new("a scout", config_mock)
+      scout.run
+    end
+  end
+
+  it "should set the report data hash as empty when scout has not been run yet" do
+    scout = ReportingScoutExample.new("a scout", config_mock)
+    assert_equal({}, scout.report_data)
+  end
+
+  it "should fill the report data hash with data collected after being run" do
+    scout = ReportingScoutExample.new("a scout", config_mock)
+    scout.run
+
+    assert_equal({:translated_response_code => "Page Not Found"}, scout.report_data)
+  end
+
+  it "should accept multiple method names" do
+    scout = MultipleReportsScoutExample.new("a scout", config_mock)
+    scout.run
+
+    assert_equal({
+      :response_time => 10,
+      :response_code => 200
+    }, scout.report_data)
+  end
+
   private
   def config_mock
     reports = {

data/test/outpost/scouts/http_test.rb

@@ -24,6 +24,14 @@ describe Outpost::Scouts::Http do
     assert_equal 'Body', @subject.response_body
   end
 
+  it "should set the reporting data accordingly" do
+    NetHttpStub.response { response_stub('200', 'Body') }
+    @subject.run
+
+    assert_equal 200   , @subject.report_data[:response_code]
+    assert_equal 'Body', @subject.report_data[:response_body]
+  end
+
   it "should set response code and body as nil when connection refused" do
     NetHttpStub.response { raise Errno::ECONNREFUSED }
     @subject.execute

data/test/outpost/scouts/ping_test.rb

@@ -27,6 +27,14 @@ describe Outpost::Scouts::Ping do
     refute subject.response_time
   end
 
+  it "should report the response time" do
+    config  = config_stub(:pinger => PingStub.new(true, 0.225))
+    subject = Outpost::Scouts::Ping.new "test", config
+    subject.run
+
+    assert_equal 225, subject.report_data[:response_time]
+  end
+
   private
 
   def config_stub(options={})

data/test/support/server.rb

@@ -2,6 +2,12 @@ require 'rack/handler/thin'
 require 'net/http'
 
 class Server
+  def wait_until_booted
+    while !responsive?
+      sleep 0.1
+    end
+  end
+
   # Got it from Capybara, but simplified it a bit.
   # lib/capybara/server.rb
   def responsive?

data/test/support/test_app.rb

@@ -8,4 +8,8 @@ class TestApp < Sinatra::Base
   get '/fail' do
     [500, 'Omg fail']
   end
+
+  get '/warning' do
+    [402, 'Omg need payment']
+  end
 end

metadata

@@ -1,33 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: outpost
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+version: !ruby/object:Gem::Version
+  version: 0.2.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Vinicius Baggio Fuentes
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-12 00:00:00 -02:00
+date: 2011-06-26 00:00:00.000000000 -03:00
 default_executable: 
 dependencies: []
-
 description: Simple service monitoring with a clean DSL for configuration.
 email: vinibaggio@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - CHANGELOG.rdoc
 - Gemfile
@@ -55,8 +45,10 @@ files:
 - outpost.gemspec
 - test/integration/basic_application_test.rb
 - test/integration/more_complex_test.rb
+- test/integration/no_subclassing_test.rb
 - test/integration/notifiers_test.rb
-- test/outpost/dsl_test.rb
+- test/integration/reporting_test.rb
+- test/outpost/application_test.rb
 - test/outpost/expectations/response_body_test.rb
 - test/outpost/expectations/response_code_test.rb
 - test/outpost/expectations/response_time_test.rb
@@ -75,42 +67,35 @@ files:
 has_rdoc: true
 homepage: http://www.github.com/vinibaggio/outpost
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: outpost
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Simple service monitoring with a clean DSL for configuration.
-test_files: 
+test_files:
 - test/integration/basic_application_test.rb
 - test/integration/more_complex_test.rb
+- test/integration/no_subclassing_test.rb
 - test/integration/notifiers_test.rb
-- test/outpost/dsl_test.rb
+- test/integration/reporting_test.rb
+- test/outpost/application_test.rb
 - test/outpost/expectations/response_body_test.rb
 - test/outpost/expectations/response_code_test.rb
 - test/outpost/expectations/response_time_test.rb