dependabot-swift 0.393.0 → 0.394.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e00ccec6ddd544f4f22c09938a9c1da9c8417075b47d6e4eb73cf0180b295bb
-  data.tar.gz: a90680a12b1dcc7c9f4eb39495de35964337ea3f8bbc2d986880101b15664160
+  metadata.gz: 73117d0984f5d33a5ffd3fb8d1b57eb286d3264284817e010a50806432c720f6
+  data.tar.gz: 6fae8e03f802a1546a493782db38fe164e23ab103777aa4415fad1e2ed409b5c
 SHA512:
-  metadata.gz: 3180f0538499b7b2829f66797dd1630c5bcf89efc2169f11237b191c93b975e3fedd86e76d88f299fe5423ab3cc660f39dbdfe877131db1d252024795b671ec4
-  data.tar.gz: fb75ad4ce85c4b70e2f3abd674e19fbe57367ed2252b1daea9fe0960ec870e83a9b0dedc2927b1772514107ad0ca6e7d368424a293c090c2b704367ddc7fd47c
+  metadata.gz: 595ebab9da23800da9fdab84dcf1969f240dbfa685c59664f70580f022ecc3da40a32f0480382cd9f8245b90c660a32417a58d4cbea396abdfb5e69daf9e5ceb
+  data.tar.gz: 24e209043401a8eddf2626bcd70d4e9904cb662a40f87f826c01c540ccc92fb8a5da75beabc65b1ce6dd24d5d1d78ec11d209acd7f1f93885c6991e5f617dc8d

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

@@ -12,9 +12,26 @@ module Dependabot
         extend T::Sig
         extend T::Helpers
 
+        # An optional `name:` label may precede the `url:` argument.
+        NAME_ARGUMENT = /(?:name:\s+"[^"]+",\s*)?/
+
+        # The `url:` argument identifies the dependency's source.
+        URL_ARGUMENT = /url:\s+"(?<url>[^"]+)",\s*/
+
+        # The version requirement (e.g. `from: "1.0.0"`, `.upToNextMajor(from: "1.0.0")`, a range).
+        REQUIREMENT_ARGUMENT = /(?<requirement>#{NativeRequirement::REGEXP})/
+
+        # A single additional labeled argument (e.g. `traits: []`) whose value may be an array, a
+        # string, or a bare token. The leading comma is optional so the final argument matches too.
+        TRAILING_ARGUMENT = /\s*,?\s*\w+\s*:\s*(?:\[[^\]]*\]|"[^"]*"|[^\s,)]+)/
+
+        # After the requirement there may be any number of trailing arguments (which can span onto
+        # following lines) before the closing `)`, optionally followed by a trailing comma.
+        TRAILING_ARGUMENTS = /(?:#{TRAILING_ARGUMENT})*\s*,?\s*/
+
         DEPENDENCY =
           /(?<declaration>\.package\(\s*
-            (?:name:\s+"[^"]+",\s*)?url:\s+"(?<url>[^"]+)",\s*(?<requirement>#{NativeRequirement::REGEXP})\s*
+            #{NAME_ARGUMENT}#{URL_ARGUMENT}#{REQUIREMENT_ARGUMENT}#{TRAILING_ARGUMENTS}
            \))/x
 
         sig do

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

@@ -28,12 +28,23 @@ module Dependabot
         sig { returns(String) }
         def updated_content
           content.gsub(declaration) do |match|
-            match.to_s.sub(old_requirement, new_requirement)
+            match.to_s.sub(old_requirement, replacement)
           end
         end
 
         private
 
+        # The parser captures a trailing comma separating the requirement from a following
+        # argument on the next line. Carry it over when the replacement doesn't already have
+        # one, so multi-line declarations stay valid.
+        sig { returns(String) }
+        def replacement
+          return new_requirement unless old_requirement.end_with?(",")
+          return new_requirement if new_requirement.end_with?(",")
+
+          "#{new_requirement},"
+        end
+
         sig { returns(String) }
         attr_reader :content
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-swift
 version: !ruby/object:Gem::Version
-  version: 0.393.0
+  version: 0.394.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.393.0
+        version: 0.394.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.393.0
+        version: 0.394.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -169,14 +169,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: turbo_tests
   requirement: !ruby/object:Gem::Requirement
@@ -272,7 +272,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.393.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.394.0
 rdoc_options: []
 require_paths:
 - lib