diff options
| author | Baptiste Fontaine | 2015-01-30 11:10:15 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2015-02-01 09:31:02 +0100 |
| commit | afebaa2c8f16becaab1448512490cfd9eed42556 (patch) | |
| tree | 111b9501f05526a4145d72d9511042fcbe26fd9e | |
| parent | d3894ce3f5bba0d490489209b43bd905693469fc (diff) | |
| download | homebrew-afebaa2c8f16becaab1448512490cfd9eed42556.tar.bz2 | |
mesos: modernize, use new Java requirement style
Closes #36376.
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
| -rw-r--r-- | Library/Formula/mesos.rb | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Library/Formula/mesos.rb b/Library/Formula/mesos.rb index 93f9cc4b9..579aa49d4 100644 --- a/Library/Formula/mesos.rb +++ b/Library/Formula/mesos.rb @@ -1,5 +1,3 @@ -require "formula" - class Mesos < Formula homepage "http://mesos.apache.org" url "http://mirror.cogentco.com/pub/apache/mesos/0.20.1/mesos-0.20.1.tar.gz" @@ -11,7 +9,7 @@ class Mesos < Formula sha1 "410c88697079563e148b42d4f36ee3687e563b1d" => :mountain_lion end - depends_on :java => "1.7" + depends_on :java => "1.7+" depends_on :macos => :mountain_lion depends_on "maven" => :build # Use our Zookeeper for Yosemite and not the one shipped with Mesos @@ -19,12 +17,11 @@ class Mesos < Formula # See https://github.com/Homebrew/homebrew/issues/32965 depends_on "zookeeper" if MacOS.version == :yosemite - def install args = ["--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking", - "--disable-silent-rules" + "--disable-silent-rules", ] args << "--with-zookeeper=#{Formula["zookeeper"].opt_prefix}" if MacOS.version == :yosemite @@ -45,7 +42,7 @@ class Mesos < Formula exec "#{sbin}/mesos-slave", "--master=127.0.0.1:5050", "--work_dir=#{testpath}" end - Timeout::timeout(15) do + Timeout.timeout(15) do system "#{bin}/mesos", "execute", "--master=127.0.0.1:5050", "--name=execute-touch", @@ -53,6 +50,6 @@ class Mesos < Formula end Process.kill("TERM", master) Process.kill("TERM", slave) - system "[ -e #{testpath}/executed ]" + assert File.exist?("#{testpath}/executed") end end |