bibliothecary 6.10.6 → 6.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b8ae8af99a91ccccfdaaf8a18aa03ff134856f4ff0bd3579ef0955ff28bb6b6
-  data.tar.gz: 7eeb154cbcc23edb621e3a1f332264bac5fe716d4e5026c20c072f14e60156b2
+  metadata.gz: 97884ae133cf8ff23366cfdfbd6a97382e200313693eaaca8ceae2e743897a72
+  data.tar.gz: 5cf10414b41b13552a692fa4802464eab0980489e9a1ce5a1e4f9601add8deb7
 SHA512:
-  metadata.gz: 4fb19ca3ce60f786ee92a013ac6cddd2b29f8400ae7f3dce1258794360f90f3afd4b9bd594e9da34c4da2b2cae5ebc8936cc288ec0341710836ef0d13bffd210
-  data.tar.gz: f9e7a66faa72e61b47dff0b73a6e80af515746a1de3e333eed4930560f2eff9519f785e303412c9774a812080a4926f317f5c8a895c9d568f768f6c78ff9f67f
+  metadata.gz: 58c47af966516baa1fb6c9586670cf8dc5d1a0831f2b6fa44b750d7e7f62471063b89083ce7306878fb2989cb8b073b3c9b105b68a90883f7f4f9ac86a111999
+  data.tar.gz: 2685dcd3c595d20c2d1fc5884dd1187079e2bdeddd6f354762b8ee3dfdb326fcb6574bcf4a15d3b7ea343f22847d188ee6093c4f7ccf6ae13c1b7d61794b6cce

data/lib/bibliothecary/parsers/maven.rb

@@ -205,8 +205,8 @@ module Bibliothecary
         json = JSON.parse(response.body)
         return [] unless json['dependencies']
         json['dependencies'].map do |dependency|
-          name = [dependency["group"], dependency["name"]].join(':')
-          next unless name =~ (/[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+(\.[A-Za-z0-9_-])?\:[A-Za-z0-9_-]/)
+          name = gradle_dependency_name(dependency["group"], dependency["name"])
+          next unless name =~ /[\w-]+\.[\w_-]+(\.[\w-])?\:[\w-]/
           {
             name: name,
             requirement: dependency["version"],
@@ -215,6 +215,20 @@ module Bibliothecary
         end.compact
       end
 
+      def self.gradle_dependency_name(group, name)
+        if group.empty? && name.include?(":")
+          group, name = name.split(":", 2)
+        end
+
+        # Strip comments, and single/doublequotes
+        [group, name].map do |part|
+          part
+            .gsub(/\s*\/\/.*$/, "") # Comments
+            .gsub(/^["']/, "") # Beginning single/doublequotes
+            .gsub(/["']$/, "") # Ending single/doublequotes
+        end.join(":")
+      end
+
       def self.extract_pom_info(xml, location, parent_properties = {})
         extract_pom_dep_info(xml, xml, location, parent_properties)
       end

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "6.10.6"
+  VERSION = "6.10.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 6.10.6
+  version: 6.10.7
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-06 00:00:00.000000000 Z
+date: 2021-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml-rb