summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2020-07-11 01:43:10 -0600
committermo khan <mo.khan@gmail.com>2020-07-11 01:43:10 -0600
commita48b0c8fdfae4ff0447f7a232fe3c39bca7ec8a9 (patch)
tree6a7cd72961761a5d53e4aba8c89893072b8b9e5f
parentc17546f6cfccf07d27f7984321fe62a7788e8da1 (diff)
Reset bundler from sub directory pathsv3.17.1
-rw-r--r--CHANGELOG.md4
-rw-r--r--Gemfile.lock2
-rw-r--r--lib/license/finder/ext/bundler.rb6
-rw-r--r--lib/license/management/version.rb2
4 files changed, 9 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c135e5a..0314844 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
# GitLab License management changelog
+## v3.17.1
+
+- Reset bundler config from within sub directories in project (!188)
+
## v3.17.0
- Isolate the embedded LicenseFinder Ruby from the target project's Ruby (!181)
diff --git a/Gemfile.lock b/Gemfile.lock
index f2a916b..ca6e615 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,7 +8,7 @@ GIT
PATH
remote: .
specs:
- license-management (3.17.0)
+ license-management (3.17.1)
license_finder (~> 6.6.0)
GEM
diff --git a/lib/license/finder/ext/bundler.rb b/lib/license/finder/ext/bundler.rb
index d362be3..a5fe21d 100644
--- a/lib/license/finder/ext/bundler.rb
+++ b/lib/license/finder/ext/bundler.rb
@@ -81,10 +81,10 @@ module LicenseFinder
end
def with_clean_bundler
- ::Gem.clear_paths
- ::Bundler.reset!
- ::Bundler.configure
Dir.chdir(project_path) do
+ ::Gem.clear_paths
+ ::Bundler.reset!
+ ::Bundler.configure
if ::Bundler.respond_to?(:with_unbundled_env)
::Bundler.with_unbundled_env { yield }
else
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index df57113..880ca6c 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
module License
module Management
- VERSION = '3.17.0'
+ VERSION = '3.17.1'
end
end