gitsu 1.0.0 → 2.0.0

data/features/step_definitions/gitsu_steps.rb

@@ -1,3 +1,19 @@
+# Gitsu
+# Copyright (C) 2013 drrb
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 Given /^no user is selected$/ do
     step "no user is selected in any scope"
 end
@@ -27,21 +43,17 @@ Given /^user list is$/ do |user_list|
 end
 
 Then /^user list should be$/ do |user_list|
-    read_user_list.should eq user_list
+    read_user_list.strip.should eq user_list
 end
 
 And /^user list contains user "(.*?)" with email "(.*?)"$/ do |name, email|
     user_list.add GitSu::User.new(name, email)
 end
 
-def split_args_with_shell(arg_line)
-    `for arg in #{arg_line}; do echo $arg; done`.strip.split("\n")
-end
-
 When /^I type "(.*?)"$/ do |command_line|
     arg_line = command_line.gsub(/^git su/, "")
     args = split_args_with_shell(arg_line)
-    gitsu.go args
+    runner.run { gitsu.go args }
 end
 
 Then /^I should see$/ do |expected_output|
@@ -79,6 +91,10 @@ Then /^the config file should be open in an editor$/ do
     git.editing?.should be true
 end
 
+def split_args_with_shell(arg_line)
+    `for arg in #{arg_line}; do echo $arg; done`.strip.split("\n")
+end
+
 class Output 
     def messages
         @messages ||= []
@@ -89,8 +105,13 @@ class Output
     end
 end
 
-class StubGit < GitSu::Git
+class StubFactory < GitSu::Factory
+    def git
+        @git ||= StubGit.new
+    end
+end
 
+class StubGit < GitSu::Git
     attr_accessor :users
 
     def initialize
@@ -166,16 +187,16 @@ def gitsu
     factory.gitsu
 end
 
+def runner
+    factory.runner
+end
+
 def user_list
     factory.user_list
 end
 
 def factory
-    if @factory.nil?
-        @factory = GitSu::Factory.new(output, user_list_file)
-        @factory.git = StubGit.new
-    end
-    @factory
+    @factory ||= StubFactory.new(output, user_list_file)
 end
 
 def user_list_file

data/features/support/env.rb

@@ -1,3 +1,19 @@
+# Gitsu
+# Copyright (C) 2013 drrb
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 require 'simplecov'
 
 lib_path = File.expand_path('../../../lib', __FILE__)

data/features/switch_to_fully_qualified_user.feature

@@ -1,3 +1,19 @@
+# Gitsu
+# Copyright (C) 2013 drrb
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 Feature: Switch to fully qualified user
     As a new user
     I want to switch to my Git user
@@ -5,6 +21,11 @@ Feature: Switch to fully qualified user
 
     Scenario: Switch to fully qualified user
         Given no user is selected
+        And user list is empty
         When I type "git su 'John Galt <jg@example.com>'"
         Then I should see "Switched local user to John Galt <jg@example.com>"
         And user "John Galt <jg@example.com>" should be selected in "local" scope
+        And user list should be
+            """
+            jg@example.com : John Galt
+            """

data/features/switch_to_multiple_users.feature

@@ -0,0 +1,64 @@
+# Gitsu
+# Copyright (C) 2013 drrb
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Feature: Switch to multiple users
+    As a pairer
+    I want to select multiple Git users at once
+    So that I can commit code that I created with my pair
+
+    Scenario: Switch to fully qualified users
+        Given no user is selected
+        When I type "git su 'John Galt <jg@example.com>' 'Joseph Porter <jp@example.com>'"
+        Then I should see "Switched local user to John Galt and Joseph Porter <dev+jg+jp@example.com>"
+        And user "John Galt and Joseph Porter <dev+jg+jp@example.com>" should be selected in "local" scope
+
+    Scenario: Switch to stored users
+        Given no user is selected
+        Given user list is
+        """
+        a@example.com: Johnny Z
+        c@example.com: Johnny X
+        b@example.com: Johnny Y
+        """
+        When I type "git su jy jx jz"
+        Then I should see "Switched local user to Johnny Z, Johnny Y and Johnny X <dev+a+b+c@example.com>"
+        And user "Johnny Z, Johnny Y and Johnny X <dev+a+b+c@example.com>" should be selected in "local" scope
+
+    Scenario: User not found
+        Given user list is
+        """
+        porter@example.com: Joseph Porter
+        """
+        When I type "git su frances joseph"
+        Then I should see "No user found matching 'frances'"
+        And no user should be selected in "local" scope
+
+    Scenario: User already matched
+        Given user list is
+        """
+        a@example.com: Johnny A
+        b@example.com: Johnny B
+        """
+        When I type "git su ja jb ja"
+        Then I should see "Couldn't find a combination of unique users matching 'ja', 'jb' and 'ja'"
+
+    Scenario: No group email configured
+        Given the Git configuration has "gitsu.groupEmailAddress" set to ""
+
+    Scenario: Group email configured
+        Given the Git configuration has "gitsu.groupEmailAddress" set to "pairs@example.org"
+        When I type "git su 'John Galt <jg@example.com>' 'Joseph Porter <jp@example.com>'"
+        And user "John Galt and Joseph Porter <pairs+jg+jp@example.org>" should be selected in "local" scope

data/features/switch_to_stored_user.feature

@@ -1,3 +1,19 @@
+# Gitsu
+# Copyright (C) 2013 drrb
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 Feature: Switch to stored user
     As an user
     I want to quickly switch to my user

data/gitsu.gemspec

@@ -1,4 +1,20 @@
 # -*- encoding: utf-8 -*-
+# Gitsu
+# Copyright (C) 2013 drrb
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'gitsu/version'
@@ -7,14 +23,14 @@ Gem::Specification.new do |gem|
   gem.name          = "gitsu"
   gem.version       = GitSu::VERSION
   gem.authors       = ["drrb"]
-  gem.email         = ["drrb@github.com"]
+  gem.email         = ["drrrrrrrrrrrb@gmail.com"]
   gem.license       = "GPL-3"
   gem.description   = %q{Manage your Git users}
   gem.summary       = <<-EOF
     Gitsu allows you to quickly configure and switch between Git users, for
-    different projects and contexts
+    different projects and contexts, and pair programming.
   EOF
-  gem.homepage      = "http://drrb.github.com/gitsu"
+  gem.homepage      = "http://drrb.github.io/gitsu"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -23,6 +39,7 @@ Gem::Specification.new do |gem|
 
   # Dependencies
   gem.add_development_dependency('coveralls', '>= 0.6.3')
+  gem.add_development_dependency('json') # Coveralls needs it
   gem.add_development_dependency('rake')
   gem.add_development_dependency('rspec')
   gem.add_development_dependency('cucumber')

data/lib/gitsu.rb

@@ -1,4 +1,21 @@
+# Gitsu
+# Copyright (C) 2013 drrb
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 require 'gitsu/factory'
+require 'gitsu/config_repository'
 require 'gitsu/git'
 require 'gitsu/gitsu'
 require 'gitsu/runner'

data/lib/gitsu/array.rb

@@ -0,0 +1,31 @@
+# Gitsu
+# Copyright (C) 2013 drrb
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+class Array
+    def to_sentence
+        if empty?
+            ""
+        elsif size == 1
+            last.to_s
+        else
+            "#{self[0..-2].map{|e| e.to_s}.join(", ")} and #{last.to_s}"
+        end
+    end
+
+    def pluralize(word)
+        size > 1 ? word + "s" : word
+    end
+end

data/lib/gitsu/config_repository.rb

@@ -0,0 +1,49 @@
+# Gitsu
+# Copyright (C) 2013 drrb
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+module GitSu
+    class ConfigRepository
+        class InvalidConfigError < RuntimeError
+        end
+
+        def initialize(git)
+            @git = git
+        end
+
+        def get(key)
+            @git.get_config(:derived, key) 
+        end
+
+        def default_select_scope
+            scope_string = get_gitsu_config "defaultSelectScope", "local"
+            if scope_string =~ /^(local|global|system)$/
+                scope_string.to_sym
+            else
+                raise InvalidConfigError, "Invalid configuration value found for gitsu.defaultSelectScope: '#{scope_string}'. Expected one of 'local', 'global', or 'system'."
+            end
+        end
+
+        def group_email_address
+            get_gitsu_config  "groupEmailAddress", "dev@example.com"
+        end
+
+        private
+        def get_gitsu_config(key, default)
+            value = get "gitsu.#{key}"
+            value.empty? ? default : value
+        end
+    end
+end

data/lib/gitsu/factory.rb

@@ -1,6 +1,21 @@
+# Gitsu
+# Copyright (C) 2013 drrb
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 module GitSu
     class Factory
-        attr_accessor :git
         def initialize(output, user_list_file)
             @output, @user_list_file = output, File.expand_path(user_list_file)
         end
@@ -9,12 +24,20 @@ module GitSu
             @git ||= CachingGit.new(Shell.new)
         end
 
+        def config_repository
+            @config_repository ||= ConfigRepository.new(git)
+        end
+
         def user_list
-            @user_list ||= UserList.new(@user_list_file)
+            @user_list ||= UserList.new(user_file)
+        end
+
+        def user_file
+            UserFile.new(@user_list_file)
         end
 
         def switcher
-            @switcher ||= Switcher.new(git, user_list, @output)
+            @switcher ||= Switcher.new(config_repository, git, user_list, @output)
         end
 
         def gitsu

data/lib/gitsu/git.rb

@@ -1,8 +1,21 @@
+# Gitsu
+# Copyright (C) 2013 drrb
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 module GitSu
     class Git
-        class InvalidConfigError < RuntimeError
-        end
-
         class ConfigSettingError < RuntimeError
         end
 
@@ -10,22 +23,6 @@ module GitSu
             @shell = shell
         end
 
-        def config_command(scope, suffix)
-            command = "git config "
-            unless scope == :derived
-                command << "--#{scope} "
-            end 
-            command << suffix
-        end
-
-        def execute_config_command(scope, command)
-            @shell.execute config_command(scope, command)
-        end
-
-        def capture_config_command(scope, command)
-            @shell.capture config_command(scope, command)
-        end
-
         def get_config(scope, key)
             capture_config_command(scope, key)
         end
@@ -83,17 +80,6 @@ module GitSu
             execute_config_command(:derived, "--get-colorbool color.ui")
         end
 
-        def default_select_scope
-            scope_string = get_config(:derived, "git-su.defaultSelectScope")
-            if scope_string.empty?
-                :local
-            elsif scope_string =~ /^(local|global|system)$/
-                scope_string.to_sym
-            else
-                raise InvalidConfigError, "Invalid configuration value found for git-su.defaultSelectScope: '#{scope_string}'. Expected one of 'local', 'global', or 'system'."
-            end
-        end
-
         def render(user)
             if color_output?
                 user_color = get_color "blue"
@@ -112,6 +98,28 @@ module GitSu
         def commit(file, message)
             @shell.execute("git commit #{file} --message='#{message}'")
         end
+
+        def list_files(*options)
+            flags = options.map {|o| "--#{o}"}.join " "
+            @shell.capture("git ls-files #{flags}").split "\n"
+        end
+
+        private
+        def config_command(scope, suffix)
+            command = "git config "
+            unless scope == :derived
+                command << "--#{scope} "
+            end 
+            command << suffix
+        end
+
+        def execute_config_command(scope, command)
+            @shell.execute config_command(scope, command)
+        end
+
+        def capture_config_command(scope, command)
+            @shell.capture config_command(scope, command)
+        end
     end
 
     class CachingGit < Git
@@ -121,6 +129,12 @@ module GitSu
             @colors[color_name] ||= super
         end
 
+        def get_config(scope, key)
+            @config ||= {}
+            @config[scope] ||= {}
+            @config[scope][key] ||= super
+        end
+
         def color_output?
             @color_output.nil? ? @color_output = super : @color_output
         end
@@ -129,10 +143,5 @@ module GitSu
             # Git complains if you try to clear the user when the config file is missing
             super unless selected_user(scope).none?
         end
-
-        def selected_user(scope)
-            @selected_users ||= {}
-            @selected_users[scope] ||= super
-        end
     end
 end