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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -462,10 +462,19 @@ module RightScale
462
462
  @attempted_connect_at = Time.now
463
463
  @close_code = @close_reason = nil
464
464
 
465
+ # Initialize use of proxy if defined
466
+ if (v = BalancedHttpClient::PROXY_ENVIRONMENT_VARIABLES.detect { |v| ENV.has_key?(v) })
467
+ proxy_uri = ENV[v].match(/^[[:alpha:]]+:\/\//) ? URI.parse(ENV[v]) : URI.parse("http://" + ENV[v])
468
+ @proxy = { :origin => proxy_uri.to_s }
469
+ end
470
+
465
471
  options = {
466
472
  # Limit to .auth_header here (rather than .headers) to keep WebSockets happy
467
473
  :headers => {"X-API-Version" => API_VERSION}.merge(@auth_client.auth_header),
468
474
  :ping => @options[:listen_timeout] }
475
+
476
+ options[:proxy] = @proxy if @proxy
477
+
469
478
  url = URI.parse(@auth_client.router_url)
470
479
  url.scheme = url.scheme == "https" ? "wss" : "ws"
471
480
  url.path = url.path + "/connect"
@@ -25,8 +25,8 @@ require 'rbconfig'
25
25
 
26
26
  Gem::Specification.new do |spec|
27
27
  spec.name = 'right_agent'
28
- spec.version = '2.4.5'
29
- spec.date = '2015-01-28'
28
+ spec.version = '2.5.0'
29
+ spec.date = '2015-02-24'
30
30
  spec.authors = ['Lee Kirchhoff', 'Raphael Simon', 'Tony Spataro', 'Scott Messier']
31
31
  spec.email = 'lee@rightscale.com'
32
32
  spec.homepage = 'https://github.com/rightscale/right_agent'
@@ -41,7 +41,7 @@ Gem::Specification.new do |spec|
41
41
  spec.add_dependency('right_support', ['>= 2.4.1', '< 3.0'])
42
42
  spec.add_dependency('right_amqp', '~> 0.8')
43
43
  spec.add_dependency('rest-client', '~> 1.7.0.3')
44
- spec.add_dependency('faye-websocket', '~> 0.7.0')
44
+ spec.add_dependency('faye-websocket', '~> 0.8.0')
45
45
  spec.add_dependency('eventmachine', ['>= 0.12.10', '< 2.0'])
46
46
  spec.add_dependency('net-ssh', '~> 2.0')
47
47
 
@@ -103,5 +103,5 @@ def version_can_handle_msgpack_result; 12 end
103
103
  def version_cannot_handle_non_delivery_result; 12 end
104
104
  def version_can_handle_non_delivery_result; 13 end
105
105
 
106
- def version_cannot_handle_http_result; 22 end
107
- def version_can_handle_http_result; 23 end
106
+ def version_cannot_handle_http; 22 end
107
+ def version_can_handle_http; 23 end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: right_agent
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.4.5
4
+ version: 2.5.0
5
5
  prerelease:
6
6
  platform: x86-mingw32
7
7
  authors:
@@ -12,7 +12,7 @@ authors:
12
12
  autorequire:
13
13
  bindir: bin
14
14
  cert_chain: []
15
- date: 2015-01-28 00:00:00.000000000 Z
15
+ date: 2015-02-24 00:00:00.000000000 Z
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
18
18
  name: right_support
@@ -75,7 +75,7 @@ dependencies:
75
75
  requirements:
76
76
  - - ~>
77
77
  - !ruby/object:Gem::Version
78
- version: 0.7.0
78
+ version: 0.8.0
79
79
  type: :runtime
80
80
  prerelease: false
81
81
  version_requirements: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ dependencies:
83
83
  requirements:
84
84
  - - ~>
85
85
  - !ruby/object:Gem::Version
86
- version: 0.7.0
86
+ version: 0.8.0
87
87
  - !ruby/object:Gem::Dependency
88
88
  name: eventmachine
89
89
  requirement: !ruby/object:Gem::Requirement
@@ -447,7 +447,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
447
447
  version: '0'
448
448
  segments:
449
449
  - 0
450
- hash: -1955218884392609250
450
+ hash: 1759897669862666077
451
451
  requirements: []
452
452
  rubyforge_project:
453
453
  rubygems_version: 1.8.26