gas 0.1.0 → 0.1.1

data/lib/gas.rb

@@ -1,34 +1,24 @@
-require 'fileutils'
-
 require 'gas/version'
 require 'gas/user'
-require 'gas/configuration'
-
-# TODO: Refactor this file
+require 'gas/config'
+require 'gas/gitconfig'
 
 module Gas
 
-  @config = File.expand_path('~/.gas')
-  @gitconfig = File.expand_path('~/.gitconfig')
+  @config = Config.new
+  @gitconfig = Gitconfig.new
 
   # Lists all authors
   def self.list
-    if !File.exists? @config
-      FileUtils.touch @config
-    end
-
-    config = File.read(@config)
-    configuration = Configuration.parse config
     puts 'Available users:'
-    puts configuration
+    puts @config
 
     self.show
   end
 
   # Shows the current user
   def self.show
-    gitconfig = File.read(@gitconfig)
-    user = Gas::Configuration.current_user gitconfig
+    user = @gitconfig.current_user
     puts 'Current user:'
     puts "#{user.name} <#{user.email}>"
   end
@@ -36,26 +26,11 @@ module Gas
   # Sets _nickname_ as current user
   # @param [String] nickname The nickname to use
   def self.use(nickname)
-    if !File.exists? @config
-      FileUtils.touch @config
-    end
-
-    config = File.read(@config)
-    configuration = Configuration.parse config
+    self.no_user? nickname
+    user = @config[nickname]
 
-    if !configuration.exists? nickname
-      puts "Nickname #{nickname} does not exist"
-      return
-    end
-
-    user = configuration[nickname]
-
-    gitconfig = File.read(@gitconfig)
-    gitconfig.gsub! /name\s?=\s?.+/, "name = #{user.name}"
-    gitconfig.gsub! /email\s?=\s?.+/, "email = #{user.email}"
-    File.open @gitconfig, 'w' do |file|
-      file.write gitconfig
-    end
+    @gitconfig.change_user user.name, user.email
+    @gitconfig.save!
 
     self.show
   end
@@ -65,19 +40,10 @@ module Gas
   # @param [String] name The name of the author
   # @param [String] email The email of the author
   def self.add(nickname, name, email)
-    config = File.read(@config)
-    configuration = Configuration.parse config
-
-    if configuration.exists? nickname
-      puts "Nickname #{nickname} does already exist"
-      return
-    end
-
+    self.has_user? nickname
     user = User.new name, email, nickname
-    configuration.add user
-    File.open @config, 'w' do |file|
-      file.write configuration
-    end
+    @config.add user
+    @config.save!
 
     puts 'Added author'
     puts user
@@ -86,25 +52,34 @@ module Gas
   # Deletes a author from the config using nickname
   # @param [String] nickname The nickname of the author
   def self.delete(nickname)
-    config = File.read(@config)
-    configuration = Configuration.parse config
-
-    if !configuration.exists? nickname
-      puts "Nickname #{nickname} does not exist"
-      return
-    end
-
-    configuration.delete nickname
-    File.open @config, 'w' do |file|
-      file.write configuration
-    end
+    self.no_user? nickname
+    @config.delete nickname
+    @config.save!
 
     puts "Deleted author #{nickname}"
   end
 
   # Prints the current version
   def self.version
-    puts Gas::Version
+    puts Gas::VERSION
+  end
+
+  # Checks if the user exists and gives error and exit if not
+  # @param [String] nickname
+  def self.no_user?(nickname)
+    if !@config.exists? nickname
+      puts "Nickname #{nickname} does not exist"
+      exit
+    end
+  end
+
+  # Checks if the user exists and gives error and exit if so
+  # @param [String] nickname
+  def self.has_user?(nickname)
+    if @config.exists? nickname
+      puts "Nickname #{nickname} does already exist"
+      exit
+    end
   end
 
 end

data/lib/gas/{configuration.rb → config.rb}

@@ -1,26 +1,36 @@
+require 'fileutils'
+
 module Gas
 
   # Class that keeps track of users
-  class Configuration
+  class Config
     attr_reader :users
 
-    # Parses [User]s from a string of the config file
-    # @param [String] config The configuration file
-    # @return [Configuration]
-    def self.parse(config)
-      users = []
-      config.scan(/\[(.+)\]\s+name = (.+)\s+email = (.+)/) do |nickname, name, email|
-        users << User.new(name, email, nickname)
-      end
+    # Initializes the object. If no users are supplied we look for a config file, if none then create it, and parse it to load users
+    # @param [Array<User>] users The override users
+    # @param [String] config The override config
+    def initialize(users = nil, config = nil)
+      @config_file = File.expand_path('~/.gas')
+      @config = ''
 
-      Configuration.new users
-    end
+      if config.nil?
+        if !File.exists? @config_file
+          FileUtils.touch @config_file
+        end
 
-    # Can parse out the current user from the gitconfig
-    # @param [String] gitconfig The git configuration
-    # @return [User] The current user
-    def self.current_user(gitconfig)
-      User.parse gitconfig
+        @config = File.read(@config_file)
+      else
+        @config = config
+      end
+
+      if users.nil?
+        @users = []
+        @config.scan(/\[(.+)\]\s+name = (.+)\s+email = (.+)/) do |nickname, name, email|
+          @users << User.new(name, email, nickname)
+        end
+      else
+        @users = users
+      end
     end
 
     # Checks if a user with _nickname_ exists
@@ -70,9 +80,11 @@ module Gas
       end
     end
 
-    # @param [Array<User>] users
-    def initialize(users)
-      @users = users
+    # Saves the current users to the config file
+    def save!
+      File.open @config_file, 'w' do |file|
+        file.write @config
+      end
     end
 
     # Override to_s to output correct format

data/lib/gas/gitconfig.rb

@@ -0,0 +1,45 @@
+module Gas
+
+  # Class that class that interacts with the .gitconfig
+  class Gitconfig
+
+    def initialize(gitconfig = nil)
+      @gitconfig_file = File.expand_path('~/.gitconfig')
+      @gitconfig = ''
+
+      if gitconfig.nil?
+        @gitconfig = File.read(@gitconfig_file)
+      else
+        @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
+    def current_user
+      regex = /\[user\]\s+name = (.+)\s+email = (.+)/
+      matches = regex.match @gitconfig
+
+      User.new matches[1], matches[2]
+    end
+
+    # Changes the user
+    # @param [String] name The new name
+    # @param [String] email The new email
+    def change_user(name, email)
+      @gitconfig.gsub! /name\s?=\s?.+/, "name = #{name}"
+      @gitconfig.gsub! /email\s?=\s?.+/, "email = #{email}"
+    end
+
+    # Saves the gitconfig
+    def save!
+      File.open @gitconfig_file, 'w' do |file|
+        file.write @gitconfig
+      end
+    end
+
+  end
+end
+

data/lib/gas/user.rb

@@ -4,16 +4,6 @@ module Gas
   class User
     attr_reader :name, :email, :nickname
 
-    # Static function to parse out the data from a git config string
-    # @param [String] gitconfig
-    # @return [User] a new user
-    def self.parse(gitconfig)
-      regex = /\[user\]\s+name = (.+)\s+email = (.+)/
-      matches = regex.match gitconfig
-
-      User.new matches[1], matches[2]
-    end
-
     # @param [String] name The name of the user
     # @param [String] email The email of the user
     # @param [String] nickname A nickname for the user, not used when parsing from gitconfig

data/lib/gas/version.rb

@@ -1,6 +1,6 @@
 module Gas
 
-  Version = '0.1.0'
+  VERSION = '0.1.1'
 
 end
 

data/spec/gas/{configuration_spec.rb → config_spec.rb}

@@ -2,33 +2,28 @@ require './spec/spec_helper'
 
 require './lib/gas'
 
-describe Gas::Configuration do
-  it 'should be able to parse users from config format' do
-    name = 'Fredrik Wallgren'
-    email = 'fredrik.wallgren@gmail.com'
-    nickname = 'walle'
-    config = "[#{nickname}]\n  name = #{name}\n  email = #{email}\n\n[user2]\n  name = foo\n  email = bar"
-    config = Gas::Configuration.parse config
-    config.users.count.should == 2
-    config.users[0].name.should == name
-    config.users[0].email.should == email
-    config.users[0].nickname.should == nickname
+describe Gas::Config do
+
+  before :each do
+    @name = 'Fredrik Wallgren'
+    @email = 'fredrik.wallgren@gmail.com'
+    @nickname = 'walle'
+    config = "[#{@nickname}]\n  name = #{@name}\n  email = #{@email}\n\n[user2]\n  name = foo\n  email = bar"
+    @config = Gas::Config.new nil, config
   end
 
