git-pairing 0.3.4 → 0.3.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGNlODBlZmMxNGNhZDkyNjY5NDI2NTJiZmI4ZDliZTM4N2NiMGQzNQ==
+    ZTk2ZjEwOTFhOTYyZmZiNWY1ODZlZjFmYzFlNTk3ZDZmNjQxMzdiMg==
   data.tar.gz: !binary |-
-    ODk1NTFmODIwNGQ0MGE1ZjIzNmUxYWJkYjNhZjdlZTA1YjdmMDFkZg==
+    NjE1ZDUwNDYzMTAyOGZjNTQ3ODc3MDcwZGUyYzk4YzRkNmQ4ZWMxOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OTRlYThmNzEzMjQ0MjBjNDBmNGYyNjI5N2M0ZWQ3NWI4NjliMDc1YTg1YzRl
-    NGY1OTdiNzFjZTY0YmJiNjQ3MjZhZmMzZjc3Yjk5NGE0NzhmMjIxNzBhNjU3
-    YWE5OWFhZWI5YzU3YzVmMjY2MjYxY2Q1YzEzODIwOTNkZmRmMDk=
+    ZGMwMzc0M2I2ZTlmNDY2NGM1NzYxNThjMWRlZmNlNTQ3YTdjZjJiMmU1YmM3
+    YWUyZjNlMTk4NWRmNjg5Y2Y2OWRjYjNhMDFkOWFjMWViY2Q4MjZmODcyMTll
+    NGVlZjhjMTJjNTVhODU3ODJhNWJlMGI2NTY1NTk0Y2JjNjA3Y2I=
   data.tar.gz: !binary |-
-    MjBmZDE2ZWQxYTlmNWE3NzliODRiNWVhMDVmMGYzNGRmYzRmN2U2NWZlMDVj
-    MDE4YjdkYmE0M2U4OTEyNmNiZmRhYTAxYTdhOTA5NjFmZjI3MjM4Y2ZhOWEz
-    YjQ3NjA1YTk1MmY4Mzk0NThhZjAxZWE0NzFjNmFmYWI4ZTU1Mjk=
+    ODJhNjJiNmQ5ZTAzMTg3OWQ3ZmZmMTk0ZjlmZjJiZjRiNWQwZjMyN2YwMmVk
+    YTcxNjc2OTMyMjVlOGE3YzEzMTA2OTZjMjdmNmIzODE1OGVmZDJhMDYzYTBk
+    YjM3NTY3MjU3MmYyMzk2ZTNmZDNkOTgzMTIzZDgwZGFlYTMxMWQ=

data/README.md

@@ -11,13 +11,13 @@ configured in a git repo.
 * 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
-* compliments [promptula](http://github.com/wballard/promptula)
+* complements [promptula](http://github.com/wballard/promptula)
 
 See help for more details and available options on the commands
 
 ```
    $ git pair -h
-   $ git whoami -h
+   $ git [ who | whoami ] -h
    $ git solo -h
 ```
 

data/bin/git-pair

@@ -8,17 +8,15 @@ require 'highline/import'
 require 'paint'
 require 'pp'
 
-# config file is put into the user's home directory
-path_to_conf = File.join(File.expand_path(ENV['HOME']),'.pairs')
-pairs_conf = GitPairs::Helper.init(path_to_conf)
-
-GitPairs::Helper.git_repo?
-
 opts = Trollop::options do
   banner <<-EOS
 
 Enables you to attribute git code commits to multiple authors
 
+Also see:
+    git solo [-h | <user-initials>]
+    git [who | whoami]
+
 Usage:
     git pair <user-initials-1> <user-initials-2> [<user-initials-3> ...]
     git pair [-a | --add] <user-initials-1> [<user-initials-2> ...]
@@ -34,6 +32,11 @@ EOS
   opt :show, "Display the current ~/.pairs config"
 end
 
+# config file is put into the user's home directory
+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])
 Trollop::die "Options are mutually exclusive - please enter only one" if too_many
 

data/lib/commands.rb

@@ -17,7 +17,7 @@ module GitPairs
     def self.set(conf, path_to_conf, partners)
       if partners.size < 2
         puts ""
-        puts Paint["Please supply at least 2 sets of initials", :red]
+        puts Paint["To configure pairing for this repo, supply a list of parnter initials.  E.g., 'git pair sq jo'", :yellow]
         Trollop::die "Wrong number of arguments"
       end
       authors = []

data/lib/helper.rb

@@ -21,6 +21,7 @@ module GitPairs
     end
 
     def self.git_repo?
+      self.git_installed?
       warning = "Not in a git repo"
       # Check if we are in a git repo
       if self.windows?
@@ -29,8 +30,9 @@ module GitPairs
         Trollop::die warning unless system 'git status > /dev/null 2>/dev/null'
       end
     end
-    
+
     def self.git_reset
+      self.git_installed?
       if self.windows?
         `git config --unset-all user.name > NUL 2>NUL`
         `git config --unset-all user.email > NUL 2>NUL`
@@ -75,6 +77,7 @@ module GitPairs
     end
 
     def self.whoami
+      self.git_installed?
       user = `git config --get user.name`.strip
       email = `git config --get user.email`.strip
       puts ""
@@ -109,6 +112,7 @@ module GitPairs
     end
 
     def self.set(conf, authors)
+      self.git_repo?
       authors.sort!
       sorted_authors = ""
       sorted_initials = ""

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-pairing
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - Steve Quince
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -112,7 +112,7 @@ files:
 - lib/commands.rb
 - lib/helper.rb
 - README.md
-homepage: https://github.com/squince/git-pairing
+homepage: https://github.com/glg/git-pairing
 licenses: []
 metadata: {}
 post_install_message: