dependabot-cargo 0.82.1 → 0.82.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70383e6f0f039c05ffd136c6f4f09f89241b15cfb6428eee093faf75b642c3ec
-  data.tar.gz: 929e65012f03c4c95e0c7b64d9a7786ae5bf93ad5c4509bca0c080d2120a92a2
+  metadata.gz: 5a28aa65af3425860af8ab7292ab32c26d4510eba3d7f3ee842ea5a21d4eeb1e
+  data.tar.gz: db336bb7961fdf086371efc40cb29d4a26159722dd8746c567cc08bc90214092
 SHA512:
-  metadata.gz: ac492a9d951bbec40aefdf775229834e784b29099b48d3b290d3d32fbe21460103a221eb6358cda623893668fb6db2407cfabb2151febab008aac69154f6bb36
-  data.tar.gz: 297afa0d8ab14c32eaf7df1ac38e14dc9951d3dc61315aaddb41bcd3f1b6a24380afc90e37218fb3aa2f6916c5e4a9dab7e11f3328073a027f9e26abf0729262
+  metadata.gz: b9e8ea8308a68cb6214dbe46ecca2ca3e885723329f41096dd5044a2cc302411430cd29a8d614396ab7ede9dc67956673072ae3a2596d69ee311cd86bd8bdf40
+  data.tar.gz: aedbad0d25ac02ddedfb105257369669005fc38f935049fa882441bb797877fc2350cccc962f5baeb02e852a014afd9c642e7d7fab0aeab98a6deb5ea7f8e7b3

data/lib/dependabot/cargo/file_fetcher.rb

@@ -27,41 +27,53 @@ module Dependabot
         fetched_files << cargo_toml
         fetched_files << cargo_lock if cargo_lock
         fetched_files << rust_toolchain if rust_toolchain
-        fetched_files += workspace_files
-        fetched_files += path_dependency_files
-        fetched_files
+        fetched_files += fetch_path_dependency_and_workspace_files
+        fetched_files.uniq
       end
 
-      def workspace_files
-        @workspace_files ||=
+      def fetch_path_dependency_and_workspace_files(files = nil)
+        fetched_files = files || [cargo_toml]
+
+        fetched_files += path_dependency_files(fetched_files)
+        fetched_files += fetched_files.flat_map { |f| workspace_files(f) }
+        fetched_files.uniq!
+
+        return fetched_files if fetched_files == files
+
+        fetch_path_dependency_and_workspace_files(fetched_files)
+      end
+
+      def workspace_files(cargo_toml)
+        @workspace_files ||= {}
+        @workspace_files[cargo_toml.name] ||=
           fetch_workspace_files(
             file: cargo_toml,
             previously_fetched_files: []
           )
       end
 
-      def path_dependency_files
-        @path_dependency_files ||=
-          begin
-            fetched_path_dependency_files = []
-            [cargo_toml, *workspace_files].each do |file|
-              fetched_path_dependency_files +=
-                fetch_path_dependency_files(
-                  file: file,
-                  previously_fetched_files: [cargo_toml, *workspace_files] +
-                                            fetched_path_dependency_files
-                )
-            end
+      def path_dependency_files(fetched_files)
+        @path_dependency_files ||= {}
+        fetched_path_dependency_files = []
+        fetched_files.each do |file|
+          @path_dependency_files[file.name] ||=
+            fetch_path_dependency_files(
+              file: file,
+              previously_fetched_files: fetched_files +
+                                        fetched_path_dependency_files
+            )
 
-            fetched_path_dependency_files
-          end
+          fetched_path_dependency_files += @path_dependency_files[file.name]
+        end
+
+        fetched_path_dependency_files
       end
 
       def fetch_workspace_files(file:, previously_fetched_files:)
         current_dir = file.name.split("/")[0..-2].join("/")
         current_dir = nil if current_dir == ""
 
-        workspace_dependency_paths_from_file(file).flat_map do |path|
+        files = workspace_dependency_paths_from_file(file).flat_map do |path|
           path = File.join(current_dir, path) unless current_dir.nil?
           path = Pathname.new(path).cleanpath.to_path
 
@@ -77,6 +89,9 @@ module Dependabot
             )
           [fetched_file, *grandchild_requirement_files]
         end.compact
+
+        files.each { |f| f.support_file = file != cargo_toml }
+        files
       end
 
       def fetch_path_dependency_files(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-cargo
 version: !ruby/object:Gem::Version
-  version: 0.82.1
+  version: 0.82.2
 platform: ruby
 authors:
 - Dependabot
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.82.1
+        version: 0.82.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.82.1
+        version: 0.82.2
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement