pivotal_git_scripts 1.1.4 → 1.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 753d8a062ae624181090e916384a9e8e701297dd
+  data.tar.gz: a650f7c1b75326dd6f220d6c3b0608e1e897a84f
+SHA512:
+  metadata.gz: 305b19b837375798d916f98aec979e51d38a547cf44aa41333d3543402ac5e3a701f0362ac667fc6de1d50a4e6dc7e3687b6fc9246870edd30d06a4881814abd
+  data.tar.gz: eb1992aa9831cf19e157306129374a8b8bc5262584fb7f3d5c6a957ea39adc0c51a75884bcf31a661d19e9f17a12267ac5a836bb37e8c36fc7390f3dc73a66fa

data/.gitignore

@@ -2,3 +2,4 @@ pkg/*
 *.gem
 .bundle
 spec/tmp
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,15 @@
+language: ruby
+rvm:
+  - 2.1.1
+  - 2.0.0
+  - 1.9.3
+  - 1.9.2
+# Fix weird issues from this Travis build:
+# https://travis-ci.org/pivotal/git_scripts/jobs/5501358
+# https://git.wiki.kernel.org/index.php/Git_FAQ#Git_commit_is_dying_telling_me_.22fatal:_empty_ident_.3Cuser.40myhost.3E_not_allowed.22.2C_what.27s_wrong.3F
+env:
+  global:
+    - GIT_AUTHOR_NAME="Travis CI"
+before_script:
+  - git config --global user.email "travis-ci@example.com"
+  - git config --global user.name "Travis CI"

data/CHANGELOG.md

@@ -0,0 +1,26 @@
+# CHANGELOG
+
+## 1.4.0 - released 2015-01-15
+
+### `git pair-commit` explicitly sets the author name
+    
+Before this change, git's user.name setting would override. In
+repositories where the user had previously run `git duet`, this meant
+that after a `git pair --global ...` the email was set correctly by `git
+pair-commit`, but the author name was not.
+
+[#62606550]
+
+### `git pair-commit` sets committer name and email
+    
+[Finishes #62606550]
+
+### Add ability to use a custom email address per user
+
+    # include the following section to set custom email addresses for users
+    email_addresses:
+      zr: zach.robinson@example.com
+
+### 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.

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in pivotal_git_scripts.gemspec
 gemspec

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/pivotal/git_scripts.png)](https://travis-ci.org/pivotal/git_scripts)
+
 # Git Scripts
 
 These scripts are helpers for managing developer workflow when using git repos hosted on GitHub.  Install as a rubygem and they can be run as standard git commands like `git about`.
@@ -46,6 +48,27 @@ Options are:
     -v, --version                    Show Version
     -h, --help                       Show this.
 
+## git-pair-commit
+
+Makes a git commit as normal, but chooses one of the pair members randomly to get credit for the commit on github (by setting the author email to that member's email address). The author name on the commit will list all members of the pair, as usual.
+
+### Using git-pair-commit in RubyMine
+RubyMine already supports pointing at a custom location for your git executable in the Preferences -> Version Control -> Git
+![screen shot 2014-03-11 at 12 49 02 pm](https://f.cloud.github.com/assets/163532/2390097/49c3023e-a956-11e3-8aeb-dcba1a814309.png)
+The trick then is that `pair-commit` doesn't encompass all git functionality, so you can't just point RubyMine directly at it, you need something in the middle that will use `pair-commit` if the first arg is `commit`, otherwise just pass through. Here's a ruby script to do just that: 
+```ruby
+#!/usr/bin/env ruby
+
+exit_code = if ARGV[1] == "commit"
+  system "git pair-commit #{ARGV[1..-1].join(" ")}"
+else
+  system "git #{ARGV.join(" ")}"
+end
+
+exit exit_code
+```
+Make sure it's executable. 
+
 ## git-project
 
     $ git project pivots

data/bin/git-pair

@@ -1,150 +1,5 @@
 #!/usr/bin/env ruby
-require 'yaml'
-require 'optparse'
+$LOAD_PATH.unshift(File.dirname(__FILE__)) # this is required when running from /usr/local/bin
+require 'pivotal_git_scripts/git_pair'
 
-def parse_cli_options(argv)
-  options = {}
-  OptionParser.new do |opts|
-    # copy-paste from readme
-    opts.banner = <<BANNER.sub('<br/>','')
-Configures git authors when pair programming.
-
-    git pair sp js
-    user.name=Josh Susser & Sam Pierson
-    user.email=pair+jsusser+sam@pivotallabs.com
-
-
-Create a `.pairs` config file in project root or your home folder.
-
-    # .pairs - configuration for 'git pair'
-    pairs:
-      # <initials>: <Firstname> <Lastname>[; <email-id>]
-      eh: Edward Hieatt
-      js: Josh Susser; jsusser
-      sf: Serguei Filimonov; serguei
-    email:
-      prefix: pair
-      domain: pivotallabs.com
-      # no_solo_prefix: true
-    #global: true
-
-
-By default this affects the current project (.git/config).<br/>
-Use the `--global` option or add `global: true` to your `.pairs` file to set the global git configuration for all projects (~/.gitconfig).
-
-Options are:
-BANNER
-    opts.on("-g", "--global", "Modify global git options instead of local") { options[:global] = true }
-    opts.on("-v", "--version", "Show Version") do
-      $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
-      require "pivotal_git_scripts/version"
-      puts PivotalGitScripts::VERSION
-      exit
-    end
-    opts.on("-h", "--help", "Show this.") { puts opts; exit }
-  end.parse!(argv)
-
-  options
-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
-  end
-
-  unless pairs_file_path
-    puts <<-INSTRUCTIONS
-Could not find a .pairs file. Create a YAML file in your project or home directory.
-Format: <initials>: <name>[; <email>]
-Example:
-# .pairs - configuration for 'git pair'
-# place in project or home directory
-pairs:
-  eh: Edward Hieatt
-  js: Josh Susser; jsusser
-  sf: Serguei Filimonov; serguei
-email:
-  prefix: pair
-  domain: pivotallabs.com
-INSTRUCTIONS
-    exit(1)
-  end
-  pairs_file_path ? YAML.load_file(pairs_file_path) : {}
-end
-
-def read_author_info_from_config(config, initials)
-  initials.map do |initials|
-    if full_name = config['pairs'][initials.downcase]
-      full_name
-    else
-      puts "Couldn't find author name for initials: #{initials}. Add this person to the .pairs file in your project or home directory."
-      exit 1
-    end
-  end
-end
-
-def build_email(emails, config)
-  if config.is_a?(Hash)
-    prefix = config['prefix'] if !config['no_solo_prefix'] or emails.size > 1
-    "#{([prefix] + emails).compact.join('+')}@#{config['domain']}"
-  else
-    config
-  end
-end
-
-def set_git_config(global_config_string, options)
-  options.each do |key,value|
-    key = "user.#{key}"
-    value = value ? %Q{#{key} "#{value}"} : "--unset #{key}"
-    system(%Q{git config#{global_config_string} #{value}})
-  end
-end
-
-def report_git_settings(git_dir, key)
-  global = `git config --global --get-regexp '^user\.#{key}'`
-  local = `git config -f #{git_dir}/config --get-regexp '^user\.#{key}'`
-  if global.length > 0 && local.length > 0
-    puts "NOTE: Overriding global user.#{key} setting with local."
-  end
-  puts "global: #{global}" if global.length > 0
-  puts "local:  #{local}" if local.length > 0
-end
-
-def extract_author_names_and_email_ids_from_config(config, initials)
-  authors = read_author_info_from_config(config, initials)
-  authors.sort!.uniq!
-  authors.map do |a|
-    full_name, email_id = a.split(";").map(&:strip)
-    email_id ||= full_name.split(' ').first.downcase
-    [full_name, email_id]
-  end.transpose
-end
-
-git_dir = `git rev-parse --git-dir`.chomp
-exit 1 if git_dir.empty?
-
-options = parse_cli_options(ARGV)
-initials = ARGV
-config = read_pairs_config
-global = " --global" if options[:global] or config["global"]
-
-if initials.any?
-  author_names, email_ids = extract_author_names_and_email_ids_from_config(config, initials)
-  authors = [author_names[0..-2].join(", "), author_names.last].reject(&:empty?).join(" & ")
-  email = build_email(email_ids, config["email"])
-
-  set_git_config global, :name => authors, :email => email, :initials => initials.join(" ")
-else
-  set_git_config global, :name => nil, :email => nil, :initials => nil
-  puts "Unset#{global} user.name, user.email, user.initials"
-end
-
-[:name, :email, :initials].each do |key|
-  report_git_settings(git_dir, key)
-end
+PivotalGitScripts::GitPair.main(ARGV)

data/bin/git-pair-commit

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift(File.dirname(__FILE__)) # this is required when running from /usr/local/bin
+require 'pivotal_git_scripts/git_pair'
+
+PivotalGitScripts::GitPair.commit(ARGV)

data/lib/pivotal_git_scripts/git_pair.rb

@@ -0,0 +1,251 @@
+require "pivotal_git_scripts/version"
+require 'yaml'
+require 'optparse'
+require 'pathname'
+
+module PivotalGitScripts
+  module GitPair
+    def self.main(argv)
+      runner = Runner.new
+      runner.main(argv)
+    end
+
+    def self.commit(argv)
+      runner = Runner.new
+      runner.commit(argv)
+    end
+
+    class GitPairException < Exception; end
+
+    class Runner
+      def main(argv)
+        git_dir = `git rev-parse --git-dir`.chomp
+        exit 1 if git_dir.empty?
+
+        options = parse_cli_options(argv)
+        initials = argv
+        config = read_pairs_config
+        global = !!(options[:global] || config["global"])
+
+        if initials.any?
+          author_names, email_ids = extract_author_names_and_email_ids_from_config(config, initials)
+          authors = pair_names(author_names)
+          git_config = {:name => authors,  :initials => initials.sort.join(" ")}
+          git_config[:email] = build_email(email_ids, config["email"]) unless no_email(config)
+          set_git_config global,  git_config
+        else
+          git_config = {:name => nil,  :initials => nil}
+          git_config[:email] = nil unless no_email(config)
+          set_git_config global, git_config
+          puts "Unset#{' global' if global} user.name, #{'user.email, ' unless no_email(config)}user.initials"
+        end
+
+        [:name, :email, :initials].each do |key|
+          report_git_settings(git_dir, key)
+        end
+      rescue GitPairException => e
+        puts e.message
+        exit 1
+      end
+
+      def commit(argv)
+        if argv[0] == '-h'
+          puts 'Usage: git pair-commit [options_for_git_commit]'
+          puts ''
+          puts 'Commits changes to the repository using `git commit`, but randomly chooses the author email from the'
+          puts 'members of the pair. In order for GitHub to assign credit for the commit activity, the user\'s email'
+          puts 'must be linked in their GitHub account.'
+          exit 0
+        end
+
+        config = read_pairs_config
+        author_details = extract_author_details_from_config(config, current_pair_initials)
+        author_names = author_details.keys.map { |i| author_details[i][:name] }
+        authors = pair_names(author_names)
+        author_email = random_author_email(author_details)
+        puts "Committing under #{author_email}"
+        passthrough_args =  argv.map{|arg| "'#{arg}'"}.join(' ')
+        env_variables = "GIT_AUTHOR_NAME='#{authors}' GIT_AUTHOR_EMAIL='#{author_email}' GIT_COMMITTER_NAME='#{authors}' GIT_COMMITTER_EMAIL='#{author_email}'"
+        system "#{env_variables} git commit #{passthrough_args}"
+      rescue GitPairException => e
+        puts e.message
+        exit 1
+      end
+
+      def current_pair_initials
+        initials = `git config user.initials`.strip.split(' ')
+        raise GitPairException, 'Error: No pair set. Please set your pair with `git pair ...`' if initials.empty?
+        initials
+      end
+
+      def parse_cli_options(argv)
+        options = {}
+        OptionParser.new do |opts|
+          # copy-paste from readme
+          opts.banner = <<BANNER.sub('<br/>','')
+      Configures git authors when pair programming.
+
+          git pair sp js
+          user.name=Josh Susser and Sam Pierson
+          user.email=pair+jsusser+sam@pivotallabs.com
+
+
+      Create a `.pairs` config file in project root or your home folder.
+
+          # .pairs - configuration for 'git pair'
+          pairs:
+            # <initials>: <Firstname> <Lastname>[; <email-id>]
+            eh: Edward Hieatt
+            js: Josh Susser; jsusser
+            sf: Serguei Filimonov; serguei
+          # if email section is present, email will be set
+          # if you leave out the email config section, email will not be set
+          email:
+            prefix: pair
+            domain: pivotallabs.com
+            # no_solo_prefix: true
+          #global: true
+          # include the following section to set custom email addresses for users
+          #email_addresses:
+          #  zr: zach.robinson@example.com
+
+
+      By default this affects the current project (.git/config).<br/>
+      Use the `--global` option or add `global: true` to your `.pairs` file to set the global git configuration for all projects (~/.gitconfig).
+
+      Options are:
+BANNER
+          opts.on("-g", "--global", "Modify global git options instead of local") { options[:global] = true }
+          opts.on("-v", "--version", "Show Version") do
+            puts PivotalGitScripts::VERSION
+            exit
+          end
+          opts.on("-h", "--help", "Show this.") { puts opts; exit }
+        end.parse!(argv)
+
+        options
+      end
+
+      def read_pairs_config
+        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
+      Could not find a .pairs file. Create a YAML file in your project or home directory.
+      Format: <initials>: <name>[; <email>]
+      Example:
+      # .pairs - configuration for 'git pair'
+      # place in project or home directory
+      pairs:
+        eh: Edward Hieatt
+        js: Josh Susser; jsusser
+        sf: Serguei Filimonov; serguei
+      email:
+        prefix: pair
+        domain: pivotallabs.com
+      INSTRUCTIONS
+        end
+
+        YAML.load_file(pairs_file_path)
+      end
+
+      def read_author_info_from_config(config, initials_ary)
+        initials_ary.map do |initials|
+          config['pairs'][initials.downcase] or
+            raise GitPairException, "Couldn't find author name for initials: #{initials}. Add this person to the .pairs file in your project or home directory."
+        end
+      end
+
+      def build_email(emails, config)
+        if config.is_a?(Hash)
+          prefix = config['prefix'] if !config['no_solo_prefix'] or emails.size > 1
+          "#{([prefix] + emails).compact.join('+')}@#{config['domain']}"
+        else
+          config
+        end
+      end
+
+      def random_author_email(author_details)
+        author_id = author_details.keys.sample
+        author_details[author_id][:email]
+      end
+
+      def set_git_config(global, options)
+        options.each do |key,value|
+          config_key = "user.#{key}"
+          arg = value ? %Q{#{config_key} "#{value}"} : "--unset #{config_key}"
+          system(%Q{git config#{' --global' if global} #{arg}})
+        end
+      end
+
+      def report_git_settings(git_dir, key)
+        global = `git config --global --get-regexp '^user\.#{key}'`
+        local = `git config -f #{git_dir}/config --get-regexp '^user\.#{key}'`
+        if global.length > 0 && local.length > 0
+          puts "NOTE: Overriding global user.#{key} setting with local."
+        end
+        puts "global: #{global}" if global.length > 0
+        puts "local:  #{local}" if local.length > 0
+      end
+
+      def extract_author_names_and_email_ids_from_config(config, initials)
+        authors = read_author_info_from_config(config, initials)
+        authors.sort!.uniq! # FIXME
+        authors.map do |a|
+          full_name, email_id = a.split(";").map(&:strip)
+          email_id ||= full_name.split(' ').first.downcase
+          [full_name, email_id]
+        end.transpose
+      end
+
+      def no_email(config)
+        !config.key? 'email'
+      end
+
+      def extract_author_details_from_config(config, initials)
+        details = {}
+
+        initials.each do |i|
+          info = read_author_info_from_config(config, [i]).first
+
+          full_name, email_id = info.split(";").map(&:strip)
+          email_id ||= full_name.split(' ').first.downcase
+
+          email = read_custom_email_address_from_config(config, i)
+          email ||= "#{email_id}@#{config['email']['domain']}"
+
+          details[i] = {
+            :name => full_name,
+            :email => email
+          }
+        end
+
+        details
+      end
+
+      def read_custom_email_address_from_config(config, initial)
+        return nil unless config['email_addresses']
+        return config['email_addresses'][initial.downcase]
+      end
+
+      private
+
+      def pair_names(author_names)
+        [author_names[0..-2].join(", "), author_names.last].reject(&:empty?).join(" and ")
+      end
+    end
+  end
+end

data/lib/pivotal_git_scripts/version.rb

@@ -1,3 +1,3 @@
 module PivotalGitScripts
-  VERSION = "1.1.4"
+  VERSION = "1.4.0"
 end

data/spec/cli_spec.rb

@@ -7,9 +7,13 @@ describe "CLI" do
   end
 
   def run(command, options={})
-    result = `#{command}`
-    raise "FAILED #{command} : #{result}" if $?.success? == !!options[:fail]
-    result
+    output = `#{command}`
+    return output if $?.success?
+    return output if options[:fail]
+
+    message = "Unable to run #{command.inspect} in #{Dir.pwd}.\n#{output}"
+    warn "ERROR: #{message}"
+    raise message
   end
 
   def write(file, content)
@@ -23,10 +27,17 @@ describe "CLI" do
 
     # 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 && git init && git add . && git commit -am 'initial'"
+      run "touch a"
+      run "git init"
+      run "git add ."
+      run "git config user.email 'rspec-tests@example.com'"
+      run "git config user.name 'rspec test suite'"
+      run "git commit -am 'initial'"
+      run "git config --unset user.email"
+      run "git config --unset user.name"
       example.run
     end
   end
@@ -82,6 +93,11 @@ describe "CLI" do
       result.should include "#{prefix}user.email #{email}"
     end
 
+    def git_config_value(name, global = false)
+      global_prefix = "cd /tmp && " if global
+      `#{global_prefix}git config user.#{name}`
+    end
+
     it "prints help" do
       result = run "git-pair --help"
       result.should include("Configures git authors when pair programming")
@@ -136,12 +152,17 @@ describe "CLI" do
 
       it "can set a 2 users as pair" do
         result = run "git pair ab bc"
-        expect_config result, "Aa Bb & Bb Cc", "ab bc", "the-pair+aa+bb@the-host.com"
+        expect_config result, "Aa Bb and Bb Cc", "ab bc", "the-pair+aa+bb@the-host.com"
       end
 
       it "can set n users as pair" do
         result = run "git pair ab bc cd"
-        expect_config result, "Aa Bb, Bb Cc & Cc Dd", "ab bc cd", "the-pair+aa+bb+cc@the-host.com"
+        expect_config result, "Aa Bb, Bb Cc and Cc Dd", "ab bc cd", "the-pair+aa+bb+cc@the-host.com"
+      end
+
+      it "prints names, email addresses, and initials in alphabetical order" do
+        result = run "git pair ab cd bc"
+        expect_config result, "Aa Bb, Bb Cc and Cc Dd", "ab bc cd", "the-pair+aa+bb+cc@the-host.com"
       end
 
       it "can set a user with apostrophes as pair" do
@@ -183,6 +204,22 @@ describe "CLI" do
         expect_config result, "Aa Bb", "ab", "foo@bar.com"
       end
 
+      context "when no email config is present" do
+        before do
+          write ".pairs", File.read(".pairs").sub(/email:.*/m, "")
+        end
+
+        it "doesn't set email" do
+          run "git pair ab"
+          git_config_value('email').should be_empty
+        end
+
+        it "doesn't report about email" do
+          result = run "git pair ab"
+          result.should_not include "email"
+        end
+      end
+
       it "uses no email prefix when only host is given" do
         write ".pairs", File.read(".pairs").sub(/email:.*/m, "email:\n  domain: foo.com")
         result = run "git pair ab"
@@ -201,7 +238,7 @@ describe "CLI" do
 
         it "uses email prefix for multiple developers" do
           result = run "git pair ab bc"
-          expect_config result, "Aa Bb & Bb Cc", "ab bc", "pairs+aa+bb@foo.com"
+          expect_config result, "Aa Bb and Bb Cc", "ab bc", "pairs+aa+bb@foo.com"
         end
       end
 
@@ -232,14 +269,177 @@ describe "CLI" do
         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
+
+      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
+
+  describe 'pair-commit' do
+    before do
+      write ".pairs", <<-YAML.unindent
+          pairs:
+            ab: Aa Bb; abb
+            bc: Bb Cc; bcc
+            cd: Cc Dd; cdd
+
+          email:
+            prefix: the-pair
+            domain: the-host.com
+
+          email_addresses:
+            bc: test@other-host.com
+      YAML
+    end
+
+    context 'when a pair has been set' do
+      before do
+        run "git pair ab cd"
+      end
+
+      def author_name_of_last_commit
+        (run "git log -1 --pretty=%an").strip
       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.")
+      def author_email_of_last_commit
+        (run "git log -1 --pretty=%ae").strip
       end
+
+      def committer_name_of_last_commit
+        (run "git log -1 --pretty=%cn").strip
+      end
+
+      def committer_email_of_last_commit
+        (run "git log -1 --pretty=%ce").strip
+      end
+
+      it "makes a commit" do
+        git_pair_commit
+        output = run "git log -1"
+        output.should include("Pair pare pear")
+      end
+
+      it "sets the author name to the pair's names" do
+        git_pair_commit
+        output = run "git log -1 --pretty=%an"
+        output.strip.should eq("Aa Bb and Cc Dd")
+      end
+
+      it "randomly chooses from pair and sets user.email" do
+        emails = 6.times.map do
+          git_pair_commit
+          author_email_of_last_commit
+        end.uniq
+        emails.should =~ ['abb@the-host.com', 'cdd@the-host.com']
+      end
+
+      context 'when git options are passed' do
+        it 'forwards those options to git' do
+          git_pair_commit
+          run 'git pair ab bc'
+          run 'git pair-commit --amend -C HEAD --reset-author'
+
+          output = run "git log -1 --pretty=%an"
+          output.strip.should eq("Aa Bb and Bb Cc")
+        end
+      end
+
+      context 'when the pair is set globally and the local repo has custom user name and email' do
+        before do
+          run 'git pair --global ab cd'
+          run "git config user.name 'Betty White'"
+          run "git config user.email 'betty@example.com'"
+        end
+
+        it 'still makes the commit with the correct user name' do
+          git_pair_commit
+
+          author_name_of_last_commit.should eq("Aa Bb and Cc Dd")
+        end
+
+        it 'still makes the commit with the correct user email' do
+          git_pair_commit
+
+          %w(abb@the-host.com cdd@the-host.com).should include(author_email_of_last_commit)
+        end
+
+        it 'still makes the commit with the correct committer name' do
+          git_pair_commit
+
+          committer_name_of_last_commit.should eq("Aa Bb and Cc Dd")
+        end
+
+        it 'still makes the commit with the correct committer email' do
+          git_pair_commit
+
+          %w(abb@the-host.com cdd@the-host.com).should include(committer_email_of_last_commit)
+        end
+      end
+
+      context 'when one of the pair has a custom email address' do
+        before do
+          run 'git pair ab bc'
+        end
+
+        it 'uses that email address' do
+          emails = 6.times.map do
+            git_pair_commit
+            author_email_of_last_commit
+          end.uniq
+          emails.should =~ ['abb@the-host.com', 'test@other-host.com']
+        end
+      end
+    end
+
+    context 'when no pair has been set' do
+      it 'raises an exception' do
+        git_pair_commit.should include('Error: No pair set')
+      end
+    end
+
+    context 'when -h flag is passed' do
+      it 'shows the help message' do
+        results = run 'git pair-commit -h'
+        results.gsub(/\s+/, ' ').should include('randomly chooses the author email from the members of the pair')
+      end
+    end
+
+    def git_pair_commit
+      run "echo #{rand(100)} > b"
+      run 'git add b'
+      run 'git pair-commit -m "Pair pare pear"', :fail => true
     end
   end
 end

data/spec/git_pair_spec.rb

@@ -0,0 +1,52 @@
+require 'pivotal_git_scripts/git_pair'
+
+describe PivotalGitScripts::GitPair::Runner do
+  let(:runner) { described_class.new }
+
+  describe 'set_git_config' do
+    it 'calls git config with pairs in the options' do
+      runner.should_receive(:system).with('git config user.foo "bar baz"')
+
+      runner.set_git_config(false, 'foo' => 'bar baz')
+    end
+
+    it 'can unset git config options' do
+      runner.should_receive(:system).with('git config --unset user.foo')
+
+      runner.set_git_config(false, 'foo' => nil)
+    end
+
+    it 'can handle multiple pairs in a hash' do
+      runner.should_receive(:system).with('git config --unset user.remove')
+      runner.should_receive(:system).with('git config user.ten "10"')
+
+      runner.set_git_config(false, 'remove' => nil, 'ten' => '10')
+    end
+
+    it 'supports a global option' do
+      runner.should_receive(:system).with('git config --global user.foo "bar baz"')
+
+      runner.set_git_config(true, 'foo' => 'bar baz')
+    end
+  end
+
+  describe 'read_author_info_from_config' do
+    it 'maps from the initials to the full name' do
+      config = {
+        'pairs' => {
+          'aa' => 'An Aardvark',
+          'tt' => 'The Turtle'
+        }
+      }
+
+      names = runner.read_author_info_from_config(config, ['aa', 'tt'])
+      names.should =~ ['An Aardvark', 'The Turtle']
+    end
+
+    it 'exits when initials cannot be found' do
+      expect {
+        runner.read_author_info_from_config({"pairs" => {}}, ['aa'])
+      }.to raise_error(PivotalGitScripts::GitPair::GitPairException)
+    end
+  end
+end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pivotal_git_scripts
 version: !ruby/object:Gem::Version
-  version: 1.1.4
-  prerelease: 
+  version: 1.4.0
 platform: ruby
 authors:
 - Pivotal Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-15 00:00:00.000000000Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies: []
 description: These scripts are helpers for managing developer workflow when using
   git repos hosted on GitHub.
@@ -18,49 +17,53 @@ email:
 executables:
 - git-about
 - git-pair
+- git-pair-commit
 - git-project
 - git-superpull
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - MIT.LICENSE
 - README.md
 - Rakefile
 - bin/git-about
 - bin/git-pair
+- bin/git-pair-commit
 - bin/git-project
 - bin/git-superpull
+- lib/pivotal_git_scripts/git_pair.rb
 - lib/pivotal_git_scripts/version.rb
 - pivotal_git_scripts.gemspec
 - spec/cli_spec.rb
+- spec/git_pair_spec.rb
 homepage: http://github.com/pivotal/git_scripts
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: pivotal_git_scripts
-rubygems_version: 1.8.6
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Developer git workflow convenience scripts
-test_files:
-- spec/cli_spec.rb
+test_files: []
+has_rdoc: 

data/Gemfile.lock

@@ -1,29 +0,0 @@
-PATH
-  remote: .
-  specs:
-    pivotal_git_scripts (1.1.4)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.1.3)
-    rake (0.9.2.2)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    unindent (1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler
-  pivotal_git_scripts!
-  rake
-  rspec
-  unindent