gas 0.1.5 → 0.1.6

data/lib/gas.rb

@@ -35,7 +35,6 @@ module Gas
     user = @config[nickname]
 
     @gitconfig.change_user user.name, user.email
-    @gitconfig.save!
 
     self.show
   end

data/lib/gas/gitconfig.rb

@@ -1,69 +1,26 @@
 module Gas
 
-  # Class that class that interacts with the .gitconfig
+  # Class that class that interacts with the git config
   class Gitconfig
 
-    def initialize(gitconfig = nil)
-      @gitconfig_file = File.expand_path('~/.gitconfig')
-      @gitconfig = ''
-
-      if gitconfig.nil? && File.exists?(@gitconfig_file)
-        @gitconfig = File.read(@gitconfig_file)
-      elsif !gitconfig.nil?
-        @gitconfig = gitconfig
-      end
-    end
-
     # Parse out the current user from the gitconfig
-    # TODO: Error handling
     # @param [String] gitconfig The git configuration
     # @return [User] The current user or nil if not present
     def current_user
-      regex = /\[user\]\s+name = (.+)\s+email = (.+)/
-      matches = regex.match @gitconfig
+      name = `git config --global --get user.name`
+      email = `git config --global --get user.email`
 
-      return nil if matches.nil?
+      return nil if name.nil? && email.nil?
 
-      User.new matches[1], matches[2]
+      User.new name.delete("\n"), email.delete("\n") # git cli returns the name and email with \n at the end
     end
 
     # Changes the user
     # @param [String] name The new name
     # @param [String] email The new email
     def change_user(name, 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
-    def save!
-      File.open @gitconfig_file, 'w' do |file|
-        file.write @gitconfig
-      end
+      `git config --global user.name "#{name}"`
+      `git config --global user.email "#{email}"`
     end
 
   end

data/lib/gas/version.rb

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

data/spec/gas/gitconfig_spec.rb

@@ -7,50 +7,38 @@ describe Gas::Gitconfig do
   before :each do
     @name = 'Fredrik Wallgren'
     @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 ''
+    @gitconfig = Gas::Gitconfig.new
   end
 
   it 'should be able to get current user from gitconfig' do
+    mock_cli_call(@gitconfig, 'git config --global --get user.name') { @name + "\n" }
+    mock_cli_call(@gitconfig, 'git config --global --get user.email') { @email + "\n" }
+
     user = @gitconfig.current_user
     user.name.should == @name
     user.email.should == @email
   end
 
   it 'should return nil if no current user is present in gitconfig' do
-    @empty_gitconfig.current_user.should == nil
+    mock_cli_call(@gitconfig, 'git config --global --get user.name') { nil }
+    mock_cli_call(@gitconfig, 'git config --global --get user.email') { nil }
+
+    @gitconfig.current_user.should == nil
   end
 
   it 'should be able to change the current user' do
     name = 'Test Testsson'
     email = 'test@testsson.com'
-    @gitconfig.change_user name, email
 
-    user = @gitconfig.current_user
-    user.name.should == name
-    user.email.should == email
-  end
+    mock_cli_call(@gitconfig, "git config --global user.name \"#{name}\"") { nil }
+    mock_cli_call(@gitconfig, "git config --global user.email \"#{email}\"") { nil }
+    mock_cli_call(@gitconfig, 'git config --global --get user.name') { name + "\n" }
+    mock_cli_call(@gitconfig, 'git config --global --get user.email') { email + "\n" }
 
-  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
+    @gitconfig.change_user name, email
 
-    user = @empty_gitconfig.current_user
+    user = @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

data/spec/spec_helper.rb

@@ -0,0 +1,14 @@
+# encoding: utf-8
+
+RSpec.configure do |config|
+  config.mock_with :rr
+end
+
+# Mocks a cli call using ` with rr.
+# Takes a block to use as rr return block
+# @param [Object] mock_object The object to mock
+# @param [String] command The command to mock
+def mock_cli_call(mock_object, command)
+  # To be able to mock ` (http://blog.astrails.com/2010/7/5/how-to-mock-backticks-operator-in-your-test-specs-using-rr)
+  mock(mock_object).__double_definition_create__.call(:`, command) { yield }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gas
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-23 00:00:00.000000000 +02:00
+date: 2011-07-30 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &12746540 !ruby/object:Gem::Requirement
+  requirement: &21428080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *12746540
+  version_requirements: *21428080
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &12746120 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &21427660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12746120
+  version_requirements: *21427660
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &12745660 !ruby/object:Gem::Requirement
+  requirement: &21427200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *21427200
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &21426780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *21426780
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: &21426360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12745660
+  version_requirements: *21426360
 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