dependabot-cargo 0.349.0 → 0.351.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09e6f4c06f765fb1bc6fba56b56a5b24684c2a7543248c08ceea0f9701833a87'
-  data.tar.gz: fe51accf4820675950bbf0837704608f998a66cf67ccc5d0c4c405f400cea3b8
+  metadata.gz: 8afbc05223d1633c506fd2a5df6b1259a8fc1b3e078bdc757c2e6f1d7738fb26
+  data.tar.gz: edb6e6ef2bc0c1f10784791deaeb70d5f450269c8bca5710becf7fd4f272a2cd
 SHA512:
-  metadata.gz: 8f4a517167ee4c5d6d0c0bfd2c122b2653ddae9ce72516fad2b56fdc68d058991a0819e2d3e24d2afa3b99a2839a7a8e1584c338e192c813ea9f1b8c8e1ddd61
-  data.tar.gz: d6a9626c6e705b73597dbe0cd94e5b95e3bbdaa532c98d7f2826f978095267e4ffadb7ae369b9ef01807f05ddf679638abde40ccbb337304e776af01ea7bc62d
+  metadata.gz: 79f7b88552527b5e73b9d0cde2c1a9a18f03736984a421207cb4d72b7350f0013d31b72d0b972614521a64ff832f13d45f19bb01ae7c345ae864e662ae5ecb5d
+  data.tar.gz: 69e748b545156fb2a3d89895a97161762b1e5f89ade7f69757c22d2fa97c19e7c18a151e04e58998cb21ba4d911b31b4182081fc664fee35d703722f60649a84

data/lib/dependabot/cargo/file_fetcher.rb

@@ -35,12 +35,7 @@ module Dependabot
                   else
                     "default"
                   end
-
-        {
-          package_managers: {
-            "cargo" => channel
-          }
-        }
+        { package_managers: { "cargo" => channel } }
       rescue TomlRB::ParseError
         raise Dependabot::DependencyFileNotParseable.new(
           T.must(rust_toolchain).path,
@@ -50,26 +45,21 @@ module Dependabot
 
       sig { override.returns(T::Array[DependencyFile]) }
       def fetch_files
-        fetched_files = T.let([], T::Array[DependencyFile])
-        fetched_files << cargo_toml
+        fetched_files = T.let([cargo_toml], T::Array[DependencyFile])
         fetched_files << T.must(cargo_lock) if cargo_lock
         fetched_files << T.must(cargo_config) if cargo_config
         fetched_files << T.must(rust_toolchain) if rust_toolchain
         fetched_files += fetch_path_dependency_and_workspace_files
-
         # If the main Cargo.toml uses workspace dependencies, ensure we have the workspace root
         parsed_manifest = parsed_file(cargo_toml)
         if uses_workspace_dependencies?(parsed_manifest) || workspace_member?(parsed_manifest)
           workspace_root = find_workspace_root(cargo_toml)
           fetched_files << workspace_root if workspace_root && !fetched_files.include?(workspace_root)
         end
-
         # Filter excluded files from final collection
-        filtered_files = fetched_files.reject do |file|
+        fetched_files.reject do |file|
           Dependabot::FileFiltering.should_exclude_path?(file.name, "file from final collection", @exclude_paths)
-        end
-
-        filtered_files.uniq
+        end.uniq
       end
 
       private
@@ -79,15 +69,10 @@ module Dependabot
       end
       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) }
-
         updated_files = fetched_files.reject(&:support_file?).uniq
-        updated_files +=
-          fetched_files.uniq
-                       .reject { |f| updated_files.map(&:name).include?(f.name) }
-
+        updated_files += fetched_files.uniq.reject { |f| updated_files.map(&:name).include?(f.name) }
         return updated_files if updated_files == files
 
         fetch_path_dependency_and_workspace_files(updated_files)
@@ -96,11 +81,7 @@ module Dependabot
       sig { params(cargo_toml: Dependabot::DependencyFile).returns(T::Array[Dependabot::DependencyFile]) }
       def workspace_files(cargo_toml)
         @workspace_files ||= T.let({}, T.nilable(T::Hash[String, T::Array[Dependabot::DependencyFile]]))
-        @workspace_files[cargo_toml.name] ||=
-          fetch_workspace_files(
-            file: cargo_toml,
-            previously_fetched_files: []
-          )
+        @workspace_files[cargo_toml.name] ||= fetch_workspace_files(file: cargo_toml, previously_fetched_files: [])
       end
 
       sig { params(fetched_files: T::Array[Dependabot::DependencyFile]).returns(T::Array[Dependabot::DependencyFile]) }
@@ -108,13 +89,10 @@ module Dependabot
         @path_dependency_files ||= T.let({}, T.nilable(T::Hash[String, T::Array[Dependabot::DependencyFile]]))
         fetched_path_dependency_files = T.let([], T::Array[Dependabot::DependencyFile])
         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
-            )
-
+          @path_dependency_files[file.name] ||= fetch_path_dependency_files(
+            file: file,
+            previously_fetched_files: fetched_files + fetched_path_dependency_files
+          )
           fetched_path_dependency_files += T.must(@path_dependency_files[file.name])
         end
 
@@ -349,8 +327,7 @@ module Dependabot
 
       sig { params(file: Dependabot::DependencyFile).returns(T::Array[String]) }
       def workspace_dependency_paths_from_file(file)
-        if parsed_file(file)["workspace"] &&
-           !parsed_file(file)["workspace"].key?("members")
+        if parsed_file(file)["workspace"] && !parsed_file(file)["workspace"].key?("members")
           return path_dependency_paths_from_file(file)
         end
 
@@ -432,9 +409,7 @@ module Dependabot
       def expand_workspaces(path)
         path = Pathname.new(path).cleanpath.to_path
         dir = directory.gsub(%r{(^/|/$)}, "")
-
         unglobbed_path = (path.split("*").first || "").gsub(%r{(?<=/)[^/]*$}, "")
-
         repo_contents(dir: unglobbed_path, raise_errors: false)
           .select { |file| file.type == "dir" }
           .map { |f| f.path.gsub(%r{^/?#{Regexp.escape(dir)}/?}, "") }
@@ -455,10 +430,7 @@ module Dependabot
 
       sig { returns(T.nilable(Dependabot::DependencyFile)) }
       def cargo_lock
-        @cargo_lock ||= T.let(
-          fetch_file_if_present("Cargo.lock"),
-          T.nilable(Dependabot::DependencyFile)
-        )
+        @cargo_lock ||= T.let(fetch_file_if_present("Cargo.lock"), T.nilable(Dependabot::DependencyFile))
       end
 
       sig { returns(T.nilable(Dependabot::DependencyFile)) }
@@ -466,7 +438,6 @@ module Dependabot
         return @cargo_config if defined?(@cargo_config)
 
         @cargo_config = fetch_support_file(".cargo/config.toml")
-
         @cargo_config ||= T.let(
           fetch_support_file(".cargo/config")&.tap { |f| f.name = ".cargo/config.toml" },
           T.nilable(Dependabot::DependencyFile)
@@ -478,15 +449,33 @@ module Dependabot
         return @rust_toolchain if defined?(@rust_toolchain)
 
         @rust_toolchain = fetch_support_file("rust-toolchain")
-
-        # Per https://rust-lang.github.io/rustup/overrides.html the file can
-        # have a `.toml` extension, but the non-extension version is preferred.
-        # Renaming here to simplify finding it later in the code.
+        # Per https://rust-lang.github.io/rustup/overrides.html the file can have a `.toml` extension,
+        # but the non-extension version is preferred. Renaming here to simplify finding it later in the code.
         @rust_toolchain ||= T.let(
           fetch_support_file("rust-toolchain.toml")&.tap { |f| f.name = "rust-toolchain" },
           T.nilable(Dependabot::DependencyFile)
         )
       end
+
+      sig { override.params(filename: T.any(Pathname, String)).returns(Dependabot::DependencyFile) }
+      def load_cloned_file_if_present(filename)
+        file = super
+        file.name = Pathname.new(file.name).cleanpath.to_s.gsub(%r{^/+}, "")
+        file
+      end
+
+      sig do
+        override.params(
+          filename: T.any(Pathname, String),
+          type: String,
+          fetch_submodules: T::Boolean
+        ).returns(Dependabot::DependencyFile)
+      end
+      def fetch_file_from_host(filename, type: "file", fetch_submodules: false)
+        file = super
+        file.name = Pathname.new(file.name).cleanpath.to_s.gsub(%r{^/+}, "")
+        file
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-cargo
 version: !ruby/object:Gem::Version
-  version: 0.349.0
+  version: 0.351.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.349.0
+        version: 0.351.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.349.0
+        version: 0.351.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -266,7 +266,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.349.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.351.0
 rdoc_options: []
 require_paths:
 - lib