ppgit 0.7.1 → 0.7.2

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.7.2
+  - fixed that `ppgit clear` would not clear when there were no local (in .git/config)
+    values for user.name/user.email prior to `ppgit name1 name2`
+0.7.1
+  - only indicate how to avoid new version warnings if there is a new version !!
 0.7.0
   - added a --names_separator option, if you don't like the default '+'
     * `ppgit ara nva`                             ==> user.name = 'ara+nva'

data/README.markdown

@@ -10,13 +10,15 @@ When you're done, restore your local git config in a snap.
 Quick Usage :
 -------------
 
-		$ ppgit john andy andy_john@acme.com
+		$ ppgit john andy
 		$ ppgit clear
-
 		$ ppgit info
 
-		$ ppgit --email_root *@acme.com
-		$ ppgit john andy
+		$ ppgit john andy andy_john@acme.com
+
+		$ ppgit ara nva  --email_root base+*@acme.com    # ==>  user.email  =  base+ara_nva@acme.com
+        $ ppgit ara nva  --names_separator _and_         # ==>  user.name   =  ara_and_nva  (default = '+')
+
 
 remark : 'ppgit' is a synonym of 'git pp' => you can write
 
@@ -53,25 +55,30 @@ Usage :
 			name = Your Name
 			email = your_email@address.com
 
-#### 3 - If your team pairs share a common email pattern (ex: ann_bob@acme.com, cid_dan@acme.com), you can specify it once and for all :
 
-		$ ppgit --email_root   *@acme.com
+#### 3 - TIP : create unique email addresses for each pair based on a common address pattern
+		$ ppgit --email_root   base+*@acme.com
 
-=> you can now use the short syntax :
+=> you can use the short syntax :
 
 		$ ppgit bob al
 		$ ppgit dan cid
 
 are now equivalent to :
 
-		$ ppgit bob al   al_bob@acme.com
-		$ ppgit dan cid  cid_dan@acme.com
+		$ ppgit bob al   base+al_bob@acme.com
+		$ ppgit dan cid  base+cid_dan@acme.com
 
 This info is stored in ~/.gitconfig => it works for all your projects.
 
 
-#### Tip : use 1 gmail address + n aliases, so you can choose 1 unique gravatar for each pair :
+#### Tip : use 1 gmail address + n aliases, so you can choose 1 unique gravatar for each pair (see 1st illustration above) :
+
+        # 1: create the gmail address :
+        #         mycompany@gmail.com
 
+        # 2: use it as a base for your PP pairs :
+        #
 		$ ppgit --email_root   mycompany+*@gmail.com
 
 => you'll get

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/lib/ppgit/git_utils.rb

@@ -1,5 +1,10 @@
 def get_local_git_value( key) get_value(key, LOCAL_CONFIG_FILE ) end
 def get_global_git_value(key) get_value(key, GLOBAL_CONFIG_FILE) end
+def get_local_or_global_git_value( key)
+  val = get_value(key, LOCAL_CONFIG_FILE )
+  val = get_value(key, GLOBAL_CONFIG_FILE) if val.blank?
+  val
+end
 
 def set_local_git_value( key, value) set_value(key, value, LOCAL_CONFIG_FILE ) end
 def set_global_git_value(key, value) set_value(key, value, GLOBAL_CONFIG_FILE) end

data/lib/ppgit/ppgit_utils.rb

@@ -42,10 +42,11 @@ def backup_git_value(options)
   source, target = options[:from], options[:to]
 
   target_already_occupied = !get_local_git_value(target).blank?
-  nothing_to_backup       =  get_local_git_value(source).blank?
+  backupee = get_local_or_global_git_value(source)
+  nothing_to_backup       =  backupee.blank?
 
   return if target_already_occupied || nothing_to_backup
-  set_local_git_value(target, get_local_git_value(source))
+  set_local_git_value(target, backupee)
 end
 
 def restore_git_value(options)

data/ppgit.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ppgit}
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alain Ravet"]
-  s.date = %q{2010-10-10}
+  s.date = %q{2010-10-14}
   s.description = %q{git users' pairs switcher}
   s.email = %q{alain.ravet+git@gmail.com}
   s.executables = ["git-pp", "ppgit"]

data/spec/ppgit_spec.rb

@@ -150,3 +150,26 @@ context 'when there is a user.name + email AND stored values in [user-before-ppg
   end
 
 end
+
+context 'when there is only global user.name and user.email' do
+  before(:all) do
+    @before_local   = []
+    @before_global  = ['[user]' ,
+                        '  name = Alain Ravet'            ,
+                        '  email = alainravet@gmail.com'  ]
+  end
+
+  it '`ppgit john andy andy_john@test.com` stores the 2 existing values in [user-before-ppgit]' do
+    cmd = ppgit('john andy andy_john@test.com' )
+    @actual_local, @actual_global = execute_command_g( cmd, @before_local, @before_global)
+    expected_local = [
+                      '[user-before-ppgit]'   ,
+                      '  name = Alain Ravet'  ,
+                      '  email = alainravet@gmail.com',
+                      '[user]'                ,
+                      '  name = andy+john'    ,
+                      '  email = andy_john@test.com',
+]
+    @actual_local.should == expected_local.join("\n")
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ppgit
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - Alain Ravet
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-10 00:00:00 +02:00
+date: 2010-10-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency