bibliothecary 6.8.8 → 6.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a942d8a210e009f17a359b9ead9049423c091d9609d6d1770eb79fc47fb16d6
-  data.tar.gz: bd1f6a3f7d3652981ee46002fe3466480c9bf9d08c7dc1dbd5bffab3698e21a0
+  metadata.gz: c655fc14eb58f419b202c25b3b28d22f041c840ceda3d527aaf21b122d5663fe
+  data.tar.gz: 43b452b2ec6411d409aff5a479fd3d89d2bdf7eeb253b253b5a76849b8990b1a
 SHA512:
-  metadata.gz: af583cc0c0dea0e280a3b28c30a9bbda9413331e76d1bfd0eba6908d209b43893cd2677acdb6113d498833514b0656cd57a0014f4949a48d1d276a629838acba
-  data.tar.gz: e8f49049133561c3fdfeb48d692736e407457943f19668251f75c5db93fae1276540754e7f0a6b0986f80f303e81a7df72ecb1dbf03c48f05d81b0e1f2057922
+  metadata.gz: 921763c07b4ae50a14a905e5eed87a558631495500150ac732763a9456b081007b6e05dac4eabfec13f06ed3d3a6b38cdc30436e828204f389a627ab64fbc38b
+  data.tar.gz: daf4e977c0c46daec88c6e9cfc0dd41b0e4ce842266716bb40aa3da10effcd5d5ee291ca034f1509f8e0233bd4a6e08ed6ab00896f7cfe4dd66ca5bbe2a859d3

data/lib/bibliothecary/parsers/maven.rb

@@ -15,6 +15,21 @@ module Bibliothecary
       MAVEN_PROPERTY_REGEX = /\$\{(.+?)\}/
       MAX_DEPTH = 5
 
+      # e.g. "[info]  test:"
+      SBT_TYPE_REGEX = /^\[info\]\s+([-\w]+):$/
+
+      # e.g. "[info]  org.typelevel:spire-util_2.12"
+      SBT_DEP_REGEX = /^\[info\]\s+(.+)$/
+
+      # e.g. "[info] 		- 1.7.5"
+      SBT_VERSION_REGEX = /^\[info\]\s+-\s+(.+)$/
+
+      # e.g. "[info] 			homepage: http://www.slf4j.org"
+      SBT_FIELD_REGEX = /^\[info\]\s+([^:]+):\s+(.+)$/
+
+      # e.g. "[info]  "
+      SBT_IGNORE_REGEX = /^\[info\]\s*$/
+
       def self.mapping
         {
           match_filename("ivy.xml", case_insensitive: true) => {
@@ -41,6 +56,10 @@ module Bibliothecary
           match_filename("maven-resolved-dependencies.txt", case_insensitive: true) => {
             kind: 'lockfile',
             parser: :parse_maven_resolved
+          },
+          match_filename("sbt-update-full.txt", case_insensitive: true) => {
+            kind: 'lockfile',
+            parser: :parse_sbt_update_full
           }
         }
       end
@@ -227,6 +246,103 @@ module Bibliothecary
           xml.locate("parent/#{non_prop_name}").first.nodes.first
         end
       end
+
+      def self.parse_sbt_update_full(file_contents)
+        all_deps = []
+        type = nil
+        lines = file_contents.split("\n")
+        while lines.any?
+          line = lines.shift
+
+          type_match = SBT_TYPE_REGEX.match(line)
+          next unless type_match
+          type = type_match.captures[0]
+
+          deps = parse_sbt_deps(type, lines)
+          all_deps.concat(deps)
+        end
+
+        # strip out evicted dependencies
+        all_deps.select! do |dep|
+          dep[:fields]["evicted"] != "true"
+        end
+
+        # in the future, we could use "callers" in the fields to
+        # decide which deps are direct root deps and which are
+        # pulled in by another dep.  The direct deps have the sbt
+        # project name as a caller.
+
+        # clean out any duplicates (I'm pretty sure sbt will have done this for
+        # us so this is paranoia, basically)
+        squished = all_deps.compact.uniq {|item| [item[:name], item[:requirement], item[:type]]}
+
+        # get rid of the fields
+        squished.each do |dep|
+          dep.delete(:fields)
+        end
+
+        return squished
+      end
+
+      def self.parse_sbt_deps(type, lines)
+        deps = []
+        while lines.any? and not SBT_TYPE_REGEX.match(lines[0])
+          line = lines.shift
+
+          next if SBT_IGNORE_REGEX.match(line)
+
+          dep_match = SBT_DEP_REGEX.match(line)
+          if dep_match
+            versions = parse_sbt_versions(type, dep_match.captures[0], lines)
+            deps.concat(versions)
+          else
+            lines.unshift(line)
+            break
+          end
+        end
+
+        deps
+      end
+
+      def self.parse_sbt_versions(type, name, lines)
+        versions = []
+        while lines.any? and not SBT_TYPE_REGEX.match(lines[0])
+          line = lines.shift
+
+          version_match = SBT_VERSION_REGEX.match(line)
+          if version_match
+            versions.push(parse_sbt_version(type, name, version_match.captures[0], lines))
+          else
+            lines.unshift(line)
+            break
+          end
+        end
+
+        versions
+      end
+
+      def self.parse_sbt_version(type, name, version, lines)
+        fields = {}
+        while lines.any? and not SBT_TYPE_REGEX.match(lines[0])
+          line = lines.shift
+
+          field_match = SBT_FIELD_REGEX.match(line)
+          if field_match
+            fields[field_match.captures[0]] = field_match.captures[1]
+          else
+            lines.unshift(line)
+            break
+          end
+        end
+
+        {
+          name: name,
+          requirement: version,
+          type: type,
+          # we post-process using some of these fields and then delete them again
+          fields: fields
+        }
+      end
     end
   end
 end

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "6.8.8"
+  VERSION = "6.8.9"
 end

metadata

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