git_switch 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: b1c118538687a8e712df595736aa99fb7a792ee0be38c9815bae263bbbbe74ef
-  data.tar.gz: 5697514a46453a8a389ee3f9aabb44fc4c5d99a99b1beaf9a9f1437fe68ee505
+SHA1:
+  metadata.gz: ac816f86573cb7e58720cb8fc173a5f2a219a617
+  data.tar.gz: b629eb101ce2484cd3d66506ef321d3050ee4c99
 SHA512:
-  metadata.gz: 739310cbbdf7ffea8df39641c12a99f524dd06b1948ddf7b9fabf95d4dae71b32ad0acd723dc8663144a65e84d77f1c20d468ac2046b0ea6731db8b8910ef3c2
-  data.tar.gz: 79adbfc5a56e137e32a7556014c57687dceb8b535b61054e7e8e2e12e96c6160c7b6dcf382528a3307d13800ec42eb534c13b0491618a07dc2a96116ace862eb
+  metadata.gz: 39403b7ef421fd699f8062daf91cdacc9be0fef010d6260996ea519de8da7ae361099f25d0f6af5cdc43a452f5280d5932aae57c3b5d561d1ee581e31173f8bc
+  data.tar.gz: bdd9422b04f7fc3ca856bc102f8f5b097217270dd0c5363a9d44bf1f5207a9e08198dd05e5a1ece83516378318b4b29ae6a17cc4418d8279232049a80d8b1cdc

data/lib/git_switch/options.rb

@@ -5,6 +5,13 @@ module GitSwitch
       @args = args
     end
 
+    def flags
+      @flags ||= args.select do |arg|
+        arg.match(/\A\-[glv]{1}\z/) ||
+          arg.match(/\A\-\-(global|list|verbose){1}\z/)
+      end
+    end
+
     def valid_args?
       if list? && args.count > 1
         puts "Invalid args"
@@ -18,11 +25,15 @@ module GitSwitch
     end
 
     def list?
-      (args.include? '-l') || (args.include? '--list')
+      (flags.include? '-l') || (flags.include? '--list')
     end
 
     def global?
-      (args.include? '-g') || (args.include? '--global')
+      (flags.include? '-g') || (flags.include? '--global')
+    end
+
+    def verbose?
+      (flags.include? '-v') || (flags.include? '--verbose')
     end
 
     private

data/lib/git_switch/switcher.rb

@@ -38,15 +38,11 @@ module GitSwitch
     end
 
     def git_repo?
-      if GitHelper.git_repo?
+      if GitHelper.git_repo? || global?
         return true
       else
-        if global?
-          return true
-        else
-          puts "Not a git repo. Please run from a git repo or run with `-g` to update global settings."
-          return false
-        end
+        puts "Not a git repo. Please run from a git repo or run with `-g` to update global settings."
+        return false
       end
     end
 
@@ -58,6 +54,7 @@ module GitSwitch
 
       set_git_config(flag)
       set_ssh
+      print_settings(flag)
     end
 
     def print_list
@@ -69,6 +66,17 @@ module GitSwitch
       puts "\n# => - current" if config.any? {|key, value| value["username"] == current_git_username}
     end
 
+    def print_settings(flag = '')
+      if options.verbose?
+        puts "\nGit Config:"
+        puts `git config #{flag} -l --show-origin | grep user`
+        puts "\nSSH:"
+        puts `ssh-add -l`
+      else
+        puts "Switched to profile #{profile}"
+      end
+    end
+
     private
 
     def load_config
@@ -97,18 +105,14 @@ module GitSwitch
     end
 
     def set_git_config(flag)
-      puts "\nGit Config:"
       `git config #{flag} user.name "#{name}"`
       `git config #{flag} user.username "#{username}"`
       `git config #{flag} user.email "#{email}"`
-      puts `git config #{flag} -l --show-origin | grep user`
     end
 
     def set_ssh
-      puts "\nSSH:"
       `ssh-add -D`
       `ssh-add #{ssh}`
-      puts `ssh-add -l`
     end
   end
 end

data/lib/git_switch/version.rb

@@ -1,3 +1,3 @@
 module GitSwitch
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_switch
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Randall Reed, Jr.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-15 00:00:00.000000000 Z
+date: 2018-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Switch between git profiles