bibliothecary 6.7.2 → 6.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 132a90ea8ed661b70e6709542f66d899eb5e35900905fd353b63f4e70b535ef8
-  data.tar.gz: 3803d75c592a1f338ea4ce0d054b1347d3a61d35db14098427a5f94031b29bfd
+  metadata.gz: b589f62fb357fbc3134d456ea82c07b7ff20b11217d2c8010c8db5ff3a009337
+  data.tar.gz: 0a0727d453938b3ce8878aabe623b2ca7dbc928cb207bcdd94eb97173ade521f
 SHA512:
-  metadata.gz: 26d770f760a52e56f7b51a04dadae781c87e73cac8e3f31d1f7cfd5d93c1a5597f079e609393146d7549b93a84bfb82a93801eacb92eb4cdf43f65e766e612ca
-  data.tar.gz: 1c8136abb0ad7b67a57b0e5e41f2e9a48e110e5c71b27baa6005c922f9fac30a69be173ec88aa20d3e494c96360986052210be0e07df0c652d15cc6f43affc34
+  metadata.gz: 3d12065e6cd92680e7ed7a0c60770e67704aa949f2d5591126eb20fb6d4c42cbfa763caf60c0a71877d41d6f75231da96d910d8b219c78af81e67bcf5e240918
+  data.tar.gz: b4c378068bf8ee58bc8a77e44a984a4eff68c0660e0c0ebaca8bee5c29b7ae69534bfead06a0993362a1f3de1b8cf96b7ff925787cdf44abc923fe9a0ffa2c1a

data/bibliothecary.gemspec

@@ -25,6 +25,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "deb_control"
   spec.add_dependency "sdl4r"
   spec.add_dependency "commander"
+  spec.add_dependency "strings-ansi"
+  spec.add_dependency "strings"
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "pry"

data/lib/bibliothecary/parsers/maven.rb

@@ -1,4 +1,5 @@
 require 'ox'
+require 'strings-ansi'
 
 module Bibliothecary
   module Parsers
@@ -11,6 +12,9 @@ module Bibliothecary
       # "|    \\--- com.google.guava:guava:23.5-jre (*)"
       GRADLE_DEP_REGEX = /(\+---|\\---){1}/
 
+      MAVEN_PROPERTY_REGEX = /\$\{(.+?)\}/
+      MAX_DEPTH = 5
+
       def self.mapping
         {
           match_filename("ivy.xml", case_insensitive: true) => {
@@ -33,6 +37,10 @@ module Bibliothecary
           match_filename("gradle-dependencies-q.txt", case_insensitive: true) => {
             kind: 'lockfile',
             parser: :parse_gradle_resolved
+          },
+          match_filename("maven-resolved-dependencies.txt", case_insensitive: true) => {
+            kind: 'lockfile',
+            parser: :parse_maven_resolved
           }
         }
       end
@@ -53,7 +61,7 @@ module Bibliothecary
         doc = Ox.parse file_contents
         root = doc&.locate("ivy-report")&.first
         return !root.nil?
-      rescue Exception => e # rubocop:disable Lint/RescueException
+      rescue Exception # rubocop:disable Lint/RescueException
         # We rescue exception here since native libs can throw a non-StandardError
         # We don't want to throw errors during the matching phase, only during
         # parsing after we match.
@@ -109,6 +117,25 @@ module Bibliothecary
         end.compact.uniq {|item| [item[:name], item[:requirement], item[:type]]}
       end
 
+      def self.parse_maven_resolved(file_contents)
+        Strings::ANSI.sanitize(file_contents)
+          .split("\n")
+          .map(&method(:parse_resolved_dep_line))
+          .compact
+          .uniq
+      end
+
+      def self.parse_resolved_dep_line(line)
+        dep_parts = line.strip.split(":")
+        return unless dep_parts.length == 5
+        # org.springframework.boot:spring-boot-starter-web:jar:2.0.3.RELEASE:compile -- module spring.boot.starter.web [auto]
+        {
+          name: dep_parts[0, 2].join(":"),
+          requirement: dep_parts[3],
+          type: dep_parts[4].split("--").first.strip
+        }
+      end
+
       def self.parse_pom_manifest(file_contents, parent_properties = {})
         manifest = Ox.parse file_contents
         xml = manifest.respond_to?('project') ? manifest.project : manifest
@@ -148,30 +175,54 @@ module Bibliothecary
       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(/^\$\{(.+)\}/)
+        match = value.match(MAVEN_PROPERTY_REGEX)
         if match
-          # 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
+          return extract_property(xml, match[1], value, parent_properties)
         else
           return value
         end
       end
+
+      def self.replace_value_with_prop(original_value, property_value, property_name)
+        original_value.gsub("${#{property_name}}", property_value)
+      end
+
+      def self.extract_property(xml, property_name, value, parent_properties = {}, depth = 0)
+        prop_value = property_value(xml, property_name, parent_properties)
+        return value unless prop_value
+        # don't resolve more than 5 levels deep to avoid potential circular references
+       
+        resolved_value = replace_value_with_prop(value, prop_value, property_name)
+        # check to see if we just resolved to another property name
+        match = resolved_value.match(MAVEN_PROPERTY_REGEX)
+        if match && depth < MAX_DEPTH
+          depth += 1
+          return extract_property(xml, match[1], resolved_value, parent_properties, depth)
+        else
+          return resolved_value
+        end 
+      end
+
+      def self.property_value(xml, property_name, parent_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 = property_name.gsub(".", "/").gsub("project/", "")
+        return value if !xml.respond_to?("properties") && parent_properties.empty? && !xml.locate(non_prop_name)
+
+        prop_field = xml.properties.locate(property_name).first
+        parent_prop = parent_properties[property_name]
+        if prop_field
+          prop_field.nodes.first
+        elsif parent_prop
+          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}
+          xml.locate(non_prop_name).first.nodes.first
+        end
+      end
     end
   end
 end

data/lib/bibliothecary/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 6.7.2
+  version: 6.7.3
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-12 00:00:00.000000000 Z
+date: 2019-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml-rb
@@ -108,6 +108,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: strings-ansi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: strings
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement