git-duet 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0e935ea43b312f7b8f22a51c37ff101c8bcfa92
-  data.tar.gz: 5a01b500d7ed09135fd5f5acbd7500084ac72fe9
+  metadata.gz: 1c0d1aba2d97cec79a441df782543cd66f943074
+  data.tar.gz: bde7359043a472e8971bb22c8310d60e94b99687
 SHA512:
-  metadata.gz: 92aa13d5ad13ea7540e47ba48aec5b9ae2e70aed2457dca8a0746d20fe4c1df2ee8cb3468a099e9026f1a858af9d5459faac31dffa0d3135cc4d9d802db4211f
-  data.tar.gz: 6d2e39230cf987832d19f259140cacb4b8b5663e4b0db208a0cac4a16001906190207541fa5313ef3615955836224d9351663fe74acadada7b62af85a17102c1
+  metadata.gz: 60244f94949de3e18600cb59358128ccea448e87f96468fd4a3677d0e2cc42ce4add71309f7a008ef4b523da340fa95ca662f6ad8ee4a36f4291aa267ce67aa3
+  data.tar.gz: ff54e2644dcf6d61c00a382ddc99c821ef7c15b1a8d419da3e02879b5bbc47a36dc1bf0a063af30fa305a9fe26681e538e6f5c1d6a44168224a173842b5a7a52

data/.travis.yml

@@ -10,6 +10,12 @@ rvm:
 - 2.0.0
 - 2.1.0
 - jruby-19mode
+before_script:
+- git clone https://github.com/sstephenson/bats.git
+- cd bats && sudo ./install.sh /usr/local
+script:
+- bundle exec rake
+- bats test
 notifications:
   email: github+git-duet@modcloth.com
 deploy:

data/README.md

@@ -64,12 +64,11 @@ Set the author and committer via `git duet`:
 git duet jd fb
 ~~~~~
 
-When you're ready to commit, use `git duet-commit` or `git dci`
+When you're ready to commit, use `git duet-commit` (or add an alias like
+a normal person.  Something like `dci = duet-commit` should work.)
 
 ~~~~~ bash
 git duet-commit -v [any other git options]
-# or...
-git dci -v [any other git options]
 ~~~~~
 
 When you're done pairing, set the author back to yourself with `git solo`:
