hitch 0.7.0 → 0.7.1

data/{MIT_LICENSE → LICENSE.md}

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2010 Rogelio J. Samour
+Copyright (c) 2009-2011 Rogelio J. Samour
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/README.md

@@ -1,7 +1,6 @@
 hitch
 =====
-    by Rogelio J. Samour
-    http://blog.therubymug.com
+by Rogelio J. Samour (http://blog.therubymug.com)
 
 Description:
 -----------
@@ -13,6 +12,7 @@ Features:
 
 * Persists pair(s) between different terminal instances.
 * Creates a unique email address for the pair. (e.g. dev+fry+leela@hashrocket.com) This provides the ability to create a Gravatar for the pair.
+* Allows you to expire the pair information in N hours. e.g. hitch --expire 8 fry leela
 
 Synopsis:
 --------
@@ -51,9 +51,9 @@ Development:
 * It's easier if you use rvm.
 * Fork hitch
 * When you cd into the directory the .rvmrc will activate and create a hitch gemset
-* gem install bundler --pre
-* bundle install
-* rake # run the test suite
+* Then run the following scripts:
+<pre><code>sh install_supported_rubies.sh
+sh rake_spec_with_all_rubies.sh # this also bundles all necessary gems</code></pre>
 
 Requirements:
 ------------
@@ -69,26 +69,6 @@ Acknowledgements:
 
 License:
 -------
+Released under the MIT License.  See the [LICENSE][license] file for further details.
 
-(The MIT License)
-
-Copyright (c) 2010 Rogelio J. Samour
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+[license]: https://github.com/therubymug/hitch/blob/master/LICENSE.md

data/lib/hitch.rb

@@ -63,7 +63,15 @@ module Hitch
   end
 
   def self.git_author_name
-    current_pair.sort.map {|pair| Hitch::Author.find(pair)}.join(' and ')
+    devs = current_pair.sort.map {|pair| Hitch::Author.find(pair)}
+    case devs.length
+    when 1
+      devs[0]
+    when 2
+      "#{devs[0]} and #{devs[1]}"
+    else
+      "#{devs[0...-1].join(', ')}, and #{devs[-1]}"
+    end
   end
 
   def self.git_author_email

data/lib/hitch/ui.rb

@@ -12,10 +12,8 @@ module Hitch
 
     def self.prompt_for_pair(new_author)
       highline.say("I don't know who #{new_author} is.")
-      if highline.agree("Do you want to add #{new_author} to ~/.hitch_pairs?", true)
-        author_name = highline.ask("What is #{new_author}'s full name?") do |q|
-          q.validate = /\A[\w.,-]+(?: [\w.,-]+)*\z/
-        end
+      if highline.agree("Do you want to add #{new_author} to ~/.hitch_pairs?")
+        author_name = highline.ask("What is #{new_author}'s full name?")
         Hitch::Author.add(new_author, author_name)
         Hitch::Author.write_file
         return new_author

data/lib/hitch/version.rb

@@ -1,3 +1,3 @@
 module Hitch
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/spec/hitch/ui_spec.rb

@@ -38,7 +38,7 @@ describe Hitch::UI do
     end
 
     it 'prompts for pair' do
-      Hitch::UI.highline.should_receive(:agree).with("Do you want to add #{new_author} to ~/.hitch_pairs?", true)
+      Hitch::UI.highline.should_receive(:agree).with("Do you want to add #{new_author} to ~/.hitch_pairs?")
       Hitch::UI.prompt_for_pair(new_author)
     end
 

data/spec/hitch_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Hitch do
 
-  let(:hitch_pairs) {{'leela' => 'Turanga Leela', 'fry' => 'Philip J. Fry'}}
+  let(:hitch_pairs) {{'leela' => 'Turanga Leela', 'fry' => 'Philip J. Fry', 'zoidberg' => 'John A. Zoidberg'}}
 
   let(:hitch_config) do
     { :group_email => 'dev@hashrocket.com',
@@ -58,6 +58,13 @@ describe Hitch do
       end
     end
 
+    context 'with more than 2 developers' do
+      it "joins 3+ developers together with commas and an 'and'" do
+        Hitch.current_pair = ['leela', 'fry', 'zoidberg']
+        Hitch.author_command.should == "export GIT_AUTHOR_NAME='Philip J. Fry, Turanga Leela, and John A. Zoidberg' GIT_AUTHOR_EMAIL='dev+fry+leela+zoidberg@hashrocket.com'"
+      end
+    end
+
   end
 
   describe '.unhitch' do
@@ -236,7 +243,4 @@ describe Hitch do
     end
   end
 
-  describe '.command' do
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hitch
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-05 00:00:00.000000000Z
+date: 2012-06-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70190445636280 !ruby/object:Gem::Requirement
+  requirement: &70229657686720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70190445636280
+  version_requirements: *70229657686720
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70190445635800 !ruby/object:Gem::Requirement
+  requirement: &70229657686240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *70190445635800
+  version_requirements: *70229657686240
 description: Git author attribution helper for pair programmers.
 email: rogelio@therubymug.com
 executables:
@@ -46,7 +46,7 @@ files:
 - lib/hitch.rb
 - bin/hitch
 - Rakefile
-- MIT_LICENSE
+- LICENSE.md
 - README.md
 - spec/hitch/author_spec.rb
 - spec/hitch/ui_spec.rb
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Hitch allows developers to be properly credited when Pair Programming and