outpost 0.2.4 → 0.2.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9bc0f3503cbedc0a68018342b7caba9f595b3c4e
+  data.tar.gz: a5f5a87728d0c4d0eb8c84bb7bc24bf65f3deaf7
+SHA512:
+  metadata.gz: 5ccad69413b0968d0a3e485324a9b9e789b82406508b89fc5f9011d8cfd9dcf004e36989ddeaa8d7566ab0e396af74f3dc3300957bac026db987b5633549130c
+  data.tar.gz: 50ffd6928a6aa8a441d83063ef253c5680994bddfdefa6eacb541c12ab570037935d5e767cda1e36d36573444988923420856d26ba233efc39d4b5d4c358fabc

data/.travis.yml

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

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 group :test do
   gem 'mail',     :require => false
@@ -6,12 +6,9 @@ group :test do
   gem 'tinder',   :require => false
 
   gem 'rake'
-  gem 'thin'
-  gem 'rack'
-  gem 'sinatra'
+
+  gem 'fakeweb'
 
   gem 'minitest', '~> 2.0.2', :platforms => :ruby_18
   gem 'ruby-debug',           :platforms => :ruby_18
-
-#  gem 'ruby-debug19', :platforms => :ruby_19
 end

data/Gemfile.lock

@@ -1,66 +1,62 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activesupport (3.0.3)
-    addressable (2.2.2)
-    columnize (0.3.2)
-    daemons (1.1.0)
-    eventmachine (0.12.10)
-    faraday (0.5.4)
-      addressable (~> 2.2.2)
-      multipart-post (~> 1.1.0)
-      rack (>= 1.1.0, < 2)
-    i18n (0.5.0)
-    linecache (0.43)
-    mail (2.2.15)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
+    columnize (0.3.6)
+    eventmachine (1.0.3)
+    fakeweb (1.3.0)
+    faraday (0.8.7)
+      multipart-post (~> 1.1)
+    faraday_middleware (0.9.0)
+      faraday (>= 0.7.4, < 0.9)
+    ffi (1.9.0)
+    hashie (1.2.0)
+    http_parser.rb (0.5.3)
+    json (1.7.7)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
+    mime-types (1.23)
     minitest (2.0.2)
-    multipart-post (1.1.0)
-    net-ping (1.3.7)
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rake (0.8.7)
-    roauth (0.0.3)
+    multi_json (1.7.7)
+    multipart-post (1.2.0)
+    net-ping (1.6.1)
+      ffi (>= 1.0.0)
+    polyglot (0.3.3)
+    rake (10.1.0)
+    rbx-require-relative (0.0.9)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    sinatra (1.1.2)
-      rack (~> 1.1)
-      tilt (~> 1.2)
-    thin (1.2.7)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
-    tilt (1.2.2)
-    tinder (1.4.3)
-      activesupport
-      eventmachine
-      faraday (~> 0.5.1)
-      mime-types
-      multipart-post
-      twitter-stream
-    treetop (1.4.9)
+    simple_oauth (0.1.9)
+    tinder (1.9.2)
+      eventmachine (~> 1.0)
+      faraday (~> 0.8)
+      faraday_middleware (~> 0.9)
+      hashie (~> 1.0)
+      json (~> 1.7.5)
+      mime-types (~> 1.19)
+      multi_json (~> 1.5)
+      twitter-stream (~> 0.1)
+    treetop (1.4.14)
+      polyglot
       polyglot (>= 0.3.1)
-    twitter-stream (0.1.10)
+    twitter-stream (0.1.16)
       eventmachine (>= 0.12.8)
