diff options
| author | Mike McQuaid | 2017-05-29 18:24:52 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2017-05-29 18:43:18 +0100 |
| commit | 7a38bab333c6808022fe53aac2be9ca2e329cd53 (patch) | |
| tree | bbc05eebc29bdb6d539cd0e9d197b3762b49ffce /Library/Homebrew/cmd | |
| parent | 4356016b4a1c2eaba02680b4ad7f1747d2df53bf (diff) | |
| download | brew-7a38bab333c6808022fe53aac2be9ca2e329cd53.tar.bz2 | |
Fixup all RuboCop warnings.
Diffstat (limited to 'Library/Homebrew/cmd')
| -rw-r--r-- | Library/Homebrew/cmd/deps.rb | 7 | ||||
| -rw-r--r-- | Library/Homebrew/cmd/help.rb | 42 | ||||
| -rw-r--r-- | Library/Homebrew/cmd/link.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/cmd/uses.rb | 4 |
4 files changed, 28 insertions, 29 deletions
diff --git a/Library/Homebrew/cmd/deps.rb b/Library/Homebrew/cmd/deps.rb index f80bdfb0d..bbf0c1b0b 100644 --- a/Library/Homebrew/cmd/deps.rb +++ b/Library/Homebrew/cmd/deps.rb @@ -38,6 +38,7 @@ #: `--include-optional`, and `--skip-recommended` as documented above. # encoding: UTF-8 + require "formula" require "ostruct" @@ -112,10 +113,10 @@ module Homebrew end else deps = f.deps.reject do |dep| - ignores.any? { |ignore| dep.send(ignore) } && !includes.any? { |include| dep.send(include) } + ignores.any? { |ignore| dep.send(ignore) } && includes.none? { |include| dep.send(include) } end reqs = f.requirements.reject do |req| - ignores.any? { |ignore| req.send(ignore) } && !includes.any? { |include| req.send(include) } + ignores.any? { |ignore| req.send(ignore) } && includes.none? { |include| req.send(include) } end end @@ -160,7 +161,7 @@ module Homebrew else "├──" end - prefix_ext = i == max ? " " : "│ " + prefix_ext = (i == max) ? " " : "│ " puts prefix + "#{chr} #{dep_display_name(dep)}" recursive_deps_tree(Formulary.factory(dep.name), prefix + prefix_ext) end diff --git a/Library/Homebrew/cmd/help.rb b/Library/Homebrew/cmd/help.rb index 1378e7b1f..fc3878f16 100644 --- a/Library/Homebrew/cmd/help.rb +++ b/Library/Homebrew/cmd/help.rb @@ -1,27 +1,27 @@ -HOMEBREW_HELP = <<-EOS.freeze -Example usage: - brew search [TEXT|/REGEX/] - brew (info|home|options) [FORMULA...] - brew install FORMULA... - brew update - brew upgrade [FORMULA...] - brew uninstall FORMULA... - brew list [FORMULA...] +HOMEBREW_HELP = <<-EOS.unindent.freeze + Example usage: + brew search [TEXT|/REGEX/] + brew (info|home|options) [FORMULA...] + brew install FORMULA... + brew update + brew upgrade [FORMULA...] + brew uninstall FORMULA... + brew list [FORMULA...] -Troubleshooting: - brew config - brew doctor - brew install -vd FORMULA + Troubleshooting: + brew config + brew doctor + brew install -vd FORMULA -Developers: - brew create [URL [--no-fetch]] - brew edit [FORMULA...] - http://docs.brew.sh/Formula-Cookbook.html + Developers: + brew create [URL [--no-fetch]] + brew edit [FORMULA...] + http://docs.brew.sh/Formula-Cookbook.html -Further help: - man brew - brew help [COMMAND] - brew home + Further help: + man brew + brew help [COMMAND] + brew home EOS # NOTE Keep the lenth of vanilla --help less than 25 lines! diff --git a/Library/Homebrew/cmd/link.rb b/Library/Homebrew/cmd/link.rb index b8bd135e0..6c4b912e8 100644 --- a/Library/Homebrew/cmd/link.rb +++ b/Library/Homebrew/cmd/link.rb @@ -72,9 +72,7 @@ module Homebrew puts "#{n} symlinks created" end - if keg_only && !ARGV.homebrew_developer? - puts_keg_only_path_message(keg) - end + puts_keg_only_path_message(keg) if keg_only && !ARGV.homebrew_developer? end end end diff --git a/Library/Homebrew/cmd/uses.rb b/Library/Homebrew/cmd/uses.rb index bab174184..24684c3b6 100644 --- a/Library/Homebrew/cmd/uses.rb +++ b/Library/Homebrew/cmd/uses.rb @@ -98,10 +98,10 @@ module Homebrew reqs = reqs_by_formula.map(&:last) else deps = f.deps.reject do |dep| - ignores.any? { |ignore| dep.send(ignore) } && !includes.any? { |include| dep.send(include) } + ignores.any? { |ignore| dep.send(ignore) } && includes.none? { |include| dep.send(include) } end reqs = f.requirements.reject do |req| - ignores.any? { |ignore| req.send(ignore) } && !includes.any? { |include| req.send(include) } + ignores.any? { |ignore| req.send(ignore) } && includes.none? { |include| req.send(include) } end end next true if deps.any? do |dep| |
