git-duet 0.1.2 → 0.1.3

data/.jrubyrc

@@ -1 +1,5 @@
 compat.version=1.9
+cext.enabled=false
+errno.backtrace=true
+
+# vim:filetype=jproperties

data/.travis.yml

@@ -1,7 +1,18 @@
 language: ruby
+env:
+  global:
+  - DEBUG=1
+matrix:
+  allow_failures:
+  - rvm: jruby-19mode
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
+  - '1.9'
+  - '2.0'
   - jruby-19mode
   - ree
+script:
+- bundle exec rake spec --trace
+notifications:
+  email:
+    recipients:
+    - github+git-duet@modcloth.com

data/README.md

@@ -1,9 +1,7 @@
 # Git Duet
 
-<a href="https://travis-ci.org/modcloth/git-duet">
-  <img src="https://api.travis-ci.org/modcloth/git-duet.png"
-    title="Build Status"
-/></a>
+[![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)
 
 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/git-duet.gemspec

@@ -29,8 +29,12 @@ Gem::Specification.new do |gem|
   gem.version = Git::Duet::VERSION
   gem.required_ruby_version = '>= 1.8.7'
 
-  gem.add_development_dependency 'nyan-cat-formatter', '>= 0.2.0'
-  gem.add_development_dependency 'rake', '>= 0.9.2.2'
-  gem.add_development_dependency 'rspec', '>= 2.0.0'
-  gem.add_development_dependency 'simplecov', '>= 0.7.0'
+  gem.add_development_dependency 'nyan-cat-formatter'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec'
+
+  unless RUBY_PLATFORM == 'java'
+    gem.add_development_dependency 'pry'
+    gem.add_development_dependency 'simplecov'
+  end
 end

data/lib/git/duet/author_mapper.rb

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

data/lib/git/duet/command_methods.rb

@@ -86,15 +86,15 @@ module Git::Duet::CommandMethods
   end
 
   def info(msg)
-    STDOUT.puts(msg) unless quiet?
+    $stdout.puts(msg) unless quiet?
   end
 
   def error(msg)
-    STDERR.puts(msg) unless quiet?
+    $stderr.puts(msg) unless quiet?
   end
 
   def prompt
-    STDOUT.print '> '
+    $stdout.print '> '
   end
 
   def quiet?

data/lib/git/duet/duet_command.rb

@@ -36,11 +36,17 @@ class Git::Duet::DuetCommand
   end
 
   def alpha_info
-    alpha_omega_info[@alpha]
+    alpha_omega_info.fetch(@alpha)
+  rescue KeyError, IndexError => e
+    error("git-duet: Failed to find author: #{e}")
+    raise Git::Duet::ScriptDieError.new(86)
   end
 
   def omega_info
-    alpha_omega_info[@omega]
+    alpha_omega_info.fetch(@omega)
+  rescue KeyError, IndexError => e
+    error("git-duet: Failed to find committer: #{e}")
+    raise Git::Duet::ScriptDieError.new(86)
   end
 
   def alpha_omega_info

data/lib/git/duet/solo_command.rb

@@ -41,5 +41,8 @@ class Git::Duet::SoloCommand
 
   def soloist_info
     @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)
   end
 end

data/lib/git/duet/version.rb

@@ -1,7 +1,7 @@
 unless defined?(Git::Duet::VERSION)
   module Git
     module Duet
-      VERSION = '0.1.2'
+      VERSION = '0.1.3'
     end
   end
 end

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

@@ -37,6 +37,10 @@ describe Git::Duet::AuthorMapper do
     subject.authors_file.should == File.join(ENV['HOME'], '.git-authors')
   end
 
+  it 'should let missing author errors bubble up' do
+    expect { subject.map('bzzzrt') }.to raise_error
+  end
+
   it 'should map initials to name -> email pairs' do
     subject.map('jd').fetch('jd').should == {
       :name => 'Jane Doe',
@@ -156,14 +160,14 @@ describe Git::Duet::AuthorMapper do
     end
 
     it 'should warn about missing authors file' do
-      STDERR.should_receive(:puts).with(
+      $stderr.should_receive(:puts).with(
         /Missing or corrupt authors file.*#{bad_path}/i
       )
       expect { subject.map('zzz') }.to raise_error
     end
 
     it 'should raise a ScriptDieError' do
-      STDERR.stub(:puts)
+      $stderr.stub(:puts)
       expect { subject.map('zzz') }.to raise_error(Git::Duet::ScriptDieError)
     end
   end

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

@@ -54,12 +54,12 @@ describe Git::Duet::DuetCommand do
     subject.execute!
   end
 
-  it 'should report env vars to STDOUT' do
+  it 'should report env vars to $stdout' do
     subject.unstub(:report_env_vars)
-    STDOUT.should_receive(:puts).with(/^GIT_AUTHOR_NAME='#{author_mapping[alpha][:name]}'/)
-    STDOUT.should_receive(:puts).with(/^GIT_AUTHOR_EMAIL='#{author_mapping[alpha][:email]}'/)
-    STDOUT.should_receive(:puts).with(/^GIT_COMMITTER_NAME='#{author_mapping[omega][:name]}'/)
-    STDOUT.should_receive(:puts).with(/^GIT_COMMITTER_EMAIL='#{author_mapping[omega][:email]}'/)
+    $stdout.should_receive(:puts).with(/^GIT_AUTHOR_NAME='#{author_mapping[alpha][:name]}'/)
+    $stdout.should_receive(:puts).with(/^GIT_AUTHOR_EMAIL='#{author_mapping[alpha][:email]}'/)
+    $stdout.should_receive(:puts).with(/^GIT_COMMITTER_NAME='#{author_mapping[omega][:name]}'/)
+    $stdout.should_receive(:puts).with(/^GIT_COMMITTER_EMAIL='#{author_mapping[omega][:email]}'/)
     subject.execute!
   end
 
@@ -68,6 +68,17 @@ describe Git::Duet::DuetCommand do
     subject.execute!
   end
 
+  %w(alpha omega).each do |author_type|
+    context "when the #{author_type} cannot be found" do
+      let(:"#{author_type}") { 'brzzzt' }
+
+      it 'aborts' do
+        subject.stub(:error => nil)
+        expect { subject.execute! }.to raise_error(Git::Duet::ScriptDieError)
+      end
+    end
+  end
+
   context 'when configured to operate on the global config' do
     subject do
       described_class.new(alpha, omega, false, true)

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

@@ -18,7 +18,7 @@ describe Git::Duet::PreCommitCommand do
   end
 
   it 'should not require any params to initialize' do
-    expect { described_class.new }.to_not raise_error(ArgumentError)
+    expect { described_class.new }.to_not raise_error
   end
 
   it 'should do nothing if the env cache is not stale' do

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

@@ -65,10 +65,10 @@ describe Git::Duet::SoloCommand do
     subject.execute!
   end
 
-  it 'should report env vars to STDOUT' do
+  it 'should report env vars to $stdout' do
     subject.unstub(:report_env_vars)
-    STDOUT.should_receive(:puts).with(/^GIT_AUTHOR_NAME='#{author_mapping[soloist][:name]}'/)
-    STDOUT.should_receive(:puts).with(/^GIT_AUTHOR_EMAIL='#{author_mapping[soloist][:email]}'/)
+    $stdout.should_receive(:puts).with(/^GIT_AUTHOR_NAME='#{author_mapping[soloist][:name]}'/)
+    $stdout.should_receive(:puts).with(/^GIT_AUTHOR_EMAIL='#{author_mapping[soloist][:email]}'/)
     subject.execute!
   end
 
@@ -77,6 +77,15 @@ describe Git::Duet::SoloCommand do
     subject.execute!
   end
 
+  context 'when soloist is missing' do
+    let(:soloist) { 'bzzzrt' }
+
+    it 'aborts' do
+      subject.stub(:error => nil)
+      expect { subject.execute! }.to raise_error(Git::Duet::ScriptDieError)
+    end
+  end
+
   context 'when configured to operate on the global config' do
     subject do
       described_class.new(soloist, false, true)

data/spec/spec_helper.rb

@@ -2,7 +2,10 @@ require 'rubygems'
 require 'bundler/setup'
 
 require 'rbconfig'
-require 'simplecov'
+
+unless RUBY_PLATFORM == 'java'
+  require 'simplecov'
+end
 
 RSpec.configure do |c|
   if !ENV['TRAVIS']
@@ -14,3 +17,9 @@ RSpec.configure do |c|
     end
   end
 end
+
+$stderr.puts <<EOWARNING
+----------------------------------------------------------------------------
+WARNING: These specs do a lot of process spawning, which is relatively slow.
+----------------------------------------------------------------------------
+EOWARNING

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-duet
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-19 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nyan-cat-formatter
@@ -21,7 +21,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -37,7 +37,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -45,7 +45,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +53,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -61,7 +61,23 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        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
@@ -69,7 +85,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -77,7 +93,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
 description: Pair programming git identity thingy
 email:
 - d.buch@modcloth.com
@@ -152,6 +168,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4378173393483041112
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23