From 07d904fdb56fc8ebfca743dbf9219348f95551c6 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 10 Jul 2016 13:53:03 +0100 Subject: [PATCH 1/5] requirement: more obvious error message. Make it more obvious which class was unsatisfied to produce this error message. --- Library/Homebrew/requirement.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/requirement.rb b/Library/Homebrew/requirement.rb index fd726be204..7a40d419e6 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 From 5413ddcb6557f1ceb3fbc9bcf28b4cf65ca1c218 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 10 Jul 2016 13:53:37 +0100 Subject: [PATCH 2/5] tuntap_requirement: fix binary logic. Previously this was only using the last line. --- Library/Homebrew/requirements/tuntap_requirement.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/requirements/tuntap_requirement.rb b/Library/Homebrew/requirements/tuntap_requirement.rb index 595e46d0d8..0c66a115f5 100644 --- a/Library/Homebrew/requirements/tuntap_requirement.rb +++ b/Library/Homebrew/requirements/tuntap_requirement.rb @@ -7,8 +7,11 @@ class TuntapRequirement < Requirement satisfy(:build_env => false) { self.class.binary_tuntap_installed? || Formula["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 From 388876c201cb3f4898dd524a410110170594d707 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 10 Jul 2016 13:53:56 +0100 Subject: [PATCH 3/5] osxfuse_requirement: tweak formatting. Nicer to split this onto two lines. --- Library/Homebrew/requirements/osxfuse_requirement.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/requirements/osxfuse_requirement.rb b/Library/Homebrew/requirements/osxfuse_requirement.rb index 6da67b3606..ba4903480d 100644 --- a/Library/Homebrew/requirements/osxfuse_requirement.rb +++ b/Library/Homebrew/requirements/osxfuse_requirement.rb @@ -9,7 +9,8 @@ class OsxfuseRequirement < Requirement satisfy(:build_env => false) { Formula["osxfuse"].installed? || 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 From f950261b99f130b536fa6881959c0a8b8682aff4 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 10 Jul 2016 13:54:37 +0100 Subject: [PATCH 4/5] tuntap_requirement: remove formula reference. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We’re just supporting the Cask now. --- Library/Homebrew/requirements/tuntap_requirement.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Library/Homebrew/requirements/tuntap_requirement.rb b/Library/Homebrew/requirements/tuntap_requirement.rb index 0c66a115f5..76f1744a23 100644 --- a/Library/Homebrew/requirements/tuntap_requirement.rb +++ b/Library/Homebrew/requirements/tuntap_requirement.rb @@ -2,9 +2,8 @@ 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? %w[ From a00995fa090f905a5fbba97a8c9270246e788a39 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 10 Jul 2016 13:54:50 +0100 Subject: [PATCH 5/5] osxfuse_requirement: remove formula reference. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We’re just supporting the Cask now. --- Library/Homebrew/requirements/osxfuse_requirement.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Library/Homebrew/requirements/osxfuse_requirement.rb b/Library/Homebrew/requirements/osxfuse_requirement.rb index ba4903480d..f4453dc5fb 100644 --- a/Library/Homebrew/requirements/osxfuse_requirement.rb +++ b/Library/Homebrew/requirements/osxfuse_requirement.rb @@ -2,11 +2,10 @@ 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") &&