git_switch 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cacd2da7a06f2667c6c79db5e1af52535b3f60a070251197311f130e94f792c
-  data.tar.gz: '0029eac18d9453fc078fe5d41060444521652eb867f6299067355a582192d213'
+  metadata.gz: 349519b9a5eaf832588e1093490d3f9caf9fb90ce2b3c922b2dde9563def62c7
+  data.tar.gz: dedebe431d491af9a10a9a3c1b72d24f872ecb9146b17c220f6cf6587217851b
 SHA512:
-  metadata.gz: dc87d4c8c806552627b8b620b4ac7a2c4dda1e973d5828998ebd75207e27710bd09fa6e25833ca8481dc74b037b1a1167e4180ffa26079124bef0a565436853c
-  data.tar.gz: 60e8cfdbc60e83348b7d9ca21fa0a76c04940bf5d8a68e4153555c6e36e244dc14c83ef7e9e351d3a01110803790d6164161f128eeefe4036d6cfe4098a7db9f
+  metadata.gz: b8d5bca901a1c226bff6dafab5d6585c225158f6baf504f7f362d5e7e2bb0f886dcdf4fd895200bcec722f20826e81357bb9cc79606f05fee0c70336d7e65b95
+  data.tar.gz: 8749517c89f0b9a26023b777208676a3c42173010bc19af1818bc49eaac3722790eb17a31072177f5a72320b4161efcb78673ae8e0850b09af15b1767ed3d2b5

data/bin/git-switch

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 require_relative '../lib/git_switch'
 
-GitSwitch::Switcher.new(ARGV).set!
+GitSwitch::Switcher.new(ARGV).run

data/lib/git_switch/git_helper.rb

@@ -0,0 +1,44 @@
+module GitSwitch
+  class GitHelper
+    def self.git_repo?
+      !find_git_repo.nil?
+    end
+
+    private
+    # Copied from https://gist.github.com/nickmccurdy/8466084
+    # Script: Find the current git repository
+    # Based on https://github.com/mojombo/grit/pull/178 by https://github.com/derricks
+
+    # Returns true if the given path represents a root directory (/ or C:/)
+    def self.root_directory?(file_path)
+      # Implementation inspired by http://stackoverflow.com/a/4969416:
+      # Does file + ".." resolve to the same directory as file_path?
+      File.directory?(file_path) &&
+        File.expand_path(file_path) == File.expand_path(File.join(file_path, '..'))
+    end
+
+    # Returns the git root directory given a path inside the repo. Returns nil if
+    # the path is not in a git repo.
+    def self.find_git_repo(start_path = '.')
+      raise NoSuchPathError unless File.exists?(start_path)
+
+      current_path = File.expand_path(start_path)
+
+      # for clarity: set to an explicit nil and then just return whatever
+      # the current value of this variable is (nil or otherwise)
+      return_path = nil
+
+      until root_directory?(current_path)
+        if File.exists?(File.join(current_path, '.git'))
+          # done
+          return_path = current_path
+          break
+        else
+          # go up a directory and try again
+          current_path = File.dirname(current_path)
+        end
+      end
+      return_path
+    end
+  end
+end

data/lib/git_switch/switcher.rb

@@ -1,43 +1,91 @@
-# require 'version'
 require 'yaml'
 require_relative './version'
 
 module GitSwitch
   class Switcher
-    attr_reader :config, :profile, :valid, :global
-    # Your code goes here...
+    attr_reader :args, :config, :profile, :global, :list
+
     def initialize(args)
       raise ArgumentError unless args.is_a? Array
-      @config = YAML.load_file(File.expand_path('~/.gitswitch'))
+      @args = args
+      @config = load_config
       @global = check_global(args)
       @profile = get_profile(args)
-      @valid = valid_args?(args)
+      @list = check_list(args)
+    end
+
+    def run
+      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')
     end
 
+    def check_list(args)
+      (args.include? '-l') || (args.include? '--list')
+    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?(args)
-      no_flags?(args) || one_flag?(args)
+    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
+      else
+        puts "Profile '#{profile}' not found!"
+        return false
+      end
+    end
+
+    def git_repo?
+      if GitHelper.git_repo?
+        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
+      end
     end
 
     def no_flags?(args)
-      args.length == 1 && args.count {|a| a.start_with? '-'} == 0
+      args.length == 1 && flag_count(args) == 0
     end
 
     def one_flag?(args)
-      args.length == 2 && args.count {|a| a.start_with?('-')} == 1
+      args.length == 2 && flag_count(args) == 1
+    end
+
+    def flag_count(args)
+      args.count {|a| a.start_with? '-'}
     end
 
     def set!
-      return unless valid
+      return unless valid_args? && valid_profile?
+      return unless git_repo?
+
       flag = global ? '--global' : ''
 
       puts "\nGit Config:"
@@ -52,6 +100,10 @@ module GitSwitch
       puts `ssh-add -l`
     end
 
+    def print_list
+      puts config.keys
+    end
+
     private
 
     def name

data/lib/git_switch/version.rb

@@ -1,3 +1,3 @@
 module GitSwitch
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/git_switch.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_switch
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Randall Reed, Jr.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2018-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,6 +90,7 @@ extra_rdoc_files: []
 files:
 - bin/git-switch
 - lib/git_switch.rb
+- lib/git_switch/git_helper.rb
 - lib/git_switch/switcher.rb
 - lib/git_switch/version.rb
 homepage: https://www.github.com/randallreedjr/git_switch
@@ -112,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Switch between git profiles