Refactoring based on suggestions

Defaulting zip_dep_if_needed(tags) and bzip2_dep_if_needed(tags)
methods to those on Linux and overriding them on macOS.

3 files changed, 6 insertions, 26 deletions

diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb
index 689e4e2f1..4b8f9e872 100644
--- a/Library/Homebrew/dependency_collector.rb
+++ b/Library/Homebrew/dependency_collector.rb
@@ -72,9 +72,13 @@ class DependencyCollector
 
   def ld64_dep_if_needed(*); end
 
-  def zip_dep_if_needed(*); end
+  def zip_dep_if_needed(tags)
+    Dependency.new("zip", tags)
+  end
 
-  def bzip2_dep_if_needed(*); end
+  def bzip2_dep_if_needed(tags)
+    Dependency.new("bzip2", tags)
+  end
 
   def self.tar_needs_xz_dependency?
     !new.xz_dep_if_needed([]).nil?
diff --git a/Library/Homebrew/extend/os/dependency_collector.rb b/Library/Homebrew/extend/os/dependency_collector.rb
index fffec1c99..56fcad31d 100644
--- a/Library/Homebrew/extend/os/dependency_collector.rb
+++ b/Library/Homebrew/extend/os/dependency_collector.rb
@@ -1,3 +1,2 @@
 require "dependency_collector"
 require "extend/os/mac/dependency_collector" if OS.mac?
-require "extend/os/linux/dependency_collector" if OS.linux?
diff --git a/Library/Homebrew/extend/os/linux/dependency_collector.rb b/Library/Homebrew/extend/os/linux/dependency_collector.rb
deleted file mode 100644
index 61df498ff..000000000
--- a/Library/Homebrew/extend/os/linux/dependency_collector.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-class DependencyCollector
-  def git_dep_if_needed(tags)
-    Dependency.new("git", tags)
-  end
-
-  def cvs_dep_if_needed(tags)
-    Dependency.new("cvs", tags)
-  end
-
-  def xz_dep_if_needed(tags)
-    Dependency.new("xz", tags)
-  end
-
-  def ld64_dep_if_needed(*); end
-
-  def zip_dep_if_needed(tags)
-    Dependency.new("zip", tags)
-  end
-
-  def bzip2_dep_if_needed(tags)
-    Dependency.new("bzip2", tags)
-  end
-end