Include the $HOME directory if it's not in the list of pwd ancestors.

This fixes the actual behavior to match the documentation, which states that the `.pairs` file may be in the user's home directory.

Author: flavorjones

lib/pivotal_git_scripts/git_pair.rb

@@ -135,6 +135,8 @@ def read_pairs_config
  directory = File.absolute_path(File.join(directory, ".."))
  candidate_directories << directory
  end
+ home = File.absolute_path(ENV["HOME"])
+ candidate_directories << home unless candidate_directories.include? home
 
  pairs_file_path = candidate_directories.
  map { |d| File.join(d, ".pairs") }.

spec/cli_spec.rb

@@ -27,7 +27,7 @@ def write(file, content)
 
  # use fake home for .ssh hacks
  run "mkdir #{dir}/home"
- ENV["HOME"] = File.expand_path("#{dir}/home")
+ ENV["HOME"] = File.absolute_path("#{dir}/home")
 
  Dir.chdir dir do
  run "touch a"
@@ -269,13 +269,40 @@ def git_config_value(name, global = false)
  end
  end
 
- it "fails if it cannot find a pairs file" do
- run "git pair ab", :fail => true
+ context "and without a .pairs file in the home directory" do
+ it "fails if it cannot find a pairs file" do
+ run "git pair ab", :fail => true
+ end
+
+ it "prints instructions" do
+ result = run "git pair ab", :fail => true
+ result.should include("Could not find a .pairs file. Create a YAML file in your project or home directory.")
+ end
  end
 
- it "prints instructions" do
- result = run "git pair ab", :fail => true
- result.should include("Could not find a .pairs file. Create a YAML file in your project or home directory.")
+ context "but a .pairs file in the home directory" do
+ around do |example|
+ file = File.join(ENV["HOME"], ".pairs") 
+ write file, <<-YAML.unindent
+ pairs:
+ ab: Aa Bb
+ bc: Bb Cc
+ cd: Cc Dd
+
+ email:
+ prefix: the-pair
+ domain: the-host.com
+ YAML
+
+ example.run
+
+ FileUtils.rm file
+ end
+
+ it "loads the file" do
+ result = run "git pair ab"
+ expect_config result, "Aa Bb", "ab", "the-pair+aa@the-host.com"
+ end
  end
  end
  end