Synchronize counts for link and unlink (#242)

Closes #239.

3 files changed, 9 insertions, 4 deletions

diff --git a/Library/Homebrew/extend/pathname.rb b/Library/Homebrew/extend/pathname.rb
index fbd7b53d1..2f0ea7e03 100644
--- a/Library/Homebrew/extend/pathname.rb
+++ b/Library/Homebrew/extend/pathname.rb
@@ -529,6 +529,11 @@ module ObserverPathnameExtension
     ObserverPathnameExtension.n += 1
   end
 
+  def mkpath
+    super
+    puts "mkdir -p #{self}" if ObserverPathnameExtension.verbose?
+  end
+
   def rmdir
     super
     puts "rmdir #{self}" if ObserverPathnameExtension.verbose?
diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb
index 258d7d46f..778d436a4 100644
--- a/Library/Homebrew/keg.rb
+++ b/Library/Homebrew/keg.rb
@@ -234,7 +234,7 @@ class Keg
       dirs.reverse_each(&:rmdir_if_possible)
     end
 
-    ObserverPathnameExtension.total
+    ObserverPathnameExtension.n
   end
 
   def lock
@@ -374,7 +374,7 @@ class Keg
     unlink
     raise
   else
-    ObserverPathnameExtension.total
+    ObserverPathnameExtension.n
   end
 
   def remove_oldname_opt_record
diff --git a/Library/Homebrew/test/test_keg.rb b/Library/Homebrew/test/test_keg.rb
index ff3627b7d..9e4254667 100644
--- a/Library/Homebrew/test/test_keg.rb
+++ b/Library/Homebrew/test/test_keg.rb
@@ -56,7 +56,7 @@ class LinkTests < Homebrew::TestCase
   def test_unlinking_keg
     @keg.link
     assert_predicate @dst, :symlink?
-    assert_equal 4, @keg.unlink
+    assert_equal 3, @keg.unlink
     refute_predicate @dst, :symlink?
   end
 
@@ -239,7 +239,7 @@ class LinkTests < Homebrew::TestCase
   def test_unlink_ignores_nonexistent_file
     @keg.link
     @dst.delete
-    assert_equal 3, @keg.unlink
+    assert_equal 2, @keg.unlink
   end
 
   def test_pkgconfig_is_mkpathed