Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rubocop default hash syntax #168514

Merged
merged 8 commits into from
Mar 7, 2024
Merged

rubocop default hash syntax #168514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
57f764f
ibabel: use default hash syntax.
MikeMcQuaid Mar 7, 2024
e0b2d2a
redquits: use default hash syntax.
MikeMcQuaid Mar 7, 2024
9215fc3
smultron: use default hash syntax.
MikeMcQuaid Mar 7, 2024
a2bb55a
winzip: use default hash syntax.
MikeMcQuaid Mar 7, 2024
8f41fc5
cmd/lib/changed_files: use default hash syntax.
MikeMcQuaid Mar 7, 2024
dac9a34
cmd/lib/check: use default hash syntax.
MikeMcQuaid Mar 7, 2024
f38b1c9
cmd/lib/ci_matrix: use default hash syntax.
MikeMcQuaid Mar 7, 2024
a149f88
cmd/lib/generate-matrix: use default hash syntax.
MikeMcQuaid Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Casks/i/ibabel.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

cask = CaskLoader.load(__FILE__)
download_url = "https://macinchem.org/wp-content/uploads/#{match[1]}/#{match[2]}/iBabel.zip"
app_version = Homebrew::Livecheck::Strategy::ExtractPlist.find_versions(cask: cask,
app_version = Homebrew::Livecheck::Strategy::ExtractPlist.find_versions(cask:,
url: download_url)[:matches].values.max
next if app_version.blank?

Expand Down
2 changes: 1 addition & 1 deletion Casks/r/redquits.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

cask = CaskLoader.load(__FILE__)
download_url = "http://redquits.s3.amazonaws.com/RedQuits_v#{major_version}.pkg"
Homebrew::Livecheck::Strategy::ExtractPlist.find_versions(cask: cask, url: download_url)[:matches].values
Homebrew::Livecheck::Strategy::ExtractPlist.find_versions(cask:, url: download_url)[:matches].values
end
end

Expand Down
2 changes: 1 addition & 1 deletion Casks/s/smultron.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

cask = CaskLoader.load(__FILE__)
download_url = "https://www.peterborgapps.com/downloads/Smultron#{major_version}.zip"
Homebrew::Livecheck::Strategy::ExtractPlist.find_versions(cask: cask, url: download_url)[:matches].values
Homebrew::Livecheck::Strategy::ExtractPlist.find_versions(cask:, url: download_url)[:matches].values
end
end

Expand Down
2 changes: 1 addition & 1 deletion Casks/w/winzip.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

cask = CaskLoader.load(__FILE__)
download_url = "https://download.winzip.com/winzipmacedition#{major_version}.dmg"
Homebrew::Livecheck::Strategy::ExtractPlist.find_versions(cask: cask, url: download_url)[:matches].values
Homebrew::Livecheck::Strategy::ExtractPlist.find_versions(cask:, url: download_url)[:matches].values
end
end

Expand Down
12 changes: 6 additions & 6 deletions cmd/lib/changed_files.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ def changed_files
modified_cask_files = modified_files.select { |path| cask_file?(path) }

{
modified_files: modified_files,
added_files: added_files,
modified_ruby_files: modified_ruby_files,
modified_command_files: modified_command_files,
modified_github_actions_files: modified_github_actions_files,
modified_cask_files: modified_cask_files,
modified_files:,
added_files:,
modified_ruby_files:,
modified_command_files:,
modified_github_actions_files:,
modified_cask_files:,
}
end
end
2 changes: 1 addition & 1 deletion cmd/lib/check.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ module Check
},
loaded_launchjobs: lambda {
launchctl = lambda do |sudo|
system_command!("/bin/launchctl", args: ["list"], print_stderr: false, sudo: sudo)
system_command!("/bin/launchctl", args: ["list"], print_stderr: false, sudo:)
.stdout
.lines.drop(1)
.grep_v(APPLE_LAUNCHJOBS_REGEX)
Expand Down
4 changes: 2 additions & 2 deletions cmd/lib/ci_matrix.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@ def self.generate(tap, labels: [], cask_names: [], skip_install: false, new_cask

cask_content = path.read

runners, multi_os = runners(cask_content: cask_content)
runners.product(architectures(cask_content: cask_content)).filter_map do |runner, arch|
runners, multi_os = runners(cask_content:)
runners.product(architectures(cask_content:)).filter_map do |runner, arch|
native_runner_arch = arch == runner.fetch(:arch)
# If it's just a single OS test then we can just use the two real arch runners.
next if !native_runner_arch && !multi_os
Expand Down
6 changes: 3 additions & 3 deletions cmd/lib/generate-matrix.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,16 @@ def generate_matrix
syntax_job = {
name: "syntax",
tap: tap.name,
runner: runner,
runner:,
}

matrix = [syntax_job]

unless labels&.include?("ci-syntax-only")
cask_jobs = if args.casks&.any?
CiMatrix.generate(tap, labels: labels, cask_names: casks, skip_install: skip_install, new_cask: new_cask)
CiMatrix.generate(tap, labels:, cask_names: casks, skip_install:, new_cask:)
else
CiMatrix.generate(tap, labels: labels, skip_install: skip_install, new_cask: new_cask)
CiMatrix.generate(tap, labels:, skip_install:, new_cask:)
end

if cask_jobs.any?
Expand Down