git-duet 0.1.3 → 0.2.0

data/lib/git/duet/config.rb

@@ -0,0 +1,11 @@
+# vim:fileencoding=utf-8
+
+module Git
+  module Duet
+    class Config
+      def self.namespace
+        ENV['GIT_DUET_CONFIG_NAMESPACE'] || 'duet.env'
+      end
+    end
+  end
+end

data/lib/git/duet/duet_command.rb

@@ -1,3 +1,4 @@
+# vim:fileencoding=utf-8
 require 'git/duet'
 require 'git/duet/author_mapper'
 require 'git/duet/command_methods'
@@ -13,17 +14,22 @@ class Git::Duet::DuetCommand
   end
 
   def execute!
-    set_alpha_as_git_config_user
-    report_env_vars
-    write_env_vars
+    if alpha && omega
+      set_alpha_as_git_config_user
+      report_env_vars
+      write_env_vars
+    else
+      show_current_config
+    end
   end
 
   private
+
   attr_accessor :alpha, :omega, :author_mapper
 
   def set_alpha_as_git_config_user
-    exec_check("git config #{@global ? '--global ' : ''}user.name '#{alpha_info[:name]}'")
-    exec_check("git config #{@global ? '--global ' : ''}user.email '#{alpha_info[:email]}'")
+    exec_check("#{git_config} user.name '#{alpha_info[:name]}'")
+    exec_check("#{git_config} user.email '#{alpha_info[:email]}'")
   end
 
   def var_map

data/lib/git/duet/install_hook_command.rb

@@ -1,3 +1,4 @@
+# vim:fileencoding=utf-8
 require 'git/duet'
 require 'fileutils'
 require 'git/duet/command_methods'
@@ -5,7 +6,7 @@ require 'git/duet/command_methods'
 class Git::Duet::InstallHookCommand
   include Git::Duet::CommandMethods
 
-  HOOK = <<-EOF.gsub(/^  /, '')
+  HOOK = <<-EOF.gsub(/^ {2}/, '')
   #!/bin/bash
   exec git duet-pre-commit "$@"
   EOF
@@ -17,17 +18,20 @@ class Git::Duet::InstallHookCommand
   def execute!
     Dir.chdir(`git rev-parse --show-toplevel`.chomp) do
       dest = File.join(Dir.pwd, '.git', 'hooks', 'pre-commit')
-      if File.exist?(dest)
-        error("git-duet-install-hook: A pre-commit hook already exists at #{dest}!")
-        error("git-duet-install-hook: Move it out of the way first, mkay?")
-        return 1
-      end
-      File.open(dest, 'w') do |f|
-        f.puts HOOK
-      end
+      return error_hook_exists(dest) if File.exist?(dest)
+      File.open(dest, 'w') { |f| f.puts HOOK }
       FileUtils.chmod(0755, dest)
       info("git-duet-install-hook: Installed hook to #{dest}")
     end
-    return 0
+    0
+  end
+
+  private
+
+  def error_hook_exists(dest)
+    error('git-duet-install-hook: ' <<
+          "A pre-commit hook already exists at #{dest}!")
+    error('git-duet-install-hook: Move it out of the way first, mkay?')
+    1
   end
 end

data/lib/git/duet/pre_commit_command.rb

@@ -1,3 +1,4 @@
+# vim:fileencoding=utf-8
 require 'git/duet'
 require 'git/duet/command_methods'
 require 'git/duet/script_die_error'
@@ -11,22 +12,21 @@ class Git::Duet::PreCommitCommand
 
   def execute!
     in_repo_root do
-      if !env_cache_exists? || env_cache_stale?
-        explode!
-      end
+      explode! if !env_cache_exists? || env_cache_stale?
     end
   end
 
   private
+
   def explode!
-    error("Your git duet settings are stale, human!")
-    error("Update them with `git duet` or `git solo`.")
+    error('Your git duet settings are stale, human!')
+    error('Update them with `git duet` or `git solo`.')
     raise Git::Duet::ScriptDieError.new(1)
   end
 
   def env_cache_exists?
     with_output_quieted do
-      exec_check('git config duet.env.mtime')
+      exec_check("git config #{Git::Duet::Config.namespace}.mtime")
     end
     true
   rescue
@@ -34,10 +34,13 @@ class Git::Duet::PreCommitCommand
   end
 
   def env_cache_stale?
-    Integer(exec_check('git config duet.env.mtime')) < stale_cutoff
+    Integer(exec_check("git config #{Git::Duet::Config.namespace}.mtime")) <
+      stale_cutoff
   end
 
   def stale_cutoff
-    Integer(Time.now - Integer(ENV.fetch('GIT_DUET_SECONDS_AGO_STALE', '1200')))
+    Integer(
+      Time.now - Integer(ENV.fetch('GIT_DUET_SECONDS_AGO_STALE', '1200'))
+    )
   end
 end

data/lib/git/duet/script_die_error.rb

@@ -1,3 +1,5 @@
+# vim:fileencoding=utf-8
+
 module Git
   module Duet
     class ScriptDieError < StandardError

data/lib/git/duet/solo_command.rb

@@ -1,3 +1,4 @@
+# vim:fileencoding=utf-8
 require 'git/duet'
 require 'git/duet/author_mapper'
 require 'git/duet/command_methods'
@@ -13,23 +14,36 @@ class Git::Duet::SoloCommand
   end
 
   def execute!
-    set_soloist_as_git_config_user
     unset_committer_vars
-    report_env_vars
-    write_env_vars
+    if soloist
+      set_soloist_as_git_config_user
+      report_env_vars
+      write_env_vars
+    else
+      show_current_config
+    end
   end
 
   private
+
   attr_accessor :soloist, :author_mapper
 
   def set_soloist_as_git_config_user
-    exec_check("git config #{@global ? '--global ' : ''}user.name '#{soloist_info[:name]}'")
-    exec_check("git config #{@global ? '--global ' : ''}user.email '#{soloist_info[:email]}'")
+    exec_check("#{git_config} user.name '#{soloist_info[:name]}'")
+    exec_check("#{git_config} user.email '#{soloist_info[:email]}'")
   end
 
   def unset_committer_vars
-    exec_check("git config #{@global ? '--global ' : ''}--unset-all duet.env.git-committer-name", [0, 5])
-    exec_check("git config #{@global ? '--global ' : ''}--unset-all duet.env.git-committer-email", [0, 5])
+    exec_check(
+      "#{git_config} --unset-all #{Git::Duet::Config.namespace}." <<
+        'git-committer-name',
+      [0, 5]
+    )
+    exec_check(
+      "#{git_config} --unset-all #{Git::Duet::Config.namespace}." <<
+        'git-committer-email',
+      [0, 5]
+    )
   end
 
   def var_map

data/lib/git/duet/version.rb

@@ -1,7 +1,9 @@
+# vim:fileencoding=utf-8
+
 unless defined?(Git::Duet::VERSION)
   module Git
     module Duet
-      VERSION = '0.1.3'
+      VERSION = '0.2.0'
     end
   end
 end

data/spec/integration/end_to_end_spec.rb

@@ -1,6 +1,7 @@
+# vim:fileencoding=utf-8
 require 'tmpdir'
 
-describe 'git-duet end to end', :integration => true do
+describe 'git-duet end to end', integration: true do
   EMAIL_LOOKUP_SCRIPT = <<-EOF.gsub(/^  /, '')
   #!/usr/bin/env ruby
   addr = {
@@ -21,11 +22,12 @@ describe 'git-duet end to end', :integration => true do
 
   def make_an_edit
     Dir.chdir(@repo_dir)
-    File.open('file.txt', 'w') { |f| f.puts "foo-#{rand(100000)}" }
+    File.open('file.txt', 'w') { |f| f.puts "foo-#{rand(100_000)}" }
     `git add file.txt`
   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')
@@ -46,7 +48,8 @@ describe 'git-duet end to end', :integration => true do
       )
     end
     ENV['GIT_DUET_AUTHORS_FILE'] = @git_authors
-    ENV['PATH'] = "#{File.expand_path('../../../bin', __FILE__)}:#{ENV['PATH']}"
+    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')
@@ -57,7 +60,9 @@ describe 'git-duet end to end', :integration => true do
   after :all do
     Dir.chdir(@startdir)
     if ENV['RSPEC_NO_CLEANUP']
-      File.open('integration-end-to-end-test-dir.txt', 'w') { |f| f.puts @tmpdir }
+      File.open('integration-end-to-end-test-dir.txt', 'w') do |f|
+        f.puts @tmpdir
+      end
     else
       FileUtils.rm_rf(@tmpdir)
     end
@@ -67,11 +72,11 @@ describe 'git-duet end to end', :integration => true do
     before(:each) { install_hook }
     after(:each) { uninstall_hook }
 
-    it 'should write the hook to the `pre-commit` hook file' do
+    it 'writes the hook to the `pre-commit` hook file' do
       File.exist?('.git/hooks/pre-commit').should be_true
     end
 
-    it 'should make the `pre-commit` hook file executable' do
+    it 'makes the `pre-commit` hook file executable' do
       File.executable?('.git/hooks/pre-commit').should be_true
     end
   end
@@ -82,24 +87,25 @@ describe 'git-duet end to end', :integration => true do
       `git solo jd -q`
     end
 
-    it 'should set the git user name' do
+    it 'sets the git user name' do
       `git config user.name`.chomp.should == 'Jane Doe'
     end
 
-    it 'should set the git user email' do
+    it 'sets the git user email' do
       `git config user.email`.chomp.should == 'jane@hamsters.biz.local'
     end
 
-    it 'should cache the git user name as author name' do
-      `git config duet.env.git-author-name`.chomp.should == 'Jane Doe'
+    it 'caches the git user name as author name' do
+      `git config #{Git::Duet::Config.namespace}.git-author-name`.chomp
+        .should == 'Jane Doe'
     end
 
-    it 'should cache the git user email as author email' do
-      `git config duet.env.git-author-email`.chomp.should == 'jane@hamsters.biz.local'
+    it 'caches the git user email as author email' do
+      `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')
@@ -116,8 +122,9 @@ describe 'git-duet end to end', :integration => true do
         `git solo jd -q`
       end
 
-      it 'should set the author email address given by the external email lookup' do
-        `git config duet.env.git-author-email`.chomp.should == 'jane_doe@lookie.me.local'
+      it 'sets the author email given by the external email lookup' do
+        `git config #{Git::Duet::Config.namespace}.git-author-email`.chomp
+          .should == 'jane_doe@lookie.me.local'
       end
     end
 
@@ -127,12 +134,14 @@ describe 'git-duet end to end', :integration => true do
         `git duet jd fb -q`
       end
 
-      it 'should set the author email address given by the external email lookup' do
-        `git config duet.env.git-author-email`.chomp.should == 'jane_doe@lookie.me.local'
+      it 'sets the author email given by the external email lookup' do
+        `git config #{Git::Duet::Config.namespace}.git-author-email`.chomp
+          .should == 'jane_doe@lookie.me.local'
       end
 
-      it 'should set the committer email address given by the external email lookup' do
-        `git config duet.env.git-committer-email`.chomp.should == 'fb9000@dalek.info.local'
+      it 'sets the committer email given by the external email lookup' do
+        `git config #{Git::Duet::Config.namespace}.git-committer-email`.chomp
+          .should == 'fb9000@dalek.info.local'
       end
     end
   end
@@ -143,7 +152,8 @@ describe 'git-duet end to end', :integration => true do
       @name_suffix = rand(9999)
       authors_cfg['email_template'] =
         %Q^<%= '' << author.split.first.downcase << ^ <<
-          %Q^author.split.last[0].chr.downcase << '#{@name_suffix}@mompopshop.local' %>^
+          %Q^author.split.last[0].chr.downcase << ^ <<
+          %Q^'#{@name_suffix}@mompopshop.local' %>^
       File.open(@git_authors, 'w') do |f|
         f.puts YAML.dump(authors_cfg)
       end
