bibliothecary 8.2.3 → 8.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bf3193b6daf685565ca3fe2105ca8be8e03c5e83d1edcafe3ca6d3c7be12d8b
-  data.tar.gz: c2b96281c11a89bf49f830bbb0be00e35d18096dcc8a8e8b2d0038e1256a6eed
+  metadata.gz: 631a4574650b4e69a1aec283acf4c0d1fb8338a1c4b767500b3b613c51357d7c
+  data.tar.gz: 1f280d94aacce63d88302f767561d9e9f05e8d3381cd4a618cff5f04cc73511f
 SHA512:
-  metadata.gz: d3d45d37ac4c8e3c982d708f454906ab41db86fc285ba800d90acb6d2e541ae7151e7d09c5ae10eccec2678760b24f2bbb3d5c2e77048b714aa71c953395ce70
-  data.tar.gz: b86748a552b1774895cad46925205a7c4915907d336436c945a7dc027d80e8feff7d12465c9524ea12a3495d4635e45c4cd32489456453b4c744a22fdf7c5c32
+  metadata.gz: d5e68b0a9fe18880ce752f45e66ba68a31834ce35356e025f892eadb409c613c3d3d57b19fedb65362e0977393757c8a0d7fa521f5e8c3ebbe90dd1aa96b1f86
+  data.tar.gz: 0ce08bdc863f9e82ed831d99b6132c043d6da012c297f81f5a0a801e847143b5a60a4545d2ce177a1deeaa7e62ed3a50010268b396d34c3f9794d04dccfbd365

data/lib/bibliothecary/parsers/pypi.rb

@@ -179,20 +179,55 @@ module Bibliothecary
         deps
       end
 
+      # While the thing in the repo that PyPI is using might be either in
+      # egg format or wheel format, PyPI uses "egg" in the fragment of the
+      # VCS URL to specify what package in the PyPI index the VCS URL
+      # should be treated as.
+      NoEggSpecified = Class.new(ArgumentError)
+
+      # Parses a requirements.txt file, following the
+      # https://pip.pypa.io/en/stable/cli/pip_install/#requirement-specifiers
+      # and https://pip.pypa.io/en/stable/topics/vcs-support/#git.
+      # Invalid lines in requirements.txt are skipped.
       def self.parse_requirements_txt(file_contents, options: {})
         deps = []
         file_contents.split("\n").each do |line|
-          match = line.delete(' ').match(REQUIREMENTS_REGEXP)
-          next unless match
-          deps << {
-            name: match[1],
-            requirement: match[-1] || '*',
-            type: 'runtime'
-          }
+          if line['://']
+            begin
+              result = parse_requirements_txt_url(line)
+            rescue URI::Error, NoEggSpecified => e
+              next
+            end
+
+            deps << result.merge(
+              type: 'runtime'
+            )
+          else
+            match = line.delete(' ').match(REQUIREMENTS_REGEXP)
+            next unless match
+
+            deps << {
+              name: match[1],
+              requirement: match[-1] || '*',
+              type: 'runtime'
+            }
+          end
         end
         deps
       end
 
+      def self.parse_requirements_txt_url(url)
+        uri = URI.parse(url)
+        raise NoEggSpecified, "No egg specified in #{url}" unless uri.fragment
+
+        name = uri.fragment[/^egg=([^&]+)([&]|$)/, 1]
+        raise NoEggSpecified, "No egg specified in #{url}" unless name
+
+        requirement = uri.path[/@(.+)$/, 1]
+
+        { name: name, requirement: requirement || "*" }
+      end
+
       def self.pip_compile?(file_contents)
         return file_contents.include?("This file is autogenerated by pip-compile")
       rescue Exception # rubocop:disable Lint/RescueException

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "8.2.3"
+  VERSION = "8.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 8.2.3
+  version: 8.2.4
 platform: ruby
 authors:
 - Andrew Nesbitt