Skip to content

Commit 8b26dee

Browse files
authored
Merge pull request #2715 from Homebrew/revert-2698-operator-style
Revert "Fix operator spacing."
2 parents 63b2eb9 + 197392b commit 8b26dee

28 files changed

+103
-101
lines changed

Library/.rubocop.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
AllCops:
22
TargetRubyVersion: 2.0
33
Exclude:
4+
- '**/Rakefile'
5+
- '**/.*'
46
- '**/Casks/**/*'
57
- '**/vendor/**/*'
68

Library/Homebrew/cask/lib/hbc/cli/internal_appcast_checkpoint.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def self.appcask_checkpoint(cask_tokens, calculate)
4343
if checkpoint.nil?
4444
onoe "Could not retrieve `appcast` checkpoint for cask '#{cask}': #{result[:command_result].stderr}"
4545
else
46-
puts((cask_tokens.count > 1) ? "#{checkpoint} #{cask}" : checkpoint)
46+
puts((cask_tokens.count > 1) ? "#{checkpoint} #{cask}": checkpoint)
4747
count += 1
4848
end
4949
end

Library/Homebrew/cmd/list.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ def filtered_list
129129
names.each do |d|
130130
versions = d.subdirs.map { |pn| pn.basename.to_s }
131131
next if ARGV.include?("--multiple") && versions.length < 2
132-
puts "#{d.basename} #{versions * " "}"
132+
puts "#{d.basename} #{versions*" "}"
133133
end
134134
end
135135
end

Library/Homebrew/cmd/search.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def search_taps(query)
114114

115115
def search_formulae(regex)
116116
aliases = Formula.alias_full_names
117-
results = (Formula.full_names + aliases).grep(regex).sort
117+
results = (Formula.full_names+aliases).grep(regex).sort
118118

119119
results.map do |name|
120120
begin

Library/Homebrew/cmd/switch.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def switch
2525
end
2626

2727
# Does the target version exist?
28-
unless (rack/version).directory?
28+
unless (rack+version).directory?
2929
onoe "#{name} does not have a version \"#{version}\" in the Cellar."
3030

3131
versions = rack.subdirs.map { |d| Keg.new(d).version }
@@ -41,7 +41,7 @@ def switch
4141
keg.unlink
4242
end
4343

44-
keg = Keg.new(rack/version)
44+
keg = Keg.new(rack+version)
4545

4646
# Link new version, if not keg-only
4747
if keg_only?(rack)

Library/Homebrew/debrew.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@ def self.choose
5050

5151
choice = nil
5252
while choice.nil?
53-
menu.entries.each_with_index { |e, i| puts "#{i + 1}. #{e.name}" }
53+
menu.entries.each_with_index { |e, i| puts "#{i+1}. #{e.name}" }
5454
print menu.prompt unless menu.prompt.nil?
5555

5656
input = $stdin.gets || exit
5757
input.chomp!
5858

5959
i = input.to_i
6060
if i > 0
61-
choice = menu.entries[i - 1]
61+
choice = menu.entries[i-1]
6262
else
6363
possible = menu.entries.find_all { |e| e.name.start_with?(input) }
6464

Library/Homebrew/dev-cmd/audit.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ def audit_text
868868

869869
def audit_lines
870870
text.without_patch.split("\n").each_with_index do |line, lineno|
871-
line_problems(line, lineno + 1)
871+
line_problems(line, lineno+1)
872872
end
873873
end
874874

Library/Homebrew/dev-cmd/bottle.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ def bottle_formula(f)
248248
mv "#{relocatable_tar_path}.gz", bottle_path
249249
end
250250

251-
if bottle_path.size > 1 * 1024 * 1024
251+
if bottle_path.size > 1*1024*1024
252252
ohai "Detecting if #{filename} is relocatable..."
253253
end
254254

Library/Homebrew/dev-cmd/edit.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ def edit
2424
if ["mate", "subl"].include?(editor)
2525
# If the user is using TextMate or Sublime Text,
2626
# give a nice project view instead.
27-
exec_editor HOMEBREW_REPOSITORY/"bin/brew",
28-
HOMEBREW_REPOSITORY/"README.md",
29-
HOMEBREW_REPOSITORY/".gitignore",
27+
exec_editor HOMEBREW_REPOSITORY+"bin/brew",
28+
HOMEBREW_REPOSITORY+"README.md",
29+
HOMEBREW_REPOSITORY+".gitignore",
3030
*library_folders
3131
else
3232
exec_editor HOMEBREW_REPOSITORY

Library/Homebrew/development_tools.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def gcc_4_0_build_version
5151
def gcc_4_2_build_version
5252
@gcc_4_2_build_version ||= begin
5353
gcc = locate("gcc-4.2") || HOMEBREW_PREFIX.join("opt/apple-gcc42/bin/gcc-4.2")
54-
if gcc.exist? && !gcc.realpath.basename.to_s.start_with?("llvm") &&
54+
if gcc.exist? && !gcc.realpath.basename.to_s.start_with?("llvm")&&
5555
build_version = `#{gcc} --version 2>/dev/null`[/build (\d{4,})/, 1]
5656
Version.new build_version
5757
else

0 commit comments

Comments
 (0)