chef-handler-opsmatic 0.0.12 → 0.0.14

data/lib/chef/handler/opsmatic.rb

@@ -112,6 +112,22 @@ class Chef
         end
       end
 
+      def check_proxy(proxy)
+        proxy_value = ENV[proxy]
+        return if proxy_value.nil? || proxy_value.empty?
+        begin
+          proxy_uri = URI.parse(proxy_value)
+          if not proxy_uri.host
+            Chef::Log.warn("#{proxy} set but could not parse URI")
+            return nil
+          end
+        rescue URI::InvalidURIError
+          Chef::Log.warn("#{proxy} set with invalid URI")
+          return nil
+        end
+        return proxy_uri
+      end
+
       # submit report to the opsmatic collector
       def submit(event) 
         Chef::Log.info("Posting chef run report to Opsmatic")
@@ -121,8 +137,20 @@ class Chef
         qs = url.query.nil? ? [] : url.query.split("&")
         qs << "token=#{@config[:integration_token]}"
         url.query = qs.join("&")
+        proxy_uri = nil
+
+        %w(HTTPS_PROXY https_proxy HTTP_PROXY http_proxy).each do |proxy|
+          proxy_uri = check_proxy(proxy)
+          break if proxy_uri
+        end
+
+        if proxy_uri
+          p_user, p_pass = proxy_uri.userinfo.split(/:/) if proxy_uri.userinfo
+          http = Net::HTTP.new(url.host, url.port, proxy_uri.host, proxy_uri.port, p_user, p_pass)
+        else
+          http = Net::HTTP.new(url.host, url.port)
+        end
 
-        http = Net::HTTP.new(url.host, url.port)
         http.open_timeout = 2
         http.read_timeout = 2
         http.use_ssl = (url.scheme == 'https')

data/lib/chef/handler/opsmatic_version.rb

@@ -1,7 +1,7 @@
 class Chef
   class Handler
     class Opsmatic < ::Chef::Handler
-      VERSION = "0.0.12"
+      VERSION = "0.0.14"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-handler-opsmatic
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3247119042070757070
+      hash: -881451571111827738
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3247119042070757070
+      hash: -881451571111827738
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2