git_switch 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 349519b9a5eaf832588e1093490d3f9caf9fb90ce2b3c922b2dde9563def62c7
-  data.tar.gz: dedebe431d491af9a10a9a3c1b72d24f872ecb9146b17c220f6cf6587217851b
+  metadata.gz: b1c118538687a8e712df595736aa99fb7a792ee0be38c9815bae263bbbbe74ef
+  data.tar.gz: 5697514a46453a8a389ee3f9aabb44fc4c5d99a99b1beaf9a9f1437fe68ee505
 SHA512:
-  metadata.gz: b8d5bca901a1c226bff6dafab5d6585c225158f6baf504f7f362d5e7e2bb0f886dcdf4fd895200bcec722f20826e81357bb9cc79606f05fee0c70336d7e65b95
-  data.tar.gz: 8749517c89f0b9a26023b777208676a3c42173010bc19af1818bc49eaac3722790eb17a31072177f5a72320b4161efcb78673ae8e0850b09af15b1767ed3d2b5
+  metadata.gz: 739310cbbdf7ffea8df39641c12a99f524dd06b1948ddf7b9fabf95d4dae71b32ad0acd723dc8663144a65e84d77f1c20d468ac2046b0ea6731db8b8910ef3c2
+  data.tar.gz: 79adbfc5a56e137e32a7556014c57687dceb8b535b61054e7e8e2e12e96c6160c7b6dcf382528a3307d13800ec42eb534c13b0491618a07dc2a96116ace862eb

data/lib/git_switch.rb

@@ -1,2 +1,3 @@
 require_relative 'git_switch/switcher'
 require_relative 'git_switch/git_helper'
+require_relative 'git_switch/options'

data/lib/git_switch/options.rb

@@ -0,0 +1,42 @@
+module GitSwitch
+  class Options
+    attr_reader :args
+    def initialize(args)
+      @args = args
+    end
+
+    def valid_args?
+      if list? && args.count > 1
+        puts "Invalid args"
+        return false
+      elsif no_flags?(args) || one_flag?(args)
+        return true
+      else
+        puts "Invalid args"
+        return false
+      end
+    end
+
+    def list?
+      (args.include? '-l') || (args.include? '--list')
+    end
+
+    def global?
+      (args.include? '-g') || (args.include? '--global')
+    end
+
+    private
+
+    def no_flags?(args)
+      args.length == 1 && flag_count(args) == 0
+    end
+
+    def one_flag?(args)
+      args.length == 2 && flag_count(args) == 1
+    end
+
+    def flag_count(args)
+      args.count {|a| a.start_with? '-'}
+    end
+  end
+end

data/lib/git_switch/switcher.rb

@@ -3,51 +3,31 @@ require_relative './version'
 
 module GitSwitch
   class Switcher
-    attr_reader :args, :config, :profile, :global, :list
+    attr_reader :config, :profile, :options
 
     def initialize(args)
       raise ArgumentError unless args.is_a? Array
-      @args = args
       @config = load_config
-      @global = check_global(args)
+      @options = GitSwitch::Options.new(args)
       @profile = get_profile(args)
-      @list = check_list(args)
     end
 
     def run
-      list ? print_list : set!
+      list? ? print_list : set!
     end
 
-    def load_config
-      YAML.load_file(File.expand_path('~/.gitswitch')) || {}
-    end
-
-    def check_global(args)
-      (args.include? '-g') || (args.include? '--global')
+    def list?
+      options.list?
     end
 
-    def check_list(args)
-      (args.include? '-l') || (args.include? '--list')
+    def global?
+      options.global?
     end
 
     def get_profile(args)
-      # TODO: RCR - Verify profile exists in config file
-      # TODO: RCR - Handle missing or empty config file
       args.detect {|a| !a.start_with? '-'}
     end
 
-    def valid_args?
-      if check_list(args) && args.count > 1
-        puts "Invalid args"
-        return false
-      elsif no_flags?(args) || one_flag?(args)
-        return true
-      else
-        puts "Invalid args"
-        return false
-      end
-    end
-
     def valid_profile?
       if config.has_key?(profile)
         return true
@@ -61,7 +41,7 @@ module GitSwitch
       if GitHelper.git_repo?
         return true
       else
-        if global
+        if global?
           return true
         else
           puts "Not a git repo. Please run from a git repo or run with `-g` to update global settings."
@@ -70,42 +50,36 @@ module GitSwitch
       end
     end
 
-    def no_flags?(args)
-      args.length == 1 && flag_count(args) == 0
-    end
-
-    def one_flag?(args)
-      args.length == 2 && flag_count(args) == 1
-    end
-
-    def flag_count(args)
-      args.count {|a| a.start_with? '-'}
-    end
-
     def set!
-      return unless valid_args? && valid_profile?
+      return unless options.valid_args? && valid_profile?
       return unless git_repo?
 
-      flag = global ? '--global' : ''
-
-      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`
+      flag = global? ? '--global' : ''
 
-      puts "\nSSH:"
-      `ssh-add -D`
-      `ssh-add #{ssh}`
-      puts `ssh-add -l`
+      set_git_config(flag)
+      set_ssh
     end
 
     def print_list
-      puts config.keys
+      profiles = config.map do |key, value|
+        prefix = value["username"] == current_git_username ? "=>" : "  "
+        "#{prefix} #{key}"
+      end
+      puts profiles
+      puts "\n# => - current" if config.any? {|key, value| value["username"] == current_git_username}
     end
 
     private
 
+    def load_config
+      # TODO: RCR - Handle missing or empty config file
+      YAML.load_file(File.expand_path('~/.gitswitch')) || {}
+    end
+
+    def current_git_username
+      `git config user.username`.chomp
+    end
+
     def name
       config[profile]["name"]
     end
@@ -121,5 +95,20 @@ module GitSwitch
     def ssh
       config[profile]["ssh"]
     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.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_switch
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Randall Reed, Jr.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-31 00:00:00.000000000 Z
+date: 2018-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.1
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
 description: Easily switch between git profiles (name, username, email) and ssh keys
 email:
 - randallreedjr@gmail.com
@@ -91,6 +77,7 @@ files:
 - bin/git-switch
 - lib/git_switch.rb
 - lib/git_switch/git_helper.rb
+- lib/git_switch/options.rb
 - lib/git_switch/switcher.rb
 - lib/git_switch/version.rb
 homepage: https://www.github.com/randallreedjr/git_switch