gitswitch 0.1.1 → 0.1.2

data/README.rdoc

@@ -16,9 +16,9 @@ Simply run the script to establish a default ~/.gitswitch file using the git inf
 Add a new git user tag
   gitswitch -a
 
-Set specific user info to your current git repository
-  gitswitch -r work
-  gitswitch -r  # Sets your 'default' tag if you don't specify a tag
+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
 
 List all the gitswitch user tags/info you have stored
   gitswitch -l

data/Rakefile

@@ -1,5 +1,8 @@
 require 'rubygems'
 require 'rake'
+# require 'rspec/core'
+# require 'rspec/core/rake_task'
+
 
 begin
   require 'jeweler'
@@ -10,7 +13,8 @@ begin
     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 "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
@@ -18,29 +22,6 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
-
-task :default => :test
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
@@ -51,3 +32,14 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+
+# desc 'Default: Run specs'
+# task :default => :spec
+# 
+# desc 'Run specs'
+# RSpec::Core::RakeTask.new(:spec) do |t|
+#   t.pattern = FileList["spec/**/*_spec.rb"]
+# end
+
+

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/gitswitch.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gitswitch}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joe Alba"]
@@ -27,9 +27,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "bin/gitswitch",
      "gitswitch.gemspec",
-     "lib/gitswitch.rb",
-     "test/helper.rb",
-     "test/test_gitswitch.rb"
+     "lib/gitswitch.rb"
   ]
   s.homepage = %q{http://github.com/joealba/gitswitch}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -37,8 +35,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Easy git user switching}
   s.test_files = [
-    "test/helper.rb",
-     "test/test_gitswitch.rb"
+    "spec/gitswitch_spec.rb",
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -46,12 +44,9 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     end
   else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
   end
 end
 

data/lib/gitswitch.rb

@@ -1,5 +1,6 @@
-require "optparse"
-require "yaml"
+require 'optparse'
+require 'yaml'
+#require 'escape'
 
 class GitSwitch
   VERSION_FILE = File.join File.dirname(__FILE__), "..", "VERSION.yml"
@@ -26,7 +27,6 @@ class GitSwitch
         puts "Ok, that's fine.  Exiting." and exit
       end
     end
-
   end
 
 
@@ -63,7 +63,7 @@ class GitSwitch
         puts parser and exit
       end
 
-      o.on "-o", "--overwrite", "Overwrite/create a .gitswitch file using your current git user info as default" do
+      o.on "-o", "--overwrite", "Overwrite/create a .gitswitch file using your global git user info as default" do
         create_gitswitch_file
         print_info and exit
       end
@@ -77,7 +77,6 @@ class GitSwitch
       end      
     end
     
-
     begin
       parser.parse! args
     rescue OptionParser::InvalidOption => error
@@ -91,12 +90,12 @@ class GitSwitch
 
   # Create a .gitswitch file with the current user defaults
   def create_gitswitch_file
-    current_git_user = get_current_git_user
-    if current_git_user[:name].empty? && current_git_user[:email].empty?
+    user = get_global_git_user
+    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 current git user info to the \"default\" tag..."
-      set_gitswitch_entry('default', current_git_user[:email], current_git_user[:name])
+      puts "Adding your global git user info to the \"default\" tag..."
+      set_gitswitch_entry('default', user[:email], user[:name])
       save_gitswitch_file
     end
   end
@@ -122,18 +121,32 @@ class GitSwitch
     save_gitswitch_file
   end
 
+
+  def get_user(tag)     
+    if @users.empty? || @users[tag].empty? || @users[tag][:email].to_s.empty?
+      return false
+    end
+    @users[tag]
+  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"
+    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..."
-    if !@users[tag].empty? && !@users[tag][:email].to_s.empty?
-      %x(#{GIT_BIN} config --replace-all --global user.name '#{@users[tag][:name]}') if !@users[tag][:name].to_s.empty?
-      %x(#{GIT_BIN} config --replace-all --global user.email '#{@users[tag][:email]}')
-    else
-      puts "ERROR: Could not find info for tag #{tag} in your .gitswitch file"
-    end
+    git_config(user, {:global => true})
+#   puts "ERROR: Could not find info for tag \"#{tag}\" in your .gitswitch file"
   end
 
 
@@ -141,28 +154,25 @@ class GitSwitch
   # ==== Parameters
   # * +tag+ - The tag associated with your desired git info in .gitswitch. Defaults to "default".
   def switch_repo_user tag = "default"
-    puts "Switching git user to \"#{tag}\" tag..."
-    if !@users[tag].empty? && !@users[tag][:email].to_s.empty?
-      %x(#{GIT_BIN} config --replace-all user.name '#{@users[tag][:name]}') if !@users[tag][:name].to_s.empty?
-      %x(#{GIT_BIN} config --replace-all user.email '#{@users[tag][:email]}')
-    else
-      puts "ERROR: Could not find info for tag #{tag} in your .gitswitch file"
-    end
+    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"
   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? "
-    tag = gets.chomp
+    tag = gets.gsub(/\W+/,'')
       
     print "E-mail address: "
     email = gets.chomp
 
-    print "Name: (ENTER to use \"" + get_current_git_user()[:name] + "\") "
+    print "Name: (ENTER to use \"" + get_global_git_user()[:name] + "\") "
     name = gets.chomp
     if name.empty?
-      name = get_current_git_user()[:name]
+      name = get_global_git_user()[:name]
     end
     set_gitswitch_entry(tag, email, name)
   end
@@ -203,10 +213,19 @@ class GitSwitch
 
   # Show the current git user info
   def get_current_git_user
-    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
+    {
+      :name => %x(#{GIT_BIN} config --global --get user.name).to_s.chomp,
+      :email => %x(#{GIT_BIN} config --global --get user.email).to_s.chomp
+    } 
+  end
+
   
 end

data/spec/gitswitch_spec.rb

@@ -0,0 +1,7 @@
+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

@@ -0,0 +1,5 @@
+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'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitswitch
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Joe Alba
@@ -17,21 +17,8 @@ cert_chain: []
 
 date: 2010-09-04 00:00:00 -04:00
 default_executable: gitswitch
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
+dependencies: []
+
 description: 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.
 email: joe@joealba.com
 executables: 
@@ -51,8 +38,8 @@ files:
 - bin/gitswitch
 - gitswitch.gemspec
 - lib/gitswitch.rb
-- test/helper.rb
-- test/test_gitswitch.rb
+- spec/gitswitch_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/joealba/gitswitch
 licenses: []
@@ -88,5 +75,5 @@ signing_key:
 specification_version: 3
 summary: Easy git user switching
 test_files: 
-- test/helper.rb
-- test/test_gitswitch.rb
+- spec/gitswitch_spec.rb
+- spec/spec_helper.rb

data/test/helper.rb

@@ -1,10 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'gitswitch'
-
-class Test::Unit::TestCase
-end

data/test/test_gitswitch.rb

@@ -1,9 +0,0 @@
-require 'helper'
-
-class TestGitswitch < Test::Unit::TestCase
-
-  # should "probably rename this file and start testing for real" do
-  #   flunk "hey buddy, you should probably rename this file and start testing for real"
-  # end
-
-end