-      roauth (>= 0.0.2)
+      http_parser.rb (~> 0.5.1)
+      simple_oauth (~> 0.1.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  fakeweb
   mail
   minitest (~> 2.0.2)
   net-ping
-  rack
   rake
   ruby-debug
-  sinatra
-  thin
   tinder

data/README.markdown

@@ -27,7 +27,7 @@ So, summing it all up, Nagios in Ruby, much cooler!
 
 ## Installing
 
-Outpost is tested with Ruby 1.8.7 and Ruby 1.9.2.
+Outpost is tested with Ruby 1.8.7 and Ruby 1.9.3.
 
     gem install outpost
 

data/lib/outpost/notifiers/email.rb

@@ -23,6 +23,7 @@ module Outpost
         @from    = options[:from]
         @to      = options[:to]
         @subject = options[:subject] || 'Outpost notification'
+        @delivery_method = options[:delivery_method] || []
 
         unless @from && @to
           raise ArgumentError, 'You need to set :from and :to to send emails.'
@@ -41,6 +42,8 @@ module Outpost
         mail.subject = @subject
         mail.body    = build_message(outpost)
 
+        mail.send(:delivery_method, *@delivery_method) unless @delivery_method.empty?
+
         mail.deliver
       end
 

data/lib/outpost/scouts/http.rb

@@ -1,4 +1,5 @@
 require 'net/http'
+require 'net/https'
 require 'outpost/expectations'
 
 module Outpost
@@ -26,21 +27,37 @@ module Outpost
       # @option options [String] :host The host that will be connected to.
       # @option options [Number] :port The port that will be used to.
       # @option options [String] :path The path that will be fetched from the
+      # @option options [Boolean] :ssl Should we use ssl?
       #   host.
       # @option options [String] :http_class The class that will be used to
       #   fetch the page, defaults to Net::HTTP
       def setup(options)
-        @host       = options[:host]
-        @port       = options[:port]       || 80
-        @path       = options[:path]       || '/'
-        @http_class = options[:http_class] || Net::HTTP
+        @host         = options.fetch(:host)
+        @path         = options.fetch(:path, '/')
+        @ssl          = options.fetch(:ssl, false)
+        @port         = options.fetch(:port, (@ssl ? 443 : 80))
+        @http_class   = options.fetch(:http_class, Net::HTTP)
+        @request_head = options.fetch(:request_head, false)
       end
 
       # 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)
+        if @request_head
+          response = @http_class.request_head(@host, @path, @port)
+        else
+          uri = (@ssl ? URI::HTTPS : URI::HTTP).build({
+            host: @host,
+            port: @port,
+            path: @path
+          })
+          http = @http_class.new(uri.host, uri.port)
+          http.use_ssl = @ssl
+
+          request = @http_class::Get.new(uri.request_uri)
+          response = http.request(request)
+        end
 
         @response_time = (Time.now - previous_time) * 1000 # Miliseconds
         @response_code = response.code.to_i

data/lib/outpost/version.rb

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

data/test/integration/basic_application_test.rb

@@ -3,12 +3,6 @@ require 'test_helper'
 require 'outpost/scouts/http'
 
 describe "basic application integration test" do
-  before(:each) do
-    @server = Server.new
-    @server.boot(TestApp)
-    @server.wait_until_booted
-  end
-
   class ExampleSuccess < Outpost::Application
     using Outpost::Scouts::Http => 'master http server' do
       options :host => 'localhost', :port => 9595

data/test/integration/more_complex_test.rb

@@ -3,12 +3,6 @@ require 'test_helper'
 require 'outpost/scouts'
 
 describe "using more complex application integration test" do
-  before(:each) do
-    @server = Server.new
-    @server.boot(TestApp)
-    @server.wait_until_booted
-  end
-
   class ExamplePingAndHttp < Outpost::Application
     using Outpost::Scouts::Http => 'master http server' do
       options :host => 'localhost', :port => 9595, :path => '/'

data/test/integration/no_subclassing_test.rb

@@ -4,11 +4,7 @@ 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
-
+  before do
     Mail.defaults do
       delivery_method :test
     end

data/test/integration/reporting_test.rb

@@ -15,10 +15,6 @@ describe "using only report data integration test" do
   end
 
   before(:each) do
-    @server = Server.new
-    @server.boot(TestApp)
-    @server.wait_until_booted
-
     @outpost = RetrieveServerData.new
     @outpost.run
   end

data/test/outpost/notifiers/email_test.rb

@@ -1,5 +1,7 @@
 require 'test_helper'
 
+require 'tmpdir'
+
 describe Outpost::Notifiers::Email do
   before(:each) do
     Mail.defaults do
@@ -40,6 +42,32 @@ describe Outpost::Notifiers::Email do
     end
   end
 
+  describe "#delivery_method" do
+    it "should use other delivery method if present" do
+      subject = Outpost::Notifiers::Email.new(
+          :from => 'mail@localhost',
+          :to   => 'mailer@example.com',
+          #using file_delivery send method for testing
+          :delivery_method => [:file, {:location => Dir.tmpdir}]
+        )
+
+      subject.notify(outpost_stub)
+
+      assert_equal Mail::TestMailer.deliveries, []
+    end
+
+    it "should use default if not present" do
+      subject = Outpost::Notifiers::Email.new(
+          :from => 'mail@example.com',
+          :to   => 'mailer@example.com'
+        )
+
+      subject.notify(outpost_stub)
+
+      assert_equal ["mail@example.com"], Mail::TestMailer.deliveries.first.from
+    end    
+  end
+
   describe "#notify" do
     it "should send a simple email" do
       subject = Outpost::Notifiers::Email.new(

data/test/outpost/scouts/http_test.rb

@@ -1,12 +1,42 @@
 require 'test_helper'
+require 'ostruct'
 
 describe Outpost::Scouts::Http do
   class NetHttpStub
+    class Get
+      def initialize(*args); end
+    end
+
+    def initialize *args; end
+    def use_ssl= *args; end
+
+    def request(*args, &block)
+      self.class.response
+    end
+
+    class << self
+      def response(*args, &block)
+        if (block)
+          @response = block
+        else
+          @response.call
+        end
+      end
+
+      def request_head(*args)
+        throw "Unexpected call"
+      end
+    end
+  end
+
+  class NetHttpHeadStub < NetHttpStub
     class << self
-      def response(&block); @response = block; end
+      def request_head(*args)
+        OpenStruct.new :code => 200, :body => 'Body'
+      end
 
       def get_response(*args)
-        @response.call
+        throw "Unexpected call"
       end
     end
   end
@@ -47,6 +77,16 @@ describe Outpost::Scouts::Http do
     refute @subject.response_body
   end
 
+  it "should make HEAD request if option is passed" do
+    config_stub = config_stub(:host => 'localhost', :http_class => NetHttpHeadStub, :request_head => true)
+    @subject    = Outpost::Scouts::Http.new("description", config_stub)
+
+    @subject.run
+
+    assert_equal 200   , @subject.response_code
+    assert_equal 'Body', @subject.response_body    
+  end
+
   private
 
   def config_stub(options={})

data/test/outpost/scouts/tcp_test.rb

@@ -2,15 +2,24 @@ 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
+    cls = Class.new do
+      def initialize(host, port, timeout)
+      end
 
-    config = config_stub(:port => 9595)
+      def duration
+        0.01
+      end
+
+      def ping? 
+        true
+      end
+    end
+
+    config = config_stub(:port => 9595, :pinger => cls)
     subject = Outpost::Scouts::Tcp.new "test", config
     subject.execute
 
-    assert subject.response_time < 100
+    assert subject.response_time.to_i < 100
   end
 
   it "should set the time to nil when it fails" do

data/test/support/requests.rb

@@ -0,0 +1,6 @@
+require 'fakeweb'
+
+FakeWeb.allow_net_connect = false
+FakeWeb.register_uri(:get, "http://localhost:9595", :body => 'Up and running!', :status => 200)
+FakeWeb.register_uri(:get, "http://localhost:9595/fail", :body => 'Omg fail', :status => 500)
+FakeWeb.register_uri(:get, "http://localhost:9595/warning", :body => 'Omg need payment', :status => 402)

data/test/test_helper.rb

@@ -8,8 +8,7 @@ require 'minitest/spec'
 require 'minitest/autorun'
 
 # Integration test helpers
-require 'support/test_app'
-require 'support/server'
+require 'support/requests'
 require 'support/stubs'
 require 'support/nothing_raised'
 
@@ -19,5 +18,4 @@ require 'outpost/notifiers'
 require 'outpost/scouts'
 
 include Support::Stubs
-include Support::NothingRaised
-
+include Support::NothingRaised

metadata

@@ -1,27 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: outpost
 version: !ruby/object:Gem::Version
-  version: 0.2.4
-  prerelease: 
+  version: 0.2.5
 platform: ruby
 authors:
 - Vinicius Baggio Fuentes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-22 00:00:00.000000000 Z
+date: 2013-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ping
-  requirement: &70128800958440 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70128800958440
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple service monitoring with a clean DSL for configuration.
 email: vinibaggio@gmail.com
 executables: []
@@ -73,33 +75,31 @@ files:
 - test/outpost/scouts/ping_test.rb
 - test/outpost/scouts/tcp_test.rb
 - test/support/nothing_raised.rb
-- test/support/server.rb
+- test/support/requests.rb
 - test/support/stubs.rb
-- test/support/test_app.rb
 - test/test_helper.rb
 homepage: http://www.github.com/vinibaggio/outpost
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: outpost
-rubygems_version: 1.8.11
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple service monitoring with a clean DSL for configuration.
 test_files:
 - test/integration/basic_application_test.rb
@@ -120,7 +120,6 @@ test_files:
 - test/outpost/scouts/ping_test.rb
 - test/outpost/scouts/tcp_test.rb
 - test/support/nothing_raised.rb
-- test/support/server.rb
+- test/support/requests.rb
 - test/support/stubs.rb
-- test/support/test_app.rb
 - test/test_helper.rb

data/test/support/server.rb

@@ -1,29 +0,0 @@
-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?
-    res = Net::HTTP.start('localhost', 9595) { |http| http.get('/') }
-
-    res.is_a?(Net::HTTPSuccess) or res.is_a?(Net::HTTPRedirection)
-  rescue Errno::ECONNREFUSED, Errno::EBADF
-    return false
-  end
-
-  def boot(app)
-    if not responsive?
-      Thread.new do
-        Thin::Logging.silent = true
-        Rack::Handler::Thin.run(app, :Port => 9595)
-      end
-    end
-  end
-end

data/test/support/test_app.rb

@@ -1,15 +0,0 @@
-require 'sinatra/base'
-
-class TestApp < Sinatra::Base
-  get '/' do
-    [200, 'Up and running!']
-  end
-
-  get '/fail' do
-    [500, 'Omg fail']
-  end
-
-  get '/warning' do
-    [402, 'Omg need payment']
-  end
-end