Merge pull request #26 from flavorjones/support-homedir-config

Support `.pairs` in the user's HOME directory, as advertised.

Author: ragaskar

Diff for: lib/pivotal_git_scripts/git_pair.rb

@@ -1,6 +1,7 @@
 require "pivotal_git_scripts/version"
 require 'yaml'
 require 'optparse'
+require 'pathname'
 
 module PivotalGitScripts
   module GitPair
@@ -126,15 +127,20 @@ def parse_cli_options(argv)
       end
 
       def read_pairs_config
-        pairs_file_path = nil
-        candidate_file_path = '.pairs'
-        until pairs_file_path || File.expand_path(candidate_file_path) == '/.pairs' do
-          if File.exists?(candidate_file_path)
-            pairs_file_path = candidate_file_path
-          else
-            candidate_file_path = File.join("..", candidate_file_path)
-          end
+        pairs_file_name = '.pairs'
+
+        directory = File.absolute_path(Dir.pwd)
+        candidate_directories = [directory]
+        while ! Pathname.new(directory).root? do
+          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") }.
+          find { |f| File.exists? f }
 
         unless pairs_file_path
           raise GitPairException, <<-INSTRUCTIONS

Diff for: 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", "[email protected]"
+        end
       end
     end
   end