arborist-webservice 0.0.1.pre20161005112659 → 0.0.1.pre20180815100446

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4e227c38b920952303ac075e51233e29f069947e2f656ef61a7d5e58317f1dc
-  data.tar.gz: ecd18bd697e9dff6ad1c8d529447ff39d75f45b05c3f829a6cbf16ce4ff4d10b
+  metadata.gz: f1006dfaf9b120fa2720a2637603c4f75397cbe36d62f2039c35d4a1f8c39b56
+  data.tar.gz: 46b34fd363f89a60bcfa7cdafceeec8d2a68c00e9e0b79d2c5126b9fc4b47137
 SHA512:
-  metadata.gz: db32b2a146b73b8fe22fa7d2171ea9a7fc9cff8b39a0d73a0d1bcfb497586bd67283f59abcfbc97328d8a1f1a0a89cc9c6c490f2f93dc6a597e6d5c804cbcabe
-  data.tar.gz: d653466ef7c1fb00c80d958f75382f87a3291d2fce72fa8b7b0ca119b3d096479929f45334d982c07a406b1971d23cafea80cc4c1ec233e8997b9d01f19b10ed
+  metadata.gz: 3d5b067c522b37beb004f549c98fba58ba7e64806a79baa05be708344ef9cc6801d982ec083bedfacbed75f6e30eb5fa4ef09ebf0b744f88272d032f1ea2dc9a
+  data.tar.gz: 49457c9714ce9c128be66eb3e04a9f7bc280ebbf4c0359e2d3719e73415eb21ce62189eb07ff68e095f876f5b8b2dadf996b46dedf230d3084baa0aa4bf5d299

data/ChangeLog

@@ -1,3 +1,36 @@
+2018-08-15  Michael Granger  <ged@FaerieMUD.org>
+
+	* .gems, Rakefile, lib/arborist/monitor/webservice.rb,
+	lib/arborist/node/webservice.rb, lib/arborist/webservice.rb,
+	lib/arborist/webservice/connection.rb,
+	lib/arborist/webservice/constants.rb,
+	lib/arborist/webservice/monkeypatches.rb:
+	Checkpoint commit before switching to Typhoeus
+	[d2e9ed791434] [tip]
+
+2018-08-01  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* .ruby-version, lib/arborist/node/webservice.rb:
+	Keep the URI as a string when serializing.
+	[04839f2b49b5]
+
+2017-12-29  Michael Granger  <ged@FaerieMUD.org>
+
+	* README.md:
+	Fix incorrect URLs in the README
+	[7bdc40158b25] [github/master]
+
+	* .gems, .pryrc, .ruby-gemset, .ruby-version, .rvm.gems, .rvmrc,
+	ChangeLog, History.md, LICENSE.txt, Manifest.txt, README.md,
+	Rakefile, arborist-webservice.gemspec, certs/ged.pem,
+	lib/arborist/monitor/webservice.rb, lib/arborist/node/webservice.rb,
+	lib/arborist/webservice.rb,
+	lib/arborist/webservice/monkeypatches.rb,
+	spec/arborist/monitor/webservice_spec.rb,
+	spec/arborist/webservice_spec.rb, spec/spec_helper.rb:
+	Finished up initial implementation
+	[dd3e9ea1e09f]
+
 2016-02-08  Michael Granger  <ged@FaerieMUD.org>
 
 	* .document, .editorconfig, .hgignore, .pryrc, .rdoc_options,
@@ -5,4 +38,4 @@
 	certs/ged.pem, lib/arborist/node/webservice.rb,
 	spec/arborist/node/webservice_spec.rb, spec/spec_helper.rb:
 	Initial commit.
-	[d318b4f0d795] [tip]
+	[d318b4f0d795]

data/Manifest.txt

@@ -10,5 +10,8 @@ Rakefile
 lib/arborist/monitor/webservice.rb
 lib/arborist/node/webservice.rb
 lib/arborist/webservice.rb
+lib/arborist/webservice/constants.rb
+spec/arborist/monitor/webservice_spec.rb
 spec/arborist/node/webservice_spec.rb
+spec/arborist/webservice_spec.rb
 spec/spec_helper.rb

data/README.md

@@ -1,13 +1,13 @@
 # Arborist-Webservices
 
 home
-: http://bitbucket.org/ged/Arborist-Webservices
+: http://bitbucket.org/ged/Arborist-Webservice
 
 github
-: https://github.com/ged/arborist-webservices
+: https://github.com/ged/arborist-webservice
 
 docs
-: http://deveiate.org/code/arborist-webservices
+: http://deveiate.org/code/arborist-webservice
 
 
 ## Description
@@ -50,14 +50,14 @@ This would check that an OPTIONS HTTP request to `http://api.example.com/v1/hear
 
 ## Installation
 
-    $ gem install arborist-webservices
+    $ gem install arborist-webservice
 
 
 ## Contributing
 
 You can check out the current development source with Mercurial via its
-{project page}[http://bitbucket.org/ged/arborist-webservices]. Or if you prefer Git, via 
-{its Github mirror}[https://github.com/ged/arborist-webservices].
+{project page}[http://bitbucket.org/ged/arborist-webservice]. Or if you prefer Git, via 
+{its Github mirror}[https://github.com/ged/arborist-webservice].
 
 After checking out the source, run:
 

data/Rakefile

@@ -31,7 +31,7 @@ hoespec = Hoe.spec 'arborist-webservice' do |spec|
 
 	spec.dependency 'arborist', '~> 0'
 	spec.dependency 'loggability', '~> 0.11'
-	spec.dependency 'httpclient', '~> 2.7'
+	spec.dependency 'typhoeus', '~> 1.3'
 
 	spec.dependency 'hoe-deveiate',            '~> 0.3', :developer
 	spec.dependency 'simplecov',               '~> 0.7', :developer

data/lib/arborist/monitor/webservice.rb

@@ -1,25 +1,49 @@
 # -*- ruby -*-
 #encoding: utf-8
 
-require 'thread'
-require 'httpclient'
+require 'typhoeus'
 
 require 'arborist'
-require 'arborist/webservice'
 require 'arborist/mixins'
 require 'arborist/monitor' unless defined?( Arborist::Monitor )
 
+require 'arborist/webservice'
+require 'arborist/webservice/constants'
+
+
+using Arborist::TimeRefinements
+
 
 # A web-service monitor type for Arborist
 module Arborist::Monitor::Webservice
+	extend Configurability
+
+
+	configurability( 'arborist.monitors.webservice' ) do
+
+		##
+		# The default timeout employed by the socket monitors, in floating-point
+		# seconds.
+		setting :default_timeout, default: 2.0 do |val|
+			Float( val )
+		end
+
+		##
+		# The maximum number of ongoing HTTP requests
+		setting :max_concurrency, default: 100 do |val|
+			Integer( val )
+		end
 
-	using Arborist::TimeRefinements
+	end
 
 
 
 	# Arborist HTML web service monitor logic
 	class HTML
 		extend Loggability
+		include Arborist::Webservice::Constants
+
+
 		log_to :arborist_webservice
 
 
@@ -28,6 +52,15 @@ module Arborist::Monitor::Webservice
 			timeout: 5.seconds
 		}
 
+		# The array of node properites used by this monitor
+		NODE_PROPERTIES = %i[ uri http_method body body_mimetype ].freeze
+
+
+		### Return an array of attributes to fetch from nodes for this monitor.
+		def self::node_properties
+			return NODE_PROPERTIES
+		end
+
 
 		### Instantiate a monitor check and run it for the specified +nodes+.
 		def self::run( nodes )
@@ -39,16 +72,8 @@ module Arborist::Monitor::Webservice
 		###
 		### +:timeout+
 		###   Set the number of seconds to wait for a connection for each node.
-		def initialize( options=DEFAULT_OPTIONS )
-			options = DEFAULT_OPTIONS.merge( options || {} )
-
-			options.each do |name, value|
-				self.public_send( "#{name}=", value )
-			end
-
-			agent = "%p/%s via %s" %
-				[ self.class, Arborist::Webservice::VERSION, HTTPClient::DEFAULT_AGENT_NAME ]
-			@client = HTTPClient.new( agent_name: agent )
+		def initialize( timeout: Arborist::Monitor::Webservice.default_timeout )
+			self.timeout = timeout
 		end
 
 
@@ -59,9 +84,6 @@ module Arborist::Monitor::Webservice
 		# The timeout for connecting, in seconds.
 		attr_accessor :timeout
 
-		# The HTTPClient object to use for HTTP
-		attr_accessor :client
-
 
 		### Return a clone of this object with its timeout set to +new_timeout+.
 		def with_timeout( new_timeout )
@@ -71,99 +93,114 @@ module Arborist::Monitor::Webservice
 		end
 
 
-		### Run the HTML check for each of the specified Hash of +nodes+ and return a Hash of
-		### updates for them based on trying to connect to them.
+		### Test HTTP connections for the specified +nodes+.
 		def run( nodes )
-			self.log.debug "Got %d nodes to check with %p" % [ nodes.length, self ]
+			results = {}
+			hydra = Typhoeus::Hydra.new( self.runner_settings )
+
+			nodes.each do |identifier, node|
+				self.log.debug "Making request for node %s" % [ identifier ]
+				request = self.request_for_node( node )
+				request.on_complete do |response|
+					self.log.debug "Handling response for %s" % [ identifier ]
+					results[ identifier ] = self.make_response_results( response )
+				end
+				hydra.queue( request )
+			end
 
-			connections = self.make_request_connections( nodes )
-			return self.wait_for_connections( connections )
+			hydra.run
+
+			return results
 		end
 
 
-		### Create Threads that will execute the HTTP requests for the specified +nodes+
-		### and return them in a ThreadGroup.
-		def make_request_connections( nodes )
-			connections = {}
+		### Return a request object built to test the specified webservice +node+.
+		def request_for_node( node_data )
+			options = {
+				method: node_data['http_method'] || DEFAULT_HTTP_METHOD,
+				http_version: node_data['http_version'] || DEFAULT_HTTP_VERSION,
+				headers: self.make_headers_hash( node_data ),
+				body: node_data['body'],
+				timeout: self.timeout,
+				connecttimeout: self.timeout / 2.0,
+			}
 
-			nodes.each do |identifier, node_data|
-				uri = node_data['uri']
-				conn = client.head_async( uri )
-				connections[ conn ] = identifier
+			if ssl_opts = self.make_ssl_options( node_data['uri'], node_data )
+				options.merge!( ssl_opts )
 			end
 
-			return connections
+			return Typhoeus::Request.new( node_data['uri'], options )
 		end
 
 
-		### Fetch the response from the request in each thread in the specified
-		### +threadgroup+. Return the results.
-		def wait_for_connections( connections )
-			results = {}
-			start = Time.now
-			timeout_at = Time.now + self.timeout
-
-			until connections.empty? || timeout_at.past?
-				responses = self.handle_connection_responses( connections )
-				results.merge!( responses )
-			end
+		### Make a Hash of SSL options if any are specified.
+		def make_ssl_options( uri, node_data )
+			return nil unless uri.start_with?( 'https:' )
 
-			# The rest are timeouts
-			if !connections.empty?
-				errors = self.timeout_connections( connections )
-				results.merge!( errors )
+			ssl_attributes = SSL_ATTRIBUTES.each_with_object({}) do |(key, ssl_key), opts|
+				opts[ ssl_key ] = node_data[ key.to_s ] if node_data.key?( key.to_s )
 			end
 
-			return results
+			return ssl_attributes
 		end
 
 
-		### Look for +connections+ that are finished and remove them. Modifies +connections+
-		### in place and returns a Hash of results based on responses.
-		def handle_connection_responses( connections )
-			results = {}
-
-			connections.keys.each do |conn|
-				begin
-					next unless conn.finished?
-
-					identifier = connections.delete( conn )
-					message = conn.pop
-
-					if message.ok?
-						results[ identifier ] = {
-							status: message.status_code,
-							http_version: message.http_version,
-						}
-					else
-						results[ identifier ] = {
-							error: "#{message.status_code} response",
-							status: message.status_code,
-							http_version: message.http_version,
-						}
-					end
-				rescue => err
-					identifier ||= connections.delete( conn ) or
-						raise "Couldn't find identifier for connection %p" % [ conn ]
-					results[ identifier ] = { error: err.message }
-				end
+		### Extract header values from the node_data, combine them with the defaults,
+		### and return them as a Hash.
+		def make_headers_hash( node_data )
+			headers = DEFAULT_HTTP_HEADERS.merge( node_data['http_headers'] || {} )
+			if node_data['body']
+				headers[ 'Content-type' ] ||= node_data['body_mimetype'] ||
+					 'application/x-www-form-urlencoded'
 			end
 
-			return results
+			return headers
 		end
 
 
-		### Cancel each of the given +connections+ and return a Hash of results.
-		def timeout_connections( connections )
-			results = {}
-			connections.each do |conn, identifier|
-				conn.async_thread.kill
-				results[ identifier ] = {
-					error: "Request timeout after %ds." % [ self.timeout ]
+		### Return a Hash of options to pass to the request runner.
+		def runner_settings
+			return {
+				max_concurrency: Arborist::Monitor::Webservice.max_concurrency,
+			}
+		end
+
+
+		### Return a Hash of results appropriate for the specified +response+.
+		def make_response_results( response )
+			if response.success?
+				return { webservice: self.success_results(response) }
+			elsif response.timed_out?
+				self.log.error "Request timed out."
+				return { error: 'Request timed out.' }
+			elsif response.code == 0
+				self.log.error "Non-HTTP response: %s." % [ response.return_code ]
+				return { error: response.return_code }
+			else
+				self.log.error "Got a %03d %s response." % [ response.code, response.status_message ]
+				return {
+					error: "%03d %s" % [ response.code, response.status_message ]
 				}
 			end
+		end
 
-			return results
+
+		### Return the information hash attached to webservice nodes for successful
+		### responses.
+		def success_results( response )
+			return {
+				status: response.code,
+				status_message: response.status_message,
+				headers: response.headers_hash,
+				appconnect_time: response.appconnect_time,
+				connect_time: response.connect_time,
+				lookup_time: response.name_lookup_time,
+				pretransfer_time: response.pretransfer_time,
+				redirect_count: response.redirect_count,
+				redirect_time: response.redirect_time,
+				start_transfer_time: response.start_transfer_time,
+				total_time: response.total_time,
+			}
 		end
 
 	end # class HTML

data/lib/arborist/node/webservice.rb

@@ -4,13 +4,16 @@
 require 'loggability'
 
 require 'arborist'
-require 'arborist/webservice'
 require 'arborist/node/service' unless defined?( Arborist::Node::Service )
 
+require 'arborist/webservice'
+require 'arborist/webservice/constants'
+
 
 # A web-service node type for Arborist
 class Arborist::Node::Webservice < Arborist::Node::Service
 	extend Loggability
+	include Arborist::Webservice::Constants
 
 
 	# Loggability API -- use the logger for this library
@@ -22,18 +25,21 @@ class Arborist::Node::Webservice < Arborist::Node::Service
 
 	### Create a new Webservice node.
 	def initialize( identifier, host, uri, attributes={}, &block )
-		@uri = URI( uri )
+		@uri = uri
+		uri_obj = URI( uri )
 
-		attributes[:app_protocol] ||= @uri.scheme
-		attributes[:port] ||= @uri.port
+		attributes[:app_protocol] ||= uri_obj.scheme
+		attributes[:port] ||= uri_obj.port
 		attributes[:protocol] = 'tcp'
-		attributes[:http_method] ||= 'OPTIONS'
-		attributes[:expected_status] ||= '2xx'
+		attributes[:app_protocol] = 'http'
+		attributes[:http_method] ||= DEFAULT_HTTP_METHOD
+		attributes[:http_headers] ||= {}
+		attributes[:expected_status] ||= DEFAULT_EXPECTED_STATUS
+		attributes[:body] ||= ''
+		attributes[:body_mimetype] ||= DEFAULT_BODY_MIMETYPE
 
 		self.log.debug "Supering with attributes: %p " % [ attributes ]
 		super( identifier, host, attributes, &block )
-
-		@api_version = nil
 	end
 
 
@@ -43,11 +49,42 @@ class Arborist::Node::Webservice < Arborist::Node::Service
 
 	##
 	# The URI of an endpoint that can be used to monitor the webservice
-	attr_reader :uri
+	dsl_accessor :uri
 
 	##
-	# The API version of this service (if it has one)
-	attr_reader :api_version
+	# The http_method used by the service
+	dsl_accessor :http_method
+
+	##
+	# The expected_status used by the service
+	dsl_accessor :expected_status
+
+	##
+	# The body used by the service
+	dsl_accessor :body
+
+	##
+	# The body_mimetype used by the service
+	dsl_accessor :body_mimetype
+
+
+	SSL_ATTRIBUTES.each_key do |attrname|
+		dsl_accessor( attrname )
+	end
+
+
+	### Set node +attributes+ from a Hash.
+	def modify( attributes )
+		attributes = stringify_keys( attributes )
+
+		super
+
+		self.uri( attributes['uri'] )
+		self.http_method( attributes['http_method'] )
+		self.expected_status( attributes['expected_status'] )
+		self.body( attributes['body'] )
+		self.body_mimetype( attributes['body_mimetype'] )
+	end
 
 
 	### Returns +true+ if the node matches the specified +key+ and +val+ criteria.
@@ -55,8 +92,15 @@ class Arborist::Node::Webservice < Arborist::Node::Service
 		self.log.debug "Matching %p: %p against %p" % [ key, val, self ]
 		return case key
 			when 'uri'
-				val = URI( val )
-				self.uri == val
+				URI( self.uri ) == URI( val )
+			when 'http_method'
+				self.http_method == val
+			when 'expected_status'
+				self.expected_status == val
+			when 'body'
+				self.body == val
+			when 'body_mimetype'
+				self.body_mimetype == val
 			else
 				super
 			end
@@ -67,21 +111,44 @@ class Arborist::Node::Webservice < Arborist::Node::Service
 	### monitor state.
 	def operational_values
 		return super.merge(
-			uri: self.uri.to_s,
-			api_version: self.api_version
+			uri: self.uri,
+			http_method: self.http_method,
+			expected_status: self.expected_status,
+			body: self.body,
+			body_mimetype: self.body_mimetype
 		)
 	end
 
 
 	### Return service-node-specific information for #inspect.
 	def node_description
-		return "{%s}%s" % [
+		desc = "%s %s %s/1.1" % [
+			self.http_method,
 			self.uri,
-			self.api_version ? " (#{self.api_version})" : ''
+			self.app_protocol.upcase,
 		]
+
+		if body && !body.empty?
+			desc << " {%s} (%s)" % [ self.body, self.body_mimetype ]
+		end
+
+		desc << ' -> %d response' % [ self.expected_status.to_i ]
+
+		return desc
 	end
 
 
+	### Serialize the resource node.  Return a Hash of the host node's state.
+	def to_h( * )
+		return super.merge(
+			uri: self.uri,
+			http_method: self.http_method,
+			expected_status: self.expected_status,
+			body: self.body,
+			body_mimetype: self.body_mimetype
+		)
+	end
+
 
 	#######
 	private

data/lib/arborist/webservice.rb

@@ -17,7 +17,7 @@ module Arborist::Webservice
 	VERSION = '0.0.1'
 
 	# Version control revision
-	REVISION = %q$Revision: d318b4f0d795 $
+	REVISION = %q$Revision: 59e390021ccd $
 
 
 	### Return the name of the library with the version, and optionally the build ID if
@@ -32,5 +32,7 @@ module Arborist::Webservice
 	require 'arborist/monitor/webservice'
 	require 'arborist/node/webservice'
 
+	autoload :Constants, 'arborist/webservice/constants'
+
 end # module Arborist::Webservice
 

data/spec/arborist/node/webservice_spec.rb

@@ -8,7 +8,17 @@ require 'arborist/node/webservice'
 
 describe Arborist::Node::Webservice do
 
-	
+	it "can match on URI"
+	it "can match on HTTP method"
+	it "can match on request body"
+	it "can match on request body media type"
+
+	it "includes the URI in the operational attributes"
+	it "includes the HTTP method in the operational attributes"
+	it "includes the request body in the operational attributes"
+	it "includes the request body media type in the operational attributes"
+
+	it "provides a DSL declaration to disable SSL verification"
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arborist-webservice
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre20161005112659
+  version: 0.0.1.pre20180815100446
 platform: ruby
 authors:
 - Michael Granger
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIEbDCCAtSgAwIBAgIBATANBgkqhkiG9w0BAQsFADA+MQwwCgYDVQQDDANnZWQx
+  MIIEbDCCAtSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  HhcNMTYwODIwMTgxNzQyWhcNMTcwODIwMTgxNzQyWjA+MQwwCgYDVQQDDANnZWQx
+  HhcNMTcwOTI3MDAzMDQ0WhcNMTgwOTI3MDAzMDQ0WjA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
   ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC/JWGRHO+USzR97vXjkFgt
   83qeNf2KHkcvrRTSnR64i6um/ziin0I0oX23H7VYrDJC9A/uoUa5nGRJS5Zw/+wW
@@ -25,17 +25,17 @@ cert_chain:
   /D+K9JW9DDs3Yjgv9k4h7YMhW5gftosd+NkNC/+Y2CkCAwEAAaN1MHMwCQYDVR0T
   BAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFHKN/nkRusdqCJEuq3lgB3fJvyTg
   MBwGA1UdEQQVMBOBEWdlZEBGYWVyaWVNVUQub3JnMBwGA1UdEgQVMBOBEWdlZEBG
-  YWVyaWVNVUQub3JnMA0GCSqGSIb3DQEBCwUAA4IBgQAPJzKiT0zBU7kpqe0aS2qb
-  FI0PJ4y5I8buU4IZGUD5NEt/N7pZNfOyBxkrZkXhS44Fp+xwBH5ebLbq/WY78Bqd
-  db0z6ZgW4LMYMpWFfbXsRbd9TU2f52L8oMAhxOvF7Of5qJMVWuFQ8FPagk2iHrdH
-  inYLQagqAF6goWTXgAJCdPd6SNeeSNqA6vlY7CV1Jh5kfNJJ6xu/CVij1GzCLu/5
-  DMOr26DBv+qLJRRC/2h34uX71q5QgeOyxvMg+7V3u/Q06DXyQ2VgeeqiwDFFpEH0
-  PFkdPO6ZqbTRcLfNH7mFgCBJjsfSjJrn0sPBlYyOXgCoByfZnZyrIMH/UY+lgQqS
-  6Von1VDsfQm0eJh5zYZD64ZF86phSR7mUX3mXItwH04HrZwkWpvgd871DZVR3i1n
-  w8aNA5re5+Rt/Vvjxj5AcEnZnZiz5x959NaddQocX32Z1unHw44pzRNUur1GInfW
-  p4vpx2kUSFSAGjtCbDGTNV2AH8w9OU4xEmNz8c5lyoA=
+  YWVyaWVNVUQub3JnMA0GCSqGSIb3DQEBBQUAA4IBgQB/qyi5pCjK8ceoKalfVAjS
+  vG64FEnLnD1bm39T5UaFIRmo+abZtfpg2QhwKvPbPjOicau2+m+MDQ2Cc3tgyaC3
+  dZxcP6w8APFg4AId09uWAZKf0xajvBMS2aOz8Bbmag6fwqRRkTMqsNYnmqcF7aRT
+  DuEzbEMfaOUYjU9RuB48vr4q8yRft0ww+3jq5iwNkrX1buL2pwBbyvgms6D/BV41
+  MaTVMjsHqJUwU2xVfhGtxGAWAer5S1HGYHkbio6mGVtiie0uWjmnzi7ppIlMr48a
+  7BNTsoZ+/JRk3iQWmmNsyFT7xfqBKye7cH11BX8V8P4MeGB5YWlMI+Myj5DZY3fQ
+  st2AGD4rb1l0ia7PfubcBThSIdz61eCb8gRi/RiZZwb3/7+eyEncLJzt2Ob9fGSF
+  X0qdrKi+2aZZ0NGuFj9AItBsVmAvkBGIpX4TEKQp5haEbPpmaqO5nIIhV26PXmyT
+  OMKv6pWsoS81vw5KAGBmfX8nht/Py90DQrbRvakATGI=
   -----END CERTIFICATE-----
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arborist
@@ -66,19 +66,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.11'
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
   requirement: !ruby/object:Gem::Requirement
@@ -99,14 +99,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: hoe-highline
   requirement: !ruby/object:Gem::Requirement
@@ -122,61 +122,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rdoc-generator-fivefish
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: rdoc-generator-fivefish
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.16'
 description: |-
   This is a collection of webservice monitoring tools for the Arborist monitoring toolkit (http://arbori.st/).
 
@@ -226,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: This is a collection of webservice monitoring tools for the Arborist monitoring