bibliothecary 7.1.4 → 7.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 139600bf079b4cc07ba891b319f14dd7ec7af7622bcd5b87ef93b70e21191e58
-  data.tar.gz: 1b0162957be9078ffb00d6c2f1ff2d2654e7aad74853bb7f06e3c81be50ca950
+  metadata.gz: c9b98a74ca8714750a835ebe600e5a031edcad43bfffa82b475f47aaf1356d2b
+  data.tar.gz: a8a74dbbfdac38ad7da70258e080c9f61aad16c4f19002b8d1d53290873ba6d0
 SHA512:
-  metadata.gz: ef6071d7672fc07be61cac936b10f694675758ca4ed2d9dfdf9cd77c440f1538771cccc528f1b4d2486fe8e6621eff96ae7825c69b97b957140302e3d7fa01f9
-  data.tar.gz: 3797470015e7d7f2da4b6603ece7e327083bb10d5b77f4bb2c8adc139f35fe0a5c1e90ef1d8cc36aba83a5ca77144f6433a98d85e8164dee8a3a38dc23fa9450
+  metadata.gz: 25f3208793295ee459d4a9995f38a877d48132fa31469091695e60597c09547f345a0f554539a4bfe065b8a307ba17a8e9fecc3d30d08cce22ef35cf7e5430e0
+  data.tar.gz: 8b38ae3f49162807dcf04f3e07c81d69501b1aa041b4e1239bc8bf477067e485266b15ad99a090f649dd826cf2f055a24ef3bf39e8fbcda071f2d087f0dea2a2

data/lib/bibliothecary/parsers/pypi.rb

@@ -4,7 +4,12 @@ module Bibliothecary
       include Bibliothecary::Analyser
 
       INSTALL_REGEXP = /install_requires\s*=\s*\[([\s\S]*?)\]/
-      REQUIRE_REGEXP = /([a-zA-Z0-9]+[a-zA-Z0-9\-_\.]+)([><=\w\.,]+)?/
+
+      # Capture Group 1 is package.
+      # Optional Group 2 is [extras].
+      # Capture Group 3 is Version
+      REQUIRE_REGEXP = /([a-zA-Z0-9]+[a-zA-Z0-9\-_\.]+)(?:\[.*?\])*([><=\w\.,]+)?/
+
       REQUIREMENTS_REGEXP = /^#{REQUIRE_REGEXP}/
       MANIFEST_REGEXP = /.*require[^\/]*(\/)?[^\/]*\.(txt|pip|in)$/
       PIP_COMPILE_REGEXP = /.*require.*$/
@@ -160,7 +165,7 @@ module Bibliothecary
           next unless match
           deps << {
             name: match[1],
-            requirement: match[2] || '*',
+            requirement: match[-1] || '*',
             type: 'runtime'
           }
         end
@@ -174,7 +179,7 @@ module Bibliothecary
           next unless match
           deps << {
             name: match[1],
-            requirement: match[2] || '*',
+            requirement: match[-1] || '*',
             type: 'runtime'
           }
         end

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "7.1.4"
+  VERSION = "7.1.5"
 end

metadata

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