gitswitch 0.2.5 → 0.3.0

data/.gitignore

@@ -5,17 +5,12 @@
 *.tmproj
 tmtags
 
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
 ## PROJECT::GENERAL
 coverage
 rdoc
-pkg
+pkg/*
+*.gem
+.bundle
+Gemfile.lock
 
 ## PROJECT::SPECIFIC

data/Gemfile

@@ -1,12 +1,2 @@
-# A sample Gemfile
 source "http://rubygems.org"
-
-group :development do
-#  gem "rake"
-  gem "rspec", "~> 2.0.0.beta.22"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.4.0"
-#  gem "rcov", ">= 0"
-#  gem "test-construct"
-end
-
+gemspec

data/README.rdoc

@@ -4,7 +4,7 @@ Easily set/switch your current git user info for a git repo .git/config or your
 
 This gem should come in handy if you have work and personal repositories.  It also might help with switching between users while pair programming.
 
-Would you rather type "git config user.email 'me@work.com'", etc. or type "gitswitch -r work"?  If you answered the latter, check out this gem.
+Would you rather type "git config user.email 'me@work.com'", etc. or type "gitswitch switch work"?  If you answered the latter, check out this gem.
 
 == Install
 
@@ -12,8 +12,8 @@ Would you rather type "git config user.email 'me@work.com'", etc. or type "gitsw
 
 == Usage
 
-Simply run the script to establish a default ~/.gitswitch file using the git info you already have in your ~/.gitconfig file
-  # gitswitch 
+First, establish a default ~/.gitswitch file using the git info you already have in your ~/.gitconfig file
+  # gitswitch init
 
   Gitswitch users file ~/.gitswitch not found.  Would you like to create one? (y/n): y
   Adding your global .gitconfig user info to the "default" tag...
@@ -21,22 +21,22 @@ Simply run the script to establish a default ~/.gitswitch file using the git inf
     Name:   Joe Alba
     E-mail: joe@home.com
 
-Add a new git user tag
-  # gitswitch -a
+Now, add a new git user tag
+  # gitswitch add
 
   Enter a tag to describe this git user entry: work
   E-mail address: jalba@work.com
   Name (ENTER to use "Joe Alba"): Joseph M. Alba
 
 Set specific user info to your current git repository by updating .git/config
-  # gitswitch -r work  # Update .git/config with your 'work' git user info
+  # gitswitch switch work  # Update .git/config with your 'work' git user info
   Switching git user to "work" tag for the current repository (Joseph M. Alba <jalba@work.com>).
 
-  # gitswitch -r       # User info from your 'default' tag is used if you don't specify a tag
+  # gitswitch switch       # User info from your 'default' tag is used if you don't specify a tag
   Switching git user to "default" tag for the current repository (Joe Alba <joe@home.com>).
 
 List all the gitswitch user tags/info you have stored
-  # gitswitch -l
+  # gitswitch list
 
   Current git user options --
   default:
@@ -46,6 +46,22 @@ List all the gitswitch user tags/info you have stored
     Name:   Joseph M. Alba
     E-mail: jalba@work.com
 
+Update a current entry.  [TAG] parameter is optional.  If omitted, you'll see a list.
+  # gitswitch update [TAG]
+
+Delete a current entry.  [TAG] parameter is optional.  If omitted, you'll see a list.
+  # gitswitch delete [TAG]
+
+Update your global .git user instead of your current repository
+  # gitswitch global work
+
+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

@@ -1,37 +1,8 @@
-require 'rubygems'
-require 'rake'
-require 'rspec/core'
+require 'bundler'
+require 'rspec'
 require 'rspec/core/rake_task'
 
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "gitswitch"
-    gem.summary = %Q{Easy git user switching}
-    gem.description = %Q{Easily switch your git name/e-mail user info -- Handy for work vs. personal and for pair programming}
-    gem.email = "joe@joealba.com"
-    gem.homepage = "http://github.com/joealba/gitswitch"
-    gem.authors = ["Joe Alba"]
-#    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-#    gem.add_development_dependency "rspec", ">= 0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "gitswitch #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+Bundler::GemHelper.install_tasks
 
 
 desc 'Default: Run specs'
@@ -42,4 +13,3 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = FileList["spec/**/*_spec.rb"]
 end
 
-

data/bin/gitswitch

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 require "gitswitch"
-GitSwitch.run ARGV
+Gitswitch::CLI.start

data/gitswitch.gemspec

@@ -1,58 +1,37 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "gitswitch/version"
 
 Gem::Specification.new do |s|
   s.name = %q{gitswitch}
