git-pairing 0.3.6 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTk2ZjEwOTFhOTYyZmZiNWY1ODZlZjFmYzFlNTk3ZDZmNjQxMzdiMg==
+    OTA4NDk4YzcxZDI5NzBjMTAxMmNhYmRhMGVlYzc0NTZlNDZkMWUxYw==
   data.tar.gz: !binary |-
-    NjE1ZDUwNDYzMTAyOGZjNTQ3ODc3MDcwZGUyYzk4YzRkNmQ4ZWMxOA==
+    OWQ1Mjc3OGM4YTg0NWNlMzI3OWVlYjQ3NWJhNDVhYTlkYjE2ZDcyNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGMwMzc0M2I2ZTlmNDY2NGM1NzYxNThjMWRlZmNlNTQ3YTdjZjJiMmU1YmM3
-    YWUyZjNlMTk4NWRmNjg5Y2Y2OWRjYjNhMDFkOWFjMWViY2Q4MjZmODcyMTll
-    NGVlZjhjMTJjNTVhODU3ODJhNWJlMGI2NTY1NTk0Y2JjNjA3Y2I=
+    ZDVlMzhhOTliMGFmNTIxM2FlYjlkMTUwMTkyNThhMzFmNjg1YjZjNDRmNmQ2
+    NmQ2ODk3NTViMzIwNDA1ZTgxY2RhMDk0NGQ1YmQ4OTEyZDFhOWYxMWYwNWZk
+    YWQ3NmUyOWI2MzYxMWNkZWIxMjgyNzQ1ZTNhODBjY2IyNGU1N2I=
   data.tar.gz: !binary |-
-    ODJhNjJiNmQ5ZTAzMTg3OWQ3ZmZmMTk0ZjlmZjJiZjRiNWQwZjMyN2YwMmVk
-    YTcxNjc2OTMyMjVlOGE3YzEzMTA2OTZjMjdmNmIzODE1OGVmZDJhMDYzYTBk
-    YjM3NTY3MjU3MmYyMzk2ZTNmZDNkOTgzMTIzZDgwZGFlYTMxMWQ=
+    NWE0M2VmMjliNmVhZjZlYThiYWI5ZmNhY2YyMGYwNTMyOTRlNzU1ZDM5OTNh
+    OWFmYjBmZTc4OWFjOTBjZjcxZDI2YTkwMjkwMzdiZDQxYWE0ZDJmNGM5MjMx
+    YzZjN2Y1ODEzODZkNTliMjNiYjdkMzM4NTNkNDk0ZTc1NWVlYzQ=

data/README.md

@@ -1,17 +1,17 @@
 # INTRO 
 
-Share code authorship when pairing and using git/github.
-Works well with [promptula](https://rubygems.org/gems/promptula) to show which git pair is currently
-configured in a git repo.
+Share code authorship when pairing and using git/github.  Display a
+customized bash prompt to show branch, pairing authors, and colorized
+git status.
 
 # Features
 
 * adds new commands to git, `git pair`, `git whoami`, and `git solo`
 * changes the git config `[user] name` to list multiple commit authors, and remembers partners per repository
 * maintains a list of pairing partners, so that you can specify multiple commit authors by their initials
-* prompts to configure new partners as needed
-* reverts back to original global settings
-* complements [promptula](http://github.com/wballard/promptula)
+* prompts the user to configure new partners as needed
+* reverts back to original global settings with `git solo` if no user is provided
+* can display a bash prompt with useful git information
 
 See help for more details and available options on the commands
 
@@ -34,24 +34,6 @@ terminal/console of choice
 
 # Customizing
 
-### Tweaking Promptula Command Prompt
-
-When promptula is installed along side git-pairing, it will display the
-pairing partners configured in a repo on the command line.  Installing
-promptula `promptula --install` adds a line to your
-.bash_profile/.bashrc `export PROMPT_COMMAND='echo -ne $(promptula)'`.
-This allows users to keep whatever prompt they have already in place,
-but augments it with additional info when you are in a git repo.  By
-default, the promptula info is at the beginning of your prompt.
-
-I prefer to have the path to my cwd in my prompt with promptula info at
-the end.  To do that, I simply replaced the export command created by
-promptula in the .bash_profile/.bashrc with
-
-```
-    export PS1="\$(pwd) \$(promoptula) "
-```
-
 ### Configuration
 
 The first time that `git pair` is executed, it will create a config file
@@ -64,6 +46,22 @@ addresses, and partner initials
 into the git config.  Feel free to update these as well if the defaults
 do not suit your fancy.
 
+### Git-Pairing Command Prompt
+
+git-pairing can display the pairing partners configured for a project on the
+command line along with other useful information when in a git repo.
+
+Executing `git pair --prompt` adds this feature.
+* shell script is copied to your home directory
+* adds a line to your .bash_profile/.bashrc to source a shell script and
+set your PS1 to the __git_pairing_prompt() function
+  * `source ~/.git-pairing-prompt.sh` 
+  * `export PS1="\[$(__git_pairing_prompt)\] "`
+* shell script and bash_profile have default behavior that can easily be
+customized by simply editing these default entries
+
+This allows users to keep track of important info when you are in a git repo.
+
 # Known Issues
 
 * May make githubs graphs and stats inaccurate since it relies on the commiter's 

data/bin/git-pair

@@ -21,6 +21,7 @@ Usage:
     git pair <user-initials-1> <user-initials-2> [<user-initials-3> ...]
     git pair [-a | --add] <user-initials-1> [<user-initials-2> ...]
     git pair [-d | --delete] <user-initials-1> [<user-initials-2> ...]
+    git pair [-p | --prompt]
     git pair [-s | --show]
     git pair -h
 
@@ -29,6 +30,7 @@ Options are mutually exclusive:
 EOS
   opt :add, "Configures new pairing partners without modifying the existing git config", :type=>:strings
   opt :delete, "Delete pairing partners from the ~/.pairs config without modifying the existing git config", :type=>:strings
+  opt :prompt, "Override the PS1 to display a useful git-centric bash prompt"
   opt :show, "Display the current ~/.pairs config"
 end
 
@@ -37,7 +39,12 @@ path_to_conf = File.join(File.expand_path(ENV['HOME']),'.pairs')
 pairs_conf = GitPairs::Helper.init(path_to_conf)
 
 
-too_many = (opts[:show_given] && opts[:add_given]) || (opts[:show_given] && opts[:delete_given]) || (opts[:add_given] && opts[:delete_given])
+too_many = opts[:show_given] && opts[:add_given]
+too_many = too_many || opts[:delete_given] && opts[:show_given]
+too_many = too_many || opts[:add_given] && opts[:delete_given]
+too_many = too_many || opts[:show_given] && opts[:prompt_given]
+too_many = too_many || opts[:delete_given] && opts[:prompt_given]
+too_many = too_many || opts[:add_given] && opts[:prompt_given]
 Trollop::die "Options are mutually exclusive - please enter only one" if too_many
 
 if opts[:show_given]
@@ -58,6 +65,8 @@ elsif opts[:delete_given]
   puts ""
   pp pairs_conf
   puts ""
+elsif opts[:prompt_given]
+  GitPairs::Helper.pair
 else
   GitPairs::Commands.set(pairs_conf, path_to_conf, ARGV.uniq)
   GitPairs::Helper.whoami

data/lib/helper.rb

@@ -111,6 +111,34 @@ module GitPairs
       end
     end
 
+    def self.pair
+      self.git_installed?
+      install_with = <<jam
+source ~/.git-pairing-prompt.sh
+export PS1="\\[\\$(__git_pairing_prompt)\\] "
+jam
+      confirmed = agree("Configure git-pairing bash prompt? ")
+      if confirmed
+        # copy shell script to user's home dir
+        home = File.expand_path('~')
+        `curl -o #{home}/.git-pairing-prompt.sh https://raw.github.com/glg/git-pairing/master/shell/.git-pairing-prompt.sh`
+        # configure prompt
+        [ "#{home}/.bash_profile", "#{home}/.bashrc" ].each do |profile|
+          if File.exists? profile
+            open(profile, 'a') do |f|
+              f.puts install_with
+            end
+          end
+        end
+        puts ""
+        puts Paint["Please re-source your bash_profile or bashrc", :yellow]
+        puts Paint["(i.e., source ~/.bash_profile", :yellow]
+        puts ""
+        puts Paint["Feel free to edit ~/.git-pairing-prompt.sh to suit your prompt preferences", :yellow]
+        puts ""
+      end
+    end
+
     def self.set(conf, authors)
       self.git_repo?
       authors.sort!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-pairing
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Steve Quince
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop