Merge pull request #2825 from reitermarkus/refactoring

Refactoring using `Forwardable` and `DelegateClass`.

2 files changed, 5 insertions, 5 deletions

diff --git a/Library/Homebrew/cmd/info.rb b/Library/Homebrew/cmd/info.rb
index 98200a0b4..731156f95 100644
--- a/Library/Homebrew/cmd/info.rb
+++ b/Library/Homebrew/cmd/info.rb
@@ -169,8 +169,8 @@ module Homebrew
       Homebrew.dump_options_for_formula f
     end
 
-    c = Caveats.new(f)
-    ohai "Caveats", c.caveats unless c.empty?
+    caveats = Caveats.new(f)
+    ohai "Caveats", caveats.to_s unless caveats.empty?
   end
 
   def decorate_dependencies(dependencies)
diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb
index aa1fd244d..374bbbd73 100644
--- a/Library/Homebrew/cmd/update-report.rb
+++ b/Library/Homebrew/cmd/update-report.rb
@@ -547,6 +547,8 @@ class Reporter
 end
 
 class ReporterHub
+  extend Forwardable
+
   attr_reader :reporters
 
   def initialize
@@ -564,9 +566,7 @@ class ReporterHub
     @hash.update(report) { |_key, oldval, newval| oldval.concat(newval) }
   end
 
-  def empty?
-    @hash.empty?
-  end
+  delegate :empty? => :@hash
 
   def dump
     # Key Legend: Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R)