summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2020-02-18 11:07:28 -0700
committermo khan <mo.khan@gmail.com>2020-02-18 11:07:28 -0700
commit6b1bf9f28f36c3e28329cbcf232d976db9a81b71 (patch)
treebeec12619716733a601c9273df20734b57514693
parent90e68a0a0c6fa0a7df09a36b168c725faf58b6f9 (diff)
Remove Pipfile overrides
-rw-r--r--Gemfile.lock2
-rw-r--r--lib/license/management.rb8
-rw-r--r--lib/license/management/python/pipenv.rb64
-rw-r--r--lib/license/management/python/pypi.rb44
-rw-r--r--license-management.gemspec1
5 files changed, 0 insertions, 119 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index efee511..cd4592a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,7 +3,6 @@ PATH
specs:
license-management (2.4.3)
license_finder (~> 6.0)
- net-hippie (~> 0.3)
GEM
remote: https://rubygems.org/
@@ -20,7 +19,6 @@ GEM
toml (= 0.2.0)
with_env (= 1.1.0)
xml-simple
- net-hippie (0.3.2)
parslet (1.8.2)
public_suffix (4.0.3)
rspec (3.9.0)
diff --git a/lib/license/management.rb b/lib/license/management.rb
index ebab5e2..8804c36 100644
--- a/lib/license/management.rb
+++ b/lib/license/management.rb
@@ -6,8 +6,6 @@ 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'
@@ -15,12 +13,6 @@ 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
diff --git a/lib/license/management/python/pipenv.rb b/lib/license/management/python/pipenv.rb
deleted file mode 100644
index 482fd25..0000000
--- a/lib/license/management/python/pipenv.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-# frozen_string_literal: true
-
-module License
- module Management
- class Pipenv < LicenseFinder::PackageManager
- include Loggable
-
- def initialize(options = {})
- super
- @lockfile = Pathname('Pipfile.lock')
- end
-
- def current_packages
- @current_packages ||=
- begin
- packages = {}
- each_dependency(groups: allowed_groups) do |name, data, group|
- version = canonicalize(data['version'])
- package = packages.fetch(key_for(name, version)) do |key|
- packages[key] = build_package_for(name, version)
- end
- package.groups << group
- end
- packages.values
- end
- end
-
- def possible_package_paths
- project_path ? [project_path.join(@lockfile)] : [@lockfile]
- end
-
- private
-
- def each_dependency(groups: [])
- dependencies = JSON.parse(IO.read(detected_package_path))
- groups.each do |group|
- dependencies[group].each do |name, data|
- yield name, data, group
- end
- end
- end
-
- def canonicalize(version)
- version.sub(/^==/, '')
- end
-
- def build_package_for(name, version)
- LicenseFinder::PipPackage.new(name, version, PyPI.definition(name, version))
- end
-
- def key_for(name, version)
- "#{name}-#{version}"
- end
-
- def allowed_groups
- %w[default develop] - ignored_groups
- end
-
- def ignored_groups
- @ignored_groups.to_a || []
- end
- end
- end
-end
diff --git a/lib/license/management/python/pypi.rb b/lib/license/management/python/pypi.rb
deleted file mode 100644
index 0397532..0000000
--- a/lib/license/management/python/pypi.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require 'net/hippie'
-
-module License
- module Management
- class PyPI
- include Loggable
-
- def initialize(http)
- @http = http
- end
-
- def definition_for(name, version)
- uri = "https://pypi.org/pypi/#{name}/#{version}/json"
- process(@http.with_retry { |client| client.get(uri) }).tap do |definition|
- log_info([name, version, definition["license"]].inspect)
- end
- rescue *Net::Hippie::CONNECTION_ERRORS
- {}
- end
-
- class << self
- def definition(name, version)
- @pypi ||= new(License::Management.http)
- @pypi.definition_for(name, version)
- end
- end
-
- private
-
- def process(response)
- return JSON.parse(response.body).fetch('info', {}) if ok?(response)
-
- log_error([response.class, response.code, response.body].inspect)
- {}
- end
-
- def ok?(response)
- response.is_a?(Net::HTTPSuccess)
- end
- end
- end
-end
diff --git a/license-management.gemspec b/license-management.gemspec
index 7fb7dcc..9acbcaf 100644
--- a/license-management.gemspec
+++ b/license-management.gemspec
@@ -28,7 +28,6 @@ Gem::Specification.new do |spec|
spec.require_paths = ['lib']
spec.add_dependency 'license_finder', '~> 6.0'
- spec.add_dependency 'net-hippie', '~> 0.3'
spec.add_development_dependency 'json-schema', '~> 2.8'
spec.add_development_dependency 'rspec', '~> 3.9'
end