Skip to content

Commit 4d5d6a6

Browse files
committed
Rename PATH#validate to PATH#existing.
1 parent 22f624b commit 4d5d6a6

File tree

5 files changed

+26
-18
lines changed

5 files changed

+26
-18
lines changed

Library/Homebrew/PATH.rb

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,14 @@ def insert(index, *paths)
2323
self
2424
end
2525

26+
def select(&block)
27+
self.class.new(@paths.select(&block))
28+
end
29+
30+
def reject(&block)
31+
self.class.new(@paths.reject(&block))
32+
end
33+
2634
def to_ary
2735
@paths
2836
end
@@ -49,9 +57,9 @@ def empty?
4957
@paths.empty?
5058
end
5159

52-
def validate
53-
validated_path = self.class.new(@paths.select(&File.method(:directory?)))
54-
validated_path unless validated_path.empty?
60+
def existing
61+
existing_path = select(&File.method(:directory?))
62+
existing_path unless existing_path.empty?
5563
end
5664

5765
private

Library/Homebrew/extend/ENV/std.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def determine_pkg_config_libdir
6262
HOMEBREW_PREFIX/"share/pkgconfig",
6363
homebrew_extra_pkg_config_paths,
6464
"/usr/lib/pkgconfig",
65-
).validate
65+
).existing
6666
end
6767

6868
# Removes the MAKEFLAGS environment variable, causing make to use a single job.

Library/Homebrew/extend/ENV/super.rb

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def determine_path
122122
nil
123123
end
124124

125-
path.validate
125+
path.existing
126126
end
127127

128128
def homebrew_extra_pkg_config_paths
@@ -133,14 +133,14 @@ def determine_pkg_config_path
133133
PATH.new(
134134
deps.map { |d| d.opt_lib/"pkgconfig" },
135135
deps.map { |d| d.opt_share/"pkgconfig" },
136-
).validate
136+
).existing
137137
end
138138

139139
def determine_pkg_config_libdir
140140
PATH.new(
141141
"/usr/lib/pkgconfig",
142142
homebrew_extra_pkg_config_paths,
143-
).validate
143+
).existing
144144
end
145145

146146
def homebrew_extra_aclocal_paths
@@ -152,7 +152,7 @@ def determine_aclocal_path
152152
keg_only_deps.map { |d| d.opt_share/"aclocal" },
153153
HOMEBREW_PREFIX/"share/aclocal",
154154
homebrew_extra_aclocal_paths,
155-
).validate
155+
).existing
156156
end
157157

158158
def homebrew_extra_isystem_paths
@@ -163,11 +163,11 @@ def determine_isystem_paths
163163
PATH.new(
164164
HOMEBREW_PREFIX/"include",
165165
homebrew_extra_isystem_paths,
166-
).validate
166+
).existing
167167
end
168168

169169
def determine_include_paths
170-
PATH.new(keg_only_deps.map(&:opt_include)).validate
170+
PATH.new(keg_only_deps.map(&:opt_include)).existing
171171
end
172172

173173
def homebrew_extra_library_paths
@@ -179,7 +179,7 @@ def determine_library_paths
179179
keg_only_deps.map(&:opt_lib),
180180
HOMEBREW_PREFIX/"lib",
181181
homebrew_extra_library_paths,
182-
).validate
182+
).existing
183183
end
184184

185185
def determine_dependencies
@@ -190,23 +190,23 @@ def determine_cmake_prefix_path
190190
PATH.new(
191191
keg_only_deps.map(&:opt_prefix),
192192
HOMEBREW_PREFIX.to_s,
193-
).validate
193+
).existing
194194
end
195195

196196
def homebrew_extra_cmake_include_paths
197197
[]
198198
end
199199

200200
def determine_cmake_include_path
201-
PATH.new(homebrew_extra_cmake_include_paths).validate
201+
PATH.new(homebrew_extra_cmake_include_paths).existing
202202
end
203203

204204
def homebrew_extra_cmake_library_paths
205205
[]
206206
end
207207

208208
def determine_cmake_library_path
209-
PATH.new(homebrew_extra_cmake_library_paths).validate
209+
PATH.new(homebrew_extra_cmake_library_paths).existing
210210
end
211211

212212
def homebrew_extra_cmake_frameworks_paths
@@ -217,7 +217,7 @@ def determine_cmake_frameworks_path
217217
PATH.new(
218218
deps.map(&:opt_frameworks),
219219
homebrew_extra_cmake_frameworks_paths,
220-
).validate
220+
).existing
221221
end
222222

223223
def determine_make_jobs

Library/Homebrew/test/PATH_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@
8686
end
8787
end
8888

89-
describe "#validate" do
89+
describe "#existing" do
9090
it "returns a new PATH without non-existent paths" do
9191
allow(File).to receive(:directory?).with("/path1").and_return(true)
9292
allow(File).to receive(:directory?).with("/path2").and_return(false)
9393

9494
path = described_class.new("/path1", "/path2")
95-
expect(path.validate.to_ary).to eq(["/path1"])
95+
expect(path.existing.to_ary).to eq(["/path1"])
9696
expect(path.to_ary).to eq(["/path1", "/path2"])
9797
end
9898
end

Library/Homebrew/utils.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ def install_gem_setup_path!(name, version = nil, executable = name)
193193
path = PATH.new(ENV["PATH"])
194194
path.prepend(RUBY_BIN) if which("ruby") != RUBY_PATH
195195
path.prepend(Gem.bindir)
196-
ENV["PATH"] = path.validate
196+
ENV["PATH"] = path.existing
197197

198198
if Gem::Specification.find_all_by_name(name, version).empty?
199199
ohai "Installing or updating '#{name}' gem"

0 commit comments

Comments
 (0)