slugbuilder 3.1.0 → 3.2.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 48283f8e0f78cce2b59471ee691f5ccd4dd7eaf4
4
- data.tar.gz: ed16664c599345ff763eb13e192cdb0b91a1fbe7
3
+ metadata.gz: 85c2f35d6340e04cc4457ec680bf942555ca54dd
4
+ data.tar.gz: 993bd1fb9f67cad39b60ab942f896545f10bd7af
5
5
  SHA512:
6
- metadata.gz: 3419f4d23079eb49aad5b2569ddcae120aec78d111e77513c398aa3c7d276df0e0235d40d2a923c5583d332c6d3c3982247759004cdeead66335dd009d6d35b7
7
- data.tar.gz: 27da415e5895ec988c59ddceb79847bc00ba6ce0131b70b2b60b2e935666585a000358d8287e32645fa858ba0abace61d49b88cbc318269857e2cc90c9c2204e
6
+ metadata.gz: a3046f42b114c863510be8dd83d0553cb149b5044daa0bcfc66e941c62b1cea294d7310bcbf7d37c0b8bf49974e2a9b19fd2641c43558e6f7691d7e8487b48c9
7
+ data.tar.gz: '0598c08f9634d0048d5126b85a0645690554d71dfe11482f7b7f680f59b8617b040d826907824109681fcddba59600eb00a785552acb08f108bc9924db5a7894'
@@ -1,5 +1,11 @@
1
1
  # Changelog
2
2
 
3
+ ## 3.2.0 (2018-04-04)
4
+
5
+ Fixed:
6
+
7
+ - Run buildpacks in context of environment (except for the currently running Ruby process). This ensures that any necessary env settings (git, etc) are preserved. [f10b962](../../commit/f10b962)
8
+
3
9
  ## 3.1.0 (2017-11-2)
4
10
 
5
11
  Fixed:
@@ -1,6 +1,6 @@
1
- The MIT License (MIT)
1
+ MIT License
2
2
 
3
- Copyright (c) 2017 Panoply
3
+ Copyright (c) 2018 Panoply Media LLC
4
4
 
5
5
  Permission is hereby granted, free of charge, to any person obtaining a copy
6
6
  of this software and associated documentation files (the "Software"), to deal
@@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9
9
  copies of the Software, and to permit persons to whom the Software is
10
10
  furnished to do so, subject to the following conditions:
11
11
 
12
- The above copyright notice and this permission notice shall be included in
13
- all copies or substantial portions of the Software.
12
+ The above copyright notice and this permission notice shall be included in all
13
+ copies or substantial portions of the Software.
14
14
 
15
15
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16
16
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17
17
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18
18
  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19
19
  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21
- THE SOFTWARE.
20
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21
+ SOFTWARE.
@@ -28,7 +28,6 @@ module Slugbuilder
28
28
  end
29
29
 
30
30
  def build(clear_cache: false, env: {}, prebuild: nil, postbuild: nil, slug_name: nil, buildpacks: Slugbuilder.config.buildpacks)
31
- @old_env = ENV.to_h
32
31
  FileUtils.mkdir_p(@env_dir)
33
32
 
34
33
  @buildpacks = buildpacks
@@ -38,7 +37,7 @@ module Slugbuilder
38
37
 
39
38
  prebuild.call(repo: @repo, git_ref: @git_ref, git_url: @git_url) if prebuild
40
39
 
41
- with_clean_env do
40
+ Bundler.with_clean_env do
42
41
  build_and_release
43
42
  end
44
43
  stitle("Setup completed in #{@setup_time} seconds")
@@ -66,24 +65,11 @@ module Slugbuilder
66
65
  rescue => e
67
66
  stitle("Failed: #{e}\n")
68
67
  return false
69
- ensure
70
- restore_env
71
68
  end
72
69
 
73
70
 
74
71
  private
75
72
 
76
- def restore_env
77
- ENV.delete_if { true }
78
- ENV.update(@old_env)
79
- end
80
-
81
- def with_clean_env
82
- ENV.delete_if { true }
83
- yield
84
- restore_env
85
- end
86
-
87
73
  def wipe_cache
88
74
  FileUtils.rm_rf(@cache_dir)
89
75
  FileUtils.rm_rf(@buildpacks_dir)
@@ -1,3 +1,3 @@
1
1
  module Slugbuilder
2
- VERSION = '3.1.0'
2
+ VERSION = '3.2.0'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: slugbuilder
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.0
4
+ version: 3.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Panoply Dev
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-11-02 00:00:00.000000000 Z
11
+ date: 2018-04-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -79,7 +79,7 @@ files:
79
79
  - CHANGELOG.md
80
80
  - CODE_OF_CONDUCT.md
81
81
  - Gemfile
82
- - LICENSE.txt
82
+ - LICENSE
83
83
  - README.md
84
84
  - Rakefile
85
85
  - bin/console