Merge pull request #3813 from maxim-belkin/brew-unix-2

bzip2 and zip dependencies_if_needed

4 files changed, 81 insertions, 2 deletions

diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb
index 03a86d661..7d3b90f9c 100644
--- a/Library/Homebrew/dependency_collector.rb
+++ b/Library/Homebrew/dependency_collector.rb
@@ -63,11 +63,19 @@ class DependencyCollector
   end
 
   def cvs_dep_if_needed(tags)
-    Dependency.new("cvs", tags)
+    Dependency.new("cvs", tags) unless which("cvs")
   end
 
   def xz_dep_if_needed(tags)
-    Dependency.new("xz", tags)
+    Dependency.new("xz", tags) unless which("xz")
+  end
+
+  def zip_dep_if_needed(tags)
+    Dependency.new("zip", tags) unless which("zip")
+  end
+
+  def bzip2_dep_if_needed(tags)
+    Dependency.new("bzip2", tags) unless which("bzip2")
   end
 
   def ld64_dep_if_needed(*); end
@@ -158,6 +166,8 @@ class DependencyCollector
   def parse_url_spec(url, tags)
     case File.extname(url)
     when ".xz"          then xz_dep_if_needed(tags)
+    when ".zip"         then zip_dep_if_needed(tags)
+    when ".bz2"         then bzip2_dep_if_needed(tags)
     when ".lha", ".lzh" then Dependency.new("lha", tags)
     when ".lz"          then Dependency.new("lzip", tags)
     when ".rar"         then Dependency.new("unrar", tags)
diff --git a/Library/Homebrew/extend/os/mac/dependency_collector.rb b/Library/Homebrew/extend/os/mac/dependency_collector.rb
index 108b6ccb2..a7e5d7ffc 100644
--- a/Library/Homebrew/extend/os/mac/dependency_collector.rb
+++ b/Library/Homebrew/extend/os/mac/dependency_collector.rb
@@ -18,6 +18,10 @@ class DependencyCollector
     Dependency.new("xz", tags)
   end
 
+  def zip_dep_if_needed(tags); end
+
+  def bzip2_dep_if_needed(tags); end
+
   def ld64_dep_if_needed(*)
     # Tiger's ld is too old to properly link some software
     return if MacOS.version > :tiger
diff --git a/Library/Homebrew/test/os/linux/dependency_collector_spec.rb b/Library/Homebrew/test/os/linux/dependency_collector_spec.rb
new file mode 100644
index 000000000..543ed39b0
--- /dev/null
+++ b/Library/Homebrew/test/os/linux/dependency_collector_spec.rb
@@ -0,0 +1,53 @@
+require "dependency_collector"
+
+describe DependencyCollector do
+  alias_matcher :be_a_build_requirement, :be_build
+
+  after(:each) do
+    described_class.clear_cache
+  end
+
+  describe "#add" do
+    resource = Resource.new
+
+    context "when xz, zip, and bzip2 are not available" do
+      it "creates a resource dependency from a '.xz' URL" do
+        resource.url("http://example.com/foo.xz")
+        allow_any_instance_of(Object).to receive(:which).with("xz")
+        expect(subject.add(resource)).to eq(Dependency.new("xz", [:build]))
+      end
+
+      it "creates a resource dependency from a '.zip' URL" do
+        resource.url("http://example.com/foo.zip")
+        allow_any_instance_of(Object).to receive(:which).with("zip")
+        expect(subject.add(resource)).to eq(Dependency.new("zip", [:build]))
+      end
+
+      it "creates a resource dependency from a '.bz2' URL" do
+        resource.url("http://example.com/foo.tar.bz2")
+        allow_any_instance_of(Object).to receive(:which).with("bzip2")
+        expect(subject.add(resource)).to eq(Dependency.new("bzip2", [:build]))
+      end
+    end
+
+    context "when xz, zip, and bzip2 are available" do
+      it "does not create a resource dependency from a '.xz' URL" do
+        resource.url("http://example.com/foo.xz")
+        allow_any_instance_of(Object).to receive(:which).with("xz").and_return(Pathname.new("foo"))
+        expect(subject.add(resource)).to be nil
+      end
+
+      it "does not create a resource dependency from a '.zip' URL" do
+        resource.url("http://example.com/foo.zip")
+        allow_any_instance_of(Object).to receive(:which).with("zip").and_return(Pathname.new("foo"))
+        expect(subject.add(resource)).to be nil
+      end
+
+      it "does not create a resource dependency from a '.bz2' URL" do
+        resource.url("http://example.com/foo.tar.bz2")
+        allow_any_instance_of(Object).to receive(:which).with("bzip2").and_return(Pathname.new("foo"))
+        expect(subject.add(resource)).to be nil
+      end
+    end
+  end
+end
diff --git a/Library/Homebrew/test/os/mac/dependency_collector_spec.rb b/Library/Homebrew/test/os/mac/dependency_collector_spec.rb
index 5d260ebf7..a8fe8ba54 100644
--- a/Library/Homebrew/test/os/mac/dependency_collector_spec.rb
+++ b/Library/Homebrew/test/os/mac/dependency_collector_spec.rb
@@ -36,6 +36,18 @@ describe DependencyCollector do
     expect(subject.add(resource)).to be nil
   end
 
+  specify "Resource dependency from a '.zip' URL" do
+    resource = Resource.new
+    resource.url("http://example.com/foo.zip")
+    expect(subject.add(resource)).to be nil
+  end
+
+  specify "Resource dependency from a '.bz2' URL" do
+    resource = Resource.new
+    resource.url("http://example.com/foo.tar.bz2")
+    expect(subject.add(resource)).to be nil
+  end
+
   specify "Resource dependency from a '.git' URL" do
     resource = Resource.new
     resource.url("git://example.com/foo/bar.git")