Merge pull request #487 from MikeMcQuaid/requirement-tweaks

Requirement tweaks

3 files changed, 12 insertions, 9 deletions

diff --git a/Library/Homebrew/requirement.rb b/Library/Homebrew/requirement.rb
index fd726be20..7a40d419e 100644
--- a/Library/Homebrew/requirement.rb
+++ b/Library/Homebrew/requirement.rb
@@ -31,7 +31,8 @@ class Requirement
 
   # The message to show when the requirement is not met.
   def message
-    s = ""
+    _, _, class_name = self.class.to_s.rpartition "::"
+    s = "#{class_name} unsatisfied!\n"
     if cask
       s += <<-EOS.undent
 
diff --git a/Library/Homebrew/requirements/osxfuse_requirement.rb b/Library/Homebrew/requirements/osxfuse_requirement.rb
index 6da67b360..f4453dc5f 100644
--- a/Library/Homebrew/requirements/osxfuse_requirement.rb
+++ b/Library/Homebrew/requirements/osxfuse_requirement.rb
@@ -2,14 +2,14 @@ require "requirement"
 
 class OsxfuseRequirement < Requirement
   fatal true
-  default_formula "osxfuse"
   cask "osxfuse"
   download "https://osxfuse.github.io/"
 
-  satisfy(:build_env => false) { Formula["osxfuse"].installed? || self.class.binary_osxfuse_installed? }
+  satisfy(:build_env => false) { self.class.binary_osxfuse_installed? }
 
   def self.binary_osxfuse_installed?
-    File.exist?("/usr/local/include/osxfuse/fuse.h") && !File.symlink?("/usr/local/include/osxfuse")
+    File.exist?("/usr/local/include/osxfuse/fuse.h") &&
+      !File.symlink?("/usr/local/include/osxfuse")
   end
 
   env do
diff --git a/Library/Homebrew/requirements/tuntap_requirement.rb b/Library/Homebrew/requirements/tuntap_requirement.rb
index 595e46d0d..76f1744a2 100644
--- a/Library/Homebrew/requirements/tuntap_requirement.rb
+++ b/Library/Homebrew/requirements/tuntap_requirement.rb
@@ -2,13 +2,15 @@ require "requirement"
 
 class TuntapRequirement < Requirement
   fatal true
-  default_formula "tuntap"
   cask "tuntap"
-  satisfy(:build_env => false) { self.class.binary_tuntap_installed? || Formula["tuntap"].installed? }
+  satisfy(:build_env => false) { self.class.binary_tuntap_installed? }
 
   def self.binary_tuntap_installed?
-    File.exist?("/Library/Extensions/tun.kext") && File.exist?("/Library/Extensions/tap.kext")
-    File.exist?("/Library/LaunchDaemons/net.sf.tuntaposx.tun.plist")
-    File.exist?("/Library/LaunchDaemons/net.sf.tuntaposx.tap.plist")
+    %w[
+      /Library/Extensions/tun.kext
+      /Library/Extensions/tap.kext
+      /Library/LaunchDaemons/net.sf.tuntaposx.tun.plist
+      /Library/LaunchDaemons/net.sf.tuntaposx.tap.plist
+    ].all? { |file| File.exist?(file) }
   end
 end