Skip to content

Commit 4767be2

Browse files
committed
Omit values when they have the same name as the key
1 parent fcbf4e5 commit 4767be2

8 files changed

Lines changed: 24 additions & 24 deletions

File tree

exe/importmap-update

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ end
6767

6868
rails_root = ENV.fetch("RAILS_ROOT", ".")
6969
runner = Importmap::Update::Commands::ShellRunner.new(cwd: rails_root)
70-
gh = Importmap::Update::GitHubClient.new(repo: repo, token: token)
70+
gh = Importmap::Update::GitHubClient.new(repo:, token:)
7171
git = Importmap::Update::GitClient.new(
7272
repo: Git.open(rails_root),
7373
author_name: ENV.fetch("IMPORTMAP_AUTHOR_NAME", "github-actions[bot]"),
@@ -81,10 +81,10 @@ plan = Importmap::Update::Planner.new(
8181
).call
8282

8383
existing_prs = gh.list_open_prs(branch_prefix: config.branch_prefix)
84-
reconciled = Importmap::Update::Reconciler.new(plan: plan, existing_prs: existing_prs).call
84+
reconciled = Importmap::Update::Reconciler.new(plan:, existing_prs:).call
8585

8686
executor = Importmap::Update::Executor.new(
87-
gh: gh, git: git, runner: runner,
87+
gh:, git:, runner:,
8888
base_branch: ENV.fetch("IMPORTMAP_BASE_BRANCH", "main"),
8989
commit_message_prefix: config.commit_message.prefix,
9090
labels: config.labels,

lib/commands.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def run(*argv)
4747
opts[:chdir] = @cwd if @cwd
4848
Bundler.with_unbundled_env do
4949
stdout, stderr, status = Open3.capture3(*argv, opts)
50-
Result.new(stdout: stdout, stderr: stderr, exit_code: status.exitstatus)
50+
Result.new(stdout:, stderr:, exit_code: status.exitstatus)
5151
end
5252
end
5353

lib/config.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@ def self.default
6262

6363
def to_h
6464
{
65-
version: version,
65+
version:,
6666
grouping: grouping.transform_values { |b| {strategy: b.strategy} },
67-
open_pull_requests_limit: open_pull_requests_limit,
68-
labels: labels,
69-
reviewers: reviewers,
70-
commit_message: {prefix: commit_message.prefix},
71-
branch_prefix: branch_prefix
67+
open_pull_requests_limit:,
68+
labels:,
69+
reviewers:,
70+
branch_prefix:,
71+
commit_message: {prefix: commit_message.prefix}
7272
}
7373
end
7474

lib/git_client.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def commit_changes(message:)
4747
end
4848

4949
def push(branch:, force: false)
50-
@repo.push("origin", branch, force: force)
50+
@repo.push("origin", branch, force:)
5151
nil
5252
end
5353
end

lib/github_client.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def ensure_labels(labels)
6262

6363
# Edits an existing PR's title and body.
6464
def update_pr(number:, title:, body:)
65-
@client.update_pull_request(@repo, number, title: title, body: body)
65+
@client.update_pull_request(@repo, number, title:, body:)
6666
nil
6767
end
6868

lib/parsers/audit_parser.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ def split_row(line)
6262
# If a description contained a `|`, cells.size will be >4. Rejoin the
6363
# tail into the advisory column so we don't lose information.
6464
def build_row(cells)
65-
name, severity, vuln_versions, *advisory_parts = cells
65+
name, severity, vulnerable_versions, *advisory_parts = cells
6666
Vulnerability.new(
67-
name: name,
68-
severity: severity,
69-
vulnerable_versions: vuln_versions,
67+
name:,
68+
severity:,
69+
vulnerable_versions:,
7070
advisory: advisory_parts.join(" | ")
7171
)
7272
end

lib/parsers/outdated_parser.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ def split_row(line)
7171
def build_row(cells)
7272
name, current, latest_or_error = cells[0], cells[1], cells[2]
7373
if VERSION_SHAPE_RE.match?(latest_or_error)
74-
OutdatedPackage.new(name: name, current: current, latest: latest_or_error, error: nil)
74+
OutdatedPackage.new(name:, current:, latest: latest_or_error, error: nil)
7575
else
76-
OutdatedPackage.new(name: name, current: current, latest: nil, error: latest_or_error)
76+
OutdatedPackage.new(name:, current:, latest: nil, error: latest_or_error)
7777
end
7878
end
7979
end

test/executor_test.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@ def ensure_labels(labels)
3030
end
3131

3232
def create_pr(branch:, base:, title:, body:, labels: [])
33-
@created << {branch: branch, base: base, title: title, body: body, labels: labels}
33+
@created << {branch:, base:, title:, body:, labels:}
3434
n = @next_pr_number
3535
@next_pr_number += 1
3636
n
3737
end
3838

3939
def update_pr(number:, title:, body:)
40-
@updated << {number: number, title: title, body: body}
40+
@updated << {number:, title:, body:}
4141
nil
4242
end
4343

4444
def close_pr(number:, comment: nil)
45-
@closed << {number: number, comment: comment}
45+
@closed << {number:, comment:}
4646
nil
4747
end
4848
end
@@ -79,12 +79,12 @@ def push(branch:, force: false)
7979

8080
def bump(name, from, to, kind: :patch, severity: nil)
8181
advisory = severity ? {severity: severity} : nil
82-
Planner::PackageBump.new(name: name, from: from, to: to, semver_kind: kind, advisory: advisory)
82+
Planner::PackageBump.new(name:, from:, to:, semver_kind: kind, advisory:)
8383
end
8484

8585
def spec(branch:, packages:, kind: :patch, title: "spec title")
8686
Planner::PRSpec.new(
87-
kind: kind, packages: packages, branch: branch, title: title,
87+
kind:, packages:, branch:, title:,
8888
metadata: {
8989
tool: "importmap-update", kind: kind,
9090
packages: packages.map { |p| {name: p.name, from: p.from, to: p.to, semver_kind: p.semver_kind} }
@@ -93,7 +93,7 @@ def spec(branch:, packages:, kind: :patch, title: "spec title")
9393
end
9494

9595
def existing_pr(number:, branch:)
96-
Reconciler::ExistingPR.new(number: number, branch: branch, body: "", title: "old")
96+
Reconciler::ExistingPR.new(number:, branch:, body: "", title: "old")
9797
end
9898

9999
def setup

0 commit comments

Comments
 (0)