dependabot-swift 0.225.0 → 0.227.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/dependabot/swift/file_parser/dependency_parser.rb +1 -1
  3. data/lib/dependabot/swift/file_parser/manifest_parser.rb +5 -6
  4. data/lib/dependabot/swift/native_requirement.rb +4 -1
  5. metadata +7 -7
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ece4598e2b52cc65a287a39c06f315c6971c62162bb5f571f8b35b8a7dcd95ca
4
- data.tar.gz: a2e0c834bb02b3e8ee6cc0fac896083700ea4423154827ddee9b3ab9af9fc8d6
3
+ metadata.gz: 7fbba844b62db1e2263b7df4bd95d64bee3709d87434e95aa2280c689f522adc
4
+ data.tar.gz: f5262404a637ef45d3035424a79d869c7cd07237b3613eb10ec383210a4b8797
5
5
  SHA512:
6
- metadata.gz: 1b53549f3e23982d335b6d8ab2e0e7bfb540fd708b22f1f220625a3aed3524af77586d097f8cc700af0839b31ded7fec9876643ee32413a76f81282c216efa8c
7
- data.tar.gz: 284f0ee7c59cfe1854b77b23ba1ace37cbe3629512a67d4fa519ef148fc1276fd0a9530802878ebdc0295335bb2983c7c6978786ab5cd45c3aaa94b3186345e0
6
+ metadata.gz: da8cd030f6ba24b8db2e6d6f5f5f5f992c3531ecdab48290ed9a2eaa0991f568bf9a329ec1a5af221ca8a31caca5c2941d6ecd5e8f6fe0f0caf4f8995ba08608
7
+ data.tar.gz: 44639e348128e55ca277b0f5ea14fdd3c35aa36a5d2f48b40f0a5b9482d0e3d534b1104111d6f7ffea4683b515aba1bdfdfb848d690d83363d71baa5225dbf2c
data/lib/dependabot/swift/file_parser/dependency_parser.rb CHANGED
@@ -49,7 +49,7 @@ module Dependabot
49
49
 
50
50
  def all_dependencies(data, level: 0)
51
51
  identity = data["identity"]
52
- url = data["url"]
52
+ url = SharedHelpers.scp_to_standard(data["url"])
53
53
  name = normalize(url)
54
54
  version = data["version"]
55
55
 
data/lib/dependabot/swift/file_parser/manifest_parser.rb CHANGED
@@ -8,7 +8,9 @@ module Dependabot
8
8
  class FileParser < Dependabot::FileParsers::Base
9
9
  class ManifestParser
10
10
  DEPENDENCY =
11
- /(?<declaration>\.package\(\s*(?:name: "[^"]+",\s*)?url: "(?<url>[^"]+)",\s*(?<requirement>.*)\s*\))/
11
+ /(?<declaration>\.package\(\s*
12
+ (?:name:\s+"[^"]+",\s*)?url:\s+"(?<url>[^"]+)",\s*(?<requirement>#{NativeRequirement::REGEXP})\s*
13
+ \))/x
12
14
 
13
15
  def initialize(manifest, source:)
14
16
  @manifest = manifest
@@ -16,11 +18,8 @@ module Dependabot
16
18
  end
17
19
 
18
20
  def requirements
19
- found = manifest.content.scan(DEPENDENCY).find do |_declaration, url, requirement|
20
- # TODO: Support pinning to specific revisions
21
- next if requirement.start_with?("branch:", ".branch(", "revision:", ".revision(")
22
-
23
- url == source[:url]
21
+ found = manifest.content.scan(DEPENDENCY).find do |_declaration, url, _requirement|
22
+ SharedHelpers.scp_to_standard(url) == source[:url]
24
23
  end
25
24
 
26
25
  return [] unless found
data/lib/dependabot/swift/native_requirement.rb CHANGED
@@ -6,6 +6,9 @@ require "dependabot/swift/requirement"
6
6
  module Dependabot
7
7
  module Swift
8
8
  class NativeRequirement
9
+ # TODO: Support pinning to specific revisions
10
+ REGEXP = /(from.*|\.upToNextMajor.*|\.upToNextMinor.*|".*"\s*\.\.[\.<]\s*".*"|exact.*|\.exact.*)/
11
+
9
12
  attr_reader :declaration
10
13
 
11
14
  def self.map_requirements(requirements)
@@ -94,7 +97,7 @@ module Dependabot
94
97
  end
95
98
 
96
99
  def single_version_declaration?
97
- up_to_next_major? || up_to_next_major_deprecated? || up_to_next_minor? ||
100
+ up_to_next_major? || up_to_next_major_deprecated? || up_to_next_minor_deprecated? ||
98
101
  exact_version? || exact_version_deprecated?
99
102
  end
100
103
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dependabot-swift
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.225.0
4
+ version: 0.227.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dependabot
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-07-31 00:00:00.000000000 Z
11
+ date: 2023-08-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 0.225.0
19
+ version: 0.227.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 0.225.0
26
+ version: 0.227.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: debug
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: 1.17.1
131
+ version: 1.19.0
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - "~>"
137
137
  - !ruby/object:Gem::Version
138
- version: 1.17.1
138
+ version: 1.19.0
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: stackprof
141
141
  requirement: !ruby/object:Gem::Requirement
@@ -207,7 +207,7 @@ licenses:
207
207
  - Nonstandard
208
208
  metadata:
209
209
  bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
210
- changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.225.0
210
+ changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.227.0
211
211
  post_install_message:
212
212
  rdoc_options: []
213
213
  require_paths: