Merge pull request #966 from MikeMcQuaid/keg-lock-constants

Use constants for LinkedKegs/PinnedKegs/Locks.

6 files changed, 27 insertions, 27 deletions

diff --git a/Library/Homebrew/test/test_formula.rb b/Library/Homebrew/test/test_formula.rb
index eb276073a..07244a151 100644
--- a/Library/Homebrew/test/test_formula.rb
+++ b/Library/Homebrew/test/test_formula.rb
@@ -505,7 +505,7 @@ class FormulaTests < Homebrew::TestCase
       f3.brew { f3.install }
     end
 
-    assert_equal HOMEBREW_LIBRARY.join("PinnedKegs/#{f1.name}").resolved_path, f1.prefix
+    assert_equal (HOMEBREW_PINNED_KEGS/f1.name).resolved_path, f1.prefix
 
     assert_predicate f1, :installed?
     assert_predicate f2, :installed?
diff --git a/Library/Homebrew/test/test_formula_installer.rb b/Library/Homebrew/test/test_formula_installer.rb
index 51bec7589..da0404c35 100644
--- a/Library/Homebrew/test/test_formula_installer.rb
+++ b/Library/Homebrew/test/test_formula_installer.rb
@@ -114,8 +114,8 @@ class FormulaInstallerTests < Homebrew::TestCase
     end
 
     dependency.prefix("0.1").join("bin/a").mkpath
-    HOMEBREW_LIBRARY.join("PinnedKegs").mkpath
-    FileUtils.ln_s dependency.prefix("0.1"), HOMEBREW_LIBRARY.join("PinnedKegs/#{dep_name}")
+    HOMEBREW_PINNED_KEGS.mkpath
+    FileUtils.ln_s dependency.prefix("0.1"), HOMEBREW_PINNED_KEGS/dep_name
 
     dependency_keg = Keg.new(dependency.prefix("0.1"))
     dependency_keg.link
diff --git a/Library/Homebrew/test/test_formula_lock.rb b/Library/Homebrew/test/test_formula_lock.rb
index 542f0d3f3..80ee9dd25 100644
--- a/Library/Homebrew/test/test_formula_lock.rb
+++ b/Library/Homebrew/test/test_formula_lock.rb
@@ -9,7 +9,7 @@ class FormulaLockTests < Homebrew::TestCase
 
   def teardown
     @lock.unlock
-    FormulaLock::LOCKDIR.children.each(&:unlink)
+    HOMEBREW_LOCK_DIR.children.each(&:unlink)
   end
 
   def test_locking_file_with_existing_lock_raises_error
diff --git a/Library/Homebrew/test/test_formula_pin.rb b/Library/Homebrew/test/test_formula_pin.rb
index 515acdc0a..297d7703e 100644
--- a/Library/Homebrew/test/test_formula_pin.rb
+++ b/Library/Homebrew/test/test_formula_pin.rb
@@ -8,7 +8,7 @@ class FormulaPinTests < Homebrew::TestCase
     end
 
     def rack
-      Pathname.new("#{HOMEBREW_CELLAR}/#{name}")
+      HOMEBREW_CELLAR/name
     end
 
     def installed_prefixes
@@ -31,21 +31,21 @@ class FormulaPinTests < Homebrew::TestCase
   end
 
   def test_pinnable_if_kegs_exist
-    (@f.rack+"0.1").mkpath
+    (@f.rack/"0.1").mkpath
     assert_predicate @pin, :pinnable?
   end
 
   def test_unpin
-    (@f.rack+"0.1").mkpath
+    (@f.rack/"0.1").mkpath
     @pin.pin
 
     assert_predicate @pin, :pinned?
-    assert_equal 1, FormulaPin::PINDIR.children.length
+    assert_equal 1, HOMEBREW_PINNED_KEGS.children.length
 
     @pin.unpin
 
     refute_predicate @pin, :pinned?
-    refute_predicate FormulaPin::PINDIR, :directory?
+    refute_predicate HOMEBREW_PINNED_KEGS, :directory?
   end
 
   def teardown
diff --git a/Library/Homebrew/test/test_integration_cmds.rb b/Library/Homebrew/test/test_integration_cmds.rb
index 812d26ba5..5b64dfd85 100644
--- a/Library/Homebrew/test/test_integration_cmds.rb
+++ b/Library/Homebrew/test/test_integration_cmds.rb
@@ -22,7 +22,7 @@ class IntegrationCommandTests < Homebrew::TestCase
       HOMEBREW_PREFIX/"bin",
       HOMEBREW_PREFIX/"share",
       HOMEBREW_PREFIX/"opt",
-      HOMEBREW_LIBRARY/"LinkedKegs",
+      HOMEBREW_LINKED_KEGS,
       HOMEBREW_LIBRARY/"Taps/caskroom",
       HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-bundle",
       HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-foo",
@@ -533,12 +533,12 @@ class IntegrationCommandTests < Homebrew::TestCase
     setup_test_formula "testball"
 
     HOMEBREW_CELLAR.join("testball/0.1").mkpath
-    HOMEBREW_LIBRARY.join("PinnedKegs").mkpath
-    FileUtils.ln_s HOMEBREW_CELLAR.join("testball/0.1"), HOMEBREW_LIBRARY.join("PinnedKegs/testball")
+    HOMEBREW_PINNED_KEGS.mkpath
+    FileUtils.ln_s HOMEBREW_CELLAR.join("testball/0.1"), HOMEBREW_PINNED_KEGS/"testball"
 
     assert_match "testball is pinned. You must unpin it to reinstall.", cmd("reinstall", "testball")
 
