bibliothecary 6.7.1 → 6.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49fa537a10ec86b1e5ea5e98a309809ce5d48f86d6446f4b7594c4336f093fba
-  data.tar.gz: 3114585dbb5202247403c9935f805666313f5e721d10a0ce7afdeb11bc22c725
+  metadata.gz: 132a90ea8ed661b70e6709542f66d899eb5e35900905fd353b63f4e70b535ef8
+  data.tar.gz: 3803d75c592a1f338ea4ce0d054b1347d3a61d35db14098427a5f94031b29bfd
 SHA512:
-  metadata.gz: a022471cd15a016c117fb44ccd599431b1795551ca084a2e114d7ffb5a13b33c9eba9c83c56c2748237ff00a6e0a512fa090cec684c08fb09b5ddb304959d87e
-  data.tar.gz: 555ae7a41a2757ce8a119f74fe9975aa9b40b75e8089ca2a9e18863b69bba93757e0f83236651893a8ba8356170d20242ac433be6873c91acabdf351564fadfc
+  metadata.gz: 26d770f760a52e56f7b51a04dadae781c87e73cac8e3f31d1f7cfd5d93c1a5597f079e609393146d7549b93a84bfb82a93801eacb92eb4cdf43f65e766e612ca
+  data.tar.gz: 1c8136abb0ad7b67a57b0e5e41f2e9a48e110e5c71b27baa6005c922f9fac30a69be173ec88aa20d3e494c96360986052210be0e07df0c652d15cc6f43affc34

data/lib/bibliothecary/parsers/maven.rb

@@ -109,16 +109,16 @@ module Bibliothecary
         end.compact.uniq {|item| [item[:name], item[:requirement], item[:type]]}
       end
 
-      def self.parse_pom_manifest(file_contents)
+      def self.parse_pom_manifest(file_contents, parent_properties = {})
         manifest = Ox.parse file_contents
         xml = manifest.respond_to?('project') ? manifest.project : manifest
         [].tap do |deps|
           ['dependencies/dependency', 'dependencyManagement/dependencies/dependency'].each do |deps_xpath|
             xml.locate(deps_xpath).each do |dep|
               deps.push({
-                name: "#{extract_pom_dep_info(xml, dep, 'groupId')}:#{extract_pom_dep_info(xml, dep, 'artifactId')}",
-                requirement: extract_pom_dep_info(xml, dep, 'version'),
-                type: extract_pom_dep_info(xml, dep, 'scope') || 'runtime'
+                name: "#{extract_pom_dep_info(xml, dep, 'groupId', parent_properties)}:#{extract_pom_dep_info(xml, dep, 'artifactId', parent_properties)}",
+                requirement: extract_pom_dep_info(xml, dep, 'version', parent_properties),
+                type: extract_pom_dep_info(xml, dep, 'scope', parent_properties) || 'runtime'
               })
             end
           end
@@ -141,16 +141,30 @@ module Bibliothecary
         end.compact
       end
 
-      def self.extract_pom_dep_info(xml, dependency, name)
+      def self.extract_pom_info(xml, location, parent_properties = {})
+        extract_pom_dep_info(xml, xml, location, parent_properties)
+      end
+
+      def self.extract_pom_dep_info(xml, dependency, name, parent_properties = {})
         field = dependency.locate(name).first
         return nil if field.nil?
         value = field.nodes.first
         match = value.match(/^\$\{(.+)\}/)
         if match
-          return value unless xml.respond_to? 'properties'
+          # the xml root is <project> so lookup the non property name in the xml
+          # this converts ${project/group.id} -> ${group/id}
+          non_prop_name = match[1].gsub('.', '/').gsub('project/', '')
+          return value if !xml.respond_to?('properties') && parent_properties.empty? && !xml.locate(non_prop_name)
           prop_field = xml.properties.locate(match[1]).first
+          parent_prop = parent_properties[match[1]]
           if prop_field
             return prop_field.nodes.first
+          elsif parent_prop
+            return parent_prop
+          elsif xml.locate(non_prop_name).first
+            # see if the value to look up is a field under the project
+            # examples are ${project.groupId} or ${project.version}
+            return xml.locate(non_prop_name).first.nodes.first
           else
             return value
           end

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "6.7.1"
+  VERSION = "6.7.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 6.7.1
+  version: 6.7.2
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-29 00:00:00.000000000 Z
+date: 2019-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml-rb
@@ -273,8 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Find and parse manifests