git-pairing 0.2.4 → 0.2.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWEzYTI2ZDViMTEzNmMxMDk4OWNjNThjZTgwYWZkZGMwOWY2MWYyOA==
+    NDE5NjgwZTdiNjYwNDU2ZTMxMTQyNWZkM2MxODNjMWRiZTdmMTZhMQ==
   data.tar.gz: !binary |-
-    YjNjNjAxNGQ4NjM2NGNhNDBhMTdkZWFlZWU4ZDM5MGRlYWNhOGMzOA==
+    OTUzMDg1ZTEwZTU2NTUyZWUyYjI5MzI2N2IzYTEyNDZmZTQyMDg5Zg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MWE1Nzc5MmQ3MDQ5NWZjZDdlZGYxMzQ0N2JkYzQzOGZkYmVjMWY0NWFiMDgw
-    ZGRiZmRmYTMxOWFiYTBlMjllYjRjMWY4MjcwMzNjNjkzM2M5NjZhNTMwNGM0
-    Mzk2YWI1N2MzNzkyZmFmOGFkNzRkY2Q0NjliZGFkNzIxY2JjMmQ=
+    ZTJjODQ4MTk0YjdmNWZiNmZhNDg2ZjBkZTg0ZTI0ZDBiNDE3ZGQ5M2VhYmIy
+    MjU2YzUxMjcxZGM4MGFlZTY3OTNhY2ZhMTEwOTY2MmM3N2MyYzgwNmUyZWNl
+    MjIyZWY4MjU2NzJlZWVhODQ4N2ZjZjAyYjA5YTQ3MzZmZmVhZjQ=
   data.tar.gz: !binary |-
-    OTVkYWM3MjllY2JiM2FkNzhmNWIwMzAyNjNiZTljNzRkZDE4OTNjNGFhMTVh
-    MmMxNDA5NWIxNmRmMmMyYThmNTFlMWUwMDRjMDYwZWYyZWFhZjc3OTczMjNl
-    ZmU2ZmM3YWZlODMyN2Y5YWZkZGMxOWM4ZjAzNzhkZGU4YjIyZTI=
+    OWY0NDg2YzVhM2ZkM2VkMTgyZjY2YTJhY2U3MDhlYTQ2NTdiZTIyOTZiZjUw
+    ZWVmZDgxYTY2Y2M4YjBiNjBmNGE0NWU5OGNjOWVkNTgxODU1OGYwMWY3YTNh
+    MGZlNTllYzMyNmIwMWJjYzE5NjRlMmQ2YzRmMWYyNTMwNTQ3MmU=

data/bin/git-pair

@@ -1,22 +1,5 @@
 #!/usr/bin/env ruby
 
-=begin
-# 1.9 adds realpath to resolve symlinks; 1.8 doesn't
-# have this method, so we add it so we get resolved symlinks
-# and compatibility
-unless File.respond_to? :realpath
-  class File #:nodoc:
-    def self.realpath path
-      return realpath(File.readlink(path)) if symlink?(path)
-      path
-    end
-  end
-end
-
-$: << File.expand_path(File.dirname(File.realpath(__FILE__)) + '/../lib')
-#$: << File.expand_path(File.dirname(__FILE__) + './../lib')
-=end
-
 require 'gli'
 require 'git-pair'
 
@@ -42,19 +25,16 @@ pre do |global,command,options,args|
     name.strip.downcase.split(/ /).each { |n| initials << n.split(//)[0] }
     email = `git config --get user.email`
     username = email.split("@")[0]
-    $pairs_conf = YAML::Store.new(CFG_FILE)
-    $pairs_conf.transaction do
-      $pairs_conf["pairs"] = {"#{initials}" => {'name'=>"#{name.strip}", 'username'=>"#{username}", 'email'=>"#{email.strip}"} }
-      #puts "in conf create"
-      #ap $pairs_conf
+    default_conf = YAML::Store.new(CFG_FILE)
+    default_conf.transaction do
+      default_conf["pairs"] = {"#{initials}" => {'name'=>"#{name.strip}", 'username'=>"#{username}", 'email'=>"#{email.strip}"} }
+      default_conf["delimiters"] = {"name" => " / ", "initials" => " "}
     end
   end
 
   # Load .pairs config
   if (File.exist?(CFG_FILE))
     $pairs_conf = YAML::load(File.open(CFG_FILE, 'r'))
-    #puts "in conf load"
-    #ap $pairs_conf
   else
     exit_now!("No ~/.pairs config file found")
   end
@@ -74,7 +54,7 @@ on_error do |exception|
   true
 end
 
-# put command rb files into ./lib/commands/
+# put command rb files into ./../lib/commands/
 commands_from './../lib/commands'
 
 exit run(ARGV)

data/lib/commands/set.rb

@@ -41,8 +41,8 @@ command :set do |c|
             sorted_authors << a[0]
             sorted_initials << a[1]
             if size > 1 && authors.index(a) < size-1
-              sorted_authors << " / "
-              sorted_initials << " "
+              sorted_authors << $pairs_conf['delimiters']['name']  #" / "
+              sorted_initials << $pairs_conf['delimiters']['initials']    #" "
             end
           end
           #puts"sorted authors: #{sorted_authors}"

metadata

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