@@ -266,6 +265,6 @@ github](https://github.com/modcloth/git-duet/issues/new).
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
+3. Commit your changes (`git dci -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request

data/git-duet.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
     'Dan Buch',
     'Jesse Szwedko',
     'Rafe Colton',
-    'Sheena McCoy',
+    'Sheena McCoy'
   ]
   gem.email = %w(
     d.buch@modcloth.com
@@ -14,16 +14,16 @@ Gem::Specification.new do |gem|
     r.colton@modcloth.com
     sp.mccoy@modcloth.com
   )
-  gem.description = %q{Pair programming git identity thingy}
-  gem.summary = "Pair harmoniously!  Decide who's driving.  " <<
-                "Commit along the way.  Don't make a mess of " <<
-                "the repository history."
+  gem.description = %q(Pair programming git identity thingy)
+  gem.summary = "Pair harmoniously!  Decide who's driving.  " \
+                "Commit along the way.  Don't make a mess of " \
+                'the repository history.'
   gem.homepage = 'https://github.com/modcloth/git-duet'
   gem.license = 'MIT'
 
-  gem.files = `git ls-files`.split($\)
-  gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files = gem.files.grep(%r{^spec/})
+  gem.files = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
+  gem.executables = gem.files.grep(/^bin\//).map { |f| File.basename(f) }
+  gem.test_files = gem.files.grep(/^spec\//)
   gem.name = 'git-duet'
   gem.require_paths = %w(lib)
   gem.version = Git::Duet::VERSION

data/lib/git/duet/author_mapper.rb

@@ -38,9 +38,7 @@ module Git
         author_email = email_from_lookup(initials, author, username)
         return author_email unless author_email.empty?
         return email_addresses[initials] if email_addresses[initials]
-        if email_template
-          return email_from_template(initials, author, username)
-        end
+        return email_from_template(initials, author, username) if email_template
         return "#{username}@#{email_domain}" if username
 
         author_name_parts = author.split
@@ -53,6 +51,8 @@ module Git
         `#{@email_lookup} '#{initials}' '#{author}' '#{username}'`.strip
       end
 
+      # rubocop:disable Lint/UnusedMethodArgument
+      # arguments are used via binding
       def email_from_template(initials, author, username)
         return ERB.new(email_template).result(binding)
       rescue StandardError => e

data/lib/git/duet/cli.rb

@@ -33,7 +33,7 @@ module Git
           options = {}
           leftover_argv = OptionParser.new do |opts|
             opts.banner = banner.gsub(/__PROG__/, opts.program_name)
-            opts.on('-q', 'Silence output') do |q|
+            opts.on('-q', 'Silence output') do |_|
               options[:quiet] = true
             end
             yield opts, options if block_given?
@@ -61,7 +61,7 @@ module Git
           leftover_argv, options = with_common_opts(
             argv, 'Usage: __PROG__ [options] ' << usage
           ) do |opts, options_hash|
-            opts.on('-g', '--global', 'Change global git config') do |g|
+            opts.on('-g', '--global', 'Change global git config') do |_|
               options_hash[:global] = true
             end
           end

data/lib/git/duet/command_methods.rb

@@ -32,7 +32,7 @@ module Git
       end
 
       def author_env_vars_set?
-        %x(#{author_name_command} && #{author_email_command})
+        `#{author_name_command} && #{author_email_command}`
         $CHILD_STATUS == 0
       end
 

data/lib/git/duet/version.rb

@@ -3,7 +3,7 @@
 unless defined?(Git::Duet::VERSION)
   module Git
     module Duet
-      VERSION = '0.4.0'
+      VERSION = '0.4.1'
     end
   end
 end

data/spec/lib/git/duet/duet_command_spec.rb

@@ -18,7 +18,7 @@ describe Git::Duet::DuetCommand do
     Dir.stub(:chdir) do |&block|
       block.call
     end
-    File.stub(:open) do |filename, mode, &block|
+    File.stub(:open) do |_, _, &block|
       block.call(double('outfile').as_null_object)
     end
   end

data/test/git-duet-commit.bats

@@ -0,0 +1,71 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+@test "lists the alpha of the duet as author in the log" {
+  git duet -q jd fb
+  add_file
+  git duet-commit -q -m 'Testing set of alpha as author'
+  run git log -1 --format='%an <%ae>'
+  assert_success 'Jane Doe <jane@hamsters.biz.local>'
+}
+
+@test "lists the omega of the duet as committer in the log" {
+  git duet -q jd fb
+  add_file
+  git duet-commit -q -m 'Testing set of omega as committer'
+  run git log -1 --format='%cn <%ce>'
+  assert_success 'Frances Bar <f.bar@hamster.info.local>'
+}
+
+@test "lists the soloist as author in the log" {
+  git solo -q jd
+  add_file
+  git duet-commit -q -m 'Testing set of soloist as author'
+  run git log -1 --format='%an <%ae>'
+  assert_success 'Jane Doe <jane@hamsters.biz.local>'
+}
+
+@test "lists the soloist as committer in the log" {
+  git solo -q jd
+  add_file
+  git duet-commit -q -m 'Testing set of soloist as committer'
+  run git log -1 --format='%cn <%ce>'
+  assert_success 'Jane Doe <jane@hamsters.biz.local>'
+}
+
+@test "does not inclued Signed-off-by whene soloing" {
+  git solo -q jd
+  add_file
+  git duet-commit -q -m 'Testing omitting signoff'
+  run grep 'Signed-off-by' .git/COMMIT_EDITMSG
+  assert_failure ''
+}
+
+@test "rejects commits with no author" {
+  add_file
+  run git duet-commit -q -m 'Testing commit with no author'
+  assert_failure
+}
+
+@test "rejects commits with stale soloists with hook" {
+  git solo -q jd
+  git duet-install-hook -q
+  git config --unset-all "$GIT_DUET_CONFIG_NAMESPACE.mtime"
+  add_file
+  run git duet-commit -q -m 'Testing stale hook fire'
+
+  assert_failure
+  assert_line 0 "Your git duet settings are stale, human!"
+}
+
+@test "rejects commits with stale duetists with hook" {
+  git duet -q jd fb
+  git duet-install-hook -q
+  git config --unset-all "$GIT_DUET_CONFIG_NAMESPACE.mtime"
+  add_file
+  run git duet-commit -q -m 'Testing stale hook fire'
+
+  assert_failure
+  assert_line 0 "Your git duet settings are stale, human!"
+}

data/test/git-duet-install-hooks.bats

@@ -0,0 +1,15 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+@test "writes the hook to the pre-commit hook file" {
+  git duet-install-hook -q
+  assert_success
+  [ -f .git/hooks/pre-commit ]
+}
+
+@test "makes the pre-commit hook executable" {
+  git duet-install-hook -q
+  assert_success
+  [ -x .git/hooks/pre-commit ]
+}

data/test/git-duet.bats

@@ -0,0 +1,63 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+@test "sets the git user name" {
+  git duet -q jd fb
+  run git config user.name
+  assert_success 'Jane Doe'
+}
+
+@test "sets the git user email" {
+  git duet -q jd fb
+  run git config user.email
+  assert_success 'jane@hamsters.biz.local'
+}
+
+@test "caches the git committer name" {
+  git duet -q jd fb
+  run git config "$GIT_DUET_CONFIG_NAMESPACE.git-committer-name"
+  assert_success 'Frances Bar'
+}
+
+@test "caches the git committer email" {
+  git duet -q jd fb
+  run git config "$GIT_DUET_CONFIG_NAMESPACE.git-committer-email"
+  assert_success 'f.bar@hamster.info.local'
+}
+
+@test "looks up external author email" {
+  GIT_DUET_EMAIL_LOOKUP_COMMAND=$GIT_DUET_TEST_LOOKUP git duet -q jd fb
+  run git config "$GIT_DUET_CONFIG_NAMESPACE.git-author-email"
+  assert_success 'jane_doe@lookie.me.local'
+}
+
+@test "looks up external committer email" {
+  GIT_DUET_EMAIL_LOOKUP_COMMAND=$GIT_DUET_TEST_LOOKUP git duet -q jd fb
+  run git config "$GIT_DUET_CONFIG_NAMESPACE.git-committer-email"
+  assert_success 'fb9000@dalek.info.local'
+}
+
+@test "uses custom email template for author when provided" {
+  local suffix=$RANDOM
+
+  set_custom_email_template "<%= \"#{author.split.first.downcase}#{author.split.last[0].chr.downcase}$suffix@mompopshop.local\" %>"
+
+  git duet zp fb
+  run git config "$GIT_DUET_CONFIG_NAMESPACE.git-author-email"
+  assert_success "zubazp$suffix@mompopshop.local"
+
+  clear_custom_email_template
+}
+
+@test "uses custom email template for committer when provided" {
+  local suffix=$RANDOM
+
+  set_custom_email_template "<%= \"#{author.split.first.downcase}#{author.split.last[0].chr.downcase}$suffix@mompopshop.local\" %>"
+
+  git duet -q jd fb
+  run git config "$GIT_DUET_CONFIG_NAMESPACE.git-committer-email"
+  assert_success "francesb$suffix@mompopshop.local"
+
+  clear_custom_email_template
+}

data/test/git-solo.bats

@@ -0,0 +1,45 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+@test "sets the git user name" {
+  git solo -q jd
+  run git config user.name
+  assert_success 'Jane Doe'
+}
+
+@test "sets the git user email" {
+  git solo jd
+  run git config user.email
+  assert_success 'jane@hamsters.biz.local'
+}
+
+@test "caches the git user name as author name" {
+  git solo -q jd
+  run git config "$GIT_DUET_CONFIG_NAMESPACE.git-author-name"
+  assert_success 'Jane Doe'
+}
+
+@test "caches the git user email as author email" {
+  git solo -q jd
+  run git config "$GIT_DUET_CONFIG_NAMESPACE.git-author-email"
+  assert_success 'jane@hamsters.biz.local'
+}
+
+@test "looks up external email" {
+  GIT_DUET_EMAIL_LOOKUP_COMMAND=$GIT_DUET_TEST_LOOKUP git solo -q jd
+  run git config "$GIT_DUET_CONFIG_NAMESPACE.git-author-email"
+  assert_success 'jane_doe@lookie.me.local'
+}
+
+@test "uses custom email template when provided" {
+  local suffix=$RANDOM
+
+  set_custom_email_template "<%= \"#{author.split.first.downcase}#{author.split.last[0].chr.downcase}$suffix@mompopshop.local\" %>"
+
+  git solo -q zp
+  run git config "$GIT_DUET_CONFIG_NAMESPACE.git-author-email"
+  assert_success "zubazp$suffix@mompopshop.local"
+
+  clear_custom_email_template
+}

data/test/test_helper.bash

@@ -0,0 +1,122 @@
+setup() {
+  GIT_DUET_TEST_DIR="${BATS_TMPDIR}/git-duet"
+
+  mkdir "$GIT_DUET_TEST_DIR"
+
+  export GIT_DUET_CONFIG_NAMESPACE='foo.bar'
+  export GIT_DUET_AUTHORS_FILE="${GIT_DUET_TEST_DIR}/.git-authors"
+  export GIT_DUET_TEST_LOOKUP="${GIT_DUET_TEST_DIR}/email-lookup"
+  export GIT_DUET_TEST_REPO="${GIT_DUET_TEST_DIR}/repo"
+
+  cat > "$GIT_DUET_AUTHORS_FILE" <<EOF
+pairs:
+  jd: Jane Doe
+  fb: Frances Bar
+  zp: Zubaz Pants
+
+email:
+  domain: hamster.info.local
+
+email_addresses:
+  jd: jane@hamsters.biz.local
+EOF
+
+  cat > "$GIT_DUET_TEST_LOOKUP" <<EOF
+#!/usr/bin/env ruby
+addr = {
+  'jd' => 'jane_doe@lookie.me.local',
+  'fb' => 'fb9000@dalek.info.local'
+}[ARGV.first]
+puts addr
+EOF
+  chmod +x "$GIT_DUET_TEST_LOOKUP"
+  git init -q "$GIT_DUET_TEST_REPO"
+  cd "$GIT_DUET_TEST_REPO"
+}
+
+teardown() {
+  rm -rf "$GIT_DUET_TEST_DIR"
+}
+
+add_file() {
+  touch file.txt
+  git add file.txt
+}
+
+set_custom_email_template() {
+  clear_custom_email_template
+  echo "email_template: $1" >> "$GIT_DUET_AUTHORS_FILE"
+}
+
+clear_custom_email_template() {
+  cat "$GIT_DUET_AUTHORS_FILE" | grep -v email_template > "$GIT_DUET_AUTHORS_FILE.bak"
+  mv "$GIT_DUET_AUTHORS_FILE.bak" "$GIT_DUET_AUTHORS_FILE"
+}
+
+flunk() {
+  { if [ "$#" -eq 0 ]; then cat -
+    else echo "$@"
+    fi
+  } >&2
+  return 1
+}
+
+assert_success() {
+  if [ "$status" -ne 0 ]; then
+    flunk "command failed with exit status $status"
+  elif [ "$#" -gt 0 ]; then
+    assert_output "$1"
+  fi
+}
+
+assert_failure() {
+  if [ "$status" -eq 0 ]; then
+    flunk "expected failed exit status"
+  elif [ "$#" -gt 0 ]; then
+    assert_output "$1"
+  fi
+}
+
+assert_equal() {
+  if [ "$1" != "$2" ]; then
+    { echo "expected: $1"
+      echo "actual:   $2"
+    } | flunk
+  fi
+}
+
+assert_output() {
+  local expected
+  if [ $# -eq 0 ]; then expected="$(cat -)"
+  else expected="$1"
+  fi
+  assert_equal "$expected" "$output"
+}
+
+assert_line() {
+  if [ "$1" -ge 0 ] 2>/dev/null; then
+    assert_equal "$2" "${lines[$1]}"
+  else
+    local line
+    for line in "${lines[@]}"; do
+      if [ "$line" = "$1" ]; then return 0; fi
+    done
+    flunk "expected line \`$1'"
+  fi
+}
+
+refute_line() {
+  if [ "$1" -ge 0 ] 2>/dev/null; then
+    local num_lines="${#lines[@]}"
+    if [ "$1" -lt "$num_lines" ]; then
+      flunk "output has $num_lines lines"
+    fi
+  else
+    local line
+    for line in "${lines[@]}"; do
+      if [ "$line" = "$1" ]; then
+        flunk "expected to not find line \`$line'"
+      fi
+    done
+  fi
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-duet
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Dan Buch
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -104,7 +104,6 @@ email:
 - r.colton@modcloth.com
 - sp.mccoy@modcloth.com
 executables:
-- git-dci
 - git-duet
 - git-duet-commit
 - git-duet-install-hook
@@ -124,7 +123,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/git-dci
 - bin/git-duet
 - bin/git-duet-commit
 - bin/git-duet-install-hook
@@ -144,7 +142,6 @@ files:
 - lib/git/duet/script_die_error.rb
 - lib/git/duet/solo_command.rb
 - lib/git/duet/version.rb
-- spec/integration/end_to_end_spec.rb
 - spec/lib/git/duet/author_mapper_spec.rb
 - spec/lib/git/duet/cli_spec.rb
 - spec/lib/git/duet/command_methods_spec.rb
@@ -153,6 +150,11 @@ files:
 - spec/lib/git/duet/solo_command_spec.rb
 - spec/spec_helper.rb
 - spec/support/author_mapper_helper.rb
+- test/git-duet-commit.bats
+- test/git-duet-install-hooks.bats
+- test/git-duet.bats
+- test/git-solo.bats
+- test/test_helper.bash
 homepage: https://github.com/modcloth/git-duet
 licenses:
 - MIT
@@ -179,7 +181,6 @@ specification_version: 4
 summary: Pair harmoniously!  Decide who's driving.  Commit along the way.  Don't make
   a mess of the repository history.
 test_files:
-- spec/integration/end_to_end_spec.rb
 - spec/lib/git/duet/author_mapper_spec.rb
 - spec/lib/git/duet/cli_spec.rb
 - spec/lib/git/duet/command_methods_spec.rb

data/bin/git-dci

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-# vim:fileencoding=utf-8
-require 'git-duet'
-exit Git::Duet::Cli.run($PROGRAM_NAME, ARGV)

data/spec/integration/end_to_end_spec.rb

@@ -1,376 +0,0 @@
-# vim:fileencoding=utf-8
-require 'tmpdir'
-require 'posix-spawn' unless RUBY_PLATFORM == 'java'
-
-describe 'git-duet end to end', integration: true do
-  EMAIL_LOOKUP_SCRIPT = <<-EOF.gsub(/^  /, '')
-  #!/usr/bin/env ruby
-  addr = {
-    'jd' => 'jane_doe@lookie.me.local',
-    'fb' => 'fb9000@dalek.info.local'
-  }[ARGV.first]
-  puts addr
-  EOF
-
-  @capture_status = nil
-
-  def sh(cmd)
-    return `#{cmd}` if RUBY_PLATFORM == 'java'
-
-    pid, input, output, _ = POSIX::Spawn.popen4(cmd, err: '/dev/null')
-    input.close
-    @capture_status = Process.waitpid2(pid).last
-    output.read
-  ensure
-    output.close
-  end
-
-  def install_hook
-    Dir.chdir(@repo_dir) do
-      sh('git duet-install-hook -q')
-    end
-  end
-
-  def uninstall_hook
-    Dir.chdir(@repo_dir) do
-      FileUtils.rm_f('.git/hooks/pre-commit')
-    end
-  end
-
-  def make_an_edit
-    Dir.chdir(@repo_dir) do
-      File.open('file.txt', 'w') { |f| f.puts "foo-#{rand(100_000)}" }
-      sh('git add file.txt')
-    end
-  end
-
-  before :all do
-    ENV['GIT_DUET_CONFIG_NAMESPACE'] = 'foo.bar'
-
-    @startdir = Dir.pwd
-    @tmpdir = Dir.mktmpdir('git-duet-specs')
-    @git_authors = File.join(@tmpdir, '.git-authors')
-    @email_lookup_path = File.join(@tmpdir, 'email-lookup')
-
-    File.open(@git_authors, 'w') do |f|
-      f.puts YAML.dump(
-        'pairs' => {
-          'jd' => 'Jane Doe',
-          'fb' => 'Frances Bar',
-          'zp' => 'Zubaz Pants'
-        },
-        'email' => {
-          'domain' => 'hamster.info.local'
-        },
-        'email_addresses' => {
-          'jd' => 'jane@hamsters.biz.local'
-        }
-      )
-    end
-    ENV['GIT_DUET_AUTHORS_FILE'] = @git_authors
-
-    top_bin = File.expand_path('../../../bin', __FILE__)
-    ENV['PATH'] = "#{top_bin}:#{ENV['PATH']}"
-
-    File.open(@email_lookup_path, 'w') { |f| f.puts EMAIL_LOOKUP_SCRIPT }
-    FileUtils.chmod(0755, @email_lookup_path)
-
-    @repo_dir = File.join(@tmpdir, 'foo')
-    Dir.chdir(@tmpdir) do
-      sh("git init #{@repo_dir}")
-    end
-  end
-
-  after :all do
-    Dir.chdir(@startdir)
-    if ENV['RSPEC_NO_CLEANUP']
-      File.open('integration-end-to-end-test-dir.txt', 'w') do |f|
-        f.puts @tmpdir
-      end
-    else
-      FileUtils.rm_rf(@tmpdir)
-    end
-  end
-
-  context 'when installing the pre-commit hook' do
-    before(:each) do
-      Dir.chdir(@repo_dir)
-      install_hook
-    end
-
-    after(:each) { uninstall_hook }
-
-    it 'writes the hook to the `pre-commit` hook file' do
-      File.exist?('.git/hooks/pre-commit').should be_true
-    end
-
-    it 'makes the `pre-commit` hook file executable' do
-      File.executable?('.git/hooks/pre-commit').should be_true
-    end
-  end
-
-  context 'when setting the author via solo' do
-    before :each do
-      Dir.chdir(@repo_dir)
-      sh('git solo jd -q')
-    end
-
-    it 'sets the git user name' do
-      sh('git config user.name').chomp.should == 'Jane Doe'
-    end
-
-    it 'sets the git user email' do
-      sh('git config user.email').chomp.should == 'jane@hamsters.biz.local'
-    end
-
-    it 'caches the git user name as author name' do
-      sh("git config #{Git::Duet::Config.namespace}.git-author-name").chomp
-        .should == 'Jane Doe'
-    end
-
-    it 'caches the git user email as author email' do
-      sh("git config #{Git::Duet::Config.namespace}.git-author-email").chomp
-        .should == 'jane@hamsters.biz.local'
-    end
-  end
-
-  context 'when an external email lookup is provided' do
-    before :each do
-      @old_email_lookup = ENV.delete('GIT_DUET_EMAIL_LOOKUP_COMMAND')
-      ENV['GIT_DUET_EMAIL_LOOKUP_COMMAND'] = @email_lookup_path
-    end
-
-    after :each do
-      ENV['GIT_DUET_EMAIL_LOOKUP_COMMAND'] = @old_email_lookup
-    end
-
-    context 'when setting the author via solo' do
-      before :each do
-        Dir.chdir(@repo_dir)
-        sh('git solo jd -q')
-      end
-
-      it 'sets the author email given by the external email lookup' do
-        sh("git config #{Git::Duet::Config.namespace}.git-author-email").chomp
-          .should == 'jane_doe@lookie.me.local'
-      end
-    end
-
-    context 'when setting author and committer via duet' do
-      before :each do
-        Dir.chdir(@repo_dir)
-        sh('git duet jd fb -q')
-      end
-
-      it 'sets the author email given by the external email lookup' do
-        sh("git config #{Git::Duet::Config.namespace}.git-author-email").chomp
-          .should == 'jane_doe@lookie.me.local'
-      end
-
-      it 'sets the committer email given by the external email lookup' do
-        sh(
-          "git config #{Git::Duet::Config.namespace}.git-committer-email"
-        ).chomp.should == 'fb9000@dalek.info.local'
-      end
-    end
-  end
-
-  context 'when a custom email template is provided' do
-    before :each do
-      authors_cfg = YAML.load_file(@git_authors)
-      @name_suffix = rand(9999)
-      authors_cfg['email_template'] =
-        "<%= '' << author.split.first.downcase << " \
-        "author.split.last[0].chr.downcase << " \
-        "'#{@name_suffix}@mompopshop.local' %>"
-      File.open(@git_authors, 'w') do |f|
-        f.puts YAML.dump(authors_cfg)
-      end
-    end
-
-    after :each do
-      authors_cfg = YAML.load_file(@git_authors)
-      authors_cfg.delete('email_template')
-      File.open(@git_authors, 'w') do |f|
-        f.puts YAML.dump(authors_cfg)
-      end
-    end
-
-    context 'after running git-solo' do
-      before :each do
-        Dir.chdir(@repo_dir)
-        sh('git solo zp -q')
-        make_an_edit
-      end
-
-      it 'uses the email template to construct the author email' do
-        sh("git duet-commit -q -m 'Testing custom email template for author'")
-        sh("git log -1 --format='%an <%ae>'").chomp
-          .should == "Zubaz Pants <zubazp#{@name_suffix}@mompopshop.local>"
-      end
-
-      it 'uses the email template to construct the committer email' do
-        sh('git duet-commit -q ' \
-           "-m 'Testing custom email template for committer'")
-        sh("git log -1 --format='%cn <%ce>'").chomp
-          .should == "Zubaz Pants <zubazp#{@name_suffix}@mompopshop.local>"
-      end
-    end
-
-    context 'after running git-duet' do
-      before :each do
-        Dir.chdir(@repo_dir)
-        sh('git duet zp fb -q')
-        make_an_edit
-      end
-
-      it 'uses the email template to construct the author email' do
-        sh("git duet-commit -q -m 'Testing custom email template for author'")
-        sh("git log -1 --format='%an <%ae>'").chomp
-          .should == "Zubaz Pants <zubazp#{@name_suffix}@mompopshop.local>"
-      end
-
-      it 'uses the email template to construct the committer email' do
-        sh('git duet-commit -q ' \
-           "-m 'Testing custom email template for committer'")
-        sh("git log -1 --format='%cn <%ce>'").chomp
-          .should == "Frances Bar <francesb#{@name_suffix}@mompopshop.local>"
-      end
-    end
-  end
-
-  context 'when setting author and committer via duet' do
-    before :each do
-      Dir.chdir(@repo_dir)
-      sh('git duet jd fb -q')
-    end
-
-    it 'sets the git user name' do
-      sh('git config user.name').chomp.should == 'Jane Doe'
-    end
-
-    it 'sets the git user email' do
-      sh('git config user.email').chomp.should == 'jane@hamsters.biz.local'
-    end
-
-    it 'caches the git committer name' do
-      sh("git config #{Git::Duet::Config.namespace}.git-committer-name").chomp
-        .should == 'Frances Bar'
-    end
-
-    it 'caches the git committer email' do
-      sh("git config #{Git::Duet::Config.namespace}.git-committer-email").chomp
-        .should == 'f.bar@hamster.info.local'
-    end
-  end
-
-  context 'when committing via git-duet-commit' do
-    context 'after running git-duet' do
-      before :each do
-        Dir.chdir(@repo_dir)
-        sh('git duet jd fb -q')
-        make_an_edit
-      end
-
-      it 'lists the alpha of the duet as author in the log' do
-        sh("git duet-commit -q -m 'Testing set of alpha as author'")
-        sh("git log -1 --format='%an <%ae>'").chomp
-          .should == 'Jane Doe <jane@hamsters.biz.local>'
-      end
-
-      it 'lists the omega of the duet as committer in the log' do
-        sh("git duet-commit -q -m 'Testing set of omega as committer'")
-        sh("git log -1 --format='%cn <%ce>'").chomp
-          .should == 'Frances Bar <f.bar@hamster.info.local>'
-      end
-
-      context 'when no author has been set' do
-        before do
-          Dir.chdir(@repo_dir)
-          %w(git-author-email git-author-name).each do |config|
-            sh("git config --unset #{Git::Duet::Config.namespace}.#{config}")
-          end
-          make_an_edit
-        end
-
-        it 'raises an error if committed without the -q option' do
-          sh("git duet-commit -q -m 'Testing commit with no author'")
-          @capture_status.to_i.should_not == 0
-        end
-
-        it 'fails to add a commit' do
-          expect do
-            sh("git duet-commit -q -m 'testing commit with no author'")
-          end.to_not change { sh('git log -1 --format=%H').chomp }
-        end
-      end
-
-      context 'with the pre-commit hook in place' do
-        before :each do
-          sh("git commit -m 'Committing before installing the hook'")
-          @latest_sha1 = sh('git log -1 --format=%H').chomp
-          make_an_edit
-          install_hook
-          sh("git config --unset-all #{Git::Duet::Config.namespace}.mtime")
-          ENV['GIT_DUET_QUIET'] = '1'
-        end
-
-        after :each do
-          uninstall_hook
-          ENV.delete('GIT_DUET_QUIET')
-        end
-
-        it 'fires the hook and reject the commit' do
-          sh("git duet-commit -q -m 'Testing hook firing'")
-          sh('git log -1 --format=%H').chomp.should == @latest_sha1
-        end
-      end
-    end
-
-    context 'after running git-solo' do
-      before :each do
-        Dir.chdir(@repo_dir)
-        sh('git solo jd -q')
-        make_an_edit
-      end
-
-      it 'lists the soloist as author in the log' do
-        sh("git duet-commit -m 'Testing set of soloist as author'")
-        sh("git log -1 --format='%an <%ae>'").chomp
-          .should == 'Jane Doe <jane@hamsters.biz.local>'
-      end
-
-      it 'lists the soloist as committer in the log' do
-        sh("git duet-commit -m 'Testing set of soloist as committer'")
-        sh("git log -1 --format='%cn <%ce>'").chomp
-          .should == 'Jane Doe <jane@hamsters.biz.local>'
-      end
-
-      it 'does not include "Signed-off-by" in the commit message' do
-        sh("git duet-commit -m 'Testing omitting signoff'")
-        sh("grep 'Signed-off-by' .git/COMMIT_EDITMSG").chomp.should == ''
-      end
-
-      context 'with the pre-commit hook in place' do
-        before :each do
-          sh("git commit -m 'Committing before installing the hook'")
-          @latest_sha1 = sh('git log -1 --format=%H').chomp
-          make_an_edit
-          install_hook
-          sh("git config --unset-all #{Git::Duet::Config.namespace}.mtime")
-          ENV['GIT_DUET_QUIET'] = '1'
-        end
-
-        after :each do
-          uninstall_hook
-          ENV.delete('GIT_DUET_QUIET')
-        end
-
-        it 'fires the hook and reject the commit' do
-          sh("git duet-commit -q -m 'Testing hook firing'")
-          sh('git log -1 --format=%H').chomp.should == @latest_sha1
-        end
-      end
-    end
-  end
-end