dependabot-devcontainers 0.371.0 → 0.373.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67ef685221aea5cecd741252f8159fb5129c5a6b600b2217af37e23a4c69c19a
-  data.tar.gz: 590f21991b518f6d69baeb479d7225b24543a510fd23153906e787d917d87e5d
+  metadata.gz: a0ed0ff6e2838fbc8ec906b73c6f4e4abc9e477f0d39d4613d0f0641cc7d4d68
+  data.tar.gz: 7ed32335f4f53fcfe48a4d5ab6a6a1c5b87c6e53ca28401254573bfb7d5a3791
 SHA512:
-  metadata.gz: b1cbac77deee9db2cdd26b49ab5630ec6f13cea803412e531302514e92c34301fef25cffaee2e7b64716ecefcb449fa5da1562d0732ac4b25d367fea0803f3bb
-  data.tar.gz: 2e7e6ddee2662ed2c79a4af2a1fbe3fd8d40aa20965657a160e70d1810d37f029747e82e4024df080a9ce8d7046f41e821edff5c769a5a8ddff4be64ecfdbca8
+  metadata.gz: dfd7a1f487cf0d7986989bc435d2afc6f6f0410cd30283f14b8f17c9945e7eac11422dbf0ccb8cef8cb2bae7f4696dbab2f38d16dc12b1812e6211f7c6297ddd
+  data.tar.gz: 31b6649c1563d4817c9f64a6081872e73ea71237cbcb48a7fd6570bc64a3cf2037623109adadeb9053625e7879eef0c4c5100781aa039bbb85448f5fa1e9069d

data/lib/dependabot/devcontainers/file_parser/feature_dependency_parser.rb

@@ -31,7 +31,7 @@ module Dependabot
 
         sig { returns(T::Array[Dependabot::Dependency]) }
         def parse
-          SharedHelpers.in_a_temporary_repo_directory(base_dir, repo_contents_path) do
+          SharedHelpers.in_a_temporary_repo_directory(config_dependency_file.directory, repo_contents_path) do
             SharedHelpers.with_git_configured(credentials: credentials) do
               parse_cli_json(evaluate_with_cli)
             end
@@ -41,26 +41,16 @@ module Dependabot
         private
 
         sig { returns(String) }
-        def base_dir
-          File.dirname(config_dependency_file.path)
-        end
-
-        sig { returns(String) }
-        def config_name
-          File.basename(config_dependency_file.path)
-        end
-
-        sig { returns(T.nilable(String)) }
-        def config_contents
-          config_dependency_file.content
+        def config_file_path
+          config_dependency_file.name
         end
 
         # https://github.com/devcontainers/cli/blob/9444540283b236298c28f397dea879e7ec222ca1/src/spec-node/devContainersSpecCLI.ts#L1072
         sig { returns(T::Hash[String, T.untyped]) }
         def evaluate_with_cli
-          raise "config_name must be a string" unless config_name.is_a?(String) && !config_name.empty?
+          raise "config_file_path must be a string" unless config_file_path.is_a?(String) && !config_file_path.empty?
 
-          cmd = "devcontainer outdated --workspace-folder . --config #{config_name} --output-format json"
+          cmd = "devcontainer outdated --workspace-folder . --config #{config_file_path} --output-format json"
           Dependabot.logger.info("Running command: #{cmd}")
 
           json = SharedHelpers.run_shell_command(

data/lib/dependabot/devcontainers/file_updater/config_updater.rb

@@ -37,14 +37,14 @@ module Dependabot
 
         sig { returns(T::Array[String]) }
         def update
-          SharedHelpers.in_a_temporary_repo_directory(base_dir, repo_contents_path) do
+          SharedHelpers.in_a_temporary_repo_directory(manifest.directory, repo_contents_path) do
             SharedHelpers.with_git_configured(credentials: credentials) do
               update_manifests(
                 target_requirement: requirement,
                 target_version: version
               )
 
-              [File.read(manifest_name), File.read(lockfile_name)].compact
+              [File.read(manifest_file_path), File.read(lockfile_path)].compact
             end
           end
         end
@@ -52,18 +52,15 @@ module Dependabot
         private
 
         sig { returns(String) }
-        def base_dir
-          File.dirname(manifest.path)
+        def manifest_file_path
+          manifest.name
         end
 
         sig { returns(String) }
-        def manifest_name
-          File.basename(manifest.path)
-        end
-
-        sig { returns(String) }
-        def lockfile_name
-          Utils.expected_lockfile_name(manifest_name)
+        def lockfile_path
+          dir = File.dirname(manifest.name)
+          lockfile_basename = Utils.expected_lockfile_name(File.basename(manifest.name))
+          Pathname.new(File.join(dir, lockfile_basename)).cleanpath.to_path
         end
 
         sig do
@@ -78,8 +75,8 @@ module Dependabot
           run_devcontainer_upgrade(target_version)
 
           # Now replace specific version back with target requirement
-          force_target_requirement(manifest_name, from: target_version, to: target_requirement)
-          force_target_requirement(lockfile_name, from: target_version, to: target_requirement)
+          force_target_requirement(manifest_file_path, from: target_version, to: target_requirement)
+          force_target_requirement(lockfile_path, from: target_version, to: target_requirement)
         end
 
         sig { params(file_name: String, from: String, to: T.any(String, Dependabot::Devcontainers::Version)).void }
@@ -92,7 +89,7 @@ module Dependabot
           cmd = "devcontainer upgrade " \
                 "--workspace-folder . " \
                 "--feature #{feature} " \
-                "--config #{manifest_name} " \
+                "--config #{manifest_file_path} " \
                 "--target-version #{target_version}"
 
           Dependabot.logger.info("Running command: `#{cmd}`")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-devcontainers
 version: !ruby/object:Gem::Version
-  version: 0.371.0
+  version: 0.373.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.371.0
+        version: 0.373.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.371.0
+        version: 0.373.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -260,7 +260,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.371.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.373.0
 rdoc_options: []
 require_paths:
 - lib