easymon 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1d844ad37457ec68ce0512ece0e56f84516b7f8
-  data.tar.gz: c78d9ec743dd261f9f6a951fb6de04085b026f22
+  metadata.gz: 0a7954525c464810b1c89b990ff7b353c2379f5a
+  data.tar.gz: 694349ce9fb924e1c1e4b789ef9a24742f55e89f
 SHA512:
-  metadata.gz: 09529599fa38fd5e2ede81efcfdd3aac49de5541a2f7af778010a84f2f2eaf67d451b0eb4306fe6eae70d00703450a87a2a60aab7a11f4b7062752c97807661e
-  data.tar.gz: 0af5259ef29c684a5bf1fce18c51d34a514beff38ea694ca8ed9f43c15cd8423bba84a0fb070ebf04bb0b66c091c6e7da52a534444c75905b8ad72243ef914f4
+  metadata.gz: a535bef8ef8df2fcf9184d5b310b020e398f1465e40afe03c9b3491a21aefb86f02584a7bb692b337ac5217e2372d0031e8f85a08dc481c4ac35cfea38f5ec7e
+  data.tar.gz: 797c12bcb3a9ecda8a2a582811e79c172c0425d1784d4d03fa7c813e63f4241f15d7506e378064a58a2f330f3e6f0e2447fd8f31147ef0ed138ca90c81e73ccc

data/lib/easymon/checks/http_check.rb

@@ -1,4 +1,4 @@
-require "restclient"
+require 'net/https'
 
 module Easymon
   class HttpCheck
@@ -19,15 +19,22 @@ module Easymon
     end
     
     private
-      def http_up?(config_url)
-        response = RestClient::Request.execute(
-                                      :method => :head, 
-                                      :url => config_url,
-                                      :timeout => 5,
-                                      :open_timeout => 5)
-        true
+      def http_up?(url)
+        http_head(url).is_a?(Net::HTTPSuccess)
       rescue Exception
         false
       end
+
+      def http_head(url)
+        uri = URI.parse(url)
+
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = uri.is_a?(URI::HTTPS)
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        http.open_timeout = 5
+        http.read_timeout = 5
+
+        http.request Net::HTTP::Head.new(uri.request_uri)
+      end
   end
-end
+end

data/lib/easymon/testing.rb

@@ -1,14 +1,16 @@
 module Easymon
-  class Testing
-    def self.stub_check(name)
+  module Testing
+    extend self
+
+    def stub_check(name)
       Easymon.const_get("#{name.to_s.capitalize}Check").any_instance.stubs(:check)
     end
 
-    def self.stub_service_success(name)
+    def stub_service_success(name)
       stub_check(name).returns([true, "Up"])
     end
 
-    def self.stub_service_failure(name)
+    def stub_service_failure(name)
       stub_check(name).returns([false, "Down"])
     end
   end

data/lib/easymon/version.rb

@@ -1,3 +1,3 @@
 module Easymon
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/test/unit/checks/http_check_test.rb

@@ -1,21 +1,32 @@
 require 'test_helper'
 
 class HttpCheckTest < ActiveSupport::TestCase
-  
   test "#run sets success conditions on successful run" do
-    RestClient::Request.any_instance.stubs(:execute).returns(true)
+    Net::HTTP.any_instance.stubs(:request).returns(Net::HTTPSuccess.new(1.1, 200, "OK"))
+
     check = create_check
     results = check.check
-    
+
     assert_equal("Up", results[1])
     assert_equal(true, results[0])
   end
   
   test "#run sets failure conditions on a failed run" do
-    RestClient::Request.any_instance.stubs(:execute).raises("boom")
+    Net::HTTP.any_instance.stubs(:request).returns(Net::HTTPNotFound.new(1.1, 404, "Not Found"))
+
+    check = create_check
+    results = check.check
+
+    assert_equal("Down", results[1])
+    assert_equal(false, results[0])
+  end
+
+  test "#run sets failure conditions on an errored run" do
+    Net::HTTP.any_instance.stubs(:request).raises("boom")
+
     check = create_check
     results = check.check
-    
+
     assert_equal("Down", results[1])
     assert_equal(false, results[0])
   end
@@ -26,8 +37,7 @@ class HttpCheckTest < ActiveSupport::TestCase
     assert_equal("Down", results[1])
     assert_equal(false, results[0])
   end
-  
-  
+
   private
   def create_check
     # Fake URL

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: easymon
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Nathan Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement