gitsu 1.0.0 → 2.0.0

data/lib/gitsu/gitsu.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 'optparse'
 
 module GitSu
@@ -10,7 +26,14 @@ module GitSu
         def go(args)
             options = {}
             optparse = OptionParser.new do |opts|
-                opts.banner = "Usage: git-su [options] user"
+                opts.banner = <<-BANNER
+Gitsu Copyright (C) 2013  drrb
+This program comes with ABSOLUTELY NO WARRANTY.
+This is free software, and you are welcome to redistribute it under
+certain conditions; see <http://www.gnu.org/licenses/> for details.
+
+Usage: git-su [options] user
+                BANNER
 
                 opts.on('-t', '--list', 'List the configured users') do
                     options[:list] = true
@@ -20,7 +43,7 @@ module GitSu
                     options[:clear] = true
                 end
 
-                opts.on('-a', '--add USER <EMAIL>', 'Add a user in email format (e.g. John Citizen <jcitizen@example.com>)') do |user|
+                opts.on('-a', '--add USER', 'Add a user in email format (e.g. John Citizen <jcitizen@example.com>)') do |user|
                     options[:add] = user
                 end
 
@@ -51,6 +74,7 @@ module GitSu
             run(options, args)
         end
 
+        private
         def run(options, args)
             if options[:help]
                 return
@@ -85,7 +109,7 @@ module GitSu
             else
                 select_scopes = scopes.empty? ? [:default] : scopes
                 select_scopes.each do |scope|
-                    @switcher.request(args.join(" "), scope)
+                    @switcher.request(scope, *args)
                 end
             end
         end

data/lib/gitsu/runner.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/>.
+
 module GitSu
     class Runner
         def initialize(output)

data/lib/gitsu/shell.rb

@@ -1,12 +1,27 @@
+# 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 Shell
         def capture(command)
             output = `#{command}`.strip
             if block_given?
                 yield(output, $?)
-            else
-                output
             end
+            output
         end
 
         def execute(command)

data/lib/gitsu/switcher.rb

@@ -1,39 +1,36 @@
-class Array
-    def list
-        if empty?
-            ""
-        elsif size == 1
-            last.to_s
-        else
-            "#{self[0..-2].map{|e| e.to_s}.join(", ")} and #{last.to_s}"
-        end
-    end
+# 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/>.
 
-    def pluralize(word)
-        size > 1 ? word + "s" : word
-    end
-end
+require 'gitsu/array'
 
 module GitSu
-
     class Switcher
-        def initialize(git, user_list, output)
-            @git, @user_list, @output = git, user_list, output
+        def initialize(config_repository, git, user_list, output)
+            @config_repository, @git, @user_list, @output = config_repository, git, user_list, output
         end
 
-        def request(user, scope)
+        def request(scope, *user_strings)
             begin
-                matching_user = User.parse(user)
-            rescue User::ParseError => parse_error
-                matching_user = @user_list.find(user)
-            end
-
-            if matching_user.none?
-                @output.puts "No user found matching '#{user}'"
-            else
-                scope = scope == :default ? @git.default_select_scope : scope
-                @git.select_user(matching_user, scope)
-                @output.puts "Switched #{scope} user to #{@git.render matching_user}"
+                parsed, not_parsed = try_to_parse_all user_strings
+                found = find_all not_parsed
+                combined_user = combine_all(parsed + found)
+                select_user combined_user, scope
+                parsed.each {|user| add_parsed_user(user) }
+            rescue RuntimeError => error
+                @output.puts error.message
             end
         end
         
@@ -58,7 +55,7 @@ module GitSu
         end
 
         def clear(*scopes)
-            scope_list = scopes.list
+            scope_list = scopes.to_sentence
 
             if scopes.include? :all
                 scopes = [:local, :global, :system]
@@ -83,6 +80,24 @@ module GitSu
                 @output.puts parse_error.message
                 return
             end
+            add_parsed_user user
+        end
+
+        private
+        def try_to_parse_all(user_strings)
+            parsed = []
+            not_parsed = []
+            user_strings.each do |user_string|
+                begin
+                    parsed << User.parse(user_string)
+                rescue User::ParseError => parse_error
+                    not_parsed << user_string
+                end
+            end
+            return [parsed, not_parsed]
+        end
+
+        def add_parsed_user(user)
             if @user_list.list.include? user
                 @output.puts "User '#{user}' already in user list"
             else
@@ -90,5 +105,28 @@ module GitSu
                 @output.puts "User '#{user}' added to users"
             end
         end
+
+        def find_all(user_strings)
+            if user_strings.empty?
+                []
+            else
+                @user_list.find *user_strings
+            end
+        end
+
+        def combine_all(users)
+            group_email = @config_repository.group_email_address
+            users.inject(User::NONE) do |combined_user, user|
+                combined_user.combine user, group_email
+            end
+        end
+
+        def select_user(user, scope)
+            if scope == :default
+                scope = @config_repository.default_select_scope
+            end
+            @git.select_user(user, scope)
+            @output.puts "Switched #{scope} user to #{@git.render user}"
+        end
     end
 end

data/lib/gitsu/user.rb

@@ -1,18 +1,41 @@
+# 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/array'
+
 module GitSu
     class User
-        NONE = User.new
+        class ParseError < RuntimeError
+        end
+
+        attr_accessor :names, :emails
+        protected :names, :emails
+
+        def initialize(name, email)
+            @names, @emails = [name], [email]
+        end
+
+        NONE = User.new(nil, nil)
         def NONE.to_s
             "(none)"
         end
         def NONE.to_ansi_s(name_color, email_color, reset_color)
-            "#{name_color}(none)#{reset_color}"
+            name_color + to_s + reset_color
         end
 
-        class ParseError < RuntimeError
-        end
-
-        attr_accessor :name, :email
-
         def User.parse(string)
             fully_qualified_user_regex = /^[^<]+<[^>]+>$/ 
             if string =~ fully_qualified_user_regex
@@ -24,8 +47,39 @@ module GitSu
             end
         end
 
-        def initialize(name, email)
-            @name, @email = name, email
+        def combine(other, group_email)
+            if none?
+                other
+            elsif other.none?
+                self
+            else
+                clone.combine! other, group_email
+            end
+        end
+
+        def clone
+            deep_clone = super
+            deep_clone.names = names.clone
+            deep_clone.emails = emails.clone
+            deep_clone
+        end
+
+        def name
+            names = emails_and_names.map {|email,name| name}
+            names.to_sentence
+        end
+
+        def email
+            emails = emails_and_names.map {|email,name| email}
+            if emails.size == 1
+                emails.first
+            else
+                email_prefixes = emails.map { |email| email.sub /@.*/, '' }
+                email_domain = emails.first.sub /^.*@/, ''
+                group_email_prefix = @group_email.sub /@.*/, ''
+                group_email_domain = @group_email.sub /^.*@/, ''
+                group_email_prefix + '+' + email_prefixes.join('+') + '@' + group_email_domain
+            end
         end
 
         def none?
@@ -37,7 +91,7 @@ module GitSu
         end
 
         def eql?(other)
-            @name == other.name && @email == other.email
+            name == other.name && email == other.email
         end
 
         def hash
@@ -45,11 +99,26 @@ module GitSu
         end
 
         def to_ansi_s(name_color, email_color, reset_color)
-            "#{name_color}#{@name}#{reset_color} #{email_color}<#{@email}>#{reset_color}"
+            "#{name_color}#{name}#{reset_color} #{email_color}<#{email}>#{reset_color}"
         end
 
         def to_s
             to_ansi_s("", "", "")
         end
+
+        protected
+        def combine!(other, group_email)
+            @names += other.names
+            @emails += other.emails
+            @group_email = group_email
+            self
+        end
+
+        private
+        # Array of emails and names, unique and ordered
+        def emails_and_names
+            combined = @emails.zip @names
+            Hash[combined].sort 
+        end
     end
 end

data/lib/gitsu/user_file.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 'fileutils'
 require 'yaml'
 
@@ -22,8 +38,8 @@ module GitSu
         end
 
         def read
-            yaml_list = YAML.load_file(@file) or return []
-            yaml_list.map do |email, name|
+            user_map = YAML.load_file(@file) or return []
+            user_map.map do |email, name|
                 User.new(name, email)
             end
         end

data/lib/gitsu/user_list.rb

@@ -1,7 +1,23 @@
+# 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 UserList
-        def initialize(file_name)
-            @user_file = UserFile.new(file_name) 
+        def initialize(user_file)
+            @user_file = user_file
         end
 
         def add(user)
@@ -12,13 +28,54 @@ module GitSu
             @user_file.read
         end
 
-        def find(search_term)
-            users = @user_file.read
-            matching_users = []
-            match_strategies.each do |strategy|
-                matching_users += users.select { |user| strategy.call(search_term, user) }
+        def find(*search_terms)
+            all_users = list
+            searches = all_matching_users(all_users, search_terms)
+            searches.each do |search|
+                if search.matches.empty?
+                    raise "No user found matching '#{search.term}'"
+                end
+            end
+
+            find_unique_combination(searches) or raise "Couldn't find a combination of unique users matching #{search_terms.map {|t| "'#{t}'" }.to_sentence}"
+        end
+
+        private
+        class Search
+            attr_accessor :term, :matches
+            def initialize(term)
+                @term, @matches = term, []
+            end
+        end
+
+        def all_matching_users(all_users, search_terms)
+            searches = search_terms.map {|search_term| Search.new(search_term)}
+            searches.each do |search|
+                match_strategies.each do |strategy|
+                    search.matches += all_users.select { |user| strategy.call(search.term, user) }
+                end
+                search.matches.uniq!
+            end
+        end
+
+        def find_unique_combination(searches)
+            searches = searches.clone
+            # Generate all combinations
+            combinations = [[]]
+            searches.each do |search|
+                previous_combos = combinations.clone
+                combinations = []
+                previous_combos.each do |combo|
+                    search.matches.each do |match|
+                        combo_extension = combo.clone
+                        combo_extension << match
+                        combinations << combo_extension
+                    end
+                end
+            end
+            combinations.find do |combo|
+                combo.uniq.size == combo.size
             end
-            matching_users.first || User::NONE
         end
 
         def match_strategies
@@ -31,14 +88,13 @@ module GitSu
 
             # Initials
             lambda do |search_term, user|
-                initials = user.name.downcase.split(" ").map { |word| word.chars.first }.join
-                initials.include? search_term.downcase
+                initials = user.name.split(" ").map { |word| word.chars.first }.join
+                initials =~ /#{search_term}/i
             end,
 
             # Segment anywhere in name or email
             lambda do |search_term, user|
-                name_and_email = "#{user.name} #{user.email}".downcase
-                name_and_email.include? search_term.downcase
+                "#{user.name} #{user.email}" =~ /#{search_term}/i
             end
             ]
         end