Skip to content

Commit 2d6ae61

Browse files
committed
Re-revert "Fix operator spacing."
1 parent 0731a68 commit 2d6ae61

36 files changed

+124
-120
lines changed

Library/.rubocop.yml

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

Library/Homebrew/brew.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ def require?(path)
5959
ENV["PATH"] = path
6060

6161
if cmd
62-
internal_cmd = require? HOMEBREW_LIBRARY_PATH.join("cmd", cmd)
62+
internal_cmd = require? HOMEBREW_LIBRARY_PATH/"cmd"/cmd
6363

6464
unless internal_cmd
65-
internal_cmd = require? HOMEBREW_LIBRARY_PATH.join("dev-cmd", cmd)
65+
internal_cmd = require? HOMEBREW_LIBRARY_PATH/"dev-cmd"/cmd
6666
if internal_cmd && !ARGV.homebrew_developer?
6767
system "git", "config", "--file=#{HOMEBREW_REPOSITORY}/.git/config",
6868
"--replace-all", "homebrew.devcmdrun", "true"

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/cask/lib/hbc/download_strategy.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ def cache_tag
216216
end
217217

218218
def repo_valid?
219-
@clone.join(".svn").directory?
219+
(@clone/".svn").directory?
220220
end
221221

222222
def repo_url

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/cmd/unpack.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def unpack
2929
raise "Cannot write to #{unpack_dir}" unless unpack_dir.writable_real?
3030

3131
formulae.each do |f|
32-
stage_dir = unpack_dir.join("#{f.name}-#{f.version}")
32+
stage_dir = unpack_dir/"#{f.name}-#{f.version}"
3333

3434
if stage_dir.exist?
3535
raise "Destination #{stage_dir} already exists!" unless ARGV.force?

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

0 commit comments

Comments
 (0)