-  s.version = "0.2.5"
+  s.version = Gitswitch::VERSION
+  s.platform = Gem::Platform::RUBY
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joe Alba"]
-  s.date = %q{2010-09-23}
+  s.date = %q{2010-09-27}
   s.default_executable = %q{gitswitch}
+  s.homepage = %q{http://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.executables = ["gitswitch"]
+  
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".bundle/config",
-     ".document",
-     ".gitignore",
-     ".rspec",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "bin/gitswitch",
-     "gitswitch.gemspec",
-     "lib/gitswitch.rb",
-     "spec/gitswitch_spec.rb",
-     "spec/spec_helper.rb"
+    "README.rdoc"
   ]
-  s.homepage = %q{http://github.com/joealba/gitswitch}
-  s.rdoc_options = ["--charset=UTF-8"]
+  
+  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.summary = %q{Easy git user switching}
-  s.test_files = [
-    "spec/gitswitch_spec.rb",
-     "spec/spec_helper.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
+	s.add_dependency('rake')
+	s.add_dependency('thor')
+  s.add_development_dependency(%q<rspec>, [">= 2.3.0"])
+
 end
 

data/lib/gitswitch/cli.rb

@@ -0,0 +1,150 @@
+require 'thor'
+
+
+class Gitswitch
+  class CLI < Thor
+
+
+    ######################################################################
+    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
+        end
+      end
+    end
+
+  
+    ######################################################################
+    desc "version", "Show the gitswitch version"
+    map ["-v","--version"] => :version
+    def version
+      puts Gitswitch::VERSION
+    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
+
+
+    ######################################################################
+    desc "list", "Show all the git user tags you have configured"
+    map ["-l","--list"] => :list
+    def list
+      puts Gitswitch.new.list_users
+    end
+
+
+    ######################################################################
+    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] ? switch_global(tag) : Gitswitch.new.switch_repo_user(tag)
+      puts Gitswitch.current_user_info
+    end
+
+
+    ######################################################################
+    desc "global [TAG]", "Switch global git user"
+    map "-s" => :switch_global
+    def switch_global(tag = 'default')
+      Gitswitch.new.switch_global_user(tag)
+      puts Gitswitch.current_user_info
+    end
+
+
+    ######################################################################
+    desc "add [TAG]", "Add a new tagged user entry"
+    map ["-a","--add"] => :add
+    def add(tag = '')
+      gs = Gitswitch.new
+
+      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
+      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
+
+
+    ######################################################################
+    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
+
+
+    ######################################################################
+    desc "delete [TAG]", "Delete a tagged user entry"
+    def delete(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 delete: \n#{tag_table}").gsub(/\W+/,'') 
+      end
+
+      Gitswitch.new.delete_gitswitch_entry(tag)
+    end
+
+
+    private
+    
+
+    ######################################################################
+    def prompt_for_email_and_name 
+      email = ask("  E-mail address: ").chomp
+      ## TODO: Validate e-mail
+      if email.nil?
+        puts "No name provided"
+        exit
+      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
+      end
+
+      return [email, name]
+    end
+
+  
+  end
+end

data/lib/gitswitch/commands.rb

@@ -0,0 +1,171 @@
+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
+
+
+  ##############################################################
+  def initialize
+    @users = {}
+    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
+    end
+  end
+    
+
+  ##############################################################
+  # Create a .gitswitch file with the current user defaults
+  def create_fresh_gitswitch_file
+    @users = {}
+    user = Gitswitch::get_git_user_info({:global => true})
+    if user[:name].empty? && user[:email].empty?
+      puts "ERROR: You must set up a default git user.name and user.email first."
+    else
+      puts "Adding your global .gitconfig user info to the \"default\" tag..."
+      set_gitswitch_entry('default', user[:email], user[:name])
+      save_gitswitch_file
+    end
+  end
+
+  def self.gitswitch_file_exists
+    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}"
+    end
+  end
+
+
+  ##############################################################
+  # Set git user parameters for a tag
+  # ==== Parameters
+  # * +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
+  end
+
+  def 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
+  end
+
+  def get_user(tag)     
+    if !@users.empty? && @users[tag] && !@users[tag].empty?
+      @users[tag]
+    end
+  end
+
+  def 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]) }
+  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
+    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
+
+
+  ##############################################################
+  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?
+  end
+
+
+  ##############################################################
+  # 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"
+    if user = get_user(tag)
+      puts "Switching your .gitconfig user info to \"#{tag}\" tag (#{user[:name]} <#{user[:email]}>)."
+      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
+    if !Gitswitch::in_a_git_repo
+      puts "You do not appear to currently be in a git repository directory"
+      false
+    else
+      if user = get_user(tag)
+        puts "Switching git user to \"#{tag}\" tag for the current repository (#{user[:name]} <#{user[:email]}>)."
+        git_config(user) or raise "Could not change the git user settings to your repository."
+      else
+        puts "ERROR: Could not find info for tag \"#{tag}\" in your .gitswitch file"
+      end
+    end
+  end
+
+
+  
+  private
+
+  # 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
+    } 
+  end
+
+end

