scout 5.3.4 → 5.3.5

data/CHANGELOG

@@ -1,9 +1,14 @@
 == Master
 
+== 5.3.5
+
+* Moved proxy support to explicit command line flags --http_proxy and https_proxy
+* fixed two unused variables that were causing warnings under 1.9.3
+
 == 5.3.4
 
 * Incorporating sleep interval into Server#time_to_checkin?
-* Added proxy support via http_proxy environment variable
+* Added proxy support command line flags
 
 == 5.3.3
 

data/lib/scout.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby -wKU
 
 module Scout
-  VERSION = "5.3.4".freeze
+  VERSION = "5.3.5".freeze
 end
 
 require "scout/command"

data/lib/scout/command.rb

@@ -72,6 +72,16 @@ module Scout
           options[:server_name] = server_name
         end
 
+        opts.on("--http-proxy URL", String,
+                 "Optional http proxy for non-SSL traffic." ) do |http_proxy|
+          options[:http_proxy] = http_proxy
+        end
+
+        opts.on("--https-proxy URL", String,
+                 "Optional https proxy for SSL traffic." ) do |https_proxy|
+          options[:https_proxy] = https_proxy
+        end
+
         opts.separator " "
         opts.separator "Common Options:"
         opts.separator "--------------------------------------------------------------------------"
@@ -154,6 +164,8 @@ module Scout
       @level   = options[:level]   || "info"
       @force   = options[:force]   || false
       @server_name    = options[:server_name]
+      @http_proxy     = options[:http_proxy] || ""
+      @https_proxy    = options[:https_proxy] || ""
 
       @args    = args
 

data/lib/scout/command/install.rb

@@ -22,7 +22,7 @@ module Scout
 
         puts "\nAttempting to contact the server..."
         begin
-          Scout::Server.new(server, key, history, log) do |scout|
+          Scout::Server.new(server, key, history, log, @http_proxy, @https_proxy) do |scout|
             scout.fetch_plan
             scout.run_plugins_by_plan
           end

data/lib/scout/command/run.rb

@@ -9,7 +9,7 @@ module Scout
         configuration_directory = config_dir
         log.debug("Configuration directory is #{configuration_directory} ") if log
         # TODO: too much external logic of command doing things TO server. This should be moved into the server class.
-        @scout = Scout::Server.new(server, key, history, log, server_name)
+        @scout = Scout::Server.new(server, key, history, log, server_name, @http_proxy, @https_proxy)
         @scout.load_history
         
         unless $stdin.tty?

data/lib/scout/command/sign.rb

@@ -11,7 +11,7 @@ module Scout
       VERIFY_MODE = OpenSSL::SSL::VERIFY_PEER | OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
       
       def run
-        url, *provided_options = @args
+        url = @args.first
         # read the plugin_code from the file specified
         if url.nil? or url == ''
           puts "Please specify the path to the plugin (scout sign /path/to/plugin.rb)"
@@ -35,7 +35,13 @@ module Scout
         
         puts "Posting Signature..."
         uri = URI.parse(url)
-        http = Net::HTTP.new(uri.host, uri.port)
+
+        # take care of http/https proxy, if specified in command line options
+        # Given a blank string, the proxy_uri URI instance's host/port/user/pass will be nil
+        # Net::HTTP::Proxy returns a regular Net::HTTP class if the first argument (host) is nil
+        proxy_uri = URI.parse(uri.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(uri.host, uri.port)
+
         if uri.is_a?(URI::HTTPS)
           http.use_ssl = true
           http.ca_file     = CA_FILE

data/lib/scout/command/test.rb

@@ -45,7 +45,7 @@ module Scout
           puts "== You haven't provided any options for running this plugin."
         end
 
-        Scout::Server.new(nil, nil, history, log) do |scout|
+        Scout::Server.new(nil, nil, history, log, @http_proxy, @https_proxy) do |scout|
           scout.prepare_checkin
           scout.process_plugin( 'interval'  => 0,
                                 'plugin_id' => 1,

data/lib/scout/server.rb

@@ -41,13 +41,15 @@ module Scout
     attr_reader :plugin_config
 
     # Creates a new Scout Server connection.
-    def initialize(server, client_key, history_file, logger = nil, server_name=nil)
+    def initialize(server, client_key, history_file, logger = nil, server_name=nil, http_proxy='', https_proxy='')
       @server       = server
       @client_key   = client_key
       @history_file = history_file
       @history      = Hash.new
       @logger       = logger
       @server_name  = server_name
+      @http_proxy   = http_proxy
+      @https_proxy   = https_proxy
       @plugin_plan  = []
       @plugins_with_signature_errors = []
       @directives   = {} # take_snapshots, interval, sleep_interval
@@ -493,7 +495,7 @@ module Scout
       contents=File.read(@history_file)
       begin
         @history = YAML.load(contents)
-      rescue => e
+      rescue
         backup_path=File.join(File.dirname(@history_file), "history.corrupt")
         info "Couldn't parse the history file. Deleting it and resetting to an empty history file. Keeping a backup at #{backup_path}"
         File.open(backup_path,"w"){|f|f.write contents}
@@ -569,13 +571,13 @@ module Scout
     def request(url, response_handler, error, &connector)
       response           = nil
       Timeout.timeout(5 * 60, APITimeoutError) do
-        if p=ENV['http_proxy']
-          info("Using HTTP proxy from ENV['http_proxy']=#{p}")
-          proxy = URI.parse(p)
-          http  = Net::HTTP.proxy(proxy.host,proxy.port).new(url.host, url.port)
-        else
-          http  = Net::HTTP.new(url.host, url.port)
-        end
+
+        # take care of http/https proxy, if specified in command line options
+        # Given a blank string, the proxy_uri URI instance's host/port/user/pass will be nil
+        # Net::HTTP::Proxy returns a regular Net::HTTP class if the first argument (host) is nil
+        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)
+
         if url.is_a? URI::HTTPS
           http.use_ssl     = true
           http.ca_file     = File.join( File.dirname(__FILE__),

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scout
 version: !ruby/object:Gem::Version 
-  hash: 51
-  prerelease: false
-  segments: 
-  - 5
-  - 3
-  - 4
-  version: 5.3.4
+  version: 5.3.5
 platform: ruby
 authors: 
 - Scout Monitoring
@@ -15,23 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-02 00:00:00 -08:00
+date: 2011-12-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: elif
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+    version: 
 description: |
   Scout makes monitoring and reporting on your web applications as flexible and simple as possible.
 
@@ -181,7 +171,6 @@ files:
 - vendor/json_pure/tools/server.rb
 - vendor/json_pure/VERSION
 - Rakefile
-- bin/scout
 - AUTHORS
 - COPYING
 - README
@@ -202,27 +191,21 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: scout
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Scout makes monitoring and reporting on your web applications as flexible and simple as possible.