dependabot-swift 0.224.0 → 0.226.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daa823cdb9f7cf8a02a3ae2db25b54b941c87b80c57633c9c2a6e3c09cf2af9d
-  data.tar.gz: 59a6217a928b15e42b033c987cb7e52572961699cd9b78a6b137e88c21d7ccef
+  metadata.gz: db5c53249cce90cbbcc7af6b7caa03dabf0ba5868191bad0bd3715e2f8e38ef3
+  data.tar.gz: 8c969168a15ae0d90e3f31a3b11d082fe1951ac08deeb9a15b5d61d84c43fcc3
 SHA512:
-  metadata.gz: 4ed7d0edc5cf21554321deb0ef4b5ba1caf36878af28c6a36129d60d016f657706d5dfe516ec6c4082fcc68a3007ed6725e2f18840dc2f72a1bb1dc584043818
-  data.tar.gz: 929239d17f49f5260cd217deba666429de17e93afb2c4b970496fa4f0656d4ce9fe3515de067995e087ccb4ea97388156b048cb2f1ebe9948b221f062381d132
+  metadata.gz: 37668cae90b80db45b2d64c5f1d81387af452ef4938aed47e700ff316185c963aeae248a983d41fe6ec1cea430e1fa1cb3263e53f8fcbf58dfe0256435aaa9ad
+  data.tar.gz: 81e0899a0dc2e8ae824ace28d3ffc2a1320dc68e3f495107dcade4c7be57b1eddcaf1ec36e432f4e8a3d6273d4db9a350b0e7870330b00ee8c01f24151201681

data/lib/dependabot/swift/file_parser/dependency_parser.rb

@@ -4,6 +4,7 @@ require "dependabot/file_parsers/base"
 require "dependabot/shared_helpers"
 require "dependabot/dependency"
 require "json"
+require "uri"
 
 module Dependabot
   module Swift
@@ -47,12 +48,14 @@ module Dependabot
         end
 
         def all_dependencies(data, level: 0)
-          name = data["identity"]
-          url = data["url"]
+          identity = data["identity"]
+          url = SharedHelpers.scp_to_standard(data["url"])
+          name = normalize(url)
           version = data["version"]
 
           source = { type: "git", url: url, ref: version, branch: nil }
-          args = { name: name, version: version, package_manager: "swift", requirements: [] }
+          metadata = { identity: identity }
+          args = { name: name, version: version, package_manager: "swift", requirements: [], metadata: metadata }
 
           if level.zero?
             args[:requirements] << { requirement: nil, groups: ["dependencies"], file: nil, source: source }
@@ -65,6 +68,12 @@ module Dependabot
           [dep, *subdependencies(data, level: level + 1)].compact
         end
 
+        def normalize(source)
+          uri = URI.parse(source.downcase)
+
+          "#{uri.host}#{uri.path}".delete_prefix("www.").delete_suffix(".git")
+        end
+
         attr_reader :dependency_files, :repo_contents_path, :credentials
       end
     end

data/lib/dependabot/swift/file_parser/manifest_parser.rb

@@ -7,7 +7,10 @@ module Dependabot
   module Swift
     class FileParser < Dependabot::FileParsers::Base
       class ManifestParser