-    HOMEBREW_LIBRARY.join("PinnedKegs").rmtree
+    HOMEBREW_PINNED_KEGS.rmtree
   end
 
   def test_home
diff --git a/Library/Homebrew/test/test_migrator.rb b/Library/Homebrew/test/test_migrator.rb
index 9ef881f76..cefb8b7a3 100644
--- a/Library/Homebrew/test/test_migrator.rb
+++ b/Library/Homebrew/test/test_migrator.rb
@@ -60,7 +60,7 @@ class MigratorTests < Homebrew::TestCase
     @keg.link
     @keg.optlink
 
-    @old_pin = HOMEBREW_LIBRARY/"PinnedKegs/oldname"
+    @old_pin = HOMEBREW_PINNED_KEGS/"oldname"
     @old_pin.make_relative_symlink @old_keg_record
 
     @migrator = Migrator.new(@new_f)
@@ -92,7 +92,7 @@ class MigratorTests < Homebrew::TestCase
     # What to do with pin?
     @new_f.unpin
 
-    FormulaLock::LOCKDIR.children.each(&:unlink)
+    HOMEBREW_LOCK_DIR.children.each(&:unlink)
   end
 
   def test_move_cellar
@@ -117,7 +117,7 @@ class MigratorTests < Homebrew::TestCase
 
   def test_repin
     @new_keg_record.join("bin").mkpath
-    expected_relative = @new_keg_record.relative_path_from HOMEBREW_LIBRARY/"PinnedKegs"
+    expected_relative = @new_keg_record.relative_path_from HOMEBREW_PINNED_KEGS
 
     @migrator.repin
 
@@ -127,13 +127,13 @@ class MigratorTests < Homebrew::TestCase
   end
 
   def test_unlink_oldname
-    assert_equal 1, HOMEBREW_LIBRARY.join("LinkedKegs").children.size
-    assert_equal 1, HOMEBREW_PREFIX.join("opt").children.size
+    assert_equal 1, HOMEBREW_LINKED_KEGS.children.size
+    assert_equal 1, (HOMEBREW_PREFIX/"opt").children.size
 
     shutup { @migrator.unlink_oldname }
 
-    refute_predicate HOMEBREW_LIBRARY/"LinkedKegs", :exist?
-    refute_predicate HOMEBREW_LIBRARY.join("bin"), :exist?
+    refute_predicate HOMEBREW_LINKED_KEGS, :exist?
+    refute_predicate HOMEBREW_LIBRARY/"bin", :exist?
   end
 
   def test_link_newname
@@ -144,8 +144,8 @@ class MigratorTests < Homebrew::TestCase
 
     shutup { @migrator.link_newname }
 
-    assert_equal 1, HOMEBREW_LIBRARY.join("LinkedKegs").children.size
-    assert_equal 1, HOMEBREW_PREFIX.join("opt").children.size
+    assert_equal 1, HOMEBREW_LINKED_KEGS.children.size
+    assert_equal 1, (HOMEBREW_PREFIX/"opt").children.size
   end
 
   def test_link_oldname_opt
@@ -182,12 +182,12 @@ class MigratorTests < Homebrew::TestCase
 
     assert_predicate @new_keg_record, :exist?
     assert_predicate @old_keg_record.parent, :symlink?
-    refute_predicate HOMEBREW_LIBRARY/"LinkedKegs/oldname", :exist?
-    assert_equal @new_keg_record.realpath, (HOMEBREW_LIBRARY/"LinkedKegs/newname").realpath
+    refute_predicate HOMEBREW_LINKED_KEGS/"oldname", :exist?
+    assert_equal @new_keg_record.realpath, (HOMEBREW_LINKED_KEGS/"newname").realpath
     assert_equal @new_keg_record.realpath, @old_keg_record.realpath
     assert_equal @new_keg_record.realpath, (HOMEBREW_PREFIX/"opt/oldname").realpath
     assert_equal @new_keg_record.parent.realpath, (HOMEBREW_CELLAR/"oldname").realpath
-    assert_equal @new_keg_record.realpath, (HOMEBREW_LIBRARY/"PinnedKegs/newname").realpath
+    assert_equal @new_keg_record.realpath, (HOMEBREW_PINNED_KEGS/"newname").realpath
     assert_equal @new_f.path.to_s, Tab.for_keg(@new_keg_record).source["path"]
   end
 
@@ -234,9 +234,9 @@ class MigratorTests < Homebrew::TestCase
   def check_after_backup
     assert_predicate @old_keg_record.parent, :directory?
     refute_predicate @old_keg_record.parent.subdirs, :empty?
-    assert_predicate HOMEBREW_LIBRARY/"LinkedKegs/oldname", :exist?
+    assert_predicate HOMEBREW_LINKED_KEGS/"oldname", :exist?
     assert_predicate HOMEBREW_PREFIX/"opt/oldname", :exist?
-    assert_predicate HOMEBREW_LIBRARY/"PinnedKegs/oldname", :symlink?
+    assert_predicate HOMEBREW_PINNED_KEGS/"oldname", :symlink?
     assert_predicate @keg, :linked?
   end