gitswitch 0.1.2 → 0.1.3

data/README.rdoc

@@ -1,35 +1,50 @@
 = gitswitch
 
-Easily switch your current git user info.  Handy for work and personal repositories.  Also might come in handy for switching between users while pair programming.
+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.
 
 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.
 
 == Install
 
-  gem install gitswitch
+  # gem install gitswitch
 
 == Usage
 
 Simply run the script to establish a default ~/.gitswitch file using the git info you already have in your ~/.gitconfig file
-  gitswitch 
+  # gitswitch 
+
+  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...
+  Current git user information:
+    Name:   Joe Alba
+    E-mail: joe@home.com
 
 Add a new git user tag
-  gitswitch -a
+  # gitswitch -a
+
+  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 -r       # User info from your 'default' tag is used if you don't specify a tag
+  # gitswitch -r 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
+  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 -l
 
   Current git user options --
-	default:
-	  Name:   Joe Alba
-	  E-mail: joe@home.com
-	work:
-	  Name:   Joe Alba
-	  E-mail: jalba@work.com
+  default:
+    Name:   Joe Alba
+    E-mail: joe@home.com
+  work:
+    Name:   Joseph M. Alba
+    E-mail: jalba@work.com
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/gitswitch.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gitswitch}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joe Alba"]
-  s.date = %q{2010-09-04}
+  s.date = %q{2010-09-05}
   s.default_executable = %q{gitswitch}
   s.description = %q{Do you write code for your employer and for yourself?  Want to easily change the e-mail address associated with your commits for work and home repos?  This gem might help you out.}
   s.email = %q{joe@joealba.com}
@@ -34,10 +34,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   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

data/lib/gitswitch.rb

@@ -1,6 +1,5 @@
 require 'optparse'
 require 'yaml'
-#require 'escape'
 
 class GitSwitch
   VERSION_FILE = File.join File.dirname(__FILE__), "..", "VERSION.yml"
@@ -18,13 +17,17 @@ class GitSwitch
     @users = {}
     if File.exists? GITSWITCH_CONFIG_FILE
       @users = YAML::load_file GITSWITCH_CONFIG_FILE
-      raise "Error loading .gitswitch file" if @users.nil?
+      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." and exit
+        puts "Ok, that's fine.  Exiting."
+        exit
       end
     end
   end
@@ -90,11 +93,11 @@ class GitSwitch
 
   # Create a .gitswitch file with the current user defaults
   def create_gitswitch_file
-    user = get_global_git_user
+    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 git user info to the \"default\" tag..."
+      puts "Adding your global .gitconfig user info to the \"default\" tag..."
       set_gitswitch_entry('default', user[:email], user[:name])
       save_gitswitch_file
     end
@@ -123,10 +126,9 @@ class GitSwitch
 
 
   def get_user(tag)     
-    if @users.empty? || @users[tag].empty? || @users[tag][:email].to_s.empty?
-      return false
+    if !@users.empty? && @users[tag] && !@users[tag].empty?
+      @users[tag]
     end
-    @users[tag]
   end
 
 
@@ -143,10 +145,12 @@ class GitSwitch
   # ==== Parameters
   # * +tag+ - The tag associated with your desired git info in .gitswitch.  Defaults to "default".
   def switch_global_user tag = "default"
-    user = get_user(tag) or raise "ERROR: Could not find info for tag \"#{tag}\" in your .gitswitch file"
-    puts "Switching git user to \"#{tag}\" tag..."
-    git_config(user, {:global => true})
-#   puts "ERROR: Could not find info for tag \"#{tag}\" in your .gitswitch file"
+    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
 
 
@@ -154,26 +158,33 @@ class GitSwitch
   # ==== Parameters
   # * +tag+ - The tag associated with your desired git info in .gitswitch. Defaults to "default".
   def switch_repo_user tag = "default"
-    user = get_user(tag) or raise "ERROR: Could not find info for tag \"#{tag}\" in your .gitswitch file"
-    puts "Switching git user to \"#{tag}\" tag for the current repository..."
-    git_config(user) or raise "Could not set your repo"
-#   puts "ERROR: Could not find info for tag \"#{tag}\" in your .gitswitch file"
+    ## 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
-    print "What tag would you like to set to this git user? "
+    print "Enter a tag to describe this git user entry: "
     tag = gets.gsub(/\W+/,'')
+    
+    if tag.empty?
+      puts "You must enter a short tag to describe the git user entry you would like to save."
+      exit
+    end
       
     print "E-mail address: "
     email = gets.chomp
 
-    print "Name: (ENTER to use \"" + get_global_git_user()[:name] + "\") "
+    print "Name: (ENTER to use \"" + get_git_user_info({:global => true})[:name] + "\") "
     name = gets.chomp
-    if name.empty?
-      name = get_global_git_user()[:name]
-    end
+    name = get_git_user_info({:global => true})[:name] if name.empty?
+
     set_gitswitch_entry(tag, email, name)
   end
   
@@ -190,7 +201,7 @@ class GitSwitch
   
   # Print active account information.
   def print_info
-    current_git_user = get_current_git_user
+    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]}"
@@ -212,20 +223,14 @@ class GitSwitch
   private
 
   # Show the current git user info
-  def get_current_git_user
-    {
-      :name => %x(#{GIT_BIN} config --get user.name).to_s.chomp,
-      :email => %x(#{GIT_BIN} config --get user.email).to_s.chomp
-    } 
-  end
-
-  # Show the global config git user info
-  def get_global_git_user
+  def get_git_user_info(args = {})
+    git_args = 'config --get'
+    git_args += ' --global' if args[:global]
+    
     {
-      :name => %x(#{GIT_BIN} config --global --get user.name).to_s.chomp,
-      :email => %x(#{GIT_BIN} config --global --get user.email).to_s.chomp
+      :name => %x(#{GIT_BIN} #{git_args} user.name).to_s.chomp,
+      :email => %x(#{GIT_BIN} #{git_args} user.email).to_s.chomp
     } 
   end
-
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitswitch
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Joe Alba
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-04 00:00:00 -04:00
+date: 2010-09-05 00:00:00 -04:00
 default_executable: gitswitch
 dependencies: []
 
@@ -38,8 +38,6 @@ files:
 - bin/gitswitch
 - gitswitch.gemspec
 - lib/gitswitch.rb
-- spec/gitswitch_spec.rb
-- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/joealba/gitswitch
 licenses: []
@@ -74,6 +72,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Easy git user switching
-test_files: 
-- spec/gitswitch_spec.rb
-- spec/spec_helper.rb
+test_files: []
+

data/spec/gitswitch_spec.rb

@@ -1,7 +0,0 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
-
-describe "somegem" do
-  it "should have tests" do
-    pending "write tests or I will kneecap you"
-  end 
-end

data/spec/spec_helper.rb

@@ -1,5 +0,0 @@
-SPEC_DIR = File.dirname(__FILE__)
-lib_path = File.expand_path("#{SPEC_DIR}/../lib")
-$LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
-
-require 'gitswitch'