diff options
| author | Can Eldem <celdem@gitlab.com> | 2020-07-09 09:54:37 +0000 |
|---|---|---|
| committer | Can Eldem <celdem@gitlab.com> | 2020-07-09 09:54:37 +0000 |
| commit | d3f219ae8c6ffe9bcbfd6d3409d72a1c9819ee2c (patch) | |
| tree | 1fcbd31252636d7ff7ceed6f59639a1a9ec2b62f /lib | |
| parent | 6f05f7b73defa1e51643a5ab4935d2b4120e3ef4 (diff) | |
| parent | b4a36141a7cbbf52b470739a9b0580cf51863a6c (diff) | |
Merge branch 'gems-lock' into 'master'v3.15.0
Detect gems.rb and gems.locked
See merge request gitlab-org/security-products/license-management!186
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/license/finder/ext/bundler.rb | 25 | ||||
| -rw-r--r-- | lib/license/management/version.rb | 2 |
2 files changed, 26 insertions, 1 deletions
diff --git a/lib/license/finder/ext/bundler.rb b/lib/license/finder/ext/bundler.rb index 08ab3ac..ddf30f5 100644 --- a/lib/license/finder/ext/bundler.rb +++ b/lib/license/finder/ext/bundler.rb @@ -32,8 +32,33 @@ module LicenseFinder end end + def possible_package_paths + if ENV['BUNDLE_GEMFILE'] && File.exist?(ENV['BUNDLE_GEMFILE']) + [project_path.join(File.basename(ENV['BUNDLE_GEMFILE']))] + else + [project_path.join('Gemfile'), project_path.join('gems.rb')] + end + end + private + def gemfile + if ENV['BUNDLE_GEMFILE'] + custom_gemfile = project_path.join(File.basename(ENV['BUNDLE_GEMFILE'])) + return custom_gemfile.basename.to_s if custom_gemfile.exist? + end + + if project_path.join("gems.rb").exist? + "gems.rb" + else + "Gemfile" + end + end + + def lockfile + gemfile == 'gems.rb' ? 'gems.locked' : "#{gemfile}.lock" + end + def default_env @default_env ||= { 'BUNDLE_ALLOW_OFFLINE_INSTALL' => 'true', diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb index de5715a..50e69a0 100644 --- a/lib/license/management/version.rb +++ b/lib/license/management/version.rb @@ -2,6 +2,6 @@ module License module Management - VERSION = '3.14.0' + VERSION = '3.15.0' end end |
