edgecase-git-pair 0.2.0 → 0.2.1

data/VERSION

@@ -0,0 +1 @@
+0.2.1

data/edgecase-git-pair.gemspec

@@ -0,0 +1,62 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{edgecase-git-pair}
+  s.version = "0.2.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Chris Kampmeier", "Adam McCrea", "Jon Distad"]
+  s.date = %q{2010-02-25}
+  s.default_executable = %q{git-pair}
+  s.description = %q{A git porcelain for pair programming. Changes git-config's user.name and user.email settings so you can commit as more than one author.}
+  s.email = %q{adam@edgecase.com}
+  s.executables = ["git-pair"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.markdown"
+  ]
+  s.files = [
+    ".autotest",
+     ".gitignore",
+     "LICENSE",
+     "README.markdown",
+     "Rakefile",
+     "VERSION",
+     "bin/git-pair",
+     "config/cucumber.yml",
+     "edgecase-git-pair.gemspec",
+     "features/adding_an_author.feature",
+     "features/removing_an_author.feature",
+     "features/resetting_the_pair.feature",
+     "features/step_definitions/config_steps.rb",
+     "features/support/env.rb",
+     "features/switching_authors.feature",
+     "foo",
+     "lib/git-pair.rb",
+     "lib/git-pair/author.rb",
+     "lib/git-pair/command.rb",
+     "lib/git-pair/config.rb"
+  ]
+  s.homepage = %q{http://github.com/edgecase/git-pair}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Configure git to commit as more than one author}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<cucumber>, [">= 0"])
+    else
+      s.add_dependency(%q<cucumber>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<cucumber>, [">= 0"])
+  end
+end
+

data/features/adding_an_author.feature

@@ -19,3 +19,9 @@ Feature: Adding an author
     Then `git pair` should display "Linus Torvalds" in its author list only once
     And the gitconfig should include "Linus Torvalds" in its author list only once
     And the gitconfig should include "linus@example.org" as the email of "Linus Torvalds"
+
+  Scenario: adding a malformed author string
+    When I add the author " "
+    And  I add the author "Bob Dole"
+    And  I add the author "Jimmy <asdf"
+    Then the config file should have no authors

data/features/step_definitions/config_steps.rb

@@ -38,6 +38,13 @@ Then /^`git pair` should display "([^\"]*)" in its author list only once$/ do |n
   assert_equal 1, authors.select { |author| author == name}.size
 end
 
+Then /^`git pair` should display no authors$/ do
+  output = git_pair
+  authors = authors_list_from_output(output)
+  authors.size.should be_zero
+end
+
+
 Then /^`git pair` should display "([^\"]*)" for the current author$/ do |names|
   output = git_pair
   assert_equal names, current_author_from_output(output)
@@ -75,6 +82,11 @@ Then /^the last command's output should include "([^\"]*)"$/ do |output|
   assert @output.include?(output)
 end
 
+Then /^the config file should have no authors$/ do
+  git_config(%(--global --get-all git-pair.authors)).should == ''
+end
+
+
 def authors_list_from_output(output)
   output =~ /Author list: (.*?)\n\s?\n/im
   $1.strip.split("\n").map { |name| name.strip }

data/features/support/env.rb

@@ -13,13 +13,13 @@ module RepositoryHelper
   CONFIG_BACKUP_PATH = "#{PROJECT_PATH}/tmp"
 
   def git_pair(options = "")
-    output = `HOME=#{TEST_REPO_PATH} GIT_DIR=#{TEST_REPO_DOT_GIT_PATH} && #{GIT_PAIR} #{options} 2>&1`
+    output = `HOME=#{TEST_REPO_PATH} GIT_DIR=#{TEST_REPO_DOT_GIT_PATH} #{GIT_PAIR} #{options} 2>&1`
     output.gsub(/\e\[\d\d?m/, '')  # strip any ANSI colors
   end
 
   def git_config(options = nil)
     options ||= "--list"
-    `HOME=#{TEST_REPO_PATH} GIT_DIR=#{TEST_REPO_DOT_GIT_PATH} && git config #{options} 2>&1`
+    `HOME=#{TEST_REPO_PATH} GIT_DIR=#{TEST_REPO_DOT_GIT_PATH} git config #{options} 2>&1`
   end
 
   def backup_gitconfigs

data/foo

@@ -0,0 +1,65 @@
+# Logfile created on Thu Feb 25 16:50:49 -0500 2010 by /
+I, [2010-02-25T16:50:49.598792 #46617]  INFO -- : nil
+I, [2010-02-25T16:50:50.167870 #46634]  INFO -- : nil
+I, [2010-02-25T16:50:50.483740 #46645]  INFO -- : nil
+I, [2010-02-25T16:50:51.055276 #46663]  INFO -- : nil
+I, [2010-02-25T16:50:51.331615 #46673]  INFO -- : nil
+I, [2010-02-25T16:50:51.908748 #46693]  INFO -- : nil
+I, [2010-02-25T16:50:52.201900 #46704]  INFO -- : nil
+I, [2010-02-25T16:50:52.493925 #46713]  INFO -- : nil
+I, [2010-02-25T16:50:52.838910 #46726]  INFO -- : nil
+I, [2010-02-25T16:50:53.127413 #46736]  INFO -- : nil
+I, [2010-02-25T16:50:53.962228 #46763]  INFO -- : nil
+I, [2010-02-25T16:50:54.240749 #46773]  INFO -- : nil
+I, [2010-02-25T16:50:55.344564 #46811]  INFO -- : nil
+I, [2010-02-25T16:50:56.771899 #46859]  INFO -- : nil
+I, [2010-02-25T16:50:57.833084 #46892]  INFO -- : nil
+I, [2010-02-25T16:50:58.116170 #46902]  INFO -- : nil
+I, [2010-02-25T16:51:16.032615 #46975]  INFO -- : nil
+I, [2010-02-25T16:51:16.595670 #46992]  INFO -- : nil
+I, [2010-02-25T16:51:16.905772 #47003]  INFO -- : nil
+I, [2010-02-25T16:51:17.476570 #47021]  INFO -- : nil
+I, [2010-02-25T16:51:17.767028 #47031]  INFO -- : nil
+I, [2010-02-25T16:51:18.347631 #47051]  INFO -- : nil
+I, [2010-02-25T16:51:18.626542 #47061]  INFO -- : nil
+I, [2010-02-25T16:51:18.900286 #47070]  INFO -- : nil
+I, [2010-02-25T16:51:19.235287 #47083]  INFO -- : nil
+I, [2010-02-25T16:51:19.511262 #47093]  INFO -- : nil
+I, [2010-02-25T16:51:20.343885 #47120]  INFO -- : nil
+I, [2010-02-25T16:51:20.673957 #47130]  INFO -- : nil
+I, [2010-02-25T16:51:21.794346 #47168]  INFO -- : nil
+I, [2010-02-25T16:51:23.214325 #47216]  INFO -- : nil
+I, [2010-02-25T16:51:24.291254 #47249]  INFO -- : nil
+I, [2010-02-25T16:51:24.571564 #47259]  INFO -- : nil
+I, [2010-02-25T16:53:23.796179 #47349]  INFO -- : #<GitPair::Author:0x300804 @email="linus@example.org", @name="Linus Torvalds">
+I, [2010-02-25T16:53:23.814352 #47349]  INFO -- : nil
+I, [2010-02-25T16:53:24.367462 #47366]  INFO -- : #<GitPair::Author:0x300804 @email="linus@example.org", @name="Linus Torvalds">
+I, [2010-02-25T16:53:24.367663 #47366]  INFO -- : nil
+I, [2010-02-25T16:53:24.642472 #47376]  INFO -- : #<GitPair::Author:0x619e50 @email="linus@example.org", @name="Linus Torvalds">
+I, [2010-02-25T16:53:24.642623 #47376]  INFO -- : nil
+I, [2010-02-25T16:53:25.203469 #47394]  INFO -- : #<GitPair::Author:0x300804 @email="linus@example.org", @name="Linus Torvalds">
+I, [2010-02-25T16:53:25.203601 #47394]  INFO -- : nil
+I, [2010-02-25T16:53:25.475837 #47404]  INFO -- : #<GitPair::Author:0x619e50 @email="linus@example.com", @name="Linus Torvalds">
+I, [2010-02-25T16:53:25.475983 #47404]  INFO -- : nil
+I, [2010-02-25T16:53:26.046659 #47424]  INFO -- : #<GitPair::Author:0x7d7f8 @email="", @name="">
+I, [2010-02-25T16:53:26.046792 #47424]  INFO -- : nil
+I, [2010-02-25T16:53:26.325583 #47434]  INFO -- : #<GitPair::Author:0x7f404 @email="", @name="">
+I, [2010-02-25T16:53:26.325716 #47434]  INFO -- : nil
+I, [2010-02-25T16:53:26.592889 #47443]  INFO -- : #<GitPair::Author:0x619e8c @email="", @name="">
+I, [2010-02-25T16:53:26.593022 #47443]  INFO -- : nil
+I, [2010-02-25T16:53:26.914915 #47456]  INFO -- : #<GitPair::Author:0x300804 @email="linus@example.org", @name="Linus Torvalds">
+I, [2010-02-25T16:53:26.915065 #47456]  INFO -- : nil
+I, [2010-02-25T16:53:27.195149 #47466]  INFO -- : #<GitPair::Author:0x619e50 @email="junio@example.org", @name="Junio C Hamano">
+I, [2010-02-25T16:53:27.195291 #47466]  INFO -- : nil
+I, [2010-02-25T16:53:28.073257 #47493]  INFO -- : #<GitPair::Author:0x300804 @email="linus@example.org", @name="Linus Torvalds">
+I, [2010-02-25T16:53:28.073412 #47493]  INFO -- : nil
+I, [2010-02-25T16:53:28.394054 #47504]  INFO -- : #<GitPair::Author:0x619e50 @email="junio@example.org", @name="Junio C Hamano">
+I, [2010-02-25T16:53:28.394197 #47504]  INFO -- : nil
+I, [2010-02-25T16:53:29.492154 #47542]  INFO -- : #<GitPair::Author:0x300804 @email="linus@example.org", @name="Linus Torvalds">
+I, [2010-02-25T16:53:29.492287 #47542]  INFO -- : nil
+I, [2010-02-25T16:53:30.880479 #47590]  INFO -- : #<GitPair::Author:0x300804 @email="linus@example.org", @name="Linus Torvalds">
+I, [2010-02-25T16:53:30.881116 #47590]  INFO -- : nil
+I, [2010-02-25T16:53:32.004486 #47623]  INFO -- : #<GitPair::Author:0x300804 @email="linus@example.org", @name="Linus Torvalds">
+I, [2010-02-25T16:53:32.006099 #47623]  INFO -- : nil
+I, [2010-02-25T16:53:32.286488 #47633]  INFO -- : #<GitPair::Author:0x619e50 @email="junio@example.org", @name="Junio C Hamano">
+I, [2010-02-25T16:53:32.286632 #47633]  INFO -- : nil

data/lib/git-pair/author.rb

@@ -1,5 +1,7 @@
 module GitPair
   class Author
+
+    class InvalidAuthorString < TypeError; end
     
     def self.all
       Config.all_author_strings.map { |string| new(string) }
@@ -28,9 +30,17 @@ module GitPair
       self.all.find { |a| a.name == author.name }
     end
 
+    def self.valid_string?(author_string)
+      author_string =~ /^\s*[^<]+\s*<[^>]+>\s*$/
+    end
+
     attr_reader :name, :email
 
     def initialize(string)
+      unless Author.valid_string?(string)
+        raise(InvalidAuthorString, "\"#{string}\" is not a valid name and email")
+      end
+
       string =~ /^(.+)\s+<([^>]+)>$/
       @name = $1.to_s 
       @email = $2.to_s

data/lib/git-pair/command.rb

@@ -56,6 +56,8 @@ module GitPair
       abort e.message, "\n" + author_list
     rescue MissingConfigurationError => e
       abort e.message, parser.help
+    rescue Author::InvalidAuthorString => e
+      abort e.message, parser.help
     end
 
     def author_list

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: edgecase-git-pair
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Chris Kampmeier
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-18 00:00:00 -05:00
+date: 2010-02-25 00:00:00 -05:00
 default_executable: git-pair
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,14 +39,17 @@ files:
 - LICENSE
 - README.markdown
 - Rakefile
+- VERSION
 - bin/git-pair
 - config/cucumber.yml
+- edgecase-git-pair.gemspec
 - features/adding_an_author.feature
 - features/removing_an_author.feature
 - features/resetting_the_pair.feature
 - features/step_definitions/config_steps.rb
 - features/support/env.rb
 - features/switching_authors.feature
+- foo
 - lib/git-pair.rb
 - lib/git-pair/author.rb
 - lib/git-pair/command.rb