anvil-cli 0.15.1 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d54b6c1487ec756d659f1879ec65ba9389fe7b1
-  data.tar.gz: 14aae44bb9dc69933222c6772f5f0bd75352838f
+  metadata.gz: e3b4840771382d2b1b73099933804d74ae098d97
+  data.tar.gz: ab7a5e1bcf1b82b403fb454c3f80d2cee537ef07
 SHA512:
-  metadata.gz: b18d73fac4a29e4011b9ee8642a609457f4f87e67e4bffb40b6c7e96182d06532cbaa3ff53c9d7f300320fc1bd213d3be8c2abeabec63bb37a4661c866967fdf
-  data.tar.gz: 67a3ef7f83b5f9f86f553b2d0a67d52634ae4072411e2f9dffb27337ad5d09d55f28ac3c812f0559aac883af0c1cd10fc655890e28780f35d0b50448c2c78dea
+  metadata.gz: ca381b767af67cae69cf2ebde26abf3af141e316c6f7d8fc245662f86a038ed31ff48ddf545ae1f283fc2cebded1ec52c7dce4a70bab12b4d854cee00efa59f8
+  data.tar.gz: 8652d416bf2f8c7db395063f6e4bf3277f9b58aadd9f923a54a33f7085c653b6a39ea6e9abb3b02cec2841917fd9c2dac417ab2782f48a011b13a75e95d7f13e

data/lib/anvil/builder.rb

@@ -18,7 +18,19 @@ class Anvil::Builder
 
   def build(options={})
     uri  = URI.parse("#{anvil_host}/build")
-    http = Net::HTTP.new(uri.host, uri.port)
+
+    if uri.scheme == "https"
+      proxy = https_proxy
+    else
+      proxy = http_proxy
+    end
+
+    if proxy
+      proxy_uri = URI.parse(proxy)
+      http = Net::HTTP.new(uri.host, uri.port, proxy_uri.host, proxy_uri.port, proxy_uri.user, proxy_uri.password)
+    else
+      http = Net::HTTP.new(uri.host, uri.port)
+    end
 
     if uri.scheme == "https"
       http.use_ssl = true
@@ -78,4 +90,28 @@ private
     ENV["ANVIL_HOST"] || "https://api.anvilworks.org"
   end
 
+  def http_proxy
+    proxy = ENV['HTTP_PROXY'] || ENV['http_proxy']
+    if proxy && !proxy.empty?
+      unless /^[^:]+:\/\// =~ proxy
+        proxy = "http://" + proxy
+      end
+      proxy
+    else
+      nil
+    end
+  end
+
+  def https_proxy
+    proxy = ENV['HTTPS_PROXY'] || ENV['https_proxy'] || ENV["HTTP_PROXY"] || ENV["http_proxy"]
+    if proxy && !proxy.empty?
+      unless /^[^:]+:\/\// =~ proxy
+        proxy = "https://" + proxy
+      end
+      proxy
+    else
+      nil
+    end
+  end
+
 end

data/lib/anvil/manifest.rb

@@ -25,7 +25,24 @@ class Anvil::Manifest
 
   def build(options={})
     uri  = URI.parse("#{anvil_host}/manifest/build")
-    http = Net::HTTP.new(uri.host, uri.port)
+
+    if uri.scheme == "https"
+      proxy = https_proxy
+    else
+      proxy = http_proxy
+    end
+
+    if proxy
+      proxy_uri = URI.parse(proxy)
+      http = Net::HTTP.new(uri.host, uri.port, proxy_uri.host, proxy_uri.port, proxy_uri.user, proxy_uri.password)
+    else
+      http = Net::HTTP.new(uri.host, uri.port)
+    end
+
+    if uri.scheme == "https"
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
 
     if uri.scheme == "https"
       http.use_ssl = true
@@ -204,4 +221,28 @@ private
     threads.each(&:join)
   end
 
+  def http_proxy
+    proxy = ENV['HTTP_PROXY'] || ENV['http_proxy']
+    if proxy && !proxy.empty?
+      unless /^[^:]+:\/\// =~ proxy
+        proxy = "http://" + proxy
+      end
+      proxy
+    else
+      nil
+    end
+  end
+
+  def https_proxy
+    proxy = ENV['HTTPS_PROXY'] || ENV['https_proxy'] || ENV["HTTP_PROXY"] || ENV["http_proxy"]
+    if proxy && !proxy.empty?
+      unless /^[^:]+:\/\// =~ proxy
+        proxy = "https://" + proxy
+      end
+      proxy
+    else
+      nil
+    end
+  end
+
 end

data/lib/anvil/version.rb

@@ -1,3 +1,3 @@
 module Anvil
-  VERSION = "0.15.1"
+  VERSION = "0.16.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anvil-cli
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.0
 platform: ruby
 authors:
 - David Dollar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-21 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: progress