bibliothecary 8.2.5 → 8.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f7fbf7ad34eaff5fc178a7befb091ec010341f3d5ad2a2b468c84c7fa3c3741
-  data.tar.gz: 7fd04a9d3d2e28e79cec97b15cd7983f558a8fa4351bc0d1819cdce74ad65a8c
+  metadata.gz: ca91a1e5491b7b57370221351c1c90631fd77c12a9687328eccb69b633b477c4
+  data.tar.gz: 9cdbb6238e28ac32d61c624f1d0a98f29939684fdbfe76b29f24b9fa1737c295
 SHA512:
-  metadata.gz: 5a6488a468d0369e391329359622334d177fd7bcb6694efee45b25f8b5c0cd77145fd517606a7550744b5d17725440b98dc5b8b2f00801183498ac7dbfb9bfc4
-  data.tar.gz: 627e705c0201a891941bce2e2765cc9cd651473c49368270db4d0360fba6f15e3b645909bbe1052aebd2c5e24472ebfb07c7c90e68e87bf1558c40840c595c1d
+  metadata.gz: '01295bf67f3ba73a4683b2fc39773d8ae53ac2b1a64ccf674bf8e93aa1cae2cdacb1575a0592f2c9fbb86ddf3cca7cd60475b12252976bad6eafc07514339b34'
+  data.tar.gz: 701ab67291c19f5e7e180beeaa0501050fd3a1726d8d02918b3e305969f70266377d1ad66c65d17517a171c24440df917d233420916bc4429780541bdd688b0f

data/lib/bibliothecary/configuration.rb

@@ -5,7 +5,6 @@ module Bibliothecary
     attr_accessor :carthage_parser_host
     attr_accessor :clojars_parser_host
     attr_accessor :mix_parser_host
-    attr_accessor :gradle_parser_host
     attr_accessor :yarn_parser_host
     attr_accessor :conda_parser_host
     attr_accessor :swift_parser_host
@@ -17,7 +16,6 @@ module Bibliothecary
       @carthage_parser_host = 'https://carthage.libraries.io'
       @clojars_parser_host  = 'https://clojars.libraries.io'
       @mix_parser_host      = 'https://mix.libraries.io'
-      @gradle_parser_host   = 'https://gradle-parser.libraries.io'
       @yarn_parser_host     = 'https://yarn-parser.libraries.io'
       @conda_parser_host    = 'https://conda-parser.libraries.io'
       @swift_parser_host    = 'http://swift.libraries.io'

data/lib/bibliothecary/parsers/maven.rb

@@ -13,16 +13,18 @@ module Bibliothecary
       GRADLE_DEP_REGEX = /(\+---|\\---){1}/
 
       # Builtin methods: https://docs.gradle.org/current/userguide/java_plugin.html#tab:configurations
-      GRADLE_KTS_DEPENDENCY_METHODS = %w(api compile compileOnlyApi implementation runtimeOnly testCompileOnly testImplementation testRuntimeOnly)
-      
-      # An intentionally overly-simplified regex to scrape deps from build.gradle.kts files. 
-      # To be truly useful bibliothecary would need a full Kotlin parser that speaks Gradle, 
-      # because the Kotlin DSL has many dynamic ways of declaring dependencies.
-      
-      GRADLE_KTS_VERSION_REGEX = /[\w.-]+/ # e.g. '1.2.3'
-      GRADLE_KTS_INTERPOLATED_VERSION_REGEX = /\$\{.*\}/ # e.g. '${my-project-settings["version"]}'
-      GRADLE_KTS_GAV_REGEX = /([\w.-]+)\:([\w.-]+)(?:\:(#{GRADLE_KTS_VERSION_REGEX}|#{GRADLE_KTS_INTERPOLATED_VERSION_REGEX}))?/
-      GRADLE_KTS_SIMPLE_REGEX = /(#{GRADLE_KTS_DEPENDENCY_METHODS.join('|')})\s*\(\s*"#{GRADLE_KTS_GAV_REGEX}"\s*\)\s*$/m # e.g. "group:artifactId:1.2.3"
+      # Deprecated methods: https://docs.gradle.org/current/userguide/upgrading_version_6.html#sec:configuration_removal
+      GRADLE_DEPENDENCY_METHODS = %w(api compile compileClasspath compileOnly compileOnlyApi implementation runtime runtimeClasspath runtimeOnly testCompile testCompileOnly testImplementation testRuntime testRuntimeOnly)
+
+      # Intentionally overly-simplified regexes to scrape deps from build.gradle (Groovy) and build.gradle.kts (Kotlin) files. 
+      # To be truly useful bibliothecary would need full Groovy / Kotlin parsers that speaks Gradle, 
+      # because the Groovy and Kotlin DSLs have many dynamic ways of declaring dependencies.
+      GRADLE_VERSION_REGEX = /[\w.-]+/ # e.g. '1.2.3'
+      GRADLE_VAR_INTERPOLATION_REGEX = /\$\w+/ # e.g. '$myVersion'
+      GRADLE_CODE_INTERPOLATION_REGEX = /\$\{.*\}/ # e.g. '${my-project-settings["version"]}'
+      GRADLE_GAV_REGEX = /([\w.-]+)\:([\w.-]+)(?:\:(#{GRADLE_VERSION_REGEX}|#{GRADLE_VAR_INTERPOLATION_REGEX}|#{GRADLE_CODE_INTERPOLATION_REGEX}))?/ # e.g. "group:artifactId:1.2.3"
+      GRADLE_GROOVY_SIMPLE_REGEX = /(#{GRADLE_DEPENDENCY_METHODS.join('|')})\s*\(?\s*['"]#{GRADLE_GAV_REGEX}['"]/m 
+      GRADLE_KOTLIN_SIMPLE_REGEX = /(#{GRADLE_DEPENDENCY_METHODS.join('|')})\s*\(\s*"#{GRADLE_GAV_REGEX}"/m 
 
       MAVEN_PROPERTY_REGEX = /\$\{(.+?)\}/
       MAX_DEPTH = 5
@@ -233,24 +235,21 @@ module Bibliothecary
       end
 
       def self.parse_gradle(file_contents, options: {})
-        response = Typhoeus.post("#{Bibliothecary.configuration.gradle_parser_host}/parse", body: file_contents)
-        raise Bibliothecary::RemoteParsingError.new("Http Error #{response.response_code} when contacting: #{Bibliothecary.configuration.gradle_parser_host}/parse", response.response_code) unless response.success?
-        json = JSON.parse(response.body)
-        return [] unless json['dependencies']
-        json['dependencies'].map do |dependency|
-          name = gradle_dependency_name(dependency["group"], dependency["name"])
-          next unless name =~ /[\w-]+\.[\w_-]+(\.[\w-])?\:[\w-]/
+        file_contents
+        .scan(GRADLE_GROOVY_SIMPLE_REGEX)                                                # match 'implementation "group:artifactId:version"'
+        .reject { |(_type, group, artifactId, _version)| group.nil? || artifactId.nil? } # remove any matches with missing group/artifactId
+        .map { |(type, group, artifactId, version)|
           {
-            name: name,
-            requirement: dependency["version"],
-            type: dependency["type"]
+            name: [group, artifactId].join(":"),
+            requirement: version || "*",
+            type: type
           }
-        end.compact
+        }
       end
 
       def self.parse_gradle_kts(file_contents, options: {})
         file_contents
-          .scan(GRADLE_KTS_SIMPLE_REGEX)                                                  # match 'implementation("group:artifactId:version")'
+          .scan(GRADLE_KOTLIN_SIMPLE_REGEX)                                                # match 'implementation("group:artifactId:version")'
           .reject { |(_type, group, artifactId, _version)| group.nil? || artifactId.nil? } # remove any matches with missing group/artifactId
           .map { |(type, group, artifactId, version)|
             {

data/lib/bibliothecary/parsers/pypi.rb

@@ -84,7 +84,7 @@ module Bibliothecary
       end
 
       def self.parse_poetry(file_contents, options: {})
-        manifest = Tomlrb.parse(file_contents)['tool']['poetry']
+        manifest = Tomlrb.parse(file_contents).fetch('tool', {}).fetch('poetry', {})
         map_dependencies(manifest['dependencies'], 'runtime') + map_dependencies(manifest['dev-dependencies'], 'develop')
       end
 

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "8.2.5"
+  VERSION = "8.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 8.2.5
+  version: 8.3.1
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-16 00:00:00.000000000 Z
+date: 2022-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb