git-duet 0.1.3 → 0.2.0

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

@@ -1,12 +1,11 @@
+# vim:fileencoding=utf-8
 require 'git/duet/pre_commit_command'
 
 describe Git::Duet::PreCommitCommand do
-  subject do
-    described_class.new(true)
-  end
+  subject(:cmd) { described_class.new(true) }
 
   before :each do
-    subject.stub(:in_repo_root) do |&block|
+    cmd.stub(:in_repo_root) do |&block|
       block.call
     end
     @old_seconds_ago_stale = ENV.delete('GIT_DUET_SECONDS_AGO_STALE')
@@ -17,20 +16,26 @@ describe Git::Duet::PreCommitCommand do
     ENV['GIT_DUET_SECONDS_AGO_STALE'] = @old_seconds_ago_stale
   end
 
-  it 'should not require any params to initialize' do
+  it 'does not require any params to initialize' do
     expect { described_class.new }.to_not raise_error
   end
 
-  it 'should do nothing if the env cache is not stale' do
-    subject.stub(:exec_check).with(/git config duet\.env\.git/)
-    subject.stub(:exec_check).with('git config duet.env.mtime').and_return(Time.now.to_i)
-    subject.should_not_receive(:explode!)
-    subject.execute!
+  it 'does nothing if the env cache is not stale' do
+    cmd.stub(:exec_check)
+      .with(/git config #{Git::Duet::Config.namespace}.git/)
+    cmd.stub(:exec_check)
+      .with("git config #{Git::Duet::Config.namespace}.mtime")
+      .and_return(Time.now.to_i)
+    cmd.should_not_receive(:explode!)
+    cmd.execute!
   end
 
-  it 'should explode if the env cache does not exist' do
-    subject.stub(:exec_check).with(/git config duet\.env\.git/)
-    subject.stub(:exec_check).with('git config duet.env.mtime').and_raise(StandardError)
-    expect { subject.execute! }.to raise_error(Git::Duet::ScriptDieError)
+  it 'explodes if the env cache does not exist' do
+    cmd.stub(:exec_check)
+      .with(/git config #{Git::Duet::Config.namespace}.git/)
+    cmd.stub(:exec_check)
+      .with("git config #{Git::Duet::Config.namespace}.mtime")
+      .and_raise(StandardError)
+    expect { cmd.execute! }.to raise_error(Git::Duet::ScriptDieError)
   end
 end

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

@@ -1,124 +1,169 @@
+# vim:fileencoding=utf-8
 require 'git/duet/solo_command'
 require 'support/author_mapper_helper'
 
 describe Git::Duet::SoloCommand do
   include SpecSupport::AuthorMapperHelper
 
-  let :soloist do
-    random_author
-  end
+  let(:soloist) { random_author }
 
-  subject do
-    described_class.new(soloist)
-  end
+  subject(:cmd) { described_class.new(soloist) }
 
   before :each do
-    subject.stub(:author_mapper => double('author mapper').tap do |am|
-      am.stub(:map => author_mapping)
+    cmd.stub(author_mapper: double('author mapper').tap do |am|
+      am.stub(map: author_mapping)
     end)
-    subject.stub(:` => '')
-    subject.stub(:report_env_vars)
-    subject.stub(:in_repo_root) do |&block|
+    cmd.stub(:` => '')
+    cmd.stub(:report_env_vars)
+    cmd.stub(:in_repo_root) do |&block|
       block.call
     end
   end
 
-  it 'should require soloist initials' do
+  it 'requires soloist initials' do
     expect { described_class.new }.to raise_error(ArgumentError)
   end
 
-  it 'should respond to `execute!`' do
-    subject.should respond_to(:execute!)
+  it 'responds to `execute!`' do
+    cmd.should respond_to(:execute!)
   end
 
-  it 'should (privately) respond to `write_env_vars`' do
-    subject.private_methods.map(&:to_sym).should include(:write_env_vars)
+  it '(privately) responds to `write_env_vars`' do
+    cmd.private_methods.map(&:to_sym).should include(:write_env_vars)
   end
 
-  it 'should set the soloist name as git config user.name' do
-    subject.stub(:`).with(/git config user\.email/)
-    subject.stub(:`).with(/git config --unset-all duet\.env/)
-    subject.should_receive(:`).with("git config user.name '#{author_mapping[soloist][:name]}'")
-    subject.execute!
+  it 'sets the soloist name as git config user.name' do
+    cmd.stub(:`).with(/git config user\.email/)
+    cmd.stub(:`).with(/git config --unset-all #{Git::Duet::Config.namespace}/)
+    cmd.should_receive(:`)
+      .with("git config user.name '#{author_mapping[soloist][:name]}'")
+    cmd.execute!
   end
 
-  it 'should set the soloist email as git config user.email' do
-    subject.stub(:`).with(/git config user\.name/)
-    subject.stub(:`).with(/git config --unset-all duet\.env/)
-    subject.should_receive(:`).with("git config user.email '#{author_mapping[soloist][:email]}'")
-    subject.execute!
+  it 'sets the soloist email as git config user.email' do
+    cmd.stub(:`).with(/git config user\.name/)
+    cmd.stub(:`).with(/git config --unset-all #{Git::Duet::Config.namespace}/)
+    cmd.should_receive(:`)
+      .with("git config user.email '#{author_mapping[soloist][:email]}'")
+    cmd.execute!
   end
 
-  it 'should unset the committer name' do
-    subject.stub(:`).with(/git config user\.name/)
-    subject.stub(:`).with(/git config user\.email/)
-    subject.stub(:`).with(/git config --unset-all duet\.env\.git-committer-email/)
-    subject.should_receive(:`).with('git config --unset-all duet.env.git-committer-name')
-    subject.execute!
+  it 'unsets the committer name' do
+    cmd.stub(:`).with(/git config user\.name/)
+    cmd.stub(:`).with(/git config user\.email/)
+    cmd.stub(:`)
+      .with(/git config --unset-all #{Git::Duet::Config
+                                      .namespace}.git-committer-email/)
+    cmd.should_receive(:`)
+      .with("git config --unset-all #{Git::Duet::Config
+                                      .namespace}.git-committer-name")
+    cmd.execute!
   end
 
-  it 'should unset the committer email' do
-    subject.stub(:`).with(/git config user\.name/)
-    subject.stub(:`).with(/git config user\.email/)
-    subject.stub(:`).with(/git config --unset-all duet\.env\.git-committer-name/)
-    subject.should_receive(:`).with('git config --unset-all duet.env.git-committer-email')
-    subject.execute!
+  it 'unsets the committer email' do
+    cmd.stub(:`).with(/git config user\.name/)
+    cmd.stub(:`).with(/git config user\.email/)
+    cmd.stub(:`)
+      .with(/git config --unset-all #{Git::Duet::Config
+                                      .namespace}.git-committer-name/)
+    cmd.should_receive(:`)
+      .with("git config --unset-all #{Git::Duet::Config
+                                      .namespace}.git-committer-email")
+    cmd.execute!
   end
 
-  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]}'/)
-    subject.execute!
+  it 'reports env vars to $stdout' do
+    cmd.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]}'/)
+    cmd.execute!
   end
 
-  it 'should set the soloist as author in custom git config' do
-    subject.should_receive(:write_env_vars)
-    subject.execute!
+  it 'sets the soloist as author in custom git config' do
+    cmd.should_receive(:write_env_vars)
+    cmd.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)
+      cmd.stub(error: nil)
+      expect { cmd.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)
+  context 'when given no arguments' do
+    let(:soloist) { nil }
+
+    it 'shows the current duet author settings' do
+      git_config_output = <<-EOF.gsub(/^ {8}/, '')
+        #{Git::Duet::Config.namespace}.git-author-name Test Author
+        #{Git::Duet::Config.namespace}.git-author-email author@test.com
+        #{Git::Duet::Config.namespace}.mtime 138039#{rand(1000..9999)}
+      EOF
+
+      cmd.stub(:`)
+        .with("git config --get-regexp #{Git::Duet::Config.namespace}") do
+        git_config_output
+      end
+      $stdout.should_receive(:puts).with(git_config_output)
+
+      cmd.execute!
     end
+  end
 
-    it 'should set the soloist name as global git config user.name' do
-      subject.stub(:`).with(/git config --global user\.email/)
-      subject.stub(:`).with(/git config --global --unset-all duet\.env/)
-      subject.should_receive(:`).with("git config --global user.name '#{author_mapping[soloist][:name]}'")
-      subject.execute!
+  context 'when configured to operate on the global config' do
+    subject(:cmd) { described_class.new(soloist, false, true) }
+
+    it 'sets the soloist name as global git config user.name' do
+      cmd.stub(:`).with(/git config --global user\.email/)
+      cmd.stub(:`)
+        .with(/git config --global --unset-all #{Git::Duet::Config.namespace}/)
+      soloist_name = author_mapping[soloist][:name]
+      cmd.should_receive(:`)
+        .with("git config --global user.name '#{soloist_name}'")
+      cmd.execute!
     end
 
-    it 'should set the soloist email as global git config user.email' do
-      subject.stub(:`).with(/git config --global user\.name/)
-      subject.stub(:`).with(/git config --global --unset-all duet\.env/)
-      subject.should_receive(:`).with("git config --global user.email '#{author_mapping[soloist][:email]}'")
-      subject.execute!
+    it 'sets the soloist email as global git config user.email' do
+      cmd.stub(:`).with(/git config --global user\.name/)
+      cmd.stub(:`)
+        .with(/git config --global --unset-all #{Git::Duet::Config.namespace}/)
+      soloist_email = author_mapping[soloist][:email]
+      cmd.should_receive(:`)
+        .with("git config --global user.email '#{soloist_email}'")
+      cmd.execute!
     end
 
-    it 'should unset the global committer name' do
-      subject.stub(:`).with(/git config --global user\.name/)
-      subject.stub(:`).with(/git config --global user\.email/)
-      subject.stub(:`).with(/git config --global --unset-all duet\.env\.git-committer-email/)
-      subject.should_receive(:`).with('git config --global --unset-all duet.env.git-committer-name')
-      subject.execute!
+    it 'unsets the global committer name' do
+      cmd.stub(:`).with(/git config --global user\.name/)
+      cmd.stub(:`).with(/git config --global user\.email/)
+      cmd.stub(:`)
+        .with(
+          /git config --global --unset-all #{Git::Duet::Config
+                                             .namespace}.git-committer-email/
+        )
+      cmd.should_receive(:`)
+        .with('git config --global --unset-all ' <<
+              "#{Git::Duet::Config.namespace}.git-committer-name")
+      cmd.execute!
     end
 
-    it 'should unset the global committer email' do
-      subject.stub(:`).with(/git config --global user\.name/)
-      subject.stub(:`).with(/git config --global user\.email/)
-      subject.stub(:`).with(/git config --global --unset-all duet\.env\.git-committer-name/)
-      subject.should_receive(:`).with('git config --global --unset-all duet.env.git-committer-email')
-      subject.execute!
+    it 'unsets the global committer email' do
+      cmd.stub(:`).with(/git config --global user\.name/)
+      cmd.stub(:`).with(/git config --global user\.email/)
+      cmd.stub(:`)
+        .with(
+          /git config --global --unset-all #{Git::Duet::Config
+                                             .namespace}.git-committer-name/
+        )
+      cmd.should_receive(:`)
+        .with('git config --global --unset-all ' <<
+              "#{Git::Duet::Config.namespace}.git-committer-email")
+      cmd.execute!
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,22 +1,9 @@
+# vim:fileencoding=utf-8
+
 require 'rubygems'
 require 'bundler/setup'
 
-require 'rbconfig'
-
-unless RUBY_PLATFORM == 'java'
-  require 'simplecov'
-end
-
-RSpec.configure do |c|
-  if !ENV['TRAVIS']
-    if RbConfig::CONFIG['host_os'] =~ /darwin/i
-      c.formatter = 'NyanCatMusicFormatter'
-    else
-      # No music allowed for neckbeards or polo shirts.
-      c.formatter = 'NyanCatFormatter'
-    end
-  end
-end
+require 'simplecov' unless RUBY_PLATFORM == 'java'
 
 $stderr.puts <<EOWARNING
 ----------------------------------------------------------------------------

data/spec/support/author_mapper_helper.rb

@@ -1,28 +1,32 @@
+# vim:fileencoding=utf-8
+
 module SpecSupport
   module AuthorMapperHelper
     def random_author
       author_mapping.keys.send(RUBY_VERSION < '1.9' ? :choice : :sample)
     end
 
-    def author_mapping
-      {
-        'jd' => {
-          :name => 'Jane Doe',
-          :email => 'jane@awesome.biz'
-        },
-        'fb' => {
-          :name => 'Frances Bar',
-          :email => 'frances@awesometown.me'
-        },
-        'qx' => {
-          :name => 'Quincy Xavier',
-          :email => 'qx@awesometown.me'
-        },
-        'hb' => {
-          :name => 'Hampton Bones',
-          :email => 'h.bones@awesometown.me'
-        }
+    AUTHOR_MAPPING = {
+      'jd' => {
+        name: 'Jane Doe',
+        email: 'jane@awesome.biz'
+      },
+      'fb' => {
+        name: 'Frances Bar',
+        email: 'frances@awesometown.me'
+      },
+      'qx' => {
+        name: 'Quincy Xavier',
+        email: 'qx@awesometown.me'
+      },
+      'hb' => {
+        name: 'Hampton Bones',
+        email: 'h.bones@awesometown.me'
       }
+    }
+
+    def author_mapping
+      AUTHOR_MAPPING.clone
     end
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-duet
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Dan Buch
@@ -12,86 +11,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nyan-cat-formatter
+  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: rake
+  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: rspec
+  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
@@ -105,15 +94,15 @@ executables:
 - git-duet-commit
 - git-duet-install-hook
 - git-duet-pre-commit
-- git-duet-pre-commit-tk
 - git-solo
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - .jrubyrc
-- .rbenv-version
 - .rspec
+- .rubocop.yml
+- .ruby-version
 - .simplecov
 - .travis.yml
 - Gemfile
@@ -124,7 +113,6 @@ files:
 - bin/git-duet-commit
 - bin/git-duet-install-hook
 - bin/git-duet-pre-commit
-- bin/git-duet-pre-commit-tk
 - bin/git-solo
 - git-duet.gemspec
 - lib/git-duet.rb
@@ -133,9 +121,9 @@ files:
 - lib/git/duet/cli.rb
 - lib/git/duet/command_methods.rb
 - lib/git/duet/commit_command.rb
+- lib/git/duet/config.rb
 - lib/git/duet/duet_command.rb
 - lib/git/duet/install_hook_command.rb
-- lib/git/duet/key_error.rb
 - lib/git/duet/pre_commit_command.rb
 - lib/git/duet/script_die_error.rb
 - lib/git/duet/solo_command.rb
@@ -149,33 +137,29 @@ files:
 - spec/lib/git/duet/solo_command_spec.rb
 - spec/spec_helper.rb
 - spec/support/author_mapper_helper.rb
-homepage: ''
+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.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4378173393483041112
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+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: