gas 0.1.4 → 0.1.5

data/README.textile

@@ -28,6 +28,10 @@ bc. $ gas list
 
 This lists the authors that are set up.
 
+You can import your current user by giving it a nickname
+
+bc. $ gas import current_user
+
 To add a author use, add
 
 bc. $ gas add walle "Fredrik Wallgren" fredrik.wallgren@gmail.com

data/bin/gas

@@ -27,6 +27,11 @@ class GasRunner < Thor
     Gas.add nickname, name, email
   end
 
+  desc "import NICKNAME", "Imports current user to gasconfig"
+  def import(nickname)
+    Gas.import nickname
+  end
+
   desc "delete AUTHOR", "Deletes author"
   def delete(nickname)
     Gas.delete nickname

data/lib/gas/gitconfig.rb

@@ -9,7 +9,7 @@ module Gas
 
       if gitconfig.nil? && File.exists?(@gitconfig_file)
         @gitconfig = File.read(@gitconfig_file)
-      else
+      elsif !gitconfig.nil?
         @gitconfig = gitconfig
       end
     end
@@ -17,11 +17,13 @@ module Gas
     # Parse out the current user from the gitconfig
     # TODO: Error handling
     # @param [String] gitconfig The git configuration
-    # @return [User] The current user
+    # @return [User] The current user or nil if not present
     def current_user
       regex = /\[user\]\s+name = (.+)\s+email = (.+)/
       matches = regex.match @gitconfig
 
+      return nil if matches.nil?
+
       User.new matches[1], matches[2]
     end
 
@@ -29,8 +31,32 @@ module Gas
     # @param [String] name The new name
     # @param [String] email The new email
     def change_user(name, email)
-      @gitconfig.gsub! /^\s*name\s?=\s?.+/, "  name = #{name}"
-      @gitconfig.gsub! /^\s*email\s?=\s?.+/, "  email = #{email}"
+      if current_user_present?
+        @gitconfig.gsub! /^\s*name\s?=\s?.+/, "  name = #{name}"
+        @gitconfig.gsub! /^\s*email\s?=\s?.+/, "  email = #{email}"
+      else
+        create_user(name, email)
+      end
+    end
+
+    # Create a user section
+    # @param [String] name The new name
+    # @param [String] email The new email
+    def create_user(name, email)
+      return if current_user_present?
+
+      @gitconfig << <<-EOS
+
+# Those lines are added by gas, feel free to change them.
+[user]
+  name = #{name}
+  email = #{email}
+      EOS
+    end
+
+    # Check if user section is present in gitconfig
+    def current_user_present?
+      !current_user.nil?
     end
 
     # Saves the gitconfig

data/lib/gas/version.rb

@@ -1,6 +1,6 @@
 module Gas
 
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 
 end
 

data/lib/gas.rb

@@ -19,8 +19,13 @@ module Gas
   # Shows the current user
   def self.show
     user = @gitconfig.current_user
-    puts 'Current user:'
-    puts "#{user.name} <#{user.email}>"
+
+    if user
+      puts 'Current user:'
+      puts "#{user.name} <#{user.email}>"
+    else
+      puts 'No current user in gitconfig'
+    end
   end
 
   # Sets _nickname_ as current user
@@ -49,6 +54,25 @@ module Gas
     puts user
   end
 
+  # Imports current user from .gitconfig to .gas
+  # @param [String] nickname The nickname to give to the new user
+  def self.import(nickname)
+    self.has_user? nickname
+    user = @gitconfig.current_user
+
+    if user
+      user = User.new user.name, user.email, nickname
+
+      @config.add user
+      @config.save!
+
+      puts 'Added author'
+      puts user
+    else
+      puts 'No current user to import'
+    end
+  end
+
   # Deletes a author from the config using nickname
   # @param [String] nickname The nickname of the author
   def self.delete(nickname)

data/spec/gas/gitconfig_spec.rb

@@ -9,6 +9,7 @@ describe Gas::Gitconfig do
     @email = 'fredrik.wallgren@gmail.com'
     gitconfig = "[other stuff]\n  foo = bar\n\n[user]\n  name = #{@name}\n  email = #{@email}\n\n[foo]\n  bar = foo"
     @gitconfig = Gas::Gitconfig.new gitconfig
+    @empty_gitconfig = Gas::Gitconfig.new ''
   end
 
   it 'should be able to get current user from gitconfig' do
@@ -17,6 +18,10 @@ describe Gas::Gitconfig do
     user.email.should == @email
   end
 
+  it 'should return nil if no current user is present in gitconfig' do
+    @empty_gitconfig.current_user.should == nil
+  end
+
   it 'should be able to change the current user' do
     name = 'Test Testsson'
     email = 'test@testsson.com'
@@ -26,4 +31,26 @@ describe Gas::Gitconfig do
     user.name.should == name
     user.email.should == email
   end
+
+  it 'should add a new user if no user section exists in gitconfig' do
+    name = 'Test Testsson'
+    email = 'test@testsson.com'
+    @empty_gitconfig.change_user name, email
+
+    user = @empty_gitconfig.current_user
+    user.name.should == name
+    user.email.should == email
+  end
+
+  it 'should not blow up if no gitconfig exists (use empty string instead)' do
+    # Stub out File#exists?
+    class File
+      def self.exists?(path)
+        false
+      end
+    end
+
+    gitconfig_file_absent = Gas::Gitconfig.new
+    gitconfig_file_absent.instance_variable_get(:@gitconfig).should == ''
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gas
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-21 00:00:00.000000000 +02:00
+date: 2011-07-23 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &9522860 !ruby/object:Gem::Requirement
+  requirement: &12746540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *9522860
+  version_requirements: *12746540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &9522440 !ruby/object:Gem::Requirement
+  requirement: &12746120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9522440
+  version_requirements: *12746120
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &9521980 !ruby/object:Gem::Requirement
+  requirement: &12745660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9521980
+  version_requirements: *12745660
 description: Gas is a utility to keep track of your git authors. Add them to gas and
   switch at any time. Great if you use one author at work and one at home for instance.
 email: fredrik.wallgren@gmail.com