pivotal_git_scripts 1.1.3 → 1.1.4

data/Gemfile.lock

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

data/README.md

@@ -34,6 +34,7 @@ Create a `.pairs` config file in project root or your home folder.
     email:
       prefix: pair
       domain: pivotallabs.com
+      # no_solo_prefix: true
     #global: true
 
 

data/bin/git-pair

@@ -25,6 +25,7 @@ Create a `.pairs` config file in project root or your home folder.
     email:
       prefix: pair
       domain: pivotallabs.com
+      # no_solo_prefix: true
     #global: true
 
 
@@ -90,7 +91,8 @@ end
 
 def build_email(emails, config)
   if config.is_a?(Hash)
-    "#{([config['prefix']] + emails).compact.join('+')}@#{config['domain']}"
+    prefix = config['prefix'] if !config['no_solo_prefix'] or emails.size > 1
+    "#{([prefix] + emails).compact.join('+')}@#{config['domain']}"
   else
     config
   end

data/lib/pivotal_git_scripts/version.rb

@@ -1,3 +1,3 @@
 module PivotalGitScripts
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

data/spec/cli_spec.rb

@@ -139,11 +139,17 @@ describe "CLI" do
         expect_config result, "Aa Bb & Bb Cc", "ab bc", "the-pair+aa+bb@the-host.com"
       end
 
-      it "can set a n users as pair" do
+      it "can set n users as pair" do
         result = run "git pair ab bc cd"
         expect_config result, "Aa Bb, Bb Cc & Cc Dd", "ab bc cd", "the-pair+aa+bb+cc@the-host.com"
       end
 
+      it "can set a user with apostrophes as pair" do
+        write ".pairs", File.read(".pairs").sub("Aa Bb", "Pete O'Connor")
+        result = run "git pair ab"
+        expect_config result, "Pete O'Connor", "ab", "the-pair+pete@the-host.com"
+      end
+
       it "fails when there is no .git in the tree" do
         run "rm -f /tmp/pairs"
         run "cp .pairs /tmp"
@@ -183,6 +189,22 @@ describe "CLI" do
         expect_config result, "Aa Bb", "ab", "aa@foo.com"
       end
 
+      context "when no no_solo_prefix is given" do
+        before do
+          write ".pairs", File.read(".pairs").sub(/email:.*/m, "email:\n  prefix: pairs\n  no_solo_prefix: true\n  domain: foo.com")
+        end
+
+        it "uses no email prefix for single developers" do
+          result = run "git pair ab"
+          expect_config result, "Aa Bb", "ab", "aa@foo.com"
+        end
+
+        it "uses email prefix for multiple developers" do
+          result = run "git pair ab bc"
+          expect_config result, "Aa Bb & Bb Cc", "ab bc", "pairs+aa+bb@foo.com"
+        end
+      end
+
       it "fails with unknown initials" do
         result = run "git pair xx", :fail => true
         result.should include("Couldn't find author name for initials: xx")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pivotal_git_scripts
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-14 00:00:00.000000000Z
+date: 2012-03-15 00:00:00.000000000Z
 dependencies: []
 description: These scripts are helpers for managing developer workflow when using
   git repos hosted on GitHub.