bibliothecary 8.2.4 → 8.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 631a4574650b4e69a1aec283acf4c0d1fb8338a1c4b767500b3b613c51357d7c
-  data.tar.gz: 1f280d94aacce63d88302f767561d9e9f05e8d3381cd4a618cff5f04cc73511f
+  metadata.gz: 6f7fbf7ad34eaff5fc178a7befb091ec010341f3d5ad2a2b468c84c7fa3c3741
+  data.tar.gz: 7fd04a9d3d2e28e79cec97b15cd7983f558a8fa4351bc0d1819cdce74ad65a8c
 SHA512:
-  metadata.gz: d5e68b0a9fe18880ce752f45e66ba68a31834ce35356e025f892eadb409c613c3d3d57b19fedb65362e0977393757c8a0d7fa521f5e8c3ebbe90dd1aa96b1f86
-  data.tar.gz: 0ce08bdc863f9e82ed831d99b6132c043d6da012c297f81f5a0a801e847143b5a60a4545d2ce177a1deeaa7e62ed3a50010268b396d34c3f9794d04dccfbd365
+  metadata.gz: 5a6488a468d0369e391329359622334d177fd7bcb6694efee45b25f8b5c0cd77145fd517606a7550744b5d17725440b98dc5b8b2f00801183498ac7dbfb9bfc4
+  data.tar.gz: 627e705c0201a891941bce2e2765cc9cd651473c49368270db4d0360fba6f15e3b645909bbe1052aebd2c5e24472ebfb07c7c90e68e87bf1558c40840c595c1d

data/lib/bibliothecary/analyser/determinations.rb

@@ -22,6 +22,12 @@ module Bibliothecary
         first_matching_mapping_details(info)
           .fetch(:can_have_lockfile, true)
       end
+
+      def groupable?(info)
+        # More package managers are groupable than ungroupable, but the methods
+        # to get this information should be positive.
+        !first_matching_mapping_details(info).fetch(:ungroupable, false)
+      end
     end
   end
 end

data/lib/bibliothecary/file_info.rb

@@ -49,5 +49,9 @@ module Bibliothecary
 
       @package_manager = nil
     end
+
+    def groupable?
+      @package_manager&.groupable?(self)
+    end
   end
 end

data/lib/bibliothecary/multi_parsers/cyclonedx.rb

@@ -98,11 +98,13 @@ module Bibliothecary
         {
           match_filename('cyclonedx.json') => {
             kind: 'lockfile',
-            parser: :parse_cyclonedx_json
+            parser: :parse_cyclonedx_json,
+            ungroupable: true
           },
           match_filename('cyclonedx.xml') => {
             kind: 'lockfile',
-            parser: :parse_cyclonedx_xml
+            parser: :parse_cyclonedx_xml,
+            ungroupable: true
           }
         }
       end

data/lib/bibliothecary/multi_parsers/dependencies_csv.rb

@@ -10,6 +10,7 @@ module Bibliothecary
         {
           match_filename('dependencies.csv') => {
             kind: 'lockfile',
+            ungroupable: true,
             parser: :parse_dependencies_csv
           }
         }

data/lib/bibliothecary/related_files_info.rb

@@ -12,7 +12,14 @@ module Bibliothecary
 
       file_infos_by_directory = file_infos.group_by { |info| File.dirname(info.relative_path) }
       file_infos_by_directory.values.each do |file_infos_for_path|
-        file_infos_by_directory_by_package_manager = file_infos_for_path.group_by { |info| info.package_manager}
+        groupable, ungroupable = file_infos_for_path.partition(&:groupable?)
+
+        # add ungroupable ones as separate RFIs
+        ungroupable.each do |file_info|
+          returns.append(RelatedFilesInfo.new([file_info]))
+        end
+
+        file_infos_by_directory_by_package_manager = groupable.group_by { |info| info.package_manager}
 
         file_infos_by_directory_by_package_manager.values.each do |file_infos_in_directory_for_package_manager|
           returns.append(RelatedFilesInfo.new(file_infos_in_directory_for_package_manager))

data/lib/bibliothecary/version.rb

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

metadata

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