outpost 0.2.3 → 0.2.4

data/.gitignore

@@ -1 +1,3 @@
 .yardoc
+.rvmrc
+*.gem

data/.travis.yml

@@ -0,0 +1,3 @@
+rvm:
+  - ree
+  - 1.9.3

data/CHANGELOG.rdoc

@@ -1,3 +1,16 @@
+== 0.2.4
+Special thanks to @brain-geek for an awesome job on Outpost! This release is his.
+
+* Features:
+ * Added TCP Scout [@brain-geek]
+ * Added support for ranges in HTTP response codes  [@brain-geek]
+* Bugfix:
+ * Fixing NoMethodError on unavailable host [@brain-geek]
+* Other:
+ * Travis CI support!
+ * Removing ruby-debug from dependency [@brain-geek]
+ * Making net-ping as outpost dependency [@brain-geek]
+
 == 0.2.3
 * Bugfix
  * Avoid using ActiveSupport methods

data/Gemfile

@@ -5,6 +5,7 @@ group :test do
   gem 'net-ping', :require => false
   gem 'tinder',   :require => false
 
+  gem 'rake'
   gem 'thin'
   gem 'rack'
   gem 'sinatra'
@@ -12,5 +13,5 @@ group :test do
   gem 'minitest', '~> 2.0.2', :platforms => :ruby_18
   gem 'ruby-debug',           :platforms => :ruby_18
 
-  gem 'ruby-debug19', :platforms => :ruby_19
+#  gem 'ruby-debug19', :platforms => :ruby_19
 end

data/Gemfile.lock

@@ -3,7 +3,6 @@ GEM
   specs:
     activesupport (3.0.3)
     addressable (2.2.2)
-    archive-tar-minitar (0.5.2)
     columnize (0.3.2)
     daemons (1.1.0)
     eventmachine (0.12.10)
@@ -13,8 +12,6 @@ GEM
       rack (>= 1.1.0, < 2)
     i18n (0.5.0)
     linecache (0.43)
-    linecache19 (0.5.11)
-      ruby_core_source (>= 0.1.4)
     mail (2.2.15)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -26,22 +23,13 @@ GEM
     net-ping (1.3.7)
     polyglot (0.3.1)
     rack (1.2.1)
+    rake (0.8.7)
     roauth (0.0.3)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    ruby-debug-base19 (0.11.24)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.4)
-      archive-tar-minitar (>= 0.5.2)
     sinatra (1.1.2)
       rack (~> 1.1)
       tilt (~> 1.2)
@@ -71,8 +59,8 @@ DEPENDENCIES
   minitest (~> 2.0.2)
   net-ping
   rack
+  rake
   ruby-debug
-  ruby-debug19
   sinatra
   thin
   tinder

data/README.markdown

@@ -1,5 +1,7 @@
 # Outpost
 
+Build status: [![Build Status](https://secure.travis-ci.org/vinibaggio/outpost.png)](http://travis-ci.org/vinibaggio/outpost)
+
 ## Features
 
 Outpost is a tool to monitor the state of your service (not server). What does it mean?

data/lib/outpost/application.rb

@@ -95,7 +95,7 @@ module Outpost
     def initialize
       @reports     = {}
       @last_status = nil
-      @scouts      = Hash.new { |h, k| h[k] = {} }
+      @scouts      = Hash.new { |h, k| h[k] = [] }
       @notifiers   = {}
       @name        = self.class.name_template
 
@@ -115,8 +115,10 @@ module Outpost
       config.instance_eval(&block)
 
       scout_description.each do |scout, description|
-        @scouts[scout][:description] = description
-        @scouts[scout][:config]      = config
+        @scouts[scout] << {
+          :description => description,
+          :config => config
+        }
       end
     end
 
@@ -128,8 +130,10 @@ module Outpost
     # Execute all the scouts associated with an Outpost-based class and returns
     # either :up or :down, depending on the results.
     def run
-      scouts.map do |scout, options|
-        @reports[options[:description]] = run_scout(scout, options)
+      scouts.map do |scout, configurations|
+        configurations.each do |options|
+          @reports[options[:description]] = run_scout(scout, options)
+        end
       end
 
       statuses = @reports.map { |_, r| r.status }

data/lib/outpost/expectations/response_code.rb

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

data/lib/outpost/expectations/response_time.rb

@@ -21,7 +21,7 @@ module Outpost
       # Method that will be used as an expectation to evaluate response time
       def evaluate_response_time(scout, rules)
         rules.all? do |rule, comparison|
-          scout.response_time.send(RESPONSE_TIME_MAPPING[rule], comparison)
+          scout.response_time.nil? ? false : scout.response_time.send(RESPONSE_TIME_MAPPING[rule], comparison)
         end
       end
     end

data/lib/outpost/scouts.rb

@@ -1,2 +1,3 @@
 require 'outpost/scouts/http'
 require 'outpost/scouts/ping'
+require 'outpost/scouts/tcp'

data/lib/outpost/scouts/ping.rb

@@ -1,10 +1,4 @@
-begin
-  require 'net/ping/external'
-rescue LoadError => e
-  puts "Please install net-ping gem: gem install net-ping".
-  raise
-end
-
+require 'net/ping/external'
 require 'outpost/expectations'
 
 module Outpost
@@ -14,8 +8,6 @@ module Outpost
     #
     # * Responds to response_time expectation
     #   ({Outpost::Expectations::ResponseTime})
-    #
-    # It needs the 'net-ping' gem.
     class Ping < Outpost::Scout
       extend Outpost::Expectations::ResponseTime
       attr_reader :response_time

data/lib/outpost/scouts/tcp.rb

@@ -0,0 +1,38 @@
+require 'net/ping/tcp'
+require 'outpost/expectations'
+
+module Outpost
+  module Scouts
+    # Uses net/ping tcp pinger to check if port is open
+    #
+    # * Responds to response_time expectation
+    #   ({Outpost::Expectations::ResponseTime})
+    class Tcp < Ping
+      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
+      # @option options [String] :host The host that will be "pinged".
+      # @option options [Object] :pinger An object that can ping hosts.
+      #   Defaults to Net::Ping::Tcp.new
+      def setup(options)
+        host   = options[:host]
+        port   = options[:port]
+        timeout= options[:timeout] || 3
+        pinger = options[:pinger] || Net::Ping::TCP
+
+        @pinger = pinger.new(host, port, timeout)
+      end
+
+      # Runs the scout, pinging the host and getting the duration.
+      def execute
+        if @pinger.ping?
+          # Miliseconds
+          @response_time = @pinger.duration * 1000
+        end
+      end
+    end
+  end
+end

data/lib/outpost/version.rb

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

data/outpost.gemspec

@@ -16,4 +16,6 @@ Gem::Specification.new do |s|
   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.add_dependency "net-ping"
 end

data/test/outpost/application_test.rb

@@ -34,16 +34,33 @@ describe Outpost::Application do
   end
 
   before(:each) do
-    @scouts = ExampleOne.new.scouts
+    @example = ExampleOne.new
+    @scouts = @example.scouts
   end
 
   it "should create correct scout description" do
-    assert_equal(ScoutMock, @scouts.keys.first)
-    assert_equal('master http server', @scouts[ScoutMock][:description])
+    scouts = @scouts[ScoutMock]
+
+    assert scouts
+    assert_equal('master http server', scouts.first[:description])
+  end
+
+  it "should store more than one scout description" do
+    @example.add_scout ScoutMock => 'slave http server' do
+      options :host => 'example.com'
+      report :up, :response_code => 200
+    end
+
+    descriptions = @example.scouts[ScoutMock].map { |options| options[:description] }
+
+    assert_equal(2, @example.scouts[ScoutMock].size)
+    assert_equal('master http server', descriptions.first)
+    assert_equal('slave http server', descriptions.last)
   end
 
   it "should create correct scout config" do
-    config = @scouts[ScoutMock][:config]
+    config = @scouts[ScoutMock].first[:config]
+
     assert_equal({:host => 'localhost'}, config.options)
     assert_equal({{:response_code => 200} => :up}, config.reports)
   end

data/test/outpost/expectations/response_code_test.rb

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

data/test/outpost/expectations/response_time_test.rb

@@ -14,6 +14,13 @@ describe Outpost::Expectations::ResponseTime do
     extend Outpost::Expectations::ResponseTime
   end
 
+  describe ".evaluation_response_time with nil" do
+    it "should fail gracefully" do
+      #this is common, as host can be not accessible for ping
+      refute SubjectTime.evaluate_response_time(build_stub(:response_time => nil), :less_than => 400)
+    end
+  end
+
   describe ".evaluate_response_time with less_than" do
     it "should return true when it matches" do
       assert SubjectTime.evaluate_response_time(scout_stub, :less_than => 5000)

data/test/outpost/scouts/tcp_test.rb

@@ -0,0 +1,32 @@
+require 'test_helper'
+
+describe Outpost::Scouts::Tcp do
+  it "should set the time of ping in milliseconds" do
+    @server = Server.new
+    @server.boot(TestApp)
+    @server.wait_until_booted
+
+    config = config_stub(:port => 9595)
+    subject = Outpost::Scouts::Tcp.new "test", config
+    subject.execute
+
+    assert subject.response_time < 100
+  end
+
+  it "should set the time to nil when it fails" do
+    #nothing uses this port by deafult
+    config = config_stub(:port => 16)
+    subject = Outpost::Scouts::Tcp.new "test", config
+    subject.execute
+
+    assert subject.response_time.nil?
+  end
+
+  private
+
+  def config_stub(options={})
+    options = {:host => 'localhost'}.merge options
+
+    build_stub(:options => options)
+  end  
+end

data/test/test_helper.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'bundler'
 Bundler.setup(:default, :test)
 
-require 'ruby-debug'
+require 'ruby-debug' unless RUBY_VERSION > '1.9'
 require 'ostruct'
 require 'minitest/spec'
 require 'minitest/autorun'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: outpost
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,9 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-06 00:00:00.000000000 -03:00
-default_executable: 
-dependencies: []
+date: 2011-12-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: net-ping
+  requirement: &70128800958440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70128800958440
 description: Simple service monitoring with a clean DSL for configuration.
 email: vinibaggio@gmail.com
 executables: []
@@ -19,6 +29,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG.rdoc
 - Gemfile
 - Gemfile.lock
@@ -41,6 +52,7 @@ files:
 - lib/outpost/scouts.rb
 - lib/outpost/scouts/http.rb
 - lib/outpost/scouts/ping.rb
+- lib/outpost/scouts/tcp.rb
 - lib/outpost/version.rb
 - outpost.gemspec
 - test/integration/basic_application_test.rb
@@ -59,12 +71,12 @@ files:
 - test/outpost/scout_test.rb
 - test/outpost/scouts/http_test.rb
 - test/outpost/scouts/ping_test.rb
+- test/outpost/scouts/tcp_test.rb
 - test/support/nothing_raised.rb
 - test/support/server.rb
 - test/support/stubs.rb
 - test/support/test_app.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://www.github.com/vinibaggio/outpost
 licenses: []
 post_install_message: 
@@ -85,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: outpost
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Simple service monitoring with a clean DSL for configuration.
@@ -106,6 +118,7 @@ test_files:
 - test/outpost/scout_test.rb
 - test/outpost/scouts/http_test.rb
 - test/outpost/scouts/ping_test.rb
+- test/outpost/scouts/tcp_test.rb
 - test/support/nothing_raised.rb
 - test/support/server.rb
 - test/support/stubs.rb