right_agent 2.4.5-x86-mingw32 → 2.5.0-x86-mingw32

data/lib/right_agent/clients/router_client.rb

@@ -462,10 +462,19 @@ module RightScale
       @attempted_connect_at = Time.now
       @close_code = @close_reason = nil
 
+      # Initialize use of proxy if defined
+      if (v = BalancedHttpClient::PROXY_ENVIRONMENT_VARIABLES.detect { |v| ENV.has_key?(v) })
+        proxy_uri = ENV[v].match(/^[[:alpha:]]+:\/\//) ? URI.parse(ENV[v]) : URI.parse("http://" + ENV[v])
+        @proxy = { :origin => proxy_uri.to_s }
+      end
+
       options = {
         # Limit to .auth_header here (rather than .headers) to keep WebSockets happy
         :headers => {"X-API-Version" => API_VERSION}.merge(@auth_client.auth_header),
         :ping => @options[:listen_timeout] }
+
+      options[:proxy] = @proxy if @proxy
+
       url = URI.parse(@auth_client.router_url)
       url.scheme = url.scheme == "https" ? "wss" : "ws"
       url.path = url.path + "/connect"

data/right_agent.gemspec

@@ -25,8 +25,8 @@ require 'rbconfig'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_agent'
-  spec.version   = '2.4.5'
-  spec.date      = '2015-01-28'
+  spec.version   = '2.5.0'
+  spec.date      = '2015-02-24'
   spec.authors   = ['Lee Kirchhoff', 'Raphael Simon', 'Tony Spataro', 'Scott Messier']
   spec.email     = 'lee@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_agent'
@@ -41,7 +41,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency('right_support', ['>= 2.4.1', '< 3.0'])
   spec.add_dependency('right_amqp', '~> 0.8')
   spec.add_dependency('rest-client', '~> 1.7.0.3')
-  spec.add_dependency('faye-websocket', '~> 0.7.0')
+  spec.add_dependency('faye-websocket', '~> 0.8.0')
   spec.add_dependency('eventmachine', ['>= 0.12.10', '< 2.0'])
   spec.add_dependency('net-ssh', '~> 2.0')
 

data/spec/spec_helper.rb

@@ -103,5 +103,5 @@ def version_can_handle_msgpack_result; 12 end
 def version_cannot_handle_non_delivery_result; 12 end
 def version_can_handle_non_delivery_result; 13 end
 
-def version_cannot_handle_http_result; 22 end
-def version_can_handle_http_result; 23 end
+def version_cannot_handle_http; 22 end
+def version_can_handle_http; 23 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_agent
 version: !ruby/object:Gem::Version
-  version: 2.4.5
+  version: 2.5.0
   prerelease: 
 platform: x86-mingw32
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_support
@@ -75,7 +75,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -447,7 +447,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1955218884392609250
+      hash: 1759897669862666077
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.26