data/lib/gitswitch/version.rb

@@ -0,0 +1,3 @@
+class Gitswitch
+	VERSION = "0.3.0"
+end

data/lib/gitswitch.rb

@@ -1,250 +1,6 @@
-require 'optparse'
-require 'yaml'
-require 'shellwords' if !String.new.methods.include?('shellescape')
+require 'gitswitch/version'
+require 'gitswitch/commands'
+require 'gitswitch/cli'
+#Gitswitch::CLI.start  ## If we decide to use Thor
 
 
-class GitSwitch
-  GITSWITCH_CONFIG_FILE = File.join ENV["HOME"], ".gitswitch"
-  GIT_BIN = '/usr/bin/env git'
-  VERSION_FILE = File.join File.dirname(__FILE__), "..", "VERSION"
-  
-
-  def self.run args = ARGV
-    gitswitch = GitSwitch.new
-    gitswitch.parse_args args
-  end
-
-
-  def initialize
-    @users = {}
-    if File.exists? GITSWITCH_CONFIG_FILE
-      @users = YAML::load_file GITSWITCH_CONFIG_FILE
-      if @users.nil?
-        puts "Error loading .gitswitch file" 
-        exit
-      end
-    else
-      print "Gitswitch users file ~/.gitswitch not found.  Would you like to create one? (y/n): "
-      if gets.chomp =~ /^y/i
-        create_gitswitch_file
-      else
-        puts "Ok, that's fine.  Exiting."
-        exit
-      end
-    end
-  end
-
-
-  # Read and parse the supplied command line arguments.
-  def parse_args args = ARGV
-    args = ["-h"] if args.empty?
-
-    parser = OptionParser.new do |o|
-      o.banner = "Usage: gitswitch [options]"
-
-      o.on "-l", "--list", "Show all git users you have configured" do
-        list_users
-        exit
-      end
-
-      o.on "-i", "--info", "Show the current git user info." do
-        print_info
-        exit
-      end
-
-      o.on "-s", "--switch [TAG]", String, "Switch git user to the specified tag in your user's global git configuration" do |tag|
-        tag ||= 'default'
-        switch_global_user(tag)
-        print_info
-        exit
-      end
-
-      o.on "-r", "--repo [TAG]", String, "Switch git user to the specified tag for the current directory's git repository" do |tag|
-        tag ||= 'default'
-        switch_repo_user(tag)
-        exit
-      end
-
-      o.on "-h", "--help", "Show this help message." do
-        print_info
-        puts parser
-        exit
-      end
-
-      o.on "-o", "--overwrite", "Overwrite/create a .gitswitch file using your global git user info as default" do
-        create_gitswitch_file
-        print_info
-        exit
-      end
-
-      o.on "-a", "--add [TAG]", "Add a new gitswitch entry" do |tag|
-        add_gitswitch_entry(tag)
-        exit
-      end
-
-      o.on("-v", "--version", "Show the current version.") do
-        print_version
-        exit
-      end      
-    end
-    
-    begin
-      parser.parse! args
-    rescue OptionParser::InvalidOption => error
-      puts error.message.capitalize
-    rescue OptionParser::MissingArgument => error
-      puts error.message.capitalize
-    end
-  end
-  
-
-
-  # Create a .gitswitch file with the current user defaults
-  def create_gitswitch_file
-    user = get_git_user_info({:global => true})
-    if user[:name].empty? && user[:email].empty?
-      puts "ERROR: You must set up a default git user.name and user.email first."
-    else
-      puts "Adding your global .gitconfig user info to the \"default\" tag..."
-      set_gitswitch_entry('default', user[:email], user[:name])
-      save_gitswitch_file
-    end
-  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}"
-    end
-  end
-
-
-  # Set git user parameters for a tag
-  # ==== Parameters
-  # * +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
-  end
-
-
-  def get_user(tag)     
-    if !@users.empty? && @users[tag] && !@users[tag].empty?
-      @users[tag]
-    end
-  end
-
-
-  def git_config(user, args = {})
-    git_args = 'config --replace-all'
-    git_args += ' --global' if args[: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
-
-  
-  # 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"
-    if user = get_user(tag)
-      puts "Switching your .gitconfig user info to \"#{tag}\" tag (#{user[:name]} <#{user[:email]}>)."
-      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
-    if user = get_user(tag)
-      puts "Switching git user to \"#{tag}\" tag for the current repository (#{user[:name]} <#{user[:email]}>)."
-      git_config(user) or raise "Could not change the git user settings to your repository."
-    else
-      puts "ERROR: Could not find info for tag \"#{tag}\" in your .gitswitch file"
-    end
-  end
-  
-  
-  # Add a user entry to your .gitswitch file
-  def add_gitswitch_entry(tag = '')
-    if (!tag.nil? && !tag.empty?)
-      tag.gsub!(/\W+/,'')
-    else
-      print "Enter a tag to describe this git user entry: "
-      tag = gets.gsub(/\W+/,'')
-    end
-    
-    if tag.empty?
-      puts "You must enter a short tag to describe the git user entry you would like to save."
-      exit
-    end
-
-    puts "Adding a new gitswitch user entry for tag '#{tag}'"
-    print "  E-mail address: "
-    email = gets.chomp
-
-    print "  Name: (ENTER to use \"" + get_git_user_info({:global => true})[:name] + "\") "
-    name = gets.chomp
-    name = get_git_user_info({:global => true})[:name] if name.empty?
-
-    set_gitswitch_entry(tag, email, name)
-  end
-  
-  
-  def list_users
-    puts "\nCurrent git user options --"
-    @users.each do |key, user|
-      puts "#{key}:"
-      puts "  Name:   #{user[:name]}" if !user[:name].to_s.empty?
-      puts "  E-mail: #{user[:email]}\n"
-    end
-  end
-
-  
-  # Print active account information.
-  def print_info
-    current_git_user = get_git_user_info
-    puts "Current git user information:\n"
-    puts "Name:   #{current_git_user[:name]}" 
-    puts "E-mail: #{current_git_user[:email]}"
-    puts
-  end
-
-  
-  # Print version information.
-  def print_version
-    if fh = File.open(VERSION_FILE,'r')
-      puts "GitSwitch " + fh.gets
-      fh.close
-    else
-      puts "Version information not found"
-    end    
-    #    puts "GitSwitch " + GitSwitch::VERSION.to_s
-  end
-
-  
-  private
-
-  # Show the current git user info
-  def get_git_user_info(args = {})
-    git_args = 'config --get'
-    git_args += ' --global' if args[: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

data/spec/gitswitch_spec.rb

@@ -1,16 +1,68 @@
 require 'spec_helper'
 
-describe GitSwitch do
+describe Gitswitch do
 
   describe "basics" do
     it "should have a VERSION" do
-      VERSION.should_not == ''
+      Gitswitch::VERSION.should_not == ''
     end
 
     it "should find the git executable" do
-      result = %x[#{GitSwitch::GIT_BIN} --version]
+      result = %x[#{Gitswitch::GIT_BIN} --version]
       $?.exitstatus.should == 0
     end    
   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
+    end
+  end
+
+
+  describe "write methods" do
+
+    it "should allow you to add a new user entry" do 
+      pending
+    end
+
+    it "should allow you to update a user entry" do 
+      pending
+    end
+
+    it "should allow you to delete a user entry" do 
+      pending
+    end
+
+    it "should allow you to overwrite the current .gitswitch file and start fresh" do
+      pending
+    end
+
+  end
+
+
+  describe "git proxy methods" do
+    
+    it "should allow you to change the global git user credentials" do
+      pending
+    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
+    end
+    
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitswitch
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 5
-  version: 0.2.5
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Joe Alba
@@ -15,10 +15,53 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-23 00:00:00 -04:00
+date: 2010-09-27 00:00:00 -04:00
 default_executable: gitswitch
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: thor
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
+        version: 2.3.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
 email: joe@joealba.com
 executables: 
@@ -34,14 +77,15 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - bin/gitswitch
 - gitswitch.gemspec
 - lib/gitswitch.rb
+- lib/gitswitch/cli.rb
+- lib/gitswitch/commands.rb
+- lib/gitswitch/version.rb
 - spec/gitswitch_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true

data/Gemfile.lock

@@ -1,31 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.1.2)
-    gemcutter (0.6.1)
-    git (1.2.5)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
-      git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
-    json_pure (1.4.6)
-    rspec (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-      rspec-mocks (= 2.0.0.beta.22)
-    rspec-core (2.0.0.beta.22)
-    rspec-expectations (2.0.0.beta.22)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.4.0)
-  rspec (~> 2.0.0.beta.22)

data/VERSION

@@ -1 +0,0 @@
-0.2.5