-        DEPENDENCY = /(?<declaration>\.package\(\s*(?:name: "[^"]+",\s*)?url: "(?<url>[^"]+)",\s*(?<requirement>.*)\))/
+        DEPENDENCY =
+          /(?<declaration>\.package\(\s*
+            (?:name:\s+"[^"]+",\s*)?url:\s+"(?<url>[^"]+)",\s*(?<requirement>#{NativeRequirement::REGEXP})\s*
+           \))/x
 
         def initialize(manifest, source:)
           @manifest = manifest
@@ -15,11 +18,8 @@ module Dependabot
         end
 
         def requirements
-          found = manifest.content.scan(DEPENDENCY).find do |_declaration, url, requirement|
-            # TODO: Support pinning to specific revisions
-            next if requirement.start_with?("branch:", ".branch(", "revision:", ".revision(")
-
-            url == source[:url]
+          found = manifest.content.scan(DEPENDENCY).find do |_declaration, url, _requirement|
+            SharedHelpers.scp_to_standard(url) == source[:url]
           end
 
           return [] unless found

data/lib/dependabot/swift/file_parser.rb

@@ -24,7 +24,8 @@ module Dependabot
               name: dep.name,
               version: dep.version,
               package_manager: dep.package_manager,
-              requirements: requirements
+              requirements: requirements,
+              metadata: dep.metadata
             )
           else
             dependency_set << dep

data/lib/dependabot/swift/file_updater/lockfile_updater.rb

@@ -8,21 +8,20 @@ module Dependabot
   module Swift
     class FileUpdater < Dependabot::FileUpdaters::Base
       class LockfileUpdater
-        def initialize(dependencies:, manifest:, repo_contents_path:, credentials:)
-          @dependencies = dependencies
+        def initialize(dependency:, manifest:, repo_contents_path:, credentials:, target_version: nil)
+          @dependency = dependency
           @manifest = manifest
           @repo_contents_path = repo_contents_path
           @credentials = credentials
+          @target_version = target_version
         end
 
         def updated_lockfile_content
           SharedHelpers.in_a_temporary_repo_directory(manifest.directory, repo_contents_path) do
             File.write(manifest.name, manifest.content)
 
-            dependency_names = dependencies.map(&:name).join(" ")
-
             SharedHelpers.with_git_configured(credentials: credentials) do
-              try_lockfile_update(dependency_names)
+              try_lockfile_update(dependency.metadata[:identity])
 
               File.read("Package.resolved")
             end
@@ -31,11 +30,18 @@ module Dependabot
 
         private
 
-        def try_lockfile_update(dependency_names)
-          SharedHelpers.run_shell_command(
-            "swift package update #{dependency_names}",
-            fingerprint: "swift package update <dependency_names>"
-          )
+        def try_lockfile_update(dependency_name)
+          if target_version
+            SharedHelpers.run_shell_command(
+              "swift package resolve #{dependency_name} --version #{target_version}",
+              fingerprint: "swift package resolve <dependency_name> --version <target_version>"
+            )
+          else
+            SharedHelpers.run_shell_command(
+              "swift package update #{dependency_name}",
+              fingerprint: "swift package update <dependency_name>"
+            )
+          end
         rescue SharedHelpers::HelperSubprocessFailed => e
           # This class is not only used for final lockfile updates, but for
           # checking resolvability. So resolvability errors here are expected in
@@ -44,7 +50,7 @@ module Dependabot
           Dependabot.logger.info("Lockfile failed to be updated due to error:\n#{e.message}")
         end
 
-        attr_reader :dependencies, :manifest, :repo_contents_path, :credentials
+        attr_reader :dependency, :manifest, :repo_contents_path, :credentials, :target_version
       end
     end
   end

data/lib/dependabot/swift/file_updater.rb

@@ -54,10 +54,11 @@ module Dependabot
 
       def updated_lockfile_content(updated_manifest)
         LockfileUpdater.new(
-          dependencies: dependencies,
+          dependency: dependency,
           manifest: updated_manifest || manifest,
           repo_contents_path: repo_contents_path,
-          credentials: credentials
+          credentials: credentials,
+          target_version: dependency.version
         ).updated_lockfile_content
       end
 

data/lib/dependabot/swift/native_requirement.rb

@@ -6,6 +6,9 @@ require "dependabot/swift/requirement"
 module Dependabot
   module Swift
     class NativeRequirement
+      # TODO: Support pinning to specific revisions
+      REGEXP = /(from.*|\.upToNextMajor.*|\.upToNextMinor.*|".*"\s*\.\.[\.<]\s*".*"|exact.*|\.exact.*)/
+
       attr_reader :declaration
 
       def self.map_requirements(requirements)
@@ -94,7 +97,7 @@ module Dependabot
       end
 
       def single_version_declaration?
-        up_to_next_major? || up_to_next_major_deprecated? || up_to_next_minor? ||
+        up_to_next_major? || up_to_next_major_deprecated? || up_to_next_minor_deprecated? ||
           exact_version? || exact_version_deprecated?
       end
 

data/lib/dependabot/swift/update_checker/version_resolver.rb

@@ -24,7 +24,7 @@ module Dependabot
 
         def fetch_latest_resolvable_version
           updated_lockfile_content = FileUpdater::LockfileUpdater.new(
-            dependencies: [dependency],
+            dependency: dependency,
             manifest: manifest,
             repo_contents_path: repo_contents_path,
             credentials: credentials
@@ -34,7 +34,8 @@ module Dependabot
 
           updated_lockfile = DependencyFile.new(
             name: "Package.resolved",
-            content: updated_lockfile_content
+            content: updated_lockfile_content,
+            directory: manifest.directory
           )
 
           dependency_parser(manifest, updated_lockfile).parse.find do |parsed_dep|

data/lib/dependabot/swift/update_checker.rb

@@ -107,7 +107,8 @@ module Dependabot
             manifest.content,
             old_requirements: old_requirements,
             new_requirements: new_requirements
-          ).updated_manifest_content
+          ).updated_manifest_content,
+          directory: manifest.directory
         )
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-swift
 version: !ruby/object:Gem::Version
-  version: 0.224.0
+  version: 0.226.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2023-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.224.0
+        version: 0.226.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.224.0
+        version: 0.226.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.1
+        version: 1.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.1
+        version: 1.18.0
 - !ruby/object:Gem::Dependency
   name: stackprof
   requirement: !ruby/object:Gem::Requirement
@@ -207,7 +207,7 @@ licenses:
 - Nonstandard
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.224.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.226.0
 post_install_message: 
 rdoc_options: []
 require_paths: