Code refactoring

4 files changed, 7 insertions, 8 deletions

diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb
index bd71d61b0..41e79810e 100644
--- a/Library/Homebrew/dependency_collector.rb
+++ b/Library/Homebrew/dependency_collector.rb
@@ -166,12 +166,12 @@ 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)
     when ".7z"          then Dependency.new("p7zip", tags)
-    when ".zip"         then zip_dep_if_needed(tags)
-    when ".bz2"         then bzip2_dep_if_needed(tags)
     end
   end
 end
diff --git a/Library/Homebrew/extend/os/mac/dependency_collector.rb b/Library/Homebrew/extend/os/mac/dependency_collector.rb
index 671a63f55..a7e5d7ffc 100644
--- a/Library/Homebrew/extend/os/mac/dependency_collector.rb
+++ b/Library/Homebrew/extend/os/mac/dependency_collector.rb
@@ -18,13 +18,13 @@ 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
     LD64Dependency.new
   end
-
-  def zip_dep_if_needed(*); end
-
-  def bzip2_dep_if_needed(*); end
 end
diff --git a/Library/Homebrew/test/dependency_collector_spec.rb b/Library/Homebrew/test/dependency_collector_spec.rb
index f8fb16c02..46e859b2d 100644
--- a/Library/Homebrew/test/dependency_collector_spec.rb
+++ b/Library/Homebrew/test/dependency_collector_spec.rb
@@ -140,4 +140,3 @@ describe DependencyCollector do
     end
   end
 end
-require "test/os/dependency_collector_spec"
diff --git a/Library/Homebrew/test/os/dependency_collector_spec.rb b/Library/Homebrew/test/os/dependency_collector_spec.rb
index d190788da..4fe064732 100644
--- a/Library/Homebrew/test/os/dependency_collector_spec.rb
+++ b/Library/Homebrew/test/os/dependency_collector_spec.rb
@@ -1 +1 @@
-require "test/os/linux/dependency_collector" if OS.linux?
+require "test/dependency_collector"