git-duet 0.2.0 → 0.3.0

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p247
+2.1.0

data/.simplecov

@@ -1,6 +1,2 @@
-# vim:fileencoding=utf-8
-if ENV['COVERAGE']
-  SimpleCov.start do
-    add_filter '/spec/'
-  end
-end
+# vim:filetype=ruby:fileencoding=utf-8
+SimpleCov.start { add_filter '/spec/' } if ENV['COVERAGE']

data/.travis.yml

@@ -1,16 +1,26 @@
----
 language: ruby
 env:
   global:
-  - DEBUG=1
+  - COVERAGE=1
 matrix:
   allow_failures:
   - rvm: jruby-19mode
 rvm:
 - 1.9.3
 - 2.0.0
+- 2.1.0
 - jruby-19mode
 notifications:
-  email:
-    recipients:
-    - github+git-duet@modcloth.com
+  email: github+git-duet@modcloth.com
+deploy:
+  provider: rubygems
+  api_key:
+    secure: aW7HYNkTGp3N8awbuJtDfko1CXBDTzElggAOQsA4p//V06Q/qH7ZTNZxPTf5/bPlmjDRgttMVv+zm3YGgb4pFdHzSWI+McLf+eI6g2I8s/Sp/GZQ2+dxH1wBqPtMhSI/Rv7R+J6GznALjKhM/PnNpPl6gsWePFbMebhKgKUvcHo=
+  gem: git-duet
+  on:
+    tags: true
+    repo: modcloth/git-duet
+addons:
+  code_climate:
+    repo_token:
+      secure: A/K+dw6//V8WkB4PapKa1BqEGbwxWbhvHSCFKe+CnHSJ19vDbij2C1x8uzh3NpYTI+B9a5/p9r0B8AmVFI2hKU5CIdGiqMd+sEMM/OzSBeMTIO8d0NKJRfJEGH9yRSlka3cpwLMKmbdPorYnI0iKdVvWLabPhzneK8qYCgHMSWw=

data/Gemfile

@@ -2,3 +2,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'codeclimate-test-reporter', group: :test, require: nil

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 ModCloth, Inc.
+Copyright (c) 2014 ModCloth, Inc.
 
 MIT License
 

data/README.md

@@ -2,6 +2,9 @@
 
 [![Gem Version](https://badge.fury.io/rb/git-duet.png)](http://badge.fury.io/rb/git-duet)
 [![Build Status](https://travis-ci.org/modcloth/git-duet.png?branch=master)](https://travis-ci.org/modcloth/git-duet)
+[![Code Climate](https://codeclimate.com/repos/52b6ea7089af7e2ddc0b1f3c/badges/cc96e2278280922e2a3f/gpa.png)](https://codeclimate.com/repos/52b6ea7089af7e2ddc0b1f3c/feed)
+[![Dependency
+Status](https://gemnasium.com/modcloth/git-duet.png)](https://gemnasium.com/modcloth/git-duet)
 
 Pair harmoniously!  Working in a pair doesn't mean you've both lost your
 identity.  Git Duet helps with blaming/praising by using stuff that's

data/Rakefile

@@ -1,6 +1,6 @@
 #!/usr/bin/env rake
 # vim:fileencoding=utf-8
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
 require 'rspec/core/rake_task'
 
@@ -13,4 +13,4 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = '--format documentation'
 end
 
-task :default => [:rubocop, :spec]
+task default: [:rubocop, :spec]

data/lib/git/duet/author_mapper.rb

@@ -53,7 +53,7 @@ class Git::Duet::AuthorMapper
     return ERB.new(email_template).result(binding)
   rescue StandardError => e
     $stderr.puts("git-duet: email template rendering error: #{e.message}")
-    raise Git::Duet::ScriptDieError.new(8)
+    raise Git::Duet::ScriptDieError, 8
   end
 
   def author_map
@@ -76,6 +76,6 @@ class Git::Duet::AuthorMapper
     @cfg ||= YAML.load(IO.read(authors_file))
   rescue StandardError => e
     $stderr.puts("git-duet: Missing or corrupt authors file: #{e.message}")
-    raise Git::Duet::ScriptDieError.new(3)
+    raise Git::Duet::ScriptDieError, 3
   end
 end

data/lib/git/duet/cli.rb

@@ -11,7 +11,7 @@ class Git::Duet::Cli
       send(method_name, parse_options(method_name, argv.clone))
       0
     rescue NoMethodError
-      raise ScriptError.new('How did you get here???')
+      raise ScriptError, 'How did you get here???'
     rescue Git::Duet::ScriptDieError => e
       e.exit_code
     end
@@ -40,26 +40,28 @@ class Git::Duet::Cli
     end
 
     def parse_solo_options(argv)
-      leftover_argv, options = with_common_opts(
-        argv, 'Usage: __PROG__ [options] <soloist-initials>'
-      ) do |opts, options_hash|
-        opts.on('-g', '--global', 'Change global git config') do |g|
-          options_hash[:global] = true
-        end
+      parse_options_with_positional_args(
+        argv, '<soloist-initials>') do |leftover_argv, options|
+        options[:soloist] = leftover_argv.first
       end
-      options[:soloist] = leftover_argv.first
-      options
     end
 
     def parse_duet_options(argv)
+      parse_options_with_positional_args(
+        argv, '<alpha-initials> <omega-initials>') do |leftover_argv, options|
+        options[:alpha], options[:omega] = leftover_argv[0..1]
+      end
+    end
+
+    def parse_options_with_positional_args(argv, usage)
       leftover_argv, options = with_common_opts(
-        argv, 'Usage: __PROG__ [options] <alpha-initials> <omega-initials>'
+        argv, 'Usage: __PROG__ [options] ' << usage
       ) do |opts, options_hash|
         opts.on('-g', '--global', 'Change global git config') do |g|
           options_hash[:global] = true
         end
       end
-      options[:alpha], options[:omega] = leftover_argv[0..1]
+      yield leftover_argv, options
       options
     end
 

data/lib/git/duet/command_methods.rb

@@ -4,7 +4,6 @@ require 'git/duet'
 require 'git/duet/script_die_error'
 
 module Git::Duet::CommandMethods
-
   private
 
   def report_env_vars
@@ -31,24 +30,24 @@ module Git::Duet::CommandMethods
   end
 
   def author_env_vars_set?
-    %x(#{get_author_name} && #{get_author_email})
+    %x(#{author_name_command} && #{author_email_command})
     $CHILD_STATUS == 0
   end
 
-  def get_author_name
+  def author_name_command
     "git config --get #{Git::Duet::Config.namespace}.git-author-name"
   end
 
-  def get_author_email
+  def author_email_command
     "git config --get #{Git::Duet::Config.namespace}.git-author-email"
   end
 
-  def get_current_config
+  def current_config_command
     "git config --get-regexp #{Git::Duet::Config.namespace}"
   end
 
   def show_current_config
-    info(exec_check(get_current_config))
+    info(exec_check(current_config_command))
   end
 
   def dump_env_vars
@@ -78,7 +77,7 @@ module Git::Duet::CommandMethods
     if author_env_vars_set?
       exec 'git commit ' << signoff_arg << quoted_passthrough_args
     else
-      raise Git::Duet::ScriptDieError.new(17)
+      fail Git::Duet::ScriptDieError, 17
     end
   end
 
@@ -92,7 +91,7 @@ module Git::Duet::CommandMethods
     output = `#{command}`
     unless okay_statuses.include?($CHILD_STATUS.exitstatus)
       error("Command #{command.inspect} exited with #{$CHILD_STATUS.to_i}")
-      raise Git::Duet::ScriptDieError.new(1)
+      fail Git::Duet::ScriptDieError, 1
     end
     output
   end

data/lib/git/duet/duet_command.rb

@@ -28,8 +28,11 @@ class Git::Duet::DuetCommand
   attr_accessor :alpha, :omega, :author_mapper
 
   def set_alpha_as_git_config_user
-    exec_check("#{git_config} user.name '#{alpha_info[:name]}'")
-    exec_check("#{git_config} user.email '#{alpha_info[:email]}'")
+    %w(name email).each do |setting|
+      exec_check(
+        "#{git_config} user.#{setting} '#{alpha_info[setting.to_sym]}'"
+      )
+    end
   end
 
   def var_map
@@ -42,20 +45,21 @@ class Git::Duet::DuetCommand
   end
 
   def alpha_info
-    alpha_omega_info.fetch(@alpha)
-  rescue KeyError, IndexError => e
-    error("git-duet: Failed to find author: #{e}")
-    raise Git::Duet::ScriptDieError.new(86)
+    fetch_info(alpha, 'author')
   end
 
   def omega_info
-    alpha_omega_info.fetch(@omega)
+    fetch_info(omega, 'committer')
+  end
+
+  def fetch_info(which, desc)
+    alpha_omega_info.fetch(which)
   rescue KeyError, IndexError => e
-    error("git-duet: Failed to find committer: #{e}")
-    raise Git::Duet::ScriptDieError.new(86)
+    error("git-duet: Failed to find #{desc}: #{e}")
+    raise Git::Duet::ScriptDieError, 86
   end
 
   def alpha_omega_info
-    @alpha_omega_info ||= author_mapper.map(@alpha, @omega)
+    @alpha_omega_info ||= author_mapper.map(alpha, omega)
   end
 end

data/lib/git/duet/pre_commit_command.rb

@@ -21,7 +21,7 @@ class Git::Duet::PreCommitCommand
   def explode!
     error('Your git duet settings are stale, human!')
     error('Update them with `git duet` or `git solo`.')
-    raise Git::Duet::ScriptDieError.new(1)
+    fail Git::Duet::ScriptDieError, 1
   end
 
   def env_cache_exists?

data/lib/git/duet/solo_command.rb

@@ -57,6 +57,6 @@ class Git::Duet::SoloCommand
     @soloist_info ||= author_mapper.map(@soloist).fetch(@soloist)
   rescue KeyError, IndexError => e
     error("git-solo: Failed to find author: #{e}")
-    raise Git::Duet::ScriptDieError.new(86)
+    raise Git::Duet::ScriptDieError, 86
   end
 end

data/lib/git/duet/version.rb

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

data/spec/integration/end_to_end_spec.rb

@@ -12,26 +12,32 @@ describe 'git-duet end to end', integration: true do
   EOF
 
   def install_hook
-    Dir.chdir(@repo_dir)
-    `git duet-install-hook -q`
+    Dir.chdir(@repo_dir) do
+      `git duet-install-hook -q`
+    end
   end
 
   def uninstall_hook
-    FileUtils.rm_f('.git/hooks/pre-commit')
+    Dir.chdir(@repo_dir) do
+      FileUtils.rm_f('.git/hooks/pre-commit')
+    end
   end
 
   def make_an_edit
-    Dir.chdir(@repo_dir)
-    File.open('file.txt', 'w') { |f| f.puts "foo-#{rand(100_000)}" }
-    `git add file.txt`
+    Dir.chdir(@repo_dir) do
+      File.open('file.txt', 'w') { |f| f.puts "foo-#{rand(100_000)}" }
+      `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' => {
@@ -48,13 +54,17 @@ describe 'git-duet end to end', integration: true do
       )
     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)
-    `git init #{@repo_dir}`
+    Dir.chdir(@tmpdir) do
+      `git init #{@repo_dir}`
+    end
   end
 
   after :all do
@@ -69,7 +79,11 @@ describe 'git-duet end to end', integration: true do
   end
 
   context 'when installing the pre-commit hook' do
-    before(:each) { install_hook }
+    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

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

@@ -3,7 +3,8 @@ require 'git/duet/author_mapper'
 
 describe Git::Duet::AuthorMapper do
   before :each do
-    subject.instance_variable_set(:@cfg, {
+    subject.instance_variable_set(
+      :@cfg,
       'authors' => {
         'jd' => 'Jane Doe; jdoe',
         'fb' => 'Frances Bar; frances',
@@ -16,7 +17,7 @@ describe Git::Duet::AuthorMapper do
       'email_addresses' => {
         'jd' => 'jane@awesome.biz'
       }
-    })
+    )
   end
 
   after :each do

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
 # vim:fileencoding=utf-8
+require 'codeclimate-test-reporter'
+CodeClimate::TestReporter.start
 
 require 'rubygems'
 require 'bundler/setup'

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: git-duet
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
+  prerelease: 
 platform: ruby
 authors:
 - Dan Buch
@@ -11,76 +12,86 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2014-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Pair programming git identity thingy
@@ -140,26 +151,30 @@ files:
 homepage: https://github.com/modcloth/git-duet
 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: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3828941408143458487
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Pair harmoniously!  Decide who's driving.  Commit along the way.  Don't make
   a mess of the repository history.
 test_files:

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 46323bd5392d627ae8bed46e4cd89f2bf8803885
-  data.tar.gz: b78bc212d1b95a47e28c8337b19cd5b3ebb38072
-SHA512:
-  metadata.gz: 28d686c6d459b9104b5c9279e98cc49b6119461bf6b19cf88b41c71b053465fc8c2bb8e66cc856571fc909206a6e4ea7946d2b0f090ae29c38ce50761635d5ba
-  data.tar.gz: ec5038f060832c4f7ed5ad35243ba9ef43498a07eff2722ac2d65e2846c10460d2c5fe879e1750dc1e913d624ebfdb3ce43732345534a3f86b5ce22b1003f03c