gitswitch 0.3.1 → 0.3.2

data/lib/gitswitch/cli.rb

@@ -20,6 +20,17 @@ class Gitswitch
           Gitswitch::new.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::new.set_gitswitch_entry('default', user[:email], user[:name])
+      end
+
     end
 
   
@@ -55,7 +66,7 @@ class Gitswitch
     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
+      puts Gitswitch.current_user_info(options)
     end
 
 
@@ -64,7 +75,6 @@ class Gitswitch
     map "-s" => :global
     def global(tag = 'default')
       Gitswitch.new.switch_global_user(tag)
-      puts Gitswitch.current_user_info
     end
 
 

data/lib/gitswitch/commands.rb

@@ -26,14 +26,7 @@ class Gitswitch
   # 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
+    save_gitswitch_file
   end
 
   def self.gitswitch_file_exists

data/lib/gitswitch/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitswitch
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Joe Alba
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Easy git user switching