scout 5.5.6 → 5.5.7

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+# 5.5.7
+
+* Fixing broken tests
+* Using proxy password (was using proxy port on mistake)
+
 # 5.5.6
 
 * Fixing broken tests

data/lib/scout/server_base.rb

@@ -58,7 +58,7 @@ module Scout
         # Net::HTTP::Proxy returns a regular Net::HTTP class if the first argument (host) is nil
         info "using http_proxy=#{@http_proxy}, https_proxy=#{@https_proxy}" if @http_proxy != '' || @https_proxy != ''
         proxy_uri = URI.parse(url.is_a?(URI::HTTPS) ? @https_proxy : @http_proxy)
-        http=Net::HTTP::Proxy(proxy_uri.host,proxy_uri.port,proxy_uri.user,proxy_uri.port).new(url.host, url.port)
+        http=Net::HTTP::Proxy(proxy_uri.host,proxy_uri.port,proxy_uri.user,proxy_uri.password).new(url.host, url.port)
 
         if url.is_a? URI::HTTPS
           http.use_ssl = true

data/lib/scout/version.rb

@@ -1,3 +1,3 @@
 module Scout
-  VERSION = "5.5.6"
+  VERSION = "5.5.7"
 end

data/test/scout_test.rb

@@ -31,13 +31,8 @@ PATH_TO_TEST_PLUGIN = File.expand_path( File.dirname(__FILE__) ) + '/plugins/tem
 
 class ScoutTest < Test::Unit::TestCase
   def setup    
-    load_fixtures :clients, :plugins, :accounts, :subscriptions, :plugin_metas
+    load_fixtures :clients, :accounts, :plugins, :subscriptions, :plugin_metas
     clear_tables :plugin_activities, :ar_descriptors, :summaries
-    # # delete the existing history file
-    # File.unlink(PATH_TO_DATA_FILE) if File.exist?(PATH_TO_DATA_FILE)
-    # File.unlink(AGENT_LOG) if File.exist?(AGENT_LOG)
-    # File.unlink(PLUGINS_PROPERTIES) if File.exist?(PLUGINS_PROPERTIES)
-    
     clear_working_dir
     
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout
 version: !ruby/object:Gem::Version
-  version: 5.5.6
+  version: 5.5.7
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elif
-  requirement: &2157870820 !ruby/object:Gem::Requirement
+  requirement: &2161512220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,7 +23,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157870820
+  version_requirements: *2161512220
 description: ! 'Scout makes monitoring and reporting on your web applications as flexible
   and simple as possible.