-  it 'should be able to get current user from gitconfig' 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"
-    user = Gas::Configuration.current_user gitconfig
-    user.name.should == name
-    user.email.should == email
+  it 'should be able to parse users from config format' do
+    @config.users.count.should == 2
+    @config.users[0].name.should == @name
+    @config.users[0].email.should == @email
+    @config.users[0].nickname.should == @nickname
   end
 
   it 'should output the users in the correct format' do
     user1 = Gas::User.new 'Fredrik Wallgren', 'fredrik.wallgren@gmail.com', 'walle'
     user2 = Gas::User.new 'foo', 'bar', 'user2'
     users = [user1, user2]
-    config = Gas::Configuration.new users
+    config = Gas::Config.new users
     config.to_s.should == "[walle]\n  name = Fredrik Wallgren\n  email = fredrik.wallgren@gmail.com\n[user2]\n  name = foo\n  email = bar"
   end
 
@@ -36,7 +31,7 @@ describe Gas::Configuration do
     user1 = Gas::User.new 'Fredrik Wallgren', 'fredrik.wallgren@gmail.com', 'walle'
     user2 = Gas::User.new 'foo', 'bar', 'user2'
     users = [user1, user2]
-    config = Gas::Configuration.new users
+    config = Gas::Config.new users
     config.exists?('walle').should be_true
     config.exists?('foo').should be_false
     config.exists?('user2').should be_true
@@ -46,7 +41,7 @@ describe Gas::Configuration do
     user1 = Gas::User.new 'Fredrik Wallgren', 'fredrik.wallgren@gmail.com', 'walle'
     user2 = Gas::User.new 'foo', 'bar', 'user2'
     users = [user1, user2]
-    config = Gas::Configuration.new users
+    config = Gas::Config.new users
     config.get('walle').should == user1
     config.get('user2').should == user2
     config['walle'].should == user1
@@ -59,7 +54,7 @@ describe Gas::Configuration do
     user1 = Gas::User.new 'Fredrik Wallgren', 'fredrik.wallgren@gmail.com', 'walle'
     user2 = Gas::User.new 'foo', 'bar', 'user2'
     users = [user1]
-    config = Gas::Configuration.new users
+    config = Gas::Config.new users
     config.users.count.should == 1
     config.add user2
     config.users.count.should == 2
@@ -69,7 +64,7 @@ describe Gas::Configuration do
     user1 = Gas::User.new 'Fredrik Wallgren', 'fredrik.wallgren@gmail.com', 'walle'
     user2 = Gas::User.new 'foo', 'bar', 'user2'
     users = [user1, user2]
-    config = Gas::Configuration.new users
+    config = Gas::Config.new users
     config.users.count.should == 2
     config.delete 'walle'
     config.users.count.should == 1

data/spec/gas/gitconfig_spec.rb

@@ -0,0 +1,29 @@
+require './spec/spec_helper'
+
+require './lib/gas'
+
+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
+  end
+
+  it 'should be able to get current user from gitconfig' do
+    user = @gitconfig.current_user
+    user.name.should == @name
+    user.email.should == @email
+  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
+end

data/spec/gas/user_spec.rb

@@ -3,15 +3,6 @@ require './spec/spec_helper'
 require './lib/gas'
 
 describe Gas::User do
-  it 'should be able to parse name and email from gitconfig format' 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"
-    user = Gas::User.parse gitconfig
-    user.name.should == name
-    user.email.should == email
-  end
-
   it 'should output in the right format' do
     name = 'Fredrik Wallgren'
     email = 'fredrik.wallgren@gmail.com'

data/spec/spec_helper.rb

@@ -1,6 +0,0 @@
-# encoding: utf-8
-
-RSpec.configure do |config|
-  config.mock_with :rr
-end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gas
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-20 00:00:00.000000000 +02:00
+date: 2011-07-21 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &19173520 !ruby/object:Gem::Requirement
+  requirement: &22238120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *19173520
+  version_requirements: *22238120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19210280 !ruby/object:Gem::Requirement
+  requirement: &22237700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,21 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19210280
-- !ruby/object:Gem::Dependency
-  name: rr
-  requirement: &19209820 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *19209820
+  version_requirements: *22237700
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &19209400 !ruby/object:Gem::Requirement
+  requirement: &22274100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19209400
+  version_requirements: *22274100
 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
@@ -70,10 +59,12 @@ files:
 - lib/gas.rb
 - lib/gas/version.rb
 - lib/gas/user.rb
-- lib/gas/configuration.rb
+- lib/gas/gitconfig.rb
+- lib/gas/config.rb
 - spec/spec_helper.rb
 - spec/gas/user_spec.rb
-- spec/gas/configuration_spec.rb
+- spec/gas/config_spec.rb
+- spec/gas/gitconfig_spec.rb
 - LICENSE
 - README.textile
 has_rdoc: true