Skip to content
Snippets Groups Projects
Commit 7a38bab3 authored by Mike McQuaid's avatar Mike McQuaid
Browse files

Fixup all RuboCop warnings.

parent 4356016b
No related branches found
No related tags found
No related merge requests found
Showing
with 56 additions and 64 deletions
......@@ -116,7 +116,6 @@ begin
odie "Unknown command: #{cmd}"
end
end
rescue UsageError => e
require "cmd/help"
Homebrew.help cmd, usage_error: e.message
......
......@@ -10,7 +10,7 @@ module Hbc
end
def self.artifact_english_article
@artifact_english_article ||= artifact_english_name =~ /^[aeiou]/i ? "an" : "a"
@artifact_english_article ||= (artifact_english_name =~ /^[aeiou]/i) ? "an" : "a"
end
def self.artifact_dsl_key
......@@ -43,7 +43,7 @@ module Hbc
unless unknown_keys.empty?
opoo %Q{Unknown arguments to #{description} -- #{unknown_keys.inspect} (ignored). Running "brew update; brew cleanup; brew cask cleanup" will likely fix it.}
end
arguments.reject! { |k| !permitted_keys.include?(k) }
arguments.select! { |k| permitted_keys.include?(k) }
# key warnings
override_keys = override_arguments.keys
......
......@@ -197,9 +197,7 @@ module Hbc
paths.each do |path|
resolved_path = Pathname.new(path)
if path.start_with?("~")
resolved_path = resolved_path.expand_path
end
resolved_path = resolved_path.expand_path if path.start_with?("~")
if resolved_path.relative? || resolved_path.split.any? { |part| part.to_s == ".." }
opoo "Skipping #{Formatter.identifier(action)} for relative path '#{path}'."
......
......@@ -66,7 +66,7 @@ module Hbc
return [] if current == version
# collect all installed versions that are different than tap version and return them
installed.select { |v| v != version }
installed.reject { |v| v == version }
end
def to_s
......
......@@ -54,7 +54,7 @@ module Hbc
class FromURILoader < FromPathLoader
def self.can_load?(ref)
!(ref.to_s !~ ::URI.regexp)
ref.to_s =~ ::URI.regexp
end
def initialize(url)
......@@ -80,7 +80,7 @@ module Hbc
class FromTapLoader < FromPathLoader
def self.can_load?(ref)
!(ref.to_s !~ HOMEBREW_TAP_CASK_REGEX)
ref.to_s =~ HOMEBREW_TAP_CASK_REGEX
end
def initialize(tapped_name)
......
......@@ -140,9 +140,7 @@ module Hbc
command_name, *args = *@args
command = help? ? "help" : self.class.lookup_command(command_name)
unless ENV["MACOS_VERSION"].nil?
MacOS.full_version = ENV["MACOS_VERSION"]
end
MacOS.full_version = ENV["MACOS_VERSION"] unless ENV["MACOS_VERSION"].nil?
Hbc.default_tap.install unless Hbc.default_tap.installed?
Hbc.init if self.class.should_init?(command)
......
......@@ -15,7 +15,7 @@ module Hbc
end
def self.abstract?
!(name.split("::").last !~ /^Abstract[^a-z]/)
name.split("::").last =~ /^Abstract[^a-z]/
end
def self.visible
......
......@@ -17,17 +17,17 @@ module Hbc
ohai "Contents of $LOAD_PATH", self.class.render_load_path($LOAD_PATH)
ohai "Environment Variables"
environment_variables = [
"RUBYLIB",
"RUBYOPT",
"RUBYPATH",
"RBENV_VERSION",
"CHRUBY_VERSION",
"GEM_HOME",
"GEM_PATH",
"BUNDLE_PATH",
"PATH",
"SHELL",
environment_variables = %w[
RUBYLIB
RUBYOPT
RUBYPATH
RBENV_VERSION
CHRUBY_VERSION
GEM_HOME
GEM_PATH
BUNDLE_PATH
PATH
SHELL
]
(self.class.locale_variables + environment_variables).sort.each(&self.class.method(:render_env_var))
......
......@@ -41,7 +41,7 @@ module Hbc
puts versioned_staged_path.to_s
.concat(" (")
.concat(versioned_staged_path.exist? ? versioned_staged_path.abv : Formatter.error("does not exist"))
.concat(")")
.concat(")")
end
else
puts "Not installed"
......@@ -49,7 +49,7 @@ module Hbc
end
def self.name_info(cask)
ohai cask.name.size > 1 ? "Names" : "Name"
ohai((cask.name.size > 1) ? "Names" : "Name")
puts cask.name.empty? ? Formatter.error("None") : cask.name
end
......@@ -69,7 +69,7 @@ module Hbc
DSL::ORDINARY_ARTIFACT_TYPES.each do |type|
next if cask.artifacts[type].empty?
cask.artifacts[type].each do |artifact|
activatable_item = type == :stage_only ? "<none>" : artifact.first
activatable_item = (type == :stage_only) ? "<none>" : artifact.first
puts "#{activatable_item} (#{type})"
end
end
......
......@@ -24,7 +24,7 @@ module Hbc
begin
cask = CaskLoader.load(cask_token)
Installer.new(cask, binaries: binaries?,
verbose: verbose?,
verbose: verbose?,
force: force?,
skip_cask_deps: skip_cask_deps?,
require_sha: require_sha?).install
......
......@@ -43,7 +43,7 @@ module Hbc
if checkpoint.nil?
onoe "Could not retrieve `appcast` checkpoint for cask '#{cask}': #{result[:command_result].stderr}"
else
puts cask_tokens.count > 1 ? "#{checkpoint} #{cask}": checkpoint
puts((cask_tokens.count > 1) ? "#{checkpoint} #{cask}": checkpoint)
count += 1
end
end
......
......@@ -12,7 +12,7 @@ module Hbc
def run
retval = args.any? ? list : list_installed
# retval is ternary: true/false/nil
if retval.nil? && !args.any?
if retval.nil? && args.none?
opoo "nothing to list" # special case: avoid exit code
elsif retval.nil?
raise CaskError, "nothing to list"
......
......@@ -86,7 +86,7 @@ module Hbc
Dir.chdir(mount) do
Dir.glob("**/*", File::FNM_DOTMATCH).map do |path|
next if skip_path?(Pathname(path))
path == "." ? path : path.prepend("./")
(path == ".") ? path : path.prepend("./")
end.compact.join("\n").concat("\n")
end
end
......
......@@ -212,7 +212,7 @@ module Hbc
class SubversionDownloadStrategy < HbVCSDownloadStrategy
def cache_tag
# TODO: pass versions as symbols, support :head here
version == "head" ? "svn-HEAD" : "svn"
(version == "head") ? "svn-HEAD" : "svn"
end
def repo_valid?
......
......@@ -119,9 +119,7 @@ module Hbc
def language_eval
return @language if instance_variable_defined?(:@language)
if @language_blocks.nil? || @language_blocks.empty?
return @language = nil
end
return @language = nil if @language_blocks.nil? || @language_blocks.empty?
MacOS.languages.map(&Locale.method(:parse)).each do |locale|
key = @language_blocks.keys.detect do |strings|
......
......@@ -113,7 +113,7 @@ module Hbc
end
def to_s
"Cask '#{token}' definition is invalid" + (!submsg.empty? ? ": #{submsg}" : "")
"Cask '#{token}' definition is invalid#{": #{submsg}" unless submsg.empty?}"
end
end
......
......@@ -94,7 +94,7 @@ module Hbc
loop do
readable_sources = IO.select(sources)[0]
readable_sources.delete_if(&:eof?).first(1).each do |source|
type = (source == sources[0] ? :stdout : :stderr)
type = ((source == sources[0]) ? :stdout : :stderr)
begin
yield(type, source.readline_nonblock || "")
rescue IO::WaitReadable, EOFError
......
......@@ -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
......
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!
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment