ppgit 0.2.0 → 0.3.0

data/CHANGELOG

@@ -1,3 +1,5 @@
+0.3.0
+ - display the info message after each command
 0.2.0
   - added `git pp` syntax (same as `ppgit`) 
 0.1.0

data/README.markdown

@@ -8,11 +8,13 @@ When you're done, restore your local git config in a snap.
 Quick Usage :
 -------------
 
-		$ ppgit john andy
 		$ ppgit john andy andy_john@acme.com
-
 		$ ppgit clear
+
+		$ ppgit info
+
 		$ ppgit --email_root *@acme.com
+		$ ppgit john andy
 
 remark : 'ppgit' is a synonym of 'git pp' => you can write
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/bin/git-pp

@@ -5,6 +5,7 @@ require 'ppgit/utils'
 
 if 0 == ARGV.length
   puts usage_message()
+
 else
   # for testing, we pass an explicit - temporary - config file.
   file_part = argv_value_of('--file')
@@ -15,10 +16,14 @@ else
     set_git_value 'ppgit.emailroot' , emailroot
   end
 
-  if ARGV == %w(clear)
+  if ARGV == %w(info)
+  # puts info_message
+
+  elsif ARGV == %w(clear)
     restore_git_value :from => 'user-before-ppgit.name' , :to => 'user.name'
     restore_git_value :from => 'user-before-ppgit.email', :to => 'user.email'
     `git config #{file_part} --remove-section user-before-ppgit`
+  # puts info_message
 
   elsif [2,3].include?(ARGV.length)
 
@@ -35,5 +40,8 @@ else
     if pair_email
       set_git_value 'user.email' , pair_email
     end
+  # puts info_message
   end
+
+  puts info_message
 end

data/bin/ppgit

@@ -5,6 +5,7 @@ require 'ppgit/utils'
 
 if 0 == ARGV.length
   puts usage_message()
+
 else
   # for testing, we pass an explicit - temporary - config file.
   file_part = argv_value_of('--file')
@@ -15,10 +16,14 @@ else
     set_git_value 'ppgit.emailroot' , emailroot
   end
 
-  if ARGV == %w(clear)
+  if ARGV == %w(info)
+  # puts info_message
+
+  elsif ARGV == %w(clear)
     restore_git_value :from => 'user-before-ppgit.name' , :to => 'user.name'
     restore_git_value :from => 'user-before-ppgit.email', :to => 'user.email'
     `git config #{file_part} --remove-section user-before-ppgit`
+  # puts info_message
 
   elsif [2,3].include?(ARGV.length)
 
@@ -35,5 +40,8 @@ else
     if pair_email
       set_git_value 'user.email' , pair_email
     end
+  # puts info_message
   end
+
+  puts info_message
 end

data/lib/ppgit/usage.txt

@@ -8,6 +8,7 @@ ppgit : quickly update ~/.gitconfig for pair-programming sessions.
 
     $ ppgit john andy andy_john@acme.com
     $ ppgit clear
+    $ ppgit info
 
     $ ppgit --email_root *@acme.com
     $ ppgit john andy

data/lib/ppgit/utils.rb

@@ -48,4 +48,26 @@ end
 def usage_message
   path = File.expand_path(File.join(File.dirname(__FILE__), 'usage.txt'))
   File.open(path).read
-end
+end
+
+def info_message
+  name, email = get_git_value('user.name'), get_git_value('user.email')
+  email_root  = get_git_value('ppgit.emailroot')
+  s = ["\n~/.gitconfig :", "  ..."]
+  s << '  -------------------------------------------------------'
+  s << '  [user]'
+  s << "    name  = #{name }" unless blank?(name )
+  s << "    email = #{email}" unless blank?(email)
+  s << '  -------------------------------------------------------'
+  s << '  [ppgit]'
+  s << "    emailroot = #{email_root}" unless blank?(email_root)
+
+  name, email = get_git_value('user-before-ppgit.name'), get_git_value('user-before-ppgit.email')
+  s << '  [user-before-ppgit]'
+  s << "    name  = #{name }" unless blank?(name )
+  s << "    email = #{email}" unless blank?(email)
+  s << '  -------------------------------------------------------'
+  s << '  ...'
+
+  s.join("\n")
+end

