gas 0.1.8 → 1.0.0

data/spec/unit/git_config_spec.rb

@@ -0,0 +1,82 @@
+require './spec/spec_helper'
+
+require './lib/gas'
+
+describe Gas::GitConfig do
+
+  before :each do
+    @name = 'Fredrik Wallgren'
+    @email = 'fredrik.wallgren@gmail.com'
+    @nickname = 'Fred'
+  end
+
+  it 'should be able to get current user from gitconfig' do
+    mock_cli_call(Gas::GitConfig, 'git config --global --get user.name') { @name + "\n" }
+    mock_cli_call(Gas::GitConfig, 'git config --global --get user.email') { @email + "\n" }
+
+    user = Gas::GitConfig.current_user
+    user.name.should eq @name
+    user.email.should eq @email
+  end
+
+  it 'should return nil if no current user is present in gitconfig' do
+    mock_cli_call(Gas::GitConfig, 'git config --global --get user.name') { nil }
+    mock_cli_call(Gas::GitConfig, 'git config --global --get user.email') { nil }
+
+    Gas::GitConfig.current_user.should be_nil
+  end
+
+
+  describe "Multiple users" do
+
+    before :each do
+      @user1 = Gas::User.new(@name, @email, @nickname)   # create a primary user for testing
+    end
+
+    it "should be able to set the current user" do
+      # setup the cli interrupt things...
+      mock_cli_call(Gas::GitConfig, "git config --global user.name \"#{@user1.name}\"") { nil }
+      mock_cli_call(Gas::GitConfig, "git config --global user.email \"#{@user1.email}\"") { nil }
+      mock_cli_call(Gas::GitConfig, 'git config --global --get user.name') { @user1.name + "\n" }
+      mock_cli_call(Gas::GitConfig, 'git config --global --get user.email') { @user1.email + "\n" }
+
+      Gas::GitConfig.change_user @user1
+
+      user = Gas::GitConfig.current_user
+      user.name.should eq @user1.name
+      user.email.should eq @user1.email
+    end
+
+    it 'should be able to change the current user' do
+      name = 'Test Testsson'
+      email = 'test@testsson.com'
+      nickname = 'test'
+
+      # User 1 cli interrupt things...
+      mock_cli_call(Gas::GitConfig, "git config --global user.name \"#{@name}\"") { nil }
+      mock_cli_call(Gas::GitConfig, "git config --global user.email \"#{@email}\"") { nil }
+      mock_cli_call(Gas::GitConfig, 'git config --global --get user.name') { @name + "\n" }
+      mock_cli_call(Gas::GitConfig, 'git config --global --get user.email') { @email + "\n" }
+
+      Gas::GitConfig.change_user @user1
+
+      user = Gas::GitConfig.current_user
+      user.name.should eq @name
+      user.email.should eq @email      # test that the user switch worked (paranoid, huh?)
+
+      # User 2 cli interrupt things...
+      mock_cli_call(Gas::GitConfig, "git config --global user.name \"#{name}\"") { nil }
+      mock_cli_call(Gas::GitConfig, "git config --global user.email \"#{email}\"") { nil }
+      mock_cli_call(Gas::GitConfig, 'git config --global --get user.name') { name + "\n" }
+      mock_cli_call(Gas::GitConfig, 'git config --global --get user.email') { email + "\n" }
+
+      @user2 = Gas::User.new(name, email, nickname)   # create user 2
+      Gas::GitConfig.change_user @user2
+
+      user = Gas::GitConfig.current_user
+      user.name.should eq name
+      user.email.should eq email       # test that the user changed appropriately
+    end
+
+  end
+end

data/spec/unit/user_spec.rb

@@ -25,4 +25,22 @@ describe Gas::User do
     user = Gas::User.new name, email, nickname
     user.nickname.should == nickname
   end
+
+  it 'should be equal if all fields are equal' do
+    user1 = Gas::User.new 'foo', 'bar', 'foobar'
+    user2 = Gas::User.new 'foo', 'bar', 'foobar'
+    user1.should == user2
+  end
+
+  it 'should be equal even with one user missing nickname' do
+    user1 = Gas::User.new 'foo', 'bar', 'foobar'
+    user2 = Gas::User.new 'foo', 'bar', ''
+    user1.should == user2
+  end
+
+  it 'should not be equal if nicknames are set but mismatch' do
+    user1 = Gas::User.new 'foo', 'bar', 'foobar'
+    user2 = Gas::User.new 'foo', 'bar', 'baz'
+    user1.should_not == user2
+  end
 end

data/spec/unit/users_spec.rb

@@ -0,0 +1,71 @@
+require './spec/spec_helper'
+
+require './lib/gas'
+
+describe Gas::Users do
+
+  before :each do
+    @name = 'Fredrik Wallgren'
+    @email = 'fredrik.wallgren@gmail.com'
+    @nickname = 'walle'
+    users = "[#{@nickname}]\n  name = #{@name}\n  email = #{@email}\n\n[user2]\n  name = foo\n  email = bar"
+    stub.instance_of(Gas::Users).setup! {}
+    @users = Gas::Users.new nil
+    stub(@users).users { [Gas::User.new(@name, @email, @nickname), Gas::User.new('foo', 'bar', 'user2')] }
+  end
+
+  it 'should be able to parse users from users format' do
+    @users.users.count.should be 2
+    @users.users[0].name.should eq @name
+    @users.users[0].email.should eq @email
+    @users.users[0].nickname.should eq @nickname
+  end
+
+  it 'should output the users in the correct format' do
+    mock(Gas::GitConfig).current_user { Gas::User.new 'foobar', 'test' }
+    @users.to_s.should == "      [walle]\n         name = Fredrik Wallgren\n         email = fredrik.wallgren@gmail.com\n      [user2]\n         name = foo\n         email = bar"
+  end
+
+  it 'should output the users in the correct format with current user' do
+    mock(Gas::GitConfig).current_user { Gas::User.new 'foo', 'bar' }
+    @users.to_s.should == "      [walle]\n         name = Fredrik Wallgren\n         email = fredrik.wallgren@gmail.com\n  ==>  [user2]\n         name = foo\n         email = bar"
+  end
+
+  it 'should be able to tell if a nickname exists' do
+    @users.exists?('walle').should be_true
+    @users.exists?('foo').should be_false
+    @users.exists?('user2').should be_true
+  end
+
+  it 'should be able to get a user from a nickname' do
+    user1, user2 = Gas::User.new(@name, @email, @nickname), Gas::User.new('foo', 'bar', 'user2')
+    stub(@users).users { [user1, user2] }
+    @users.get('walle').should eq user1
+    @users.get('user2').should eq user2
+    @users['walle'].should eq user1
+    @users['user2'].should eq user2
+    @users[:walle].should eq user1
+    @users[:user2].should eq user2
+  end
+
+  it 'should be able to add users' do
+    user1, user2 = Gas::User.new(@name, @email, @nickname), Gas::User.new('foo', 'bar', 'user2')
+    @users = Gas::Users.new nil
+    @users.add user1
+    @users.users.count.should be 1
+    @users.add user2
+    @users.users.count.should be 2
+  end
+
+  it 'should be able to delete users by nickname' do
+    user1, user2 = Gas::User.new(@name, @email, @nickname), Gas::User.new('foo', 'bar', 'user2')
+    @users = Gas::Users.new nil
+    @users.add user1
+    @users.add user2
+    @users.users.count.should be 2
+    @users.delete @nickname
+    @users.users.count.should be 1
+    @users.delete 'user2'
+    @users.users.count.should be 0
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gas
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,72 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-11-18 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.14.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.14.6
-- !ruby/object:Gem::Dependency
-  name: sshkey
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.2
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -139,66 +75,41 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 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 or if you
-  are doing pair programming.  Includes SSH support.
+  are doing pair programming. Is extendable with own commands.
 email: fredrik.wallgren@gmail.com
 executables:
 - gas
+- gas-add
+- gas-delete
+- gas-import
+- gas-list
+- gas-show
+- gas-use
 extensions: []
 extra_rdoc_files:
 - README.textile
 - LICENSE
 files:
 - bin/gas
-- lib/gas/config.rb
-- lib/gas/gitconfig.rb
-- lib/gas/github_speaker.rb
-- lib/gas/prompter.rb
-- lib/gas/settings.rb
-- lib/gas/ssh.rb
+- bin/gas-add
+- bin/gas-delete
+- bin/gas-import
+- bin/gas-list
+- bin/gas-show
+- bin/gas-use
+- lib/gas/git_config.rb
 - lib/gas/user.rb
