gitswitch 0.3.2 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: e495045a498536c929c7ee81a01d0d4c2d2dde1622d9df5c4a09bf374fcee99e
+  data.tar.gz: 4f59cc61dec0c72ad4e0561743cd218b1e27af1d72750b97a1f533497cdeeeb8
+SHA512:
+  metadata.gz: 1bcc6bed6d628b752034312cfbf58a30c9b7b8e0bc373b5d596538b7930de38f1f13e423171a9aeb2cf838da1430349797a93fed5c15c916fa0f5e835e7e6a0b
+  data.tar.gz: 6c0393c27ad23ddabc7d51e75616b63ef523006494303fab6176026c65acd0dbe5923fc741de46a8318ea047bb34a9cd9bb771485736958792abd43dc3484eb9

data/.github/workflows/tests.yml

@@ -0,0 +1,32 @@
+name: Ruby CI
+
+on:
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - 'README.rdoc'
+  pull_request:
+    branches:
+      - main
+    paths-ignore:
+      - 'README.rdoc'
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    if: "contains(github.event.commits[0].message, '[ci skip]') == false"
+
+    strategy:
+      matrix:
+        ruby: [3.0.2, 2.7.4, 2.6.8, 2.5.9]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Test
+        run: bundle exec rake spec

data/.gitignore

@@ -1,10 +1,6 @@
 ## MAC OS
 .DS_Store
 
-## TEXTMATE
-*.tmproj
-tmtags
-
 ## PROJECT::GENERAL
 coverage
 rdoc
@@ -14,3 +10,4 @@ pkg/*
 Gemfile.lock
 
 ## PROJECT::SPECIFIC
+spec/tmp/.gitswitch

data/Gemfile

@@ -1,2 +1,2 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 gemspec

data/README.rdoc

@@ -1,6 +1,6 @@
 = gitswitch
 
-Easily set/switch your current git user info for a git repo .git/config or your global ~/.gitconfig file.  
+Easily set/switch your current git user info for a git repo .git/config or your global ~/.gitconfig file.
 
 This gem should come in handy if you have work and personal repositories.  It also might help with switching between users while pair programming.
 
@@ -53,15 +53,7 @@ Delete a current entry.  [TAG] parameter is optional.  If omitted, you'll see a
   # gitswitch delete [TAG]
 
 Update your global .git user instead of your current repository
-  # gitswitch global work
+  # gitswitch switch work --global
 
 Show your current git user info.  If you are in a git repo directory, it will show you the info associated with the current repository.  Outside a repo (or if you use the --global option), it will show you the info from your global .git config.
   # gitswitch info
-
-== What's with all the aliases?
-
-I initially wrote the gem using optparse and used the '-r' style params to keep the commands as short as possible.  Now, I've decided to lean toward a rake-style descriptive method of passing commands -- which meshes well with the way Thor likes to do things.  But the old command line options still work fine in case you got used to it.
-
-== Copyright
-
-Copyright (c) 2010 Joe Alba. See LICENSE for details.

data/Rakefile

@@ -4,7 +4,6 @@ require 'rspec/core/rake_task'
 
 Bundler::GemHelper.install_tasks
 
-
 desc 'Default: Run specs'
 task :default => :spec
 

data/bin/gitswitch

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
 
 require "gitswitch"
-Gitswitch::CLI.start
+
+Dry::CLI.new(Gitswitch::CLI::Commands).call

data/gitswitch.gemspec

@@ -8,30 +8,34 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
 
   s.authors = ["Joe Alba"]
-  s.date = %q{2010-09-27}
-  s.default_executable = %q{gitswitch}
-  s.homepage = %q{http://github.com/joealba/gitswitch}
+  s.date = %q{2012-04-29}
+  s.homepage = %q{https://github.com/joealba/gitswitch}
   s.description = %q{Easily switch your git name/e-mail user info -- Handy for work vs. personal and for pair programming}
   s.summary = %q{Easy git user switching}
   s.email = %q{joe@joealba.com}
-  
+  s.metadata = {
+    "bug_tracker_uri" => "#{s.homepage}/issues",
+    "changelog_uri" => "#{s.homepage}/blob/main/CHANGELOG.md",
+    "documentation_uri" => s.homepage.to_s,
+    "homepage_uri" => s.homepage.to_s,
+    "source_code_uri" => s.homepage.to_s
+  }
+
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
   ]
-  
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
   s.rdoc_options = ["--charset=UTF-8"]
-  s.rubygems_version = %q{1.3.7}
-
-
-	s.add_dependency('rake')
-	s.add_dependency('thor')
-  s.add_development_dependency(%q<rspec>, [">= 2.5.0"])
 
+  s.add_dependency('rake')
+  s.add_dependency('dry-cli')
+  s.add_dependency('tty-prompt')
+  s.add_development_dependency(%q<rspec>, [">= 3.3.0"])
+  s.add_development_dependency 'simplecov'
 end
-

data/lib/gitswitch.rb

@@ -1,6 +1,9 @@
 require 'gitswitch/version'
 require 'gitswitch/commands'
+require 'gitswitch/git'
 require 'gitswitch/cli'
-#Gitswitch::CLI.start  ## If we decide to use Thor
-
 
+module Gitswitch
+  EXIT_OK = 0
+  EXIT_MISSING_INFO = 1
+end

data/lib/gitswitch/cli.rb

@@ -1,160 +1,207 @@
-require 'thor'
+require "dry/cli"
+require "tty-prompt"
+
+module Gitswitch
+  module CLI
+    module Helpers
+      def prompt_for_email_and_name
+        prompt = TTY::Prompt.new
+        email = prompt.ask("  E-mail address: ").to_s.chomp
+        if email.empty?
+          puts "No e-mail address provided"
+          exit Gitswitch::EXIT_MISSING_INFO
+        end
 
+        default_name = Gitswitch::get_git_user_info({global: true})[:name]
+        name = prompt.ask("  Name: (ENTER to use \"" + default_name + "\") ").to_s.chomp
+        name = default_name if name.empty?
 
-class Gitswitch
-  class CLI < Thor
+        if name.empty?
+          puts "No name provided"
+        end
 
+        return [email, name]
+      end
+    end
 
-    ######################################################################
-    desc "init", "Initialize your .gitswitch file"
-    def init
-      if !Gitswitch::gitswitch_file_exists
-        if yes?("Gitswitch users file ~/.gitswitch not found.  Would you like to create one? (y/n): ")
-          Gitswitch::new.create_fresh_gitswitch_file
-        else
-          puts "Ok, that's fine.  Exiting."
-          exit
-        end
-      else
-        if yes?("Gitswitch users file ~/.gitswitch already exists.  Would you like to wipe it out and create a fresh one? (y/n): ")
-          Gitswitch::new.create_fresh_gitswitch_file
+    module Commands
+      extend Dry::CLI::Registry
+
+      class Init < Dry::CLI::Command
+        desc "Initialize your .gitswitch file"
+
+        def call(*)
+          prompt = TTY::Prompt.new
+
+          if !Gitswitch::gitswitch_file_exists
+            if prompt.yes?("Gitswitch users file ~/.gitswitch not found.  Would you like to create one? (y/n):")
+              Gitswitch.create_fresh_gitswitch_file
+            else
+              puts "Ok, that's fine.  Exiting."
+              exit Gitswitch::EXIT_OK
+            end
+          else
+            if prompt.yes?("Gitswitch users file ~/.gitswitch already exists.  Would you like to wipe it out and create a fresh one? (y/n):")
+              Gitswitch.create_fresh_gitswitch_file
+            end
+          end
+
+          # Grab the current global info to drop into the default slot -- if available
+          user = Gitswitch.get_git_user_info({global: true})
+          if user[:name].empty? && user[:email].empty?
+            puts "No global git user.name and user.email configurations were found.  Set up a default now."
+            add('default')
+          else
+            puts "Adding your global .gitconfig user info to the \"default\" tag..."
+            Gitswitch.set_gitswitch_entry('default', user[:email], user[:name])
+          end
+
+          exit Gitswitch::EXIT_OK
         end
       end
 
-      # Grab the current global info to drop into the default slot -- if available
-      user = Gitswitch::get_git_user_info({:global => true})
-      if user[:name].empty? && user[:email].empty?
-        puts "No global git user.name and user.email configurations were found.  Set up a default now."
-        add('default')
-      else
-        puts "Adding your global .gitconfig user info to the \"default\" tag..."
-        Gitswitch::new.set_gitswitch_entry('default', user[:email], user[:name])
+      class Info < Dry::CLI::Command
+        desc "Show the current git user"
+        option :global, type: :boolean, default: false, desc: "Show global config"
+
+        def call(**options)
+          puts Gitswitch.current_user_info(options)
+
+          exit Gitswitch::EXIT_OK
+        end
       end
 
-    end
+      class List < Dry::CLI::Command
+        desc "Show all the git user tags you have configured"
 
-  
-    ######################################################################
-    desc "version", "Show the gitswitch version"
-    map ["-v","--version"] => :version
-    def version
-      puts Gitswitch::VERSION
-    end
+        def call(*)
+          puts Gitswitch.list_users
 
+          exit Gitswitch::EXIT_OK
+        end
+      end
 
-    ######################################################################
-    desc "info", "Show the current git user"
-    map "-i" => :info
-    method_option :global, :type => :boolean
-    def info
-      puts Gitswitch.current_user_info(options)
-    end
+      class Switch < Dry::CLI::Command
+        desc "Switch git user"
+        argument :tag, desc: "Tag name"
+        option :global, type: :boolean, default: false, desc: "Set global config"
 
+        def call(tag: "default", **options)
+          options[:global] ? Gitswitch.switch_global_user(tag) : Gitswitch.switch_repo_user(tag)
+          puts Gitswitch.current_user_info(options)
 
-    ######################################################################
-    desc "list", "Show all the git user tags you have configured"
-    map ["-l","--list"] => :list
-    def list
-      puts Gitswitch.new.list_users
-    end
+          exit Gitswitch::EXIT_OK
+        end
+      end
 
+      class Global < Dry::CLI::Command
+        desc "Switch the global git user info (your ~/.gitconfig file)"
+        argument :tag, desc: "Tag name"
 
-    ######################################################################
-    desc "switch [TAG]", "Switch git user"
-    map "-r" => :switch
-    method_option :global, :type => :boolean, :aliases => ["-s","--global"] ## To support the deprecated behavior
-    method_option :repository, :type => :boolean, :aliases => "-r"
-    def switch(tag = 'default')
-      options[:global] ? global(tag) : Gitswitch.new.switch_repo_user(tag)
-      puts Gitswitch.current_user_info(options)
-    end
+        def call(tag: "default", **)
+          Gitswitch.switch_global_user(tag)
 
+          exit Gitswitch::EXIT_OK
+        end
+      end
 
-    ######################################################################
-    desc "global [TAG]", "Switch global git user (your ~/.gitconfig file)"
-    map "-s" => :global
-    def global(tag = 'default')
-      Gitswitch.new.switch_global_user(tag)
-    end
+      class Add < Dry::CLI::Command
+        include ::Gitswitch::CLI::Helpers
+
+        desc "Add a new tagged user entry"
+        argument :tag, desc: "Tag name"
 
+        def call(tag: "", **)
+          tag = tag.gsub(/\W+/,'')
+          if (tag.nil? || tag.empty?)
+            prompt = TTY::Prompt.new
+            tag = prompt.ask("Enter a tag to describe this git user entry: ").to_s.gsub(/\W+/,'')
+          end
 
-    ######################################################################
-    desc "add [TAG]", "Add a new tagged user entry"
-    map ["-a","--add"] => :add
-    def add(tag = '')
-      gs = Gitswitch.new
+          if tag.empty?
+            puts "You must enter a short tag to describe the git user entry you would like to save."
+            exit Gitswitch::EXIT_MISSING_INFO
+          end
 
-      tag.gsub!(/\W+/,'')
-      tag = ask("Enter a tag to describe this git user entry: ").gsub(/\W+/,'') if (tag.nil? || tag.empty?)
-  
-      if tag.empty?
-        puts "You must enter a short tag to describe the git user entry you would like to save."
-        exit
+          puts "Adding a new gitswitch user entry for tag '#{tag}'"
+          (email, name) = prompt_for_email_and_name
+          Gitswitch.set_gitswitch_entry(tag, email, name)
+          exit Gitswitch::EXIT_OK
+        end
       end
 
-      puts "Adding a new gitswitch user entry for tag '#{tag}'"
-      (email, name) = prompt_for_email_and_name
-      gs.set_gitswitch_entry(tag, email, name)
-    end
+      class Delete < Dry::CLI::Command
+        desc "Delete a tagged user entry"
 
+        def call(tag: "")
+          tag_table = Gitswitch.get_tag_display
 
-    ######################################################################
-    desc "update [TAG]", "Update a tagged user entry"
-    map ["-o","--overwrite"] => :add
-    def update(tag = '')
-      gs = Gitswitch.new
-      tag_table = gs.get_tag_display
-    
-      tag.gsub!(/\W+/,'')
-      if (tag.nil? || tag.empty?)
-        tag = ask("Which tag would you like to update: \n#{tag_table}").gsub(/\W+/,'') 
-      end
-      
-      puts "Updating #{tag} entry..."
-      (email, name) = prompt_for_email_and_name
-      Gitswitch.new.set_gitswitch_entry(tag, email, name)
-    end
+          tag = tag.gsub(/\W+/, '')
+          if (tag.empty?)
+            puts tag_table
+            prompt = TTY::Prompt.new
+            tag = prompt.ask("\nWhich tag would you like to delete: ").to_s.gsub(/\W+/,'')
+          end
+
+          if tag.empty?
+            puts "No tag chosen"
+            exit Gitswitch::EXIT_MISSING_INFO
+          end
 
+          Gitswitch.delete_gitswitch_entry(tag)
 
-    ######################################################################
-    desc "delete [TAG]", "Delete a tagged user entry"
-    def delete(tag = '')
-      gs = Gitswitch.new
+          puts Gitswitch.get_tag_display
 
-      tag_table = gs.get_tag_display
-    
-      tag.gsub!(/\W+/,'')
-      if (tag.nil? || tag.empty?)
-        tag = ask("Which tag would you like to delete: \n#{tag_table}").gsub(/\W+/,'') 
+          exit Gitswitch::EXIT_OK
+        end
       end
 
-      Gitswitch.new.delete_gitswitch_entry(tag)
-    end
+      class Update < Dry::CLI::Command
+        include ::Gitswitch::CLI::Helpers
 
+        desc "Update a tagged user entry"
+        argument :tag, desc: "Tag name"
 
-    private
-    
+        def call(tag: "", **)
+          tag_table = Gitswitch.get_tag_display
 
-    ######################################################################
-    def prompt_for_email_and_name 
-      email = ask("  E-mail address: ").chomp
-      ## TODO: Validate e-mail
-      if email.nil?
-        puts "No name provided"
-        exit
+          tag = tag.gsub(/\W+/, '')
+          if (tag.empty?)
+            prompt = TTY::Prompt.new
+            tag = prompt.ask("Which tag would you like to update: \n#{tag_table}\nTag: ").to_s.gsub(/\W+/,'')
+          end
+
+          if tag.empty?
+            puts "No tag chosen"
+            exit Gitswitch::EXIT_MISSING_INFO
+          end
+
+          puts "Updating #{tag} entry..."
+          (email, name) = prompt_for_email_and_name
+          Gitswitch.set_gitswitch_entry(tag, email, name)
+
+          exit Gitswitch::EXIT_OK
+        end
       end
-      
-      name = ask("  Name: (ENTER to use \"" + Gitswitch::get_git_user_info({:global => true})[:name] + "\") ").chomp
-      name = Gitswitch::get_git_user_info({:global => true})[:name] if name.empty?
-      
-      if name.nil?
-        puts "No name provided"
-        exit
+
+      class Version < Dry::CLI::Command
+        desc "Show the gitswitch version"
+
+        def call(*)
+          puts Gitswitch::VERSION
+
+          exit Gitswitch::EXIT_OK
+        end
       end
 
-      return [email, name]
+      register "add", Add, aliases: ["-a", "--add"]
+      register "delete", Delete, aliases: ["remove"]
+      register "info", Info, aliases: ["-i", "--info"]
+      register "init", Init
+      register "list", List, aliases: ["-l", "--list"]
+      register "switch", Switch, aliases: ["-r"]
+      register "update", Update, aliases: ["-o","--overwrite"]
+      register "version", Version, aliases: ["-v", "--version"]
     end
-
-  
   end
-end
+end

data/lib/gitswitch/commands.rb

@@ -1,45 +1,42 @@
 require 'yaml'
-require 'shellwords' if !String.new.methods.include?('shellescape')
-
-
-class Gitswitch
-  GITSWITCH_CONFIG_FILE = File.join ENV["HOME"], ".gitswitch"
-  GIT_BIN = '/usr/bin/env git'
-
-  attr_reader :users
 
+module Gitswitch
+  def self.gitswitch_config_file
+    ENV['GITSWITCH_CONFIG_FILE'] || File.join(ENV["HOME"], ".gitswitch")
+  end
 
   ##############################################################
-  def initialize
-    @users = {}
+  def self.users
+    @users ||= load_users
+  end
+
+  def self.load_users
+    user_hash = {}
     if Gitswitch::gitswitch_file_exists
-      @users = YAML::load_file GITSWITCH_CONFIG_FILE
-      if @users.nil?
-        puts "Error loading .gitswitch file.  Delete the file and start fresh." 
-        exit
-      end
+      user_hash = YAML::load_file gitswitch_config_file
     end
+    user_hash
   end
-    
 
-  ##############################################################
-  # Create a .gitswitch file with the current user defaults
-  def create_fresh_gitswitch_file
-    @users = {}
-    save_gitswitch_file
+  ## Create a .gitswitch file with the current user defaults
+  def self.create_fresh_gitswitch_file
+    save_gitswitch_file({})
   end
 
   def self.gitswitch_file_exists
-    File.exists? GITSWITCH_CONFIG_FILE
+    File.exists? gitswitch_config_file
   end
 
-  def save_gitswitch_file
-    if fh = File.open(GITSWITCH_CONFIG_FILE, 'w')
-      fh.write(@users.to_yaml)
-      fh.close
-    else
-      puts "ERROR: Could not open/write the gitswitch config file: #{GITSWITCH_CONFIG_FILE}"
+  def self.save_gitswitch_file(users_hash)
+    begin
+      File.open(gitswitch_config_file, 'w') do |fh|
+        fh.write(users_hash.to_yaml)
+      end
+    rescue
+      warn "ERROR: Could not open/write the gitswitch config file: #{gitswitch_config_file}: #{$!}"
+      exit
     end
+    @users = nil
   end
 
 
@@ -49,68 +46,57 @@ class Gitswitch
   # * +tag+ - Required. The tag you want to add to your .gitswitch file
   # * +email+ - Required
   # * +name+ - Required
-  def set_gitswitch_entry(tag, email, name)
-    @users[tag] = {:name => name, :email => email}
-    save_gitswitch_file
+  def self.set_gitswitch_entry(tag, email, name)
+    users[tag] = {name: name, email: email}
+    save_gitswitch_file(users)
   end
 
-  def delete_gitswitch_entry(tag)
+  def self.delete_gitswitch_entry(tag)
     if tag == 'default'
       puts "Cannot delete the default tag.  Use the update command instead"
       exit
     end
-    @users.delete(tag)
-    save_gitswitch_file
+    users.delete(tag)
+    save_gitswitch_file(users)
   end
 
-  def get_user(tag)     
-    if !@users.empty? && @users[tag] && !@users[tag].empty?
-      @users[tag]
+  def self.get_user(tag)
+    ## TODO: Stop coding so defensively.
+    if !users.empty? && users[tag] && !users[tag].empty?
+      users[tag]
     end
   end
 
-  def get_tags
-    @users.keys
+  def self.get_tags
+    users.keys
   end
 
-  def get_tag_display
-    max_length = @users.keys.sort{|x,y| y.length <=> x.length }.first.length
-    @users.each_pair.map {|key,value| sprintf("  %#{max_length}s  %s\n", key, value[:email]) }
+  def self.get_tag_display
+    users.map do |key, user|
+      item = "#{key}:\n"
+      item << "  Name:   #{user[:name]}\n" if !user[:name].to_s.empty?
+      item << "  E-mail: #{user[:email]}\n"
+      item
+    end.join("\n")
   end
 
-  def list_users
-    response = ''
-    response << "\nCurrent git user options --\n"
-    @users.each do |key, user|
-      response << "#{key}:\n"
-      response << "  Name:   #{user[:name]}\n" if !user[:name].to_s.empty?
-      response << "  E-mail: #{user[:email]}\n\n"
-    end
+  def self.list_users
+    response = "\nCurrent git user options --\n"
+    response << get_tag_display
+
     response
   end
 
   ## Return active user information.
   ## If you're in a git repo, show that user info.  Otherwise, display the global info.
   def self.current_user_info(options = {})
-    response = !Gitswitch::in_a_git_repo || options[:global] ? "Your git user information from your global config:\n" : "Your git user information from the current repository:\n"
     current_git_user = Gitswitch::get_git_user_info(options)
-    response << "Name:   #{current_git_user[:name]}\n" 
-    response << "E-mail: #{current_git_user[:email]}\n"
-    response
-  end
-
-  def self.in_a_git_repo
-    %x(#{GIT_BIN} status 2>&1 | head -n 1).to_s =~ /^fatal/i ? false : true
-  end
 
+    response = !Gitswitch::in_a_git_repo || options[:global] ? "Your git user information from your global config:\n" : "Your git user information from the current repository:\n"
+    response << "Name:   #{current_git_user[:name]}\n"
+    response << "E-mail: #{current_git_user[:email]}\n"
 
-  ##############################################################
-  def git_config(user, options = {})
-    git_args = 'config --replace-all'
-    git_args += ' --global' if options[:global]
-  
-    %x(#{GIT_BIN} #{git_args} user.email #{user[:email].to_s.shellescape})
-    %x(#{GIT_BIN} #{git_args} user.name #{user[:name].to_s.shellescape}) if !user[:name].to_s.empty?
+    response
   end
 
 
@@ -118,21 +104,21 @@ class Gitswitch
   # Switch git user in your global .gitconfig file
   # ==== Parameters
   # * +tag+ - The tag associated with your desired git info in .gitswitch.  Defaults to "default".
-  def switch_global_user tag = "default"
+  def self.switch_global_user(tag = "default")
     if user = get_user(tag)
       puts "Switching your .gitconfig user info to \"#{tag}\" tag (#{user[:name]} <#{user[:email]}>)."
-      git_config(user, {:global => true})
+      git_config(user, {global: true})
     else
       puts "ERROR: Could not find info for tag \"#{tag}\" in your .gitswitch file"
     end
   end
 
 
+  ##############################################################
   # Set the git user information for current repository
   # ==== Parameters
   # * +tag+ - The tag associated with your desired git info in .gitswitch. Defaults to "default".
-  def switch_repo_user(tag = "default")
-    ## TODO: See if we're actually in a git repo
+  def self.switch_repo_user(tag = "default")
     if !Gitswitch::in_a_git_repo
       puts "You do not appear to currently be in a git repository directory"
       false
@@ -146,19 +132,17 @@ class Gitswitch
     end
   end
 
+  ##############################################################
+  # TODO: Straight delegation through to Gitswitch::Git
+  def self.in_a_git_repo
+    Gitswitch::Git.in_a_git_repo
+  end
 
-  
-  private
+  def self.git_config(user, options = {})
+    Gitswitch::Git.git_config(user, options)
+  end
 
-  # Show the current git user info
   def self.get_git_user_info(options = {})
-    git_args = 'config --get'
-    git_args += ' --global' if options[:global]
-  
-    {
-      :name => %x(#{GIT_BIN} #{git_args} user.name).to_s.chomp,
-      :email => %x(#{GIT_BIN} #{git_args} user.email).to_s.chomp
-    } 
+    Gitswitch::Git.get_git_user_info(options)
   end
-
 end

data/lib/gitswitch/git.rb

@@ -0,0 +1,33 @@
+require 'shellwords' if !String.new.methods.include?('shellescape')
+
+module Gitswitch
+  module Git
+    GIT_BIN = '/usr/bin/env git'
+
+    def self.version
+      %x(#{GIT_BIN} --version).to_s.gsub(/^git version\s*/, '')
+    end
+
+    def self.in_a_git_repo
+      %x(#{GIT_BIN} status 2>&1 | head -n 1).to_s =~ /^fatal/i ? false : true
+    end
+
+    def self.git_config(user, options = {})
+      git_args = 'config --replace-all'
+      git_args += ' --global' if options[:global]
+
+      %x(#{GIT_BIN} #{git_args} user.email #{user[:email].to_s.shellescape})
+      %x(#{GIT_BIN} #{git_args} user.name #{user[:name].to_s.shellescape}) if !user[:name].to_s.empty?
+    end
+
+    def self.get_git_user_info(options = {})
+      git_args = 'config --get'
+      git_args += ' --global' if options[:global]
+
+      {
+        name: %x(#{GIT_BIN} #{git_args} user.name).to_s.chomp,
+        email: %x(#{GIT_BIN} #{git_args} user.email).to_s.chomp
+      }
+    end
+  end
+end

data/lib/gitswitch/version.rb

@@ -1,3 +1,3 @@
-class Gitswitch
-	VERSION = "0.3.2"
-end
+module Gitswitch
+  VERSION = "0.5.0"
+end

data/spec/git_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Gitswitch::Git do
+  it "finds the git executable" do
+    result = %x[#{Gitswitch::Git::GIT_BIN} --version]
+    expect($?.exitstatus).to eq 0
+  end
+
+  it "grabs the local git version" do
+    expect(Gitswitch::Git.version).to match /^\d+\.+\d+/ # Should start off looking like a version number
+  end
+end

data/spec/gitswitch_spec.rb

@@ -1,68 +1,57 @@
 require 'spec_helper'
 
 describe Gitswitch do
-
   describe "basics" do
     it "should have a VERSION" do
-      Gitswitch::VERSION.should_not == ''
+      expect(Gitswitch::VERSION).not_to eq ''
     end
-
-    it "should find the git executable" do
-      result = %x[#{Gitswitch::GIT_BIN} --version]
-      $?.exitstatus.should == 0
-    end    
   end
 
-
   describe "read-only" do
-    it "should show the current git user credentials" do
-      Gitswitch.current_user_info.should =~ /^Your git user/
-    end
-    it "should show the current list of available gitswitch tags" do
-      pending
+    it "shows the current list of available gitswitch tags" do
+      skip
     end
   end
 
-
   describe "write methods" do
-
-    it "should allow you to add a new user entry" do 
-      pending
+    before :each do
+      Gitswitch.create_fresh_gitswitch_file
     end
 
-    it "should allow you to update a user entry" do 
-      pending
+    it "allows you to add a new user entry" do
+      initial_user_count = Gitswitch.users.keys.count
+      set_test_entry
+      expect(Gitswitch.users.keys.count > initial_user_count).to eq true
     end
 
-    it "should allow you to delete a user entry" do 
-      pending
+    it "allows you to update a user entry" do
+      set_test_entry
+      test_entry = get_test_entry
+      Gitswitch.set_gitswitch_entry(test_entry[0], 'testing@test.com', test_entry[2])
+      expect(Gitswitch.get_user(test_entry[0])[:email]).to eq 'testing@test.com'
+      expect(Gitswitch.get_user(test_entry[0])[:name]).to eq test_entry[2]
     end
 
-    it "should allow you to overwrite the current .gitswitch file and start fresh" do
-      pending
+    it "allows you to delete a user entry" do
+      set_test_entry
+      Gitswitch.delete_gitswitch_entry(get_test_entry[0])
+      expect(Gitswitch.users.keys.count).to eq 0
     end
 
-  end
-
-
-  describe "git proxy methods" do
-    
-    it "should allow you to change the global git user credentials" do
-      pending
+    it "allows you to overwrite the current .gitswitch file and start fresh" do
+      set_test_entry
+      Gitswitch.create_fresh_gitswitch_file
+      expect(Gitswitch.users.keys.count).to eq 0
     end
-    
-    it "should allow you to change a specific repository's user credentials" do 
-      pending
-    end    
   end
 
-
   describe "weird outlier cases" do
-
     it "in a git repo directory with no user info specified, show the global config header and user info" do
-      pending
+      skip
     end
-    
   end
 
+  it "shows the current git user credentials" do
+    expect(Gitswitch.current_user_info).to match /^Your git user/
+  end
 end

data/spec/spec_helper.rb

@@ -1,12 +1,20 @@
+require 'simplecov'
+SimpleCov.start
+
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rubygems'
+
 require 'gitswitch'
 
-require 'bundler'
-Bundler.setup
+RSpec.configure do |c|
+end
 
+ENV['GITSWITCH_CONFIG_FILE'] = File.join(File.dirname(__FILE__), 'tmp', '.gitswitch')
 
-RSpec.configure do |c|
+def get_test_entry
+  ['test','test@null.com', 'A. Tester']
+end
 
+def set_test_entry
+  Gitswitch.set_gitswitch_entry(*get_test_entry)
 end

metadata

@@ -1,82 +1,101 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gitswitch
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 2
-  version: 0.3.2
+version: !ruby/object:Gem::Version
+  version: 0.5.0
 platform: ruby
-authors: 
+authors:
 - Joe Alba
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2010-09-27 00:00:00 -04:00
-default_executable: gitswitch
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dry-cli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: thor
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: tty-prompt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
-        version: 2.5.0
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: Easily switch your git name/e-mail user info -- Handy for work vs. personal and for pair programming
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Easily switch your git name/e-mail user info -- Handy for work vs. personal
+  and for pair programming
 email: joe@joealba.com
-executables: 
+executables:
 - gitswitch
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
-- .bundle/config
-- .document
-- .gemtest
-- .gitignore
-- .rspec
+files:
+- ".bundle/config"
+- ".document"
+- ".gemtest"
+- ".github/workflows/tests.yml"
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -86,43 +105,42 @@ files:
 - lib/gitswitch.rb
 - lib/gitswitch/cli.rb
 - lib/gitswitch/commands.rb
+- lib/gitswitch/git.rb
 - lib/gitswitch/version.rb
+- spec/git_spec.rb
 - spec/gitswitch_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
-homepage: http://github.com/joealba/gitswitch
+- spec/tmp/.gitkeep
+homepage: https://github.com/joealba/gitswitch
 licenses: []
-
-post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+metadata:
+  bug_tracker_uri: https://github.com/joealba/gitswitch/issues
+  changelog_uri: https://github.com/joealba/gitswitch/blob/main/CHANGELOG.md
+  documentation_uri: https://github.com/joealba/gitswitch
+  homepage_uri: https://github.com/joealba/gitswitch
+  source_code_uri: https://github.com/joealba/gitswitch
+post_install_message:
+rdoc_options:
+- "--charset=UTF-8"
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.5.2
-signing_key: 
-specification_version: 3
+rubygems_version: 3.2.22
+signing_key:
+specification_version: 4
 summary: Easy git user switching
-test_files: 
+test_files:
+- spec/git_spec.rb
 - spec/gitswitch_spec.rb
 - spec/spec_helper.rb
+- spec/tmp/.gitkeep