anvil-cli 0.15.1 → 0.16.0
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.
- checksums.yaml +4 -4
- data/lib/anvil/builder.rb +37 -1
- data/lib/anvil/manifest.rb +42 -1
- data/lib/anvil/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e3b4840771382d2b1b73099933804d74ae098d97
|
|
4
|
+
data.tar.gz: ab7a5e1bcf1b82b403fb454c3f80d2cee537ef07
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ca381b767af67cae69cf2ebde26abf3af141e316c6f7d8fc245662f86a038ed31ff48ddf545ae1f283fc2cebded1ec52c7dce4a70bab12b4d854cee00efa59f8
|
|
7
|
+
data.tar.gz: 8652d416bf2f8c7db395063f6e4bf3277f9b58aadd9f923a54a33f7085c653b6a39ea6e9abb3b02cec2841917fd9c2dac417ab2782f48a011b13a75e95d7f13e
|
data/lib/anvil/builder.rb
CHANGED
|
@@ -18,7 +18,19 @@ class Anvil::Builder
|
|
|
18
18
|
|
|
19
19
|
def build(options={})
|
|
20
20
|
uri = URI.parse("#{anvil_host}/build")
|
|
21
|
-
|
|
21
|
+
|
|
22
|
+
if uri.scheme == "https"
|
|
23
|
+
proxy = https_proxy
|
|
24
|
+
else
|
|
25
|
+
proxy = http_proxy
|
|
26
|
+
end
|
|
27
|
+
|
|
28
|
+
if proxy
|
|
29
|
+
proxy_uri = URI.parse(proxy)
|
|
30
|
+
http = Net::HTTP.new(uri.host, uri.port, proxy_uri.host, proxy_uri.port, proxy_uri.user, proxy_uri.password)
|
|
31
|
+
else
|
|
32
|
+
http = Net::HTTP.new(uri.host, uri.port)
|
|
33
|
+
end
|
|
22
34
|
|
|
23
35
|
if uri.scheme == "https"
|
|
24
36
|
http.use_ssl = true
|
|
@@ -78,4 +90,28 @@ private
|
|
|
78
90
|
ENV["ANVIL_HOST"] || "https://api.anvilworks.org"
|
|
79
91
|
end
|
|
80
92
|
|
|
93
|
+
def http_proxy
|
|
94
|
+
proxy = ENV['HTTP_PROXY'] || ENV['http_proxy']
|
|
95
|
+
if proxy && !proxy.empty?
|
|
96
|
+
unless /^[^:]+:\/\// =~ proxy
|
|
97
|
+
proxy = "http://" + proxy
|
|
98
|
+
end
|
|
99
|
+
proxy
|
|
100
|
+
else
|
|
101
|
+
nil
|
|
102
|
+
end
|
|
103
|
+
end
|
|
104
|
+
|
|
105
|
+
def https_proxy
|
|
106
|
+
proxy = ENV['HTTPS_PROXY'] || ENV['https_proxy'] || ENV["HTTP_PROXY"] || ENV["http_proxy"]
|
|
107
|
+
if proxy && !proxy.empty?
|
|
108
|
+
unless /^[^:]+:\/\// =~ proxy
|
|
109
|
+
proxy = "https://" + proxy
|
|
110
|
+
end
|
|
111
|
+
proxy
|
|
112
|
+
else
|
|
113
|
+
nil
|
|
114
|
+
end
|
|
115
|
+
end
|
|
116
|
+
|
|
81
117
|
end
|
data/lib/anvil/manifest.rb
CHANGED
|
@@ -25,7 +25,24 @@ class Anvil::Manifest
|
|
|
25
25
|
|
|
26
26
|
def build(options={})
|
|
27
27
|
uri = URI.parse("#{anvil_host}/manifest/build")
|
|
28
|
-
|
|
28
|
+
|
|
29
|
+
if uri.scheme == "https"
|
|
30
|
+
proxy = https_proxy
|
|
31
|
+
else
|
|
32
|
+
proxy = http_proxy
|
|
33
|
+
end
|
|
34
|
+
|
|
35
|
+
if proxy
|
|
36
|
+
proxy_uri = URI.parse(proxy)
|
|
37
|
+
http = Net::HTTP.new(uri.host, uri.port, proxy_uri.host, proxy_uri.port, proxy_uri.user, proxy_uri.password)
|
|
38
|
+
else
|
|
39
|
+
http = Net::HTTP.new(uri.host, uri.port)
|
|
40
|
+
end
|
|
41
|
+
|
|
42
|
+
if uri.scheme == "https"
|
|
43
|
+
http.use_ssl = true
|
|
44
|
+
http.verify_mode = OpenSSL::SSL::VERIFY_NONE
|
|
45
|
+
end
|
|
29
46
|
|
|
30
47
|
if uri.scheme == "https"
|
|
31
48
|
http.use_ssl = true
|
|
@@ -204,4 +221,28 @@ private
|
|
|
204
221
|
threads.each(&:join)
|
|
205
222
|
end
|
|
206
223
|
|
|
224
|
+
def http_proxy
|
|
225
|
+
proxy = ENV['HTTP_PROXY'] || ENV['http_proxy']
|
|
226
|
+
if proxy && !proxy.empty?
|
|
227
|
+
unless /^[^:]+:\/\// =~ proxy
|
|
228
|
+
proxy = "http://" + proxy
|
|
229
|
+
end
|
|
230
|
+
proxy
|
|
231
|
+
else
|
|
232
|
+
nil
|
|
233
|
+
end
|
|
234
|
+
end
|
|
235
|
+
|
|
236
|
+
def https_proxy
|
|
237
|
+
proxy = ENV['HTTPS_PROXY'] || ENV['https_proxy'] || ENV["HTTP_PROXY"] || ENV["http_proxy"]
|
|
238
|
+
if proxy && !proxy.empty?
|
|
239
|
+
unless /^[^:]+:\/\// =~ proxy
|
|
240
|
+
proxy = "https://" + proxy
|
|
241
|
+
end
|
|
242
|
+
proxy
|
|
243
|
+
else
|
|
244
|
+
nil
|
|
245
|
+
end
|
|
246
|
+
end
|
|
247
|
+
|
|
207
248
|
end
|
data/lib/anvil/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: anvil-cli
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.16.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- David Dollar
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2013-
|
|
11
|
+
date: 2013-05-02 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: progress
|