+- lib/gas/users.rb
 - lib/gas/version.rb
 - lib/gas.rb
-- spec/integration/ssh_spec.rb
+- spec/integration/gas_spec.rb
+- spec/integration/users_spec.rb
 - spec/spec_helper.rb
-- spec/unit/config_spec.rb
-- spec/unit/gitconfig_spec.rb
-- spec/unit/github_speaker_spec.rb
-- spec/unit/settings_spec.rb
+- spec/unit/git_config_spec.rb
 - spec/unit/user_spec.rb
+- spec/unit/users_spec.rb
 - LICENSE
 - README.textile
 homepage: https://github.com/walle/gas
@@ -216,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1919630044039596509
+      hash: -1416212539312677470
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -225,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1919630044039596509
+      hash: -1416212539312677470
 requirements: []
 rubyforge_project: gas
 rubygems_version: 1.8.24

data/lib/gas/config.rb

@@ -1,148 +0,0 @@
-require 'fileutils'
-
-module Gas
-
-  # Class that keeps track of users
-  class Config
-    attr_reader :users
-
-    # This function checks for a ~/.gas FILE and if it exists, it puts it into memory and deletes it from the HDD
-    # then it creates the ~/.gas FOLDER and saves the old .gas file as ~/git.conf
-    #
-    def migrate_to_gas_dir!
-      old_config_file = GAS_DIRECTORY
-      config_dir = GAS_DIRECTORY
-      new_config_file = GAS_DIRECTORY + "/gas.authors"
-
-      if File.file? old_config_file
-        file = File.open(old_config_file, "rb")
-        contents = file.read
-        file.close
-
-        File.delete old_config_file
-
-        Dir::mkdir(config_dir)
-
-        file = File.new(new_config_file, "w")
-        file.puts contents
-        file.close
-      end
-    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)
-      migrate_to_gas_dir! # Migrates old users to the new configuration file location, how thoughtful of me, I know
-      @config_file = "#{GAS_DIRECTORY}/gas.authors"
-      @gas_dir = GAS_DIRECTORY
-      @config = ''
-
-      if config.nil?
-        if !File.exists? @config_file
-          Dir::mkdir(@gas_dir)
-          FileUtils.touch @config_file
-        end
-
-        @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
-    # @param [String] nickname
-    # @return [Boolean]
-    def exists?(nickname)
-      @users.each do |user|
-        if user.nickname == nickname
-          return true;
-        end
-      end
-
-      false
-    end
-
-    # Returns the user with nickname nil if no such user exists
-    # @param [String|Symbol] nickname
-    # @return [User|nil]
-    def get(nickname)
-      @users.each do |user|
-        if user.nickname == nickname.to_s
-          return user
-        end
-      end
-
-      nil
-    end
-
-    # Override [] to get hash style acces to users
-    # @param [String|Symbol] nickname
-    # @return [User|nil]
-    def [](nickname)
-      get nickname
-    end
-
-    # Adds a user
-    # @param [User]
-    def add(user)
-      @users << user
-    end
-
-    # Deletes a user by nickname
-    # @param [String] nickname The nickname of the user to delete
-    def delete(nickname)
-      @users.delete_if do |user|
-        user.nickname == nickname
-      end
-    end
-
-    # Saves the current users to the config file
-    def save!
-      File.open @config_file, 'w' do |file|
-        file.write self
-      end
-    end
-
-
-    # Override to_s to output correct format
-    def to_s
-      gc = Gitconfig.new
-
-      users = @users.map do |user|
-        if is_current_user(gc.current_user_object[:name], gc.current_user_object[:email], user.to_s)
-          "  ==>" + user.to_s[5,user.to_s.length]
-        else
-          user.to_s
-        end
-      end.join("\n")
-
-      return users
-    end
-
-
-    # Scans the @users (a string containing info formatted identical to the gas.author file)
-    #  ...and checks to see if it's name and email match what you're looking for
-    def is_current_user(name, email, object)
-      object.scan(/\[(.+)\]\s+name = (.+)\s+email = (.+)/) do |nicknamec, namec, emailc|
-        if namec == name and emailc == email
-          #  check if ssh is active
-          # TODO:  Check if its SSH key is setup, and indicate SSH ACTIVE
-          return true
-        end
-      end
-      return false   # could not get a current user's nickname
-    end
-
-  end
-end