git_switch 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ac816f86573cb7e58720cb8fc173a5f2a219a617
-  data.tar.gz: b629eb101ce2484cd3d66506ef321d3050ee4c99
+SHA256:
+  metadata.gz: 7ef41c6c02e2a0139590b8455ae0f0df5730439e1ebf51bf79552854ce08f18a
+  data.tar.gz: 711caa5c3378da0e60ceee25d935e564efeee262c27b3cbe74b1d4ada3ba457c
 SHA512:
-  metadata.gz: 39403b7ef421fd699f8062daf91cdacc9be0fef010d6260996ea519de8da7ae361099f25d0f6af5cdc43a452f5280d5932aae57c3b5d561d1ee581e31173f8bc
-  data.tar.gz: bdd9422b04f7fc3ca856bc102f8f5b097217270dd0c5363a9d44bf1f5207a9e08198dd05e5a1ece83516378318b4b29ae6a17cc4418d8279232049a80d8b1cdc
+  metadata.gz: 7b8fab1051a79af43ac94fc40012622c9d70543e0f930f4dcef2dbf3a913423c58726e9d9d2f89399f3548540641ce0cc1d0e190f960a47b0b522de9d6c4d548
+  data.tar.gz: d1d04826119f0a020e1f8e03231a71c69017f31e0dcdafa4f98d98f801bbb9c7f1dbf1fb01e4d9fc70116fbe4aac89ee3010a116da0c70c11b1b2f592ffee582

data/lib/git_switch/config.rb

@@ -0,0 +1,65 @@
+require 'yaml'
+
+module GitSwitch
+  class Config
+    attr_reader :profiles, :selected_profile
+    def initialize(args)
+      @profiles = load!
+      @args = args
+      @selected_profile = get_profile(args)
+    end
+
+    def get_profile(args)
+      args.detect {|a| !a.start_with? '-'}
+    end
+
+    def name
+      profiles[selected_profile]["name"]
+    end
+
+    def username
+      profiles[selected_profile]["username"]
+    end
+
+    def email
+      profiles[selected_profile]["email"]
+    end
+
+    def ssh
+      profiles[selected_profile]["ssh"]
+    end
+
+    def profile
+      @selected_profile
+    end
+
+    def valid_profile?
+      if profiles.has_key?(selected_profile)
+        return true
+      else
+        puts "Profile '#{selected_profile}' not found!"
+        return false
+      end
+    end
+
+    def print_list
+      profiles = @profiles.map do |key, value|
+        prefix = value["username"] == current_git_username ? "=>" : "  "
+        "#{prefix} #{key}"
+      end
+      puts profiles
+      puts "\n# => - current" if @profiles.any? {|key, value| value["username"] == current_git_username}
+    end
+
+    private
+
+    def load!
+      # 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
+  end
+end

data/lib/git_switch/options.rb

@@ -18,12 +18,18 @@ module GitSwitch
         return false
       elsif no_flags?(args) || one_flag?(args)
         return true
+      elsif usage?
+        return true
       else
         puts "Invalid args"
         return false
       end
     end
 
+    def usage?
+      args.count == 0
+    end
+
     def list?
       (flags.include? '-l') || (flags.include? '--list')
     end

data/lib/git_switch/switcher.rb

@@ -1,40 +1,55 @@
-require 'yaml'
 require_relative './version'
 
 module GitSwitch
   class Switcher
-    attr_reader :config, :profile, :options
+    attr_reader :config, :options
 
     def initialize(args)
       raise ArgumentError unless args.is_a? Array
-      @config = load_config
       @options = GitSwitch::Options.new(args)
-      @profile = get_profile(args)
+      @config = GitSwitch::Config.new(args)
     end
 
     def run
-      list? ? print_list : set!
+      if usage?
+        print_usage
+      elsif list?
+        print_list
+      else
+        set!
+      end
     end
 
-    def list?
-      options.list?
+    def profile
+      config.profile
     end
 
-    def global?
-      options.global?
+    def name
+      config.name
     end
 
-    def get_profile(args)
-      args.detect {|a| !a.start_with? '-'}
+    def username
+      config.username
     end
 
-    def valid_profile?
-      if config.has_key?(profile)
-        return true
-      else
-        puts "Profile '#{profile}' not found!"
-        return false
-      end
+    def email
+      config.email
+    end
+
+    def ssh
+      config.ssh
+    end
+
+    def usage?
+      options.usage?
+    end
+
+    def list?
+      options.list?
+    end
+
+    def global?
+      options.global?
     end
 
     def git_repo?
@@ -46,6 +61,10 @@ module GitSwitch
       end
     end
 
+    def valid_profile?
+      config.valid_profile?
+    end
+
     def set!
       return unless options.valid_args? && valid_profile?
       return unless git_repo?
@@ -57,13 +76,12 @@ module GitSwitch
       print_settings(flag)
     end
 
+    def print_usage
+      puts usage
+    end
+
     def print_list
-      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}
+      config.print_list
     end
 
     def print_settings(flag = '')
@@ -79,31 +97,6 @@ module GitSwitch
 
     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
-
-    def username
-      config[profile]["username"]
-    end
-
-    def email
-      config[profile]["email"]
-    end
-
-    def ssh
-      config[profile]["ssh"]
-    end
-
     def set_git_config(flag)
       `git config #{flag} user.name "#{name}"`
       `git config #{flag} user.username "#{username}"`
@@ -114,5 +107,23 @@ module GitSwitch
       `ssh-add -D`
       `ssh-add #{ssh}`
     end
+
+    def usage
+      <<~USAGE
+      usage: git switch [-l | --list] <profile> [-v | --verbose] [-g | --global]
+
+      switch to a profile for local development only
+      git switch <profile>
+
+      switch to a profile globally
+      git switch -g <profile>
+
+      switch to a profile and see all output
+      git switch -v <profile>
+
+      see available profiles
+      git switch -l
+      USAGE
+    end
   end
 end

data/lib/git_switch/version.rb

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

data/lib/git_switch.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_switch
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Randall Reed, Jr.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-20 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,6 +76,7 @@ extra_rdoc_files: []
 files:
 - bin/git-switch
 - lib/git_switch.rb
+- lib/git_switch/config.rb
 - lib/git_switch/git_helper.rb
 - lib/git_switch/options.rb
 - lib/git_switch/switcher.rb
@@ -100,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Switch between git profiles