@@ -232,21 +232,22 @@ module HoptoadNotifier end def send_to_hoptoad data #:nodoc: + headers = { + 'Content-type' => 'application/x-yaml', + 'Accept' => 'text/xml, application/xml' + } + url = HoptoadNotifier.url - Net::HTTP::Proxy( - HoptoadNotifier.proxy_host, - HoptoadNotifier.proxy_port, - HoptoadNotifier.proxy_user, - HoptoadNotifier.proxy_pass).start(url.host, url.port) do |http| - - headers = { - 'Content-type' => 'application/x-yaml', - 'Accept' => 'text/xml, application/xml' - } - + http = Net::HTTP::Proxy(HoptoadNotifier.proxy_host, + HoptoadNotifier.proxy_port, + HoptoadNotifier.proxy_user, + HoptoadNotifier.proxy_pass).new(url.host, url.port) + + http.use_ssl = true http.read_timeout = HoptoadNotifier.http_read_timeout http.open_timeout = HoptoadNotifier.http_open_timeout + http.use_ssl = !!HoptoadNotifier.secure response = begin http.post(url.path, stringify_keys(data).to_yaml, headers) @@ -255,12 +256,11 @@ module HoptoadNotifier nil end - case response - when Net::HTTPSuccess then - logger.info "Hoptoad Success: #{response.class}" - else - logger.error "Hoptoad Failure: #{response.class}\n#{response.body if response.respond_to? :body}" - end + case response + when Net::HTTPSuccess then + logger.info "Hoptoad Success: #{response.class}" + else + logger.error "Hoptoad Failure: #{response.class}\n#{response.body if response.respond_to? :body}" end end lib/hoptoad_notifier.rb @@ -1,9 +1,7 @@ #!/usr/bin/env ruby -# This file must _not_ end in test.rb, or it will get run every time. require File.join(File.dirname(__FILE__), "..", "lib", "hoptoad_notifier") -#fail ARGV.inspect fail "Please supply an API Key as the first argument" if ARGV.empty? RAILS_ENV = "production" @@ -12,17 +10,19 @@ RAILS_ROOT = "./" host = ARGV[1] host ||= "hoptoadapp.com" -HoptoadNotifier.configure do |config| - config.host = host - config.api_key = ARGV.first -end +secure = (ARGV[2] == "secure") exception = begin - raise 'Testing hoptoad notifier. If you can see this, it works.' + raise "Testing hoptoad notifier with secure = #{secure}. If you can see this, it works." rescue => foo foo end -puts "Sending notification to project with key #{ARGV.first}" +HoptoadNotifier.configure do |config| + config.secure = secure + config.host = host + config.api_key = ARGV.first +end +puts "Sending #{secure or "in"}secure notification to project with key #{ARGV.first}" HoptoadNotifier.notify(exception) script/integration_test.rb 1f85f70369d194ac11e43c73b23e19fc20e68d41 Tammer Saleh tsaleh@thoughtbot.com http://github.com/pzingg/hoptoad_notifier/commit/58d5dd794f2d9aa4b3e4d376bb7299436d727331 58d5dd794f2d9aa4b3e4d376bb7299436d727331 2008-12-18T15:22:45-08:00 2008-12-18T15:16:36-08:00 Fixed bug in https support 0bd2a161a6274cd4e20c365f3b0f63e8fdacf443 Tammer Saleh tsaleh@thoughtbot.com