@@ -164,14 +174,16 @@ describe 'git-duet end to end', :integration => true do
         make_an_edit
       end
 
-      it 'should use the email template to construct the author email' do
+      it 'uses the email template to construct the author email' do
         `git duet-commit -q -m 'Testing custom email template for author'`
-        `git log -1 --format='%an <%ae>'`.chomp.should == "Zubaz Pants <zubazp#{@name_suffix}@mompopshop.local>"
+        `git log -1 --format='%an <%ae>'`.chomp
+          .should == "Zubaz Pants <zubazp#{@name_suffix}@mompopshop.local>"
       end
 
-      it 'should use the email template to construct the committer email' do
+      it 'uses the email template to construct the committer email' do
         `git duet-commit -q -m 'Testing custom email template for committer'`
-        `git log -1 --format='%cn <%ce>'`.chomp.should == "Zubaz Pants <zubazp#{@name_suffix}@mompopshop.local>"
+        `git log -1 --format='%cn <%ce>'`.chomp
+          .should == "Zubaz Pants <zubazp#{@name_suffix}@mompopshop.local>"
       end
     end
 
@@ -182,14 +194,16 @@ describe 'git-duet end to end', :integration => true do
         make_an_edit
       end
 
-      it 'should use the email template to construct the author email' do
+      it 'uses the email template to construct the author email' do
         `git duet-commit -q -m 'Testing custom email template for author'`
-        `git log -1 --format='%an <%ae>'`.chomp.should == "Zubaz Pants <zubazp#{@name_suffix}@mompopshop.local>"
+        `git log -1 --format='%an <%ae>'`.chomp
+          .should == "Zubaz Pants <zubazp#{@name_suffix}@mompopshop.local>"
       end
 
-      it 'should use the email template to construct the committer email' do
+      it 'uses the email template to construct the committer email' do
         `git duet-commit -q -m 'Testing custom email template for committer'`
-        `git log -1 --format='%cn <%ce>'`.chomp.should == "Frances Bar <francesb#{@name_suffix}@mompopshop.local>"
+        `git log -1 --format='%cn <%ce>'`.chomp
+          .should == "Frances Bar <francesb#{@name_suffix}@mompopshop.local>"
       end
     end
   end
@@ -200,20 +214,22 @@ describe 'git-duet end to end', :integration => true do
       `git duet jd fb -q`
     end
 
-    it 'should set the git user name' do
+    it 'sets the git user name' do
       `git config user.name`.chomp.should == 'Jane Doe'
     end
 
-    it 'should set the git user email' do
+    it 'sets the git user email' do
       `git config user.email`.chomp.should == 'jane@hamsters.biz.local'
     end
 
-    it 'should cache the git committer name' do
-      `git config duet.env.git-committer-name`.chomp.should == 'Frances Bar'
+    it 'caches the git committer name' do
+      `git config #{Git::Duet::Config.namespace}.git-committer-name`.chomp
+        .should == 'Frances Bar'
     end
 
-    it 'should cache the git committer email' do
-      `git config duet.env.git-committer-email`.chomp.should == 'f.bar@hamster.info.local'
+    it 'caches the git committer email' do
+      `git config #{Git::Duet::Config.namespace}.git-committer-email`.chomp
+        .should == 'f.bar@hamster.info.local'
     end
   end
 
@@ -225,33 +241,35 @@ describe 'git-duet end to end', :integration => true do
         make_an_edit
       end
 
-      it 'should list the alpha of the duet as author in the log' do
+      it 'lists the alpha of the duet as author in the log' do
         `git duet-commit -q -m 'Testing set of alpha as author'`
-        `git log -1 --format='%an <%ae>'`.chomp.should == 'Jane Doe <jane@hamsters.biz.local>'
+        `git log -1 --format='%an <%ae>'`.chomp
+          .should == 'Jane Doe <jane@hamsters.biz.local>'
       end
 
-      it 'should list the omega of the duet as committer in the log' do
+      it 'lists the omega of the duet as committer in the log' do
         `git duet-commit -q -m 'Testing set of omega as committer'`
-        `git log -1 --format='%cn <%ce>'`.chomp.should == 'Frances Bar <f.bar@hamster.info.local>'
+        `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|
-            `git config --unset duet.env.#{config}`
+            `git config --unset #{Git::Duet::Config.namespace}.#{config}`
           end
           make_an_edit
         end
 
-        it 'should raise an error if committed without the -q option' do
+        it 'raises an error if committed without the -q option' do
           `git duet-commit -q -m 'Testing commit with no author'`
-          $?.to_i.should_not == 0
+          $CHILD_STATUS.to_i.should_not == 0
         end
 
-        it 'should fail to add a commit' do
-          expect{ `git duet-commit -q -m 'testing commit with no author'` }.
-            to_not change{ `git log -1 --format=%H`.chomp }
+        it 'fails to add a commit' do
+          expect { `git duet-commit -q -m 'testing commit with no author'` }
+            .to_not change { `git log -1 --format=%H`.chomp }
         end
       end
 
@@ -261,7 +279,7 @@ describe 'git-duet end to end', :integration => true do
           @latest_sha1 = `git log -1 --format=%H`.chomp
           make_an_edit
           install_hook
-          `git config --unset-all duet.env.mtime`
+          `git config --unset-all #{Git::Duet::Config.namespace}.mtime`
           ENV['GIT_DUET_QUIET'] = '1'
         end
 
@@ -270,7 +288,7 @@ describe 'git-duet end to end', :integration => true do
           ENV.delete('GIT_DUET_QUIET')
         end
 
-        it 'should fire the hook and reject the commit' do
+        it 'fires the hook and reject the commit' do
           `git duet-commit -q -m 'Testing hook firing'`
           `git log -1 --format=%H`.chomp.should == @latest_sha1
         end
@@ -284,18 +302,20 @@ describe 'git-duet end to end', :integration => true do
         make_an_edit
       end
 
-      it 'should list the soloist as author in the log' do
+      it 'lists the soloist as author in the log' do
         `git duet-commit -m 'Testing set of soloist as author' 2>/dev/null`
-        `git log -1 --format='%an <%ae>'`.chomp.should == 'Jane Doe <jane@hamsters.biz.local>'
+        `git log -1 --format='%an <%ae>'`.chomp
+          .should == 'Jane Doe <jane@hamsters.biz.local>'
       end
 
-      it 'should list the soloist as committer in the log' do
+      it 'lists the soloist as committer in the log' do
         `git duet-commit -m 'Testing set of soloist as committer' 2>/dev/null`
-        `git log -1 --format='%cn <%ce>'`.chomp.should == 'Jane Doe <jane@hamsters.biz.local>'
+        `git log -1 --format='%cn <%ce>'`.chomp
+          .should == 'Jane Doe <jane@hamsters.biz.local>'
       end
 
-      it 'should not include "Signed-off-by" in the commit message' do
-        `git duet-commit -m 'Testing ommitting signoff when only one author' 2>/dev/null`
+      it 'does not include "Signed-off-by" in the commit message' do
+        `git duet-commit -m 'Testing omitting signoff' 2>/dev/null`
         `grep 'Signed-off-by' .git/COMMIT_EDITMSG`.chomp.should == ''
       end
 
@@ -305,7 +325,7 @@ describe 'git-duet end to end', :integration => true do
           @latest_sha1 = `git log -1 --format=%H`.chomp
           make_an_edit
           install_hook
-          `git config --unset-all duet.env.mtime`
+          `git config --unset-all #{Git::Duet::Config.namespace}.mtime`
           ENV['GIT_DUET_QUIET'] = '1'
         end
 
@@ -314,7 +334,7 @@ describe 'git-duet end to end', :integration => true do
           ENV.delete('GIT_DUET_QUIET')
         end
 
-        it 'should fire the hook and reject the commit' do
+        it 'fires the hook and reject the commit' do
           `git duet-commit -q -m 'Testing hook firing'`
           `git log -1 --format=%H`.chomp.should == @latest_sha1
         end