Merge pull request #2286 from reitermarkus/redundant-utils

Remove redundant `Utils`.

4 files changed, 3 insertions, 37 deletions

diff --git a/Library/Homebrew/cask/lib/hbc/cli/cleanup.rb b/Library/Homebrew/cask/lib/hbc/cli/cleanup.rb
index 2273280b9..0bb3c3694 100644
--- a/Library/Homebrew/cask/lib/hbc/cli/cleanup.rb
+++ b/Library/Homebrew/cask/lib/hbc/cli/cleanup.rb
@@ -62,7 +62,7 @@ module Hbc
       end
 
       def disk_cleanup_size
-        Utils.size_in_bytes(cache_files)
+        cache_files.map(&:disk_usage).inject(:+)
       end
 
       def remove_cache_files(*tokens)
diff --git a/Library/Homebrew/cask/lib/hbc/cli/style.rb b/Library/Homebrew/cask/lib/hbc/cli/style.rb
index a64a1dbe7..f38d785fc 100644
--- a/Library/Homebrew/cask/lib/hbc/cli/style.rb
+++ b/Library/Homebrew/cask/lib/hbc/cli/style.rb
@@ -24,7 +24,7 @@ module Hbc
       end
 
       def install_rubocop
-        Utils.capture_stderr do
+        capture_stderr do
           begin
             Homebrew.install_gem_setup_path! "rubocop-cask", HOMEBREW_RUBOCOP_CASK_VERSION, "rubocop"
           rescue SystemExit
diff --git a/Library/Homebrew/cask/lib/hbc/utils.rb b/Library/Homebrew/cask/lib/hbc/utils.rb
index ef3e5eda3..7bfc4ea42 100644
--- a/Library/Homebrew/cask/lib/hbc/utils.rb
+++ b/Library/Homebrew/cask/lib/hbc/utils.rb
@@ -90,27 +90,6 @@ module Hbc
       Etc.getpwuid(Process.euid).name
     end
 
-    # paths that "look" descendant (textually) will still
-    # return false unless both the given paths exist
-    def self.file_is_descendant(file, dir)
-      file = Pathname.new(file)
-      dir  = Pathname.new(dir)
-      return false unless file.exist? && dir.exist?
-      unless dir.directory?
-        onoe "Argument must be a directory: '#{dir}'"
-        return false
-      end
-      unless file.absolute? && dir.absolute?
-        onoe "Both arguments must be absolute: '#{file}', '#{dir}'"
-        return false
-      end
-      while file.parent != file
-        return true if File.identical?(file, dir)
-        file = file.parent
-      end
-      false
-    end
-
     def self.path_occupied?(path)
       File.exist?(path) || File.symlink?(path)
     end
@@ -145,18 +124,5 @@ module Hbc
       timestamp.concat(fraction)
       container_path.join(timestamp)
     end
-
-    def self.size_in_bytes(files)
-      Array(files).reduce(0) { |acc, elem| acc + (File.size?(elem) || 0) }
-    end
-
-    def self.capture_stderr
-      previous_stderr = $stderr
-      $stderr = StringIO.new
-      yield
-      $stderr.string
-    ensure
-      $stderr = previous_stderr
-    end
   end
 end
diff --git a/Library/Homebrew/test/cask/cli/cleanup_spec.rb b/Library/Homebrew/test/cask/cli/cleanup_spec.rb
index f8578e80d..c7ef356c0 100644
--- a/Library/Homebrew/test/cask/cli/cleanup_spec.rb
+++ b/Library/Homebrew/test/cask/cli/cleanup_spec.rb
@@ -19,7 +19,7 @@ describe Hbc::CLI::Cleanup, :cask do
 
       cached_downloads.each(&FileUtils.method(:touch))
 
-      cleanup_size = Hbc::Utils.size_in_bytes(cached_downloads[0])
+      cleanup_size = cached_downloads[0].disk_usage
 
       expect {
         subject.cleanup(cleaned_up_cached_download)