Skip to content

Commit da0ab03

Browse files
nebhalenebhale
committed
Package task without git
Previously, the package task required a git repository to work properly. It's possible that the package task will be run from an archive download instead. This change updates the package task to handle a non-git repository. [#69076566]
1 parent 28b840b commit da0ab03

3 files changed

Lines changed: 17 additions & 7 deletions

File tree

‎java-buildpack.iml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@
271271
<orderEntry type="sourceFolder" forTests="false" />
272272
<orderEntry type="library" scope="PROVIDED" name="addressable (v2.3.6, rbenv: 1.9.3-p545) [gem]" level="application" />
273273
<orderEntry type="library" scope="PROVIDED" name="ast (v1.1.0, rbenv: 1.9.3-p545) [gem]" level="application" />
274-
<orderEntry type="library" scope="PROVIDED" name="bundler (v1.5.3, rbenv: 1.9.3-p545) [gem]" level="application" />
274+
<orderEntry type="library" scope="PROVIDED" name="bundler (v1.6.1, rbenv: 1.9.3-p545) [gem]" level="application" />
275275
<orderEntry type="library" scope="PROVIDED" name="codeclimate-test-reporter (v0.3.0, rbenv: 1.9.3-p545) [gem]" level="application" />
276276
<orderEntry type="library" scope="PROVIDED" name="crack (v0.4.2, rbenv: 1.9.3-p545) [gem]" level="application" />
277277
<orderEntry type="library" scope="PROVIDED" name="debugger-ruby_core_source (v1.3.2, rbenv: 1.9.3-p545) [gem]" level="application" />
@@ -289,12 +289,12 @@
289289
<orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.0.0.beta2, rbenv: 1.9.3-p545) [gem]" level="application" />
290290
<orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.0.0.beta2, rbenv: 1.9.3-p545) [gem]" level="application" />
291291
<orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.0.0.beta2, rbenv: 1.9.3-p545) [gem]" level="application" />
292-
<orderEntry type="library" scope="PROVIDED" name="rubocop (v0.20.0, rbenv: 1.9.3-p545) [gem]" level="application" />
292+
<orderEntry type="library" scope="PROVIDED" name="rubocop (v0.20.1, rbenv: 1.9.3-p545) [gem]" level="application" />
293293
<orderEntry type="library" scope="PROVIDED" name="ruby-debug-base19x (v0.11.30.pre15, rbenv: 1.9.3-p545) [gem]" level="application" />
294294
<orderEntry type="library" scope="PROVIDED" name="ruby-debug-ide (v0.4.22, rbenv: 1.9.3-p545) [gem]" level="application" />
295295
<orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.4.2, rbenv: 1.9.3-p545) [gem]" level="application" />
296-
<orderEntry type="library" scope="PROVIDED" name="rubyzip (v1.1.2, rbenv: 1.9.3-p545) [gem]" level="application" />
297-
<orderEntry type="library" scope="PROVIDED" name="safe_yaml (v1.0.1, rbenv: 1.9.3-p545) [gem]" level="application" />
296+
<orderEntry type="library" scope="PROVIDED" name="rubyzip (v1.1.3, rbenv: 1.9.3-p545) [gem]" level="application" />
297+
<orderEntry type="library" scope="PROVIDED" name="safe_yaml (v1.0.2, rbenv: 1.9.3-p545) [gem]" level="application" />
298298
<orderEntry type="library" scope="PROVIDED" name="simplecov (v0.8.2, rbenv: 1.9.3-p545) [gem]" level="application" />
299299
<orderEntry type="library" scope="PROVIDED" name="simplecov-html (v0.8.0, rbenv: 1.9.3-p545) [gem]" level="application" />
300300
<orderEntry type="library" scope="PROVIDED" name="slop (v3.5.0, rbenv: 1.9.3-p545) [gem]" level="application" />

‎lib/java_buildpack/util/cache/download_cache.rb‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,11 @@ def http_options(rich_uri)
194194
end
195195

196196
def proxy(uri)
197-
proxy_uri = secure?(uri) ? URI.parse(ENV['https_proxy'] || '') : URI.parse(ENV['http_proxy'] || '')
197+
proxy_uri = if secure?(uri)
198+
URI.parse(ENV['https_proxy'] || ENV['HTTPS_PROXY'] || '')
199+
else
200+
URI.parse(ENV['http_proxy'] || ENV['HTTP_PROXY'] || '')
201+
end
198202

199203
@logger.debug { "Proxy: #{proxy_uri.host}, #{proxy_uri.port}, #{proxy_uri.user}, #{proxy_uri.password}" }
200204
Net::HTTP::Proxy(proxy_uri.host, proxy_uri.port, proxy_uri.user, proxy_uri.password)

‎rakelib/package.rb‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,23 @@
1818

1919
module Package
2020

21+
def self.git(command)
22+
`git #{command}`.chomp
23+
rescue
24+
nil
25+
end
26+
2127
ARCHITECTURES = %w(x86_64).freeze
2228

2329
BUILD_DIR = 'build'.freeze
2430

25-
HASH = `git rev-parse --short HEAD`.chomp.freeze
31+
HASH = git 'rev-parse --short HEAD'.freeze
2632

2733
OFFLINE = ENV['OFFLINE'].to_b.freeze
2834

2935
PLATFORMS = %w(centos6 lucid mountainlion precise).freeze
3036

31-
REMOTE = `git config --get remote.origin.url`.chomp.freeze
37+
REMOTE = git 'config --get remote.origin.url'.freeze
3238

3339
STAGING_DIR = "#{BUILD_DIR}/staging".freeze
3440

0 commit comments

Comments
 (0)