ppgit 0.5.0 → 0.6.0

data/CHANGELOG

@@ -1,3 +1,5 @@
+0.6.0
+  - use '+' in the pair name, instead of '_'
 0.5.0
   - print warning if a new version is available - closes gh-3
   - display info in green, error in red - http://bit.ly/aHb1pw - closes gh-2

data/README.markdown

@@ -1,6 +1,8 @@
 [ppgit](http://rubygems.org/gems/ppgit)
 =======
 
+![Alt text](http://github.com/alainravet/ppgit/raw/master/doc/ppgit-img3.png)
+
 For Git-friendly Pair-Programming sessions.    
 Sign your commits with your pair 2-part name and email : andy\_john / andy\_john@acme.com    
 When you're done, restore your local git config in a snap.
@@ -25,6 +27,8 @@ remark : 'ppgit' is a synonym of 'git pp' => you can write
 Usage :
 -------
 
+![Alt text](http://github.com/alainravet/ppgit/raw/master/doc/ppgit-img1.png)
+
 #### 1 - When the pairing session starts, quickly set user.name and user.email to the pair values :
 
 		$ ppgit john andy  andy_john@mycompany.com
@@ -32,7 +36,7 @@ Usage :
 => this will update the .git/config of your project to
 
 		[user]
-			name = andy_john
+			name = andy+john
 			email = andy_john@mycompany.com
 		[user-before-ppgit]
 			name = Your Name
@@ -43,7 +47,7 @@ Usage :
 
 		$ ppgit clear
 
-=> will restore your ~/.gitconfig to :
+=> will restore your .git/config to :
 
 		[user]
 			name = Your Name
@@ -81,8 +85,16 @@ This info is stored in ~/.gitconfig => it works for all your projects.
 
 		$ gem install ppgit
 
-#### Report bugs to <http://github.com/alainravet/ppgit/>
 
+#### Update :
+
+You are warned when a new version is available :
+
+![Alt text](http://github.com/alainravet/ppgit/raw/master/doc/ppgit-img2.png)
+
+
+#### Report bugs to <http://github.com/alainravet/ppgit/>
+test
 --------------------------------------------------------------------------------
 
 == Note on Patches/Pull Requests

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/bin/git-pp

@@ -11,11 +11,13 @@ if ARGV.empty?
   do_ppgit_show_usage_message()
 
 else
-  LOCAL_CONFIG_FILE  = in_test_mode ? config_file_part('--file'       ) : nil
+#  LOCAL_CONFIG_FILE  = in_test_mode ? config_file_part('--file'       ) : nil
+  LOCAL_CONFIG_FILE  = in_test_mode ? config_file_part('--file'       ) : '--file .git/config'
   GLOBAL_CONFIG_FILE = in_test_mode ? config_file_part('--global_file') : '--global'
 
   if emailroot = argv_value_of('--email_root')
     do_ppgit_emailroot(emailroot)
+    do_ppgit_info() if ARGV.empty?
   end
 
   if ARGV == %w(info)
@@ -29,7 +31,7 @@ else
     do_ppgit_set_pair_as_a_user(user_1=ARGV[0], user_2=ARGV[1], pair_email=ARGV[2])
     do_ppgit_info()
 
-  else
+  elsif 0 != ARGV.length
     puts yellow( "\nError - invalid command : ")
     puts yellow( '   ppgit ') + lred(ARGV.join(' '))
     puts "\n----------------------------\n\n"

data/bin/ppgit

@@ -11,11 +11,13 @@ if ARGV.empty?
   do_ppgit_show_usage_message()
 
 else
-  LOCAL_CONFIG_FILE  = in_test_mode ? config_file_part('--file'       ) : nil
+#  LOCAL_CONFIG_FILE  = in_test_mode ? config_file_part('--file'       ) : nil
+  LOCAL_CONFIG_FILE  = in_test_mode ? config_file_part('--file'       ) : '--file .git/config'
   GLOBAL_CONFIG_FILE = in_test_mode ? config_file_part('--global_file') : '--global'
 
   if emailroot = argv_value_of('--email_root')
     do_ppgit_emailroot(emailroot)
+    do_ppgit_info() if ARGV.empty?
   end
 
   if ARGV == %w(info)
@@ -29,7 +31,7 @@ else
     do_ppgit_set_pair_as_a_user(user_1=ARGV[0], user_2=ARGV[1], pair_email=ARGV[2])
     do_ppgit_info()
 
-  else
+  elsif 0 != ARGV.length
     puts yellow( "\nError - invalid command : ")
     puts yellow( '   ppgit ') + lred(ARGV.join(' '))
     puts "\n----------------------------\n\n"

data/lib/ppgit/commands.rb

@@ -27,11 +27,9 @@ def do_ppgit_set_pair_as_a_user(user_1, user_2, pair_email)
   backup_git_value :from => 'user.email', :to => 'user-before-ppgit.email'
 
   two_users  = [user_1, user_2]
-  pair_user  = two_users.sort.join('_')
+  pair_email ||= make_email_from_email_root_and_user(two_users.sort.join('_'))
 
-  pair_email ||= make_email_from_email_root_and_user(pair_user)
-
-  set_local_git_value 'user.name', pair_user
+  set_local_git_value 'user.name', two_users.sort.join('+')
   if pair_email
     set_local_git_value 'user.email', pair_email
   end
@@ -57,15 +55,22 @@ end
 
 
 def do_ppgit_info
-  name, email = get_local_git_value('user.name'), get_local_git_value('user.email')
-  email_root  = get_local_git_value('ppgit.emailroot')
+  ppgit_info(LOCAL_CONFIG_FILE )
+  ppgit_info(GLOBAL_CONFIG_FILE)
+end
+
+def ppgit_info(file)
+  name, email = get_value('user.name', file), get_value('user.email', file)
+  email_root  = get_value('ppgit.emailroot', file)
   s = []
-  s << "  -------------------------------------------------------"
-  if name.blank? && email.blank?
-    s << '  [user] is empty (user.email and user.name are not set)'
-  else
+  s << "-------------------------------------------------------"
+  s << "file = " + ((file == '--global') ? '~/.gitconfig' : file.gsub('--file ',''))
+  s << "-------------------------------------------------------"
+  unless name.blank? && email.blank?
+#    s << '  [user] is empty (user.email and user.name are not set)'
+#  else
     s << '  [user]'
-    s << "    name  = #{name }" unless name .blank?
+    s << "    name  = #{name }" unless name.blank?
     s << "    email = #{email}" unless email.blank?
     s << '  -------------------------------------------------------'
   end
@@ -74,14 +79,14 @@ def do_ppgit_info
     s << "    emailroot = #{email_root}" unless email_root.blank?
     s << '  -------------------------------------------------------'
   end
-  name, email = get_local_git_value('user-before-ppgit.name'), get_local_git_value('user-before-ppgit.email')
+  name, email = get_value('user-before-ppgit.name', file), get_value('user-before-ppgit.email', file)
   unless name.blank? && email.blank?
     s << '  [user-before-ppgit]'
-    s << "    name  = #{name }" unless name .blank?
+    s << "    name  = #{name }" unless name.blank?
     s << "    email = #{email}" unless email.blank?
     s << '  -------------------------------------------------------'
   end
   s << ' '
-
   puts green s.join("\n")
 end
+

data/lib/ppgit/usage.txt

@@ -27,7 +27,7 @@ remark : 'ppgit' is a synonym of 'git pp' => you can write
         => will update ~/.gitconfig to
       
             [user]
-              name = andy_john
+              name = andy+john
               email = andy_john@mycompany.com
 
 

data/ppgit.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ppgit}
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alain Ravet"]
-  s.date = %q{2010-07-26}
+  s.date = %q{2010-10-07}
   s.description = %q{git users' pairs switcher}
   s.email = %q{alain.ravet+git@gmail.com}
   s.executables = ["git-pp", "ppgit"]
@@ -27,6 +27,9 @@ Gem::Specification.new do |s|
      "VERSION",
      "bin/git-pp",
      "bin/ppgit",
+     "doc/ppgit-img1.png",
+     "doc/ppgit-img2.png",
+     "doc/ppgit-img3.png",
      "lib/ppgit.rb",
      "lib/ppgit/commands.rb",
      "lib/ppgit/git_utils.rb",

data/spec/ppgit_clear_spec.rb

@@ -34,7 +34,7 @@ describe "`ppgit clear`" do
   context 'when there is a user.name + email AND stored values in user-before-ppgit AND an emailroot' do
     before(:all) do
       @before_local   = [  '[user]'                        ,
-                            '  name = andy_john'            ,  # value to replace
+                            '  name = andy+john'            ,  # value to replace
                             '  email = andy_john@test.com'  ,  #  ..
 
                             '[user-before-ppgit]'             , # section to erase
@@ -65,7 +65,7 @@ describe "`ppgit clear`" do
   context 'when both the backup user.name and email are the same as the global values' do
     before(:all) do
       @before_local   = [  '[user]'                           , # section to erase
-                            '  name = andy_john'              , #
+                            '  name = andy+john'              , #
                             '  email = andy_john@test.com'    , #
 
                             '[user-before-ppgit]'             , # section to erase
@@ -93,7 +93,7 @@ describe "`ppgit clear`" do
   context 'when only the backup user.name is the same as the global value' do
     before(:all) do
       @before_local   = [  '[user]'                           , #
-                            '  name = andy_john'              , # will disappear
+                            '  name = andy+john'              , # will disappear
                             '  email = andy_john@test.com'    , # will be restored
 
                             '[user-before-ppgit]'             , #

data/spec/ppgit_email_root_spec.rb

@@ -53,7 +53,7 @@ describe "medium: `ppgit john andy --email_root acme+*@gmail.com`" do
 
   it 'stores the user in local (.git/config)' do
     expected_local = [  '[user]'                          ,
-                        '  name = andy_john'              ,
+                        '  name = andy+john'              ,
                         '  email = acme+andy_john@gmail.com'
                       ].join("\n")
     @actual_local.should == expected_local
@@ -77,7 +77,7 @@ describe "complex: `ppgit john andy andy_john@test.com --email_root acme+*@gmail
 
   it 'uses the explicit email address (3rd parameter)' do
     expected_local = [  '[user]'                          ,
-                        '  name = andy_john'              ,
+                        '  name = andy+john'              ,
                         '  email = andy_john@test.com'
                       ].join("\n")
     @actual_local.should == expected_local

data/spec/ppgit_info_spec.rb

@@ -5,7 +5,7 @@ describe "`ppgit info`" do
   context "when ALL the [user] and the ppgit variables are stored in the 2 config files"  do
     before(:all) do
       before_local    = [  '[user]'                         ,
-                            '  name = andy_john'            ,
+                            '  name = andy+john'            ,
                             '  email = andy_john@test.com'  ,
 
                             '[user-before-ppgit]'           ,
@@ -17,12 +17,10 @@ describe "`ppgit info`" do
       ignore, ignore, @output = execute_command_g( ppgit("info"), before_local, before_global)
     end
 
-    it('should display the [user].* info'             ) { @output.should match(/\[user\].+andy_john.+andy_john@test.com/mi) }
+    it('should display the [user].* info'             ) { @output.should match(/\[user\].+andy\+john.+andy_john@test.com/mi) }
     it('should display the [user-before-ppgit].* info') { @output.should match(/\[user-before-ppgit\].+John User.+johnuser@gmail.be/mi) }
     it('should display the [ppgit].emailroot info'    ) {
-      pending 'till we can find a better way to fake the file system' do
-        @output.should match(/\[ppgit\].+emailroot\s+=\s+acme\+\*@gmail.com/mi)
-      end
+      @output.should match(/\[ppgit\].+emailroot\s+=\s+acme\+\*@gmail.com/mi)
     }
   end
 
@@ -34,7 +32,7 @@ describe "`ppgit info`" do
       ignore, ignore, @output = execute_command_g( ppgit("info"), before_local, before_global)
     end
 
-    it('should display the empty [user] section'                 ) { @output.should match(/\[user\]/mi) }
+    it('should not display the empty [user] section'                 ) { @output.should_not match(/\[user\]/mi) }
 
     it('should NOT display the empty [user-before-ppgit] section') { @output.should_not match(/\[user-before-ppgit\]/mi) }
     it('should NOT display the [ppgit] info'                     ) { @output.should_not match(/\[ppgit\]/mi)             }

data/spec/ppgit_spec.rb

@@ -15,7 +15,7 @@ context "with empty git config files"  do
     end
     it("combines the 2 names alphabetically and stores this user.name in  .git/config" ) do
       expected_local = ['[user]'              ,
-                        '  name = andy_john'  ]
+                        '  name = andy+john'  ]
       @actual_local.should == expected_local.join("\n")
     end
     it("doesn't change --global (~/.gitconfig)") { @actual_global.should == @before_global.join("\n") }
@@ -29,7 +29,7 @@ context "with empty git config files"  do
     end
     it "also stores the 3rd parameter as user.email in .git/config" do
       expected_local = ['[user]'                        ,
-                        '  name = andy_john'            ,
+                        '  name = andy+john'            ,
                         '  email = andy_john@test.com'  ]
 
       @actual_local.should == expected_local.join("\n")
@@ -52,7 +52,7 @@ context 'when there is only a ppgit.emailroot' do
     end
     it( 'combines the users names and the emailroot to create and store user.email' ) do
       expected_local = ['[user]'              ,
-                        '  name = andy_john'  ,
+                        '  name = andy+john'  ,
                         '  email = pp+andy_john@gmail.com'  ]
       @actual_local.should == expected_local.join("\n")
     end
@@ -73,7 +73,7 @@ context 'when there is only a user.name' do
     cmd = ppgit('john andy' )
     @actual_local, @actual_global = execute_command_g( cmd, @before_local, @before_global)
     expected_local = ['[user]'                ,
-                      '  name = andy_john'    ,
+                      '  name = andy+john'    ,
                       '[user-before-ppgit]'   ,
                       '  name = Alain Ravet'  ]
     @actual_local.should == expected_local.join("\n")
@@ -83,7 +83,7 @@ context 'when there is only a user.name' do
     cmd = ppgit('john andy andy_john@test.com' )
     @actual_local, @actual_global = execute_command_g( cmd, @before_local, @before_global)
     expected_local = ['[user]'                ,
-                      '  name = andy_john'    ,
+                      '  name = andy+john'    ,
                       '  email = andy_john@test.com'    ,
                       '[user-before-ppgit]'   ,
                       '  name = Alain Ravet'  ]
@@ -104,7 +104,7 @@ context 'when there is a user.name and a user.email' do
     cmd = ppgit('john andy andy_john@test.com' )
     @actual_local, @actual_global = execute_command_g( cmd, @before_local, @before_global)
     expected_local = ['[user]'                ,
-                      '  name = andy_john'    ,
+                      '  name = andy+john'    ,
                       '  email = andy_john@test.com',
                       '[user-before-ppgit]'   ,
                       '  name = Alain Ravet'  ,
@@ -117,7 +117,7 @@ end
 context 'when there is a user.name + email AND stored values in [user-before-ppgit]' do
   before(:all) do
     @before_local    = ['[user]' ,
-                        '  name = andy_john'            ,
+                        '  name = andy+john'            ,
                         '  email = andy_john@test.com'  ,
                         '[user-before-ppgit]'             ,
                         '  name = Alain Ravet'            ,
@@ -129,7 +129,7 @@ context 'when there is a user.name + email AND stored values in [user-before-ppg
 
   it '`ppgit artie zane artie_zane@test.com`  does not overwrite the values stored in user-before-ppgit' do
     expected_local = ['[user]'                ,
-                      '  name = artie_zane'    ,
+                      '  name = artie+zane'    ,
                       '  email = artie_zane@test.com',
                       '[user-before-ppgit]'   ,
                       '  name = Alain Ravet'  ,

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ppgit
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Alain Ravet
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-26 00:00:00 +02:00
+date: 2010-10-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,6 +54,9 @@ files:
 - VERSION
 - bin/git-pp
 - bin/ppgit
+- doc/ppgit-img1.png
+- doc/ppgit-img2.png
+- doc/ppgit-img3.png
 - lib/ppgit.rb
 - lib/ppgit/commands.rb
 - lib/ppgit/git_utils.rb