git-pairing 0.3.1 → 0.3.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDI5NGIxODQxZWYxMzYyZjI2NDYxNTVhNzRmMGZjODUzZWM1ZjI4Zg==
+    OWRkNGNmYWViYzI0MTNhOTFlZmQ1MzFmOWQ3OThhOGFmZjI4NGU4NA==
   data.tar.gz: !binary |-
-    YTQ1MmU4NmM0YmY1Njg4MTE5OWQxZTFmYmEyMDU4YTk0ZTU3ODNmNw==
+    MGZhYjY4MDYzMjY2ODkyOGZiOWIzZWFlZTg5M2NkYjI2ZGIzOGE2OQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    N2IwNGFmOGMwMzhjMDc4MDg1YjY3NjgwMmE4OGZiM2YzZWRhNTcyMzZlNjky
-    Zjk2ODBlZjExNTAwNjY1NDdhMjk2NTY1YmZlNTEyNmU0ZmM4YWM4M2EyNDM4
-    MjBhYzgxZGQzOTQ5Zjk1MDU4ODdiNzM2NTNhOWRiMTQyZTkxYmQ=
+    OTNjMDUzYzE5OWVmMzM2ZDU2ODAxZjcwNmNlZmNlZjU5NzJkNTM2ZjE2Mzk2
+    Yzc1ZTgyMTIwNmNhOWM0ZTNkZTljNTAzYjE3YmE0MTRmOWEyNjIyYzJlMThl
+    OTQ2MmQyN2ZhOGFiZDJjODRjZDQxNWJlMTI5YmM4OWRlYzk1OGY=
   data.tar.gz: !binary |-
-    NDlmOTY0MGRiN2NiODljNzNmZTdhYjdjOGIwNGU4ZGMwZjE1NDc0MDhjNTBl
-    YTU3OWZhNDcxZjZiZTg3ZDdhMGZhNTEyZjFkOGNjZTUwZDBmOTc4ODU5ZDIx
-    N2JlNDMxZjVlMjU3YzA5MmFhYzY3NGYzZmU2ZDM5ZmI3ZDExNmM=
+    OGMxMzg2YzcwOTY0NzhjNDExYWM1MWM3ZDAyMTMzYThiNGU4NzY2NDZlZDZk
+    ZmI0NjE0N2IwM2QxYWEzYTI1OTMwZDZiOTY5NDhjZmJmZWY5ZTk4NjJmOWRl
+    Y2RmYWM2Yzk0YTkxNzg3OGIyYjY5ZDhkNTk2M2ZkY2VlNWMzNWY=

data/README.md

@@ -66,12 +66,8 @@ do not suit your fancy.
 
 # Known Issues
 
-* Does not currently work on Windows... Ubuntu and Mac OS X seem fine
-* May not play entirely nicely with github since they use the commiter's 
+* May make githubs graphs and stats inaccurate since it relies on the commiter's 
 name and email address to generate statistics and links 
-* Will not play nice with [Chris Kampmeier's
-git-pair](https://github.com/chrisk/git-pair) gem since it uses similar
-git command syntax (namely `git pair`) 
 
 # Building
 

data/bin/git-pair

@@ -12,8 +12,7 @@ require 'pp'
 path_to_conf = File.join(File.expand_path(ENV['HOME']),'.pairs')
 pairs_conf = GitPairs::Helper.init(path_to_conf)
 
-# Check if we are in a git repo
-Trollop::die "Not in a git repo" unless system 'git status > /dev/null 2>/dev/null'
+GitPairs::Helper.git_repo?
 
 opts = Trollop::options do
   banner <<-EOS

data/bin/git-solo

@@ -22,14 +22,11 @@ end
 initials  = ARGV
 pairs_conf = GitPairs::Helper.init(File.join(File.expand_path(ENV['HOME']),'.pairs'))
 
-Trollop::die "Not in a git repo" unless system 'git status > /dev/null 2>/dev/null'
+GitPairs::Helper.git_repo?
 
 if initials.nil? || initials.empty?
   # revert to global git config
-  `git config --unset-all user.name > /dev/null 2>/dev/null`
-  `git config --unset-all user.email > /dev/null 2>/dev/null`
-  `git config --unset-all user.initials > /dev/null 2>/dev/null`
-  `git config --remove-section user > /dev/null 2>/dev/null`
+  GitPairs::Helper.git_reset
 elsif GitPairs::Helper.exists?(pairs_conf, initials[0])
   # set local git config to single configured partner
   author = GitPairs::Helper.fetch(pairs_conf, initials[0])

data/bin/git-whoami

@@ -14,5 +14,5 @@ Usage:
 EOS
 end
 
-Trollop::die "Please ensure that git is installed before using 'git whoami'" unless system 'git --version > /dev/null 2>/dev/null'
+GitPairs::Helper.git_installed?
 GitPairs::Helper.whoami

data/lib/helper.rb

@@ -5,11 +5,49 @@ require 'highline/import'
 module GitPairs
   class Helper
     # Functions for manipulating the .pairs config file
+    def self.windows?
+      windows = (RUBY_PLATFORM.to_s =~ /win32|mswin|mingw|cygwin/ || RUBY_PLATFORM.to_s == 'ruby') ? true : false
+      return windows
+    end
+
+    def self.git_installed?
+      warning = "Please ensure that git is installed before proceeding"
+      # Check if we are in a git repo
+      if self.windows?
+        Trollop::die warning unless system 'git --version > NUL 2>NUL'
+      else
+        Trollop::die warning unless system 'git --version > /dev/null 2>/dev/null'
+      end
+    end
+
+    def self.git_repo?
+      warning = "Not in a git repo"
+      # Check if we are in a git repo
+      if self.windows?
+        Trollop::die warning unless system 'git status > NUL 2>NUL'
+      else
+        Trollop::die warning unless system 'git status > /dev/null 2>/dev/null'
+      end
+    end
+    
+    def self.git_reset
+      if self.windows?
+        `git config --unset-all user.name > NUL 2>NUL`
+        `git config --unset-all user.email > NUL 2>NUL`
+        `git config --unset-all user.initials > NUL 2>NUL`
+        `git config --remove-section user > NUL 2>NUL`
+      else
+        `git config --unset-all user.name > /dev/null 2>/dev/null`
+        `git config --unset-all user.email > /dev/null 2>/dev/null`
+        `git config --unset-all user.initials > /dev/null 2>/dev/null`
+        `git config --remove-section user > /dev/null 2>/dev/null`
+      end
+    end
 
     def self.init(path_to_conf)
       # Create config if it doesn't already exist
       unless File.exists?(path_to_conf)
-        Trollop::die "Please ensure that git is installed before proceeding" unless system 'git --version > /dev/null 2>/dev/null'
+        self.git_installed?
         puts Paint["initializing git-pairing for the first time...", :yellow]
         name = `git config --global --get user.name`
         initials = ""

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-pairing
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Steve Quince