scout 5.7.2.pre → 5.7.2.pre.2

data/CHANGELOG.markdown

@@ -2,6 +2,7 @@
 
 * updated pusher gem and associated vendored gems
 * added support for realtime when using an http proxy
+* added support for proxies during full signing process and troubleshoot
 
 # 5.7.1
 

data/lib/scout/command/sign.rb

@@ -6,9 +6,6 @@ module Scout
   class Command
     class Sign < Command
       HELP_URL    = "https://scoutapp.com/info/creating_a_plugin#private_plugins"
-      CA_FILE     = File.join( File.dirname(__FILE__),
-                                    *%w[.. .. .. data cacert.pem] )
-      VERIFY_MODE = OpenSSL::SSL::VERIFY_PEER | OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
       
       def run
         url = @args.first
@@ -34,19 +31,10 @@ module Scout
         sig=Base64.encode64(code_signature)
         
         puts "Posting Signature..."
-        uri = URI.parse(url)
 
-        # 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)
+        uri = URI.parse(url)
+        http = build_http(uri)
 
-        if uri.is_a?(URI::HTTPS)
-          http.use_ssl = true
-          http.ca_file     = CA_FILE
-          http.verify_mode = VERIFY_MODE        
-        end
         request = Net::HTTP::Post.new(uri.request_uri)
         request.set_form_data({'signature' => sig})
         res = http.request(request)
@@ -65,13 +53,10 @@ module Scout
       
       def fetch_code(url)
         puts "Fetching code..."
+
         uri = URI.parse(url)
-        http = Net::HTTP.new(uri.host, uri.port)
-        if uri.is_a?(URI::HTTPS)
-          http.use_ssl = true
-          http.ca_file     = CA_FILE
-          http.verify_mode = VERIFY_MODE
-        end
+        http = build_http(uri)
+
         request = Net::HTTP::Get.new(uri.request_uri)
         res = http.request(request)
         if !res.is_a?(Net::HTTPOK)

data/lib/scout/command/troubleshoot.rb

@@ -101,17 +101,11 @@ module Scout
       end
     end
 
-    def request(url, response_handler, error, &connector)
+    def request(uri, response_handler, error, &connector)
       response           = nil
       Timeout.timeout(5 * 60, APITimeoutError) do
-        http               = Net::HTTP.new(url.host, url.port)
-        if url.is_a? URI::HTTPS
-          http.use_ssl     = true
-          http.ca_file     = File.join( File.dirname(__FILE__),
-                                        *%w[.. .. .. data cacert.pem] )
-          http.verify_mode = OpenSSL::SSL::VERIFY_PEER |
-                             OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
-        end
+        http = build_http(uri)
+
         response           = no_warnings { http.start(&connector) }
       end
       case response

data/lib/scout/command.rb

@@ -5,6 +5,8 @@ require "fileutils"
 
 module Scout
   class Command
+    include Scout::HTTP
+
     def self.user
       @user ||= ENV["USER"] || ENV["USERNAME"] || "root"
     end

data/lib/scout/http.rb

@@ -0,0 +1,24 @@
+require "net/https"
+require "uri"
+
+module Scout
+  module HTTP
+    CA_FILE     = File.join( File.dirname(__FILE__), *%w[.. .. data cacert.pem] )
+    VERIFY_MODE = OpenSSL::SSL::VERIFY_PEER | OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
+
+    # 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
+    def build_http(uri)
+      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
+        http.verify_mode = VERIFY_MODE        
+      end
+      http
+    end
+  end
+end

data/lib/scout/server_base.rb

@@ -9,6 +9,8 @@ require "base64"
 
 module Scout
   class ServerBase
+    include Scout::HTTP
+
     # A new class for plugin Timeout errors.
     class PluginTimeoutError < RuntimeError; end
     # A new class for API Timeout errors.
@@ -51,23 +53,11 @@ module Scout
       end
     end
 
-    def request(url, response_handler, error, &connector)
+    def request(uri, response_handler, error, &connector)
       response = nil
       Timeout.timeout(5 * 60, APITimeoutError) do
-        # 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
-        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.password).new(url.host, url.port)
+        http = build_http(uri)
 
-        if url.is_a? URI::HTTPS
-          http.use_ssl = true
-          http.ca_file = File.join(File.dirname(__FILE__),
-                                   *%w[.. .. data cacert.pem])
-          http.verify_mode = OpenSSL::SSL::VERIFY_PEER |
-              OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
-        end
         response = no_warnings { http.start(&connector) }
       end
       case response

data/lib/scout/version.rb

@@ -1,3 +1,3 @@
 module Scout
-  VERSION = "5.7.2.pre"
+  VERSION = "5.7.2.pre.2"
 end

data/lib/scout.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby -wKU
 require "scout/version"
 
+require "scout/http"
 require "scout/command"
 require "scout/plugin"
 require "scout/plugin_options"

metadata

@@ -1,44 +1,52 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: scout
-version: !ruby/object:Gem::Version
-  version: 5.7.2.pre
+version: !ruby/object:Gem::Version 
+  hash: -793397844
   prerelease: 6
+  segments: 
+  - 5
+  - 7
+  - 2
+  - pre
+  - 2
+  version: 5.7.2.pre.2
 platform: ruby
-authors:
+authors: 
 - Andre Lewis
 - Derek Haynes
 - James Edward Gray II
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-09-09 00:00:00 -06:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: elif
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: ! 'The scout gem reports metrics to scoutapp.com, an easy-to-use hosted
-  server monitoring service.
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+description: |
+  The scout gem reports metrics to scoutapp.com, an easy-to-use hosted server monitoring service.
 
-'
 email: support@scoutapp.com
-executables:
+executables: 
 - scout
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - CHANGELOG.markdown
 - Gemfile
@@ -60,6 +68,7 @@ files:
 - lib/scout/daemon_spawn.rb
 - lib/scout/data_file.rb
 - lib/scout/environment.rb
+- lib/scout/http.rb
 - lib/scout/plugin.rb
 - lib/scout/plugin_options.rb
 - lib/scout/scout_logger.rb
@@ -193,33 +202,41 @@ files:
 - vendor/signature/spec/signature_spec.rb
 - vendor/signature/spec/spec_helper.rb
 - vendor/util/lib/core_extensions.rb
+has_rdoc: true
 homepage: http://scoutapp.com
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: scout
-rubygems_version: 1.8.25
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
-summary: Scout is an easy-to-use hosted server monitoring service. The scout Ruby
-  gem reports metrics to our service. The agent runs plugins, configured via the Scout
-  web interface, to monitor a server.
-test_files:
-- test/plugins/disk_usage.rb
-- test/scout_test.rb
-has_rdoc: 
+summary: Scout is an easy-to-use hosted server monitoring service. The scout Ruby gem reports metrics to our service. The agent runs plugins, configured via the Scout web interface, to monitor a server.
+test_files: []
+