data/ppgit.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ppgit}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alain Ravet"]
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
      "ppgit.gemspec",
      "spec/ppgit_clear_spec.rb",
      "spec/ppgit_email_root_spec.rb",
+     "spec/ppgit_info_spec.rb",
      "spec/ppgit_spec.rb",
      "spec/ppgit_usage_spec.rb",
      "spec/spec.opts",
@@ -46,6 +47,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/ppgit_clear_spec.rb",
      "spec/ppgit_email_root_spec.rb",
+     "spec/ppgit_info_spec.rb",
      "spec/ppgit_spec.rb",
      "spec/ppgit_usage_spec.rb",
      "spec/spec_helper.rb"

data/spec/ppgit_clear_spec.rb

@@ -46,4 +46,11 @@ describe "`ppgit clear`" do
     check_command_result(@cmd, before, expected)
   end
 
+  it "displays the info after the fact" do
+    before   = [  '[ppgit]'                         ,
+                  '  emailroot = old+*@gmail.com'  ]
+    output = execute_command(@cmd, before)
+    output.should match(/\[user\].*\[ppgit\].*emailroot.*\[user-before-ppgit\].*/mi)
+  end
+
 end

data/spec/ppgit_info_spec.rb

@@ -0,0 +1,10 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "`ppgit info`" do
+  it 'should display the config details' do
+    output = `#{PPGIT_CMD} info`
+    output.should match(/\[user\].*\[ppgit\].*\[user-before-ppgit\]/mi)
+  end
+end
+
+

data/spec/ppgit_spec.rb

@@ -100,6 +100,9 @@ describe "`ppgit john andy andy_john@acme.com`" do
                   '  name = Alain Ravet'            ,
                   '  email = alainravet@gmail.com'  ]
 
+    before do
+      @cmd = "#{PPGIT_CMD} artie zane artie_zane@test.com"
+    end
 
     it "does not overwrite the values stored in user-before-ppgit" do
       expected = [  '[user]'                        ,
@@ -110,8 +113,14 @@ describe "`ppgit john andy andy_john@acme.com`" do
                     '  name = Alain Ravet'          , # not touched
                     '  email = alainravet@gmail.com'] #  ..
 
-      cmd = "#{PPGIT_CMD} artie zane artie_zane@test.com"
-      check_command_result(cmd, before, expected)
+
+      check_command_result(@cmd, before, expected)
     end
+
+    it "displays the info after the fact" do
+      output = execute_command(@cmd, before)
+      output.should match(/\[user\].*artie_zane.*\[ppgit\].*\[user-before-ppgit\].*alainravet@gmail.com/mi)
+    end
+
   end
 end

data/spec/spec_helper.rb

@@ -47,3 +47,10 @@ def check_command_result(git_command, before, expected)
   actual_text = File.open(config_file_path).read.gsub(/\t/, '  ').chomp
   actual_text.should == expected
 end
+
+def execute_command(git_command, before)
+  before = before.join("\n")
+  config_file_path = temp_from_string(before).path
+
+  output = `#{git_command} --file #{config_file_path}`
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ppgit
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Alain Ravet
@@ -60,6 +60,7 @@ files:
 - ppgit.gemspec
 - spec/ppgit_clear_spec.rb
 - spec/ppgit_email_root_spec.rb
+- spec/ppgit_info_spec.rb
 - spec/ppgit_spec.rb
 - spec/ppgit_usage_spec.rb
 - spec/spec.opts
@@ -101,6 +102,7 @@ summary: git users' pairs switcher
 test_files: 
 - spec/ppgit_clear_spec.rb
 - spec/ppgit_email_root_spec.rb
+- spec/ppgit_info_spec.rb
 - spec/ppgit_spec.rb
 - spec/ppgit_usage_spec.rb
 - spec/spec_helper.rb