tobytripp-git-pair 1.1.0 → 1.1.1

data/.rvmrc

@@ -0,0 +1,4 @@
+rvm --create use 1.9.2@git-pair
+
+[[ -s "git-pair.gems" ]] && rvm gemset import git-pair.gems
+bundle install

data/Gemfile

@@ -0,0 +1,2 @@
+source "http://rubygems.org"
+gemspec

data/Gemfile.lock

@@ -0,0 +1,36 @@
+PATH
+  remote: .
+  specs:
+    tobytripp-git-pair (1.1.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    builder (3.0.0)
+    cucumber (0.10.0)
+      builder (>= 2.1.2)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.3.2)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+    diff-lcs (1.1.2)
+    gherkin (2.3.3)
+      json (~> 1.4.6)
+    json (1.4.6)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    term-ansicolor (1.0.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cucumber
+  rspec (~> 2.5.0)
+  tobytripp-git-pair!

data/Rakefile

@@ -1,19 +1,30 @@
 require 'rubygems'
 require 'rake'
 
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
 begin
   require 'cucumber/rake/task'
-  Cucumber::Rake::Task.new(:features)
 
-  task :features => :check_dependencies
+  namespace :cucumber do
+    Cucumber::Rake::Task.new(:ok) do |t|
+      t.cucumber_opts = "--tags ~@wip"
+    end
+
+    Cucumber::Rake::Task.new(:wip, "Run features that are being worked on") do |t|
+      t.cucumber_opts = "--tags @wip:2 --wip"
+    end
+  end
+
+  task :cucumber => 'cucumber:ok'
 rescue LoadError
-  task :features do
+  task :cucumber do
     abort "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
   end
 end
 
-task :default => :features
+task :default => :cucumber
 
 # Don't print commands when shelling out (for example, running Cucumber)
 RakeFileUtils.verbose(false)
-

data/features/adding_an_author.feature

@@ -9,19 +9,19 @@ Feature: Adding an author
 
   Scenario: adding the same name and email twice
     When I add the author "Linus Torvalds <linus@example.org>"
-    And I add the author "Linus Torvalds <linus@example.org>"
+     And I add the author "Linus Torvalds <linus@example.org>"
     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 Torvalds" in its author list only once
 
   Scenario: adding the same name twice with different emails
     When I add the author "Linus Torvalds <linus@example.org>"
-    And I add the author "Linus Torvalds <linus@example.com>"
+     And I add the author "Linus Torvalds <linus@example.com>"
     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"
+     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"
+     And I add the author "Bob Dole"
+     And I add the author "Jimmy <asdf"
     Then the config file should have no authors

data/features/listing_authors.feature

@@ -0,0 +1,7 @@
+Feature: Listing the current authors
+  Background:
+    Given my global Git configuration is setup with user "Global User"
+
+  @wip
+  Scenario: when no authors have been added
+    Then `git pair` should display "Global User" in its author list

data/features/resetting_the_pair.feature

@@ -1,7 +1,9 @@
 Feature: Resetting the current authors
   Scenario: resetting the current authors
     Given I have added the author "Linus Torvalds <linus@example.org>"
-    And my global Git configuration is setup with user "Global User"
-    And I switch to the pair "LT"
+      And my global Git configuration is setup with user "Global User"
+      And I switch to the pair "LT"
+
     When I reset the current authors
-    Then `git pair` should display "Global User" for the current author
+
+     Then `git pair` should display "Global User" for the current author

data/features/step_definitions/config_steps.rb

@@ -22,20 +22,20 @@ When /^I (?:try to )?switch to the pair "([^\"]*)"$/ do |abbreviations|
   @output = git_pair abbreviations
 end
 
-When /^I reset the current authors$/ do 
+When /^I reset the current authors$/ do
   git_pair '--reset'
 end
 
 Then /^`git pair` should display "([^\"]*)" in its author list$/ do |name|
   output = git_pair
   authors = authors_list_from_output(output)
-  assert authors.include?(name)
+  authors.should include( name )
 end
 
 Then /^`git pair` should display "([^\"]*)" in its author list only once$/ do |name|
   output = git_pair
   authors = authors_list_from_output(output)
-  assert_equal 1, authors.select { |author| author == name}.size
+  authors.select { |author| author == name}.size.should == 1
 end
 
 Then /^`git pair` should display no authors$/ do
@@ -47,24 +47,24 @@ end
 
 Then /^`git pair` should display "([^\"]*)" for the current author$/ do |names|
   output = git_pair
-  assert_equal names, current_author_from_output(output)
+  current_author_from_output(output).should == names
 end
 
 Then /^`git pair` should display "([^\"]*)" for the current email$/ do |email|
   output = git_pair
-  assert_equal email, current_email_from_output(output)
+  current_email_from_output(output).should == email
 end
 
 Then /^the gitconfig should include "([^\"]*)" in its author list only once$/ do |name|
   output = git_config
   authors = output.split("\n").map { |line| line =~ /^git-pair\.authors=(.*) <[^>]+>$/; $1 }.compact
-  assert_equal 1, authors.select { |author| author == name}.size
+  authors.select { |author| author == name}.size.should == 1
 end
 
 Then /^the gitconfig should include "([^\"]*)" as the email of "([^\"]*)"$/ do |email, name|
   output = git_config
   authors = output.split("\n").map { |line| line =~ /^git-pair\.authors=.* <([^>]+)>$/; $1 }.compact
-  assert_equal 1, authors.select { |author| author == email}.size
+  authors.select { |author| author == email}.size.should == 1
 end
 
 Then /^`git pair` should display the following author list:$/ do |table|
@@ -75,11 +75,11 @@ end
 
 Then /^`git pair` should display an empty author list$/ do
   output = git_pair
-  assert authors_list_from_output(output).empty?
+  authors_list_from_output(output).should be_empty
 end
 
 Then /^the last command\'s output should include "([^\"]*)"$/ do |output|
-  assert @output.include?(output)
+  @output.should include(output)
 end
 
 Then /^the config file should have no authors$/ do

data/features/support/env.rb

@@ -1,7 +1,5 @@
 require 'tmpdir'
-require 'test/unit/assertions'
-World(Test::Unit::Assertions)
-
+require 'rspec'
 
 module RepositoryHelper
   # TODO: use 1.8.7's Dir.mktmpdir?
@@ -37,7 +35,6 @@ end
 
 World(RepositoryHelper)
 
-
 Before do
   backup_gitconfigs
   FileUtils.mkdir_p RepositoryHelper::TEST_REPO_PATH

data/git-pair.gems

@@ -0,0 +1 @@
+bundler -v1.0.10

data/lib/git-pair/author.rb

@@ -1,10 +1,9 @@
 module GitPair
   class Author
-
     ValidAuthorStringRegex = /^\s*([^<]+)<([^>]+)>\s*$/
 
     class InvalidAuthorString < TypeError; end
-    
+
     def self.all
       Config.all_author_strings.map { |string| new(string) }
     end
@@ -15,7 +14,7 @@ module GitPair
     end
 
     def self.find(abbr)
-      all.find { |author| author.match?(abbr) } || 
+      all.find { |author| author.match?(abbr) } ||
         raise(NoMatchingAuthorsError, "no authors matched #{abbr}")
     end
 

data/tobytripp-git-pair.gemspec

@@ -1,29 +1,30 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name        = %q{tobytripp-git-pair}
-  s.version     = "1.1.0"
+  s.version     = "1.1.1"
   s.platform    = Gem::Platform::RUBY
-  
+
   s.authors     = ["Chris Kampmeier", "Adam McCrea", "Jon Distad", "Toby Tripp"]
   s.email       = %q{toby.tripp+github@gmail.com}
 
   s.summary     = %q{Configure git to commit as more than one author}
   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.default_executable = %q{git-pair}
+
   s.executables        = ["git-pair"]
-  
+
   s.rdoc_options       = ["--charset=UTF-8"]
   s.extra_rdoc_files   = %w[LICENSE README.markdown]
 
   s.files      = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- features/*`.split("\n")
-  
+
   s.homepage   = %q{http://github.com/tobytripp/git-pair}
-  
+
   s.require_paths = ["lib"]
-  
+
   s.required_rubygems_version = ">= 1.3.5"
+
   s.add_development_dependency "cucumber"
+  s.add_development_dependency "rspec", "~> 2.5.0"
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: tobytripp-git-pair
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
+  prerelease: 
+  version: 1.1.1
 platform: ruby
 authors: 
 - Chris Kampmeier
@@ -18,8 +13,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-07 00:00:00 -06:00
-default_executable: git-pair
+date: 2011-05-09 00:00:00 -05:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cucumber
@@ -29,12 +24,20 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.5.0
+  type: :development
+  version_requirements: *id002
 description: 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.
 email: toby.tripp+github@gmail.com
 executables: 
@@ -47,6 +50,9 @@ extra_rdoc_files:
 files: 
 - .autotest
 - .gitignore
+- .rvmrc
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.markdown
 - Rakefile
@@ -54,11 +60,13 @@ files:
 - bin/git-pair
 - config/cucumber.yml
 - features/adding_an_author.feature
+- features/listing_authors.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
+- git-pair.gems
 - lib/git-pair.rb
 - lib/git-pair/author.rb
 - lib/git-pair/command.rb
@@ -78,30 +86,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 17
-      segments: 
-      - 1
-      - 3
-      - 5
       version: 1.3.5
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Configure git to commit as more than one author
 test_files: 
 - features/adding_an_author.feature
+- features/listing_authors.feature
 - features/removing_an_author.feature
 - features/resetting_the_pair.feature
 - features/step_definitions/config_steps.rb