git_switch 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4682e1a21cd0fcf56ba298bc9de39312bc7de40fd2cc7060853c9f452a934b79
-  data.tar.gz: 378010b8b024f582759db350d4d6eeb21c15cc8ee7fe3a4807985bb37e335c55
+  metadata.gz: f34c15659dbf757f6ae047445f05afa0050899d6da90e9c1015907cdfb34faa8
+  data.tar.gz: 7dba73abededbefb3755e3135ec7b8270da70ba909899e52f75e763a9ed134e3
 SHA512:
-  metadata.gz: f825028bb0d5296d3a260b5a6dd142e3c457debf9aee12ddd01d2f069007a85940b464e0366fde6cc1761e81230ab2daa2802ad3e47bb2e7b33ff382d92827c3
-  data.tar.gz: 2a0a4755354d88147f41459bae0aeef877a7a145300e77b49d830b972253caa9240776c69d0a85ee48430487ea3516ab78419c330c76cf4bb7e8e80de43da424
+  metadata.gz: d8ae7bd065bb39786fe6fd747c387d4927dc9a2a0edeb845a7626779d8ab7f67d94c6ab0396c73af77c017a3313220d014b0ed95386c91039b4db365f996b67a
+  data.tar.gz: 808140af72dcee08f62baeb6e92b1376d5384560edf50808d893fa4592d78f6f41ac44c2ef461b5fb18f603523a3c136cfb6f15ed2cf0994668b6ae1f85c3e72

data/lib/git_switch/config.rb

@@ -13,10 +13,6 @@ module GitSwitch
       args.detect {|a| !a.start_with? '-'}
     end
 
-    def name
-      profiles[selected_profile]["name"]
-    end
-
     def username
       profiles[selected_profile]["username"]
     end
@@ -25,10 +21,18 @@ module GitSwitch
       profiles[selected_profile]["email"]
     end
 
+    def name
+      profiles[selected_profile]["name"]
+    end
+
     def ssh
       profiles[selected_profile]["ssh"]
     end
 
+    def ssh_command
+      "ssh -i #{ssh}"
+    end
+
     def profile
       @selected_profile
     end

data/lib/git_switch/switcher.rb

@@ -5,7 +5,7 @@ module GitSwitch
   class Switcher
     attr_reader :config, :options
     delegate :usage?, :config?, :list?, :global?, to: :options
-    delegate :profile, :name, :username, :email, :ssh, :print_list, :configure!, :valid_profile?, to: :config
+    delegate :profile, :name, :username, :email, :ssh, :ssh_command, :print_list, :configure!, :valid_profile?, to: :config
 
     def initialize(args)
       raise ArgumentError unless args.is_a? Array
@@ -38,21 +38,19 @@ module GitSwitch
     def set!
       return unless valid_profile? && git_repo?
 
-      flag = global? ? '--global' : ''
-
-      set_git_config(flag)
+      set_git_config
       set_ssh
-      print_settings(flag)
+      print_settings
     end
 
     def print_usage
       puts usage
     end
 
-    def print_settings(flag = '')
+    def print_settings
       if options.verbose?
         puts "\nGit Config:"
-        puts `git config #{flag} -l --show-origin | grep user`
+        puts `git config #{git_config_flag} -l --show-origin | grep user`
         puts "\nSSH:"
         puts `ssh-add -l`
       else
@@ -62,14 +60,18 @@ module GitSwitch
 
     private
 
-    def set_git_config(flag)
-      `git config #{flag} user.name "#{name}"`
-      `git config #{flag} user.username "#{username}"`
-      `git config #{flag} user.email "#{email}"`
+    def git_config_flag
+      @git_config_flag ||= global? ? '--global' : ''
+    end
+
+    def set_git_config
+      `git config #{git_config_flag} user.name "#{name}"`
+      `git config #{git_config_flag} user.username "#{username}"`
+      `git config #{git_config_flag} user.email "#{email}"`
     end
 
     def set_ssh
-      `ssh-add -D`
+      `git config #{git_config_flag} core.sshCommand "#{ssh_command}"`
       `ssh-add #{ssh}`
     end
 

data/lib/git_switch/version.rb

@@ -1,3 +1,3 @@
 module GitSwitch
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_switch
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Randall Reed, Jr.