Merge pull request #24 from zrob/custom-email

Add ability to use a custom email address per user

Author: Matt Royal

Diff for: Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pivotal_git_scripts (1.2.0)
+    pivotal_git_scripts (1.3.0)
 
 GEM
   remote: http://rubygems.org/

Diff for: lib/pivotal_git_scripts/git_pair.rb

@@ -58,9 +58,10 @@ def commit(argv)
         end
 
         config = read_pairs_config
-        author_names, email_ids = extract_author_names_and_email_ids_from_config(config, current_pair_initials)
+        author_details = extract_author_details_from_config(config, current_pair_initials)
+        author_names = author_details.keys.map { |i| author_details[i][:name] }
         authors = pair_names(author_names)
-        author_email = random_author_email(email_ids, config['email'])
+        author_email = random_author_email(author_details)
         puts "Committing under #{author_email}"
         passthrough_args =  argv.map{|arg| "'#{arg}'"}.join(' ')
         env_variables = "GIT_AUTHOR_NAME='#{authors}' GIT_AUTHOR_EMAIL='#{author_email}' GIT_COMMITTER_NAME='#{authors}' GIT_COMMITTER_EMAIL='#{author_email}'"
@@ -103,6 +104,9 @@ def parse_cli_options(argv)
             domain: pivotallabs.com
             # no_solo_prefix: true
           #global: true
+          # include the following section to set custom email addresses for users
+          #email_addresses:
+          #  zr: [email protected]
 
 
       By default this affects the current project (.git/config).<br/>
@@ -168,9 +172,9 @@ def build_email(emails, config)
         end
       end
 
-      def random_author_email(email_ids, config)
-        author_id = email_ids.sample
-        "#{author_id}@#{config['domain']}"
+      def random_author_email(author_details)
+        author_id = author_details.keys.sample
+        author_details[author_id][:email]
       end
 
       def set_git_config(global, options)
@@ -205,6 +209,32 @@ def no_email(config)
         !config.key? 'email'
       end
 
+      def extract_author_details_from_config(config, initials)
+        details = {}
+
+        initials.each do |i|
+          info = read_author_info_from_config(config, [i]).first
+
+          full_name, email_id = info.split(";").map(&:strip)
+          email_id ||= full_name.split(' ').first.downcase
+
+          email = read_custom_email_address_from_config(config, i)
+          email ||= "#{email_id}@#{config['email']['domain']}"
+
+          details[i] = {
+            :name => full_name,
+            :email => email
+          }
+        end
+
+        details
+      end
+
+      def read_custom_email_address_from_config(config, initial)
+        return nil unless config['email_addresses']
+        return config['email_addresses'][initial.downcase]
+      end
+
       private
 
       def pair_names(author_names)

Diff for: lib/pivotal_git_scripts/version.rb

@@ -1,3 +1,3 @@
 module PivotalGitScripts
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

Diff for: spec/cli_spec.rb

@@ -291,6 +291,9 @@ def git_config_value(name, global = false)
           email:
             prefix: the-pair
             domain: the-host.com
+
+          email_addresses:
+            bc: [email protected]
       YAML
     end
 
@@ -377,6 +380,20 @@ def committer_email_of_last_commit
           %w([email protected] [email protected]).should include(committer_email_of_last_commit)
         end
       end
+
+      context 'when one of the pair has a custom email address' do
+        before do
+          run 'git pair ab bc'
+        end
+
+        it 'uses that email address' do
+          emails = 6.times.map do
+            git_pair_commit
+            author_email_of_last_commit
+          end.uniq
+          emails.should =~ ['[email protected]', '[email protected]']
+        end
+      end
     end
 
     context 'when no pair has been set' do