diff --git a/Library/Homebrew/cask_dependent.rb b/Library/Homebrew/cask_dependent.rb index a372401690..e1c4bcd52e 100644 --- a/Library/Homebrew/cask_dependent.rb +++ b/Library/Homebrew/cask_dependent.rb @@ -20,10 +20,8 @@ class CaskDependent end def deps - @deps ||= begin - @cask.depends_on.formula.map do |f| - Dependency.new f - end + @deps ||= @cask.depends_on.formula.map do |f| + Dependency.new f end end diff --git a/Library/Homebrew/cleanup.rb b/Library/Homebrew/cleanup.rb index e205ebd3bc..5c8ae73474 100644 --- a/Library/Homebrew/cleanup.rb +++ b/Library/Homebrew/cleanup.rb @@ -430,11 +430,9 @@ module Homebrew end def rm_ds_store(dirs = nil) - dirs ||= begin - Keg::MUST_EXIST_DIRECTORIES + [ - HOMEBREW_PREFIX/"Caskroom", - ] - end + dirs ||= Keg::MUST_EXIST_DIRECTORIES + [ + HOMEBREW_PREFIX/"Caskroom", + ] dirs.select(&:directory?) .flat_map { |d| Pathname.glob("#{d}/**/.DS_Store") } .each(&:unlink) diff --git a/Library/Homebrew/development_tools.rb b/Library/Homebrew/development_tools.rb index 33f4cddc8e..14fd4388ec 100644 --- a/Library/Homebrew/development_tools.rb +++ b/Library/Homebrew/development_tools.rb @@ -41,24 +41,21 @@ class DevelopmentTools end def clang_version - @clang_version ||= begin - if (path = locate("clang")) && - (build_version = `#{path} --version`[/(?:clang|LLVM) version (\d+\.\d)/, 1]) - Version.new build_version - else - Version::NULL - end + @clang_version ||= if (path = locate("clang")) && + (build_version = `#{path} --version`[/(?:clang|LLVM) version (\d+\.\d)/, 1]) + Version.new build_version + else + Version::NULL end end def clang_build_version - @clang_build_version ||= begin - if (path = locate("clang")) && - (build_version = `#{path} --version`[%r{clang(-| version [^ ]+ \(tags/RELEASE_)(\d{2,})}, 2]) - Version.new build_version - else - Version::NULL - end + @clang_build_version ||= if (path = locate("clang")) && + (build_version = `#{path} --version`[ +%r{clang(-| version [^ ]+ \(tags/RELEASE_)(\d{2,})}, 2]) + Version.new build_version + else + Version::NULL end end diff --git a/Library/Homebrew/os/mac/mach.rb b/Library/Homebrew/os/mac/mach.rb index ff0b1c74c3..f0e6e30d30 100644 --- a/Library/Homebrew/os/mac/mach.rb +++ b/Library/Homebrew/os/mac/mach.rb @@ -13,9 +13,7 @@ module MachOShim delegate [:dylib_id, :rpaths, :delete_rpath] => :macho def macho - @macho ||= begin - MachO.open(to_s) - end + @macho ||= MachO.open(to_s) end private :macho diff --git a/Library/Homebrew/os/mac/sdk.rb b/Library/Homebrew/os/mac/sdk.rb index f39d9e527d..164c095b09 100644 --- a/Library/Homebrew/os/mac/sdk.rb +++ b/Library/Homebrew/os/mac/sdk.rb @@ -170,12 +170,10 @@ module OS # This will only look up SDKs on Xcode 10 or newer, and still # return nil SDKs for Xcode 9 and older. def sdk_prefix - @sdk_prefix ||= begin - if CLT.provides_sdk? - "#{CLT::PKG_PATH}/SDKs" - else - "" - end + @sdk_prefix ||= if CLT.provides_sdk? + "#{CLT::PKG_PATH}/SDKs" + else + "" end end end diff --git a/Library/Homebrew/rubocops/cask/ast/cask_header.rb b/Library/Homebrew/rubocops/cask/ast/cask_header.rb index addb8a718c..01386a4667 100644 --- a/Library/Homebrew/rubocops/cask/ast/cask_header.rb +++ b/Library/Homebrew/rubocops/cask/ast/cask_header.rb @@ -33,12 +33,10 @@ module RuboCop end def cask_token - @cask_token ||= begin - if dsl_version? - pair_node.val_node.children.first - else - method_node.first_argument.str_content - end + @cask_token ||= if dsl_version? + pair_node.val_node.children.first + else + method_node.first_argument.str_content end end diff --git a/Library/Homebrew/rubocops/shared/desc_helper.rb b/Library/Homebrew/rubocops/shared/desc_helper.rb index 4ca9d5f9f1..f095efd8a8 100644 --- a/Library/Homebrew/rubocops/shared/desc_helper.rb +++ b/Library/Homebrew/rubocops/shared/desc_helper.rb @@ -59,7 +59,7 @@ module RuboCop end # Check if the desc starts with the formula's or cask's name. - name_regex = name.delete("-").split("").join('[\s\-]?') + name_regex = name.delete("-").chars.join('[\s\-]?') if regex_match_group(desc, /^#{name_regex}\b/i) desc_problem "Description shouldn't start with the #{type} name." end diff --git a/Library/Homebrew/utils/github/api.rb b/Library/Homebrew/utils/github/api.rb index 6653c51376..3407fb2a10 100644 --- a/Library/Homebrew/utils/github/api.rb +++ b/Library/Homebrew/utils/github/api.rb @@ -139,9 +139,7 @@ module GitHub end def credentials - @credentials ||= begin - Homebrew::EnvConfig.github_api_token || keychain_username_password - end + @credentials ||= Homebrew::EnvConfig.github_api_token || keychain_username_password end sig { returns(Symbol) }