website/.gitignore @@ -1,3 +1,6 @@ +=== 0.2.7 2008-02-17 + * Add support for HTTP Proxy when :proxy_server argument is passed. Based on patch from Mathias Dalheimer. + === 0.2.6 2007-10-16 * Updated to support EC2 API version 2007-08-29 released on 2007-10-16 * Supports new instances type feature. Specify an instance type to launch History.txt @@ -77,20 +77,23 @@ module EC2 # # :use_ssl => Boolean (default : true) # :server => String (default : 'ec2.amazonaws.com') + # :proxy_server => String (default : nil) # class Base - attr_reader :use_ssl, :server, :port + attr_reader :use_ssl, :server, :proxy_server, :port def initialize( options = {} ) options = { :access_key_id => "", :secret_access_key => "", :use_ssl => true, - :server => DEFAULT_HOST + :server => DEFAULT_HOST, + :proxy_server => nil }.merge(options) @server = options[:server] + @proxy_server = options[:proxy_server] @use_ssl = options[:use_ssl] raise ArgumentError, "No :access_key_id provided" if options[:access_key_id].nil? || options[:access_key_id].empty? @@ -112,7 +115,15 @@ module EC2 @access_key_id = options[:access_key_id] @secret_access_key = options[:secret_access_key] - @http = Net::HTTP.new(options[:server], @port) + + # Use proxy server if defined + # Based on patch by Mathias Dalheimer. 20070217 + proxy = @proxy_server ? URI.parse(@proxy_server) : OpenStruct.new + @http = Net::HTTP::Proxy( proxy.host, + proxy.port, + proxy.user, + proxy.password).new(options[:server], @port) + @http.use_ssl = @use_ssl # Don't verify the SSL certificates. Avoids SSL Cert warning in log on every GET. lib/EC2.rb @@ -12,7 +12,7 @@ module EC2 #:nodoc: module VERSION #:nodoc: MAJOR = 0 MINOR = 2 - TINY = 6 + TINY = 7 STRING = [MAJOR, MINOR, TINY].join('.') end end lib/EC2/version.rb @@ -16,7 +16,7 @@ context "The EC2 Gem " do setup do @major = 0 @minor = 2 - @tiny = 6 + @tiny = 7 @string = [@major, @minor, @tiny].join('.') end test/test_EC2_version.rb website/index.html 8b5e48dfd718751ba8543d1de39b6a86d2e9365e Glenn Rempe glenn@rempe.us http://github.com/grempe/amazon-ec2/commit/53ae17bdcedcaaa648a059ef7f0dd89feca40836 53ae17bdcedcaaa648a059ef7f0dd89feca40836 2008-02-17T14:46:05-08:00 2008-02-17T14:43:20-08:00 Updated to add http proxy support. Based on patch by Mathias Dalheimer. 35c0dedb3b781163b0fddd272793aa824cc3c0e9 Glenn Rempe glenn@rempe.us