summaryrefslogtreecommitdiff
path: root/lib/license/management.rb
diff options
context:
space:
mode:
authorCan Eldem <celdem@gitlab.com>2020-01-16 10:24:11 +0000
committerCan Eldem <celdem@gitlab.com>2020-01-16 10:24:11 +0000
commit2074e7e5ea3012be6f3a72bd4af934a42b7202ca (patch)
treece9ec33580f0e6e3f9cf3df1aab2f2cf7b5601cb /lib/license/management.rb
parentf4f59927f87944a4d73be26416a7334521875f40 (diff)
parent34f162a4903d852d47bd5440839f7519eb6fa8f0 (diff)
Merge branch '12012-pipfile-lock' into 'master'v2.4.0
Add support for Pipfile.lock See merge request gitlab-org/security-products/license-management!103
Diffstat (limited to 'lib/license/management.rb')
-rw-r--r--lib/license/management.rb16
1 files changed, 16 insertions, 0 deletions
diff --git a/lib/license/management.rb b/lib/license/management.rb
index a6e0664..ebab5e2 100644
--- a/lib/license/management.rb
+++ b/lib/license/management.rb
@@ -2,9 +2,12 @@
require 'pathname'
require 'yaml'
+require 'json'
require 'license_finder'
require 'license/management/loggable'
require 'license/management/verifiable'
+require 'license/management/python/pipenv'
+require 'license/management/python/pypi'
require 'license/management/repository'
require 'license/management/report'
require 'license/management/version'
@@ -12,6 +15,12 @@ require 'license/management/version'
# This applies a monkey patch to the JsonReport found in the `license_finder` gem.
LicenseFinder::JsonReport.prepend(License::Management::Report)
+# This monkey patch can be removed once https://github.com/pivotal/LicenseFinder/pull/659 is released
+LicenseFinder::Scanner.const_set(
+ :PACKAGE_MANAGERS,
+ LicenseFinder::Scanner::PACKAGE_MANAGERS + [License::Management::Pipenv]
+)
+
# This monkey patch can be removed once we upgrade to license_finder 5.9.2. Details [here](https://gitlab.com/gitlab-org/gitlab/issues/13748#note_235810786).
module LicenseFinder
class Bundler < PackageManager
@@ -31,5 +40,12 @@ module License
def self.root
Pathname.new(File.dirname(__FILE__)).join('../..')
end
+
+ def self.http
+ @http ||= Net::Hippie::Client.new.tap do |client|
+ client.logger = ::Logger.new('http.log')
+ client.follow_redirects = 3
+ end
+ end
end
end