hitch 0.6.1 → 0.7.0

data/MIT_LICENSE

@@ -0,0 +1,9 @@
+(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.

data/README.md

@@ -0,0 +1,94 @@
+hitch
+=====
+    by Rogelio J. Samour
+    http://blog.therubymug.com
+
+Description:
+-----------
+
+Hitch allows developers to be properly credited when Pair Programming and using Git.
+
+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.
+
+Synopsis:
+--------
+
+- For leela and fry to pair:
+  - hitch leela fry
+- To clear pair info:
+  - hitch -u
+- For a complete list of features:
+  - hitch -h
+- Creating a Gravatar for your pair:
+  - Once I've hitched with my pair. (e.g. hitch leela fry) I have now created a unique email: dev+fry+leela@hashrocket.com
+  - Then, I go to gravatar.com. Add an image to that particular email address and I'm done.
+
+Install:
+-------
+
+* gem install hitch
+* rvm users run this:
+<pre><code>for x in $(rvm list strings); do rvm use $x@global && gem install hitch; done</code></pre>
+* hitch --setup >> ~/.bashrc
+  - this prints out the necessary shell function and aliases you need to add to your ~/.bashrc or ~/.zshrc
+* Or copy/paste the following into your ~/.bashrc or ~/.zshrc:
+<pre><code>hitch() {
+  command hitch "$@"
+  if [[ -s "$HOME/.hitch_export_authors" ]] ; then source "$HOME/.hitch_export_authors" ; fi
+}
+alias unhitch='hitch -u'
+# Uncomment to persist pair info between terminal instances
+# hitch
+</code></pre>
+
+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
+
+Requirements:
+------------
+
+* Git, HighLine
+
+Acknowledgements:
+----------------
+
+* Stephen Caudill
+* Les Hill
+* Tim Pope
+
+License:
+-------
+
+(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.

data/Rakefile

@@ -1,30 +1,4 @@
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
-
-desc "Run specs"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = %w(-ps --color)
-end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = %q{hitch}
-    gemspec.version = '0.6.1'
-    gemspec.summary = %q{Hitch allows developers to be properly credited when Pair Programming and using Git.}
-    gemspec.email = %q{rogelio@therubymug.com}
-    gemspec.homepage = %q{http://github.com/therubymug/hitch}
-    gemspec.has_rdoc = false
-    gemspec.authors = ["Rogelio J. Samour"]
-    gemspec.files = %w( README.rdoc Rakefile ) + Dir["{bin,lib}/**/*"].sort
-    gemspec.extra_rdoc_files = ["README.rdoc"]
-    gemspec.executables = ["hitch"]
-    gemspec.add_development_dependency "rspec", ">= 1.3.0"
-    gemspec.add_dependency('highline', '>= 1.5.0')
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end

data/bin/hitch

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib hitch]))
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib hitch version]))
 
 args = ARGV
 options = []
@@ -11,6 +12,9 @@ opts = OptionParser.new do |opts|
   opts.on("-s", "--setup", "Print out shell goodies") do
     options = [:setup]
   end
+  opts.on("-e N", "--expire N", Integer, "Expire pair information in N hours.") do |n|
+    options = [:expire, n]
+  end
   opts.on("-u", "--unhitch", "Clear pair information") do
     options = [:unhitch]
   end
@@ -21,11 +25,15 @@ opts = OptionParser.new do |opts|
     exit
   end
   opts.on_tail("-v", "--version", "Show version") do
-    abort "hitch v#{Hitch.version}"
+    abort "hitch v#{Hitch::VERSION}"
   end
 end
+
 if args.any?
   opts.parse!(args)
+  if options.delete(:expire)
+    system(Hitch.expire_command(options.pop))
+  end
   options = [:export, args] if options.empty?
 else
   options = [:print_info]

data/lib/hitch.rb

@@ -6,12 +6,6 @@ require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib hitch ui]))
 
 module Hitch
 
-  VERSION = '0.6.1'
-
-  def self.version
-    VERSION
-  end
-
   def self.print_info
     if Hitch.pairing? && STDOUT.tty?
       Hitch::UI.highline.say("#{Hitch.git_author_name} <#{Hitch.git_author_email}>")
@@ -24,6 +18,10 @@ module Hitch
     print_info
   end
 
+  def self.expire_command(time)
+    %Q(sleep #{to_seconds(time)} && #{Hitch.bin_path} --unhitch&)
+  end
+
   def self.unhitch
     Hitch.current_pair = []
     write_export_file
@@ -123,10 +121,23 @@ module Hitch
     File.expand_path('~/.hitch_export_authors')
   end
 
+  def self.bin_path
+    %x[which hitch].chomp
+  end
+
   def self.pairing?
     current_pair.any?
   end
 
+  def self.to_seconds(value)
+    value = value.to_s.gsub(/[^\d]/, '').to_i
+    unless value.zero?
+      value * 60 * 60
+    else
+      raise StandardError
+    end
+  end
+
   def self.write_export_file
     File.open(hitch_export_authors, 'w'){|f| f.write(author_command) }
   end

data/lib/hitch/ui.rb

@@ -14,7 +14,7 @@ module Hitch
       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|.,)+\s?]+\Z/
+          q.validate = /\A[\w.,-]+(?: [\w.,-]+)*\z/
         end
         Hitch::Author.add(new_author, author_name)
         Hitch::Author.write_file

data/lib/hitch/version.rb

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

data/spec/hitch/author_spec.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe Hitch::Author do
 

data/spec/hitch/ui_spec.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe Hitch::UI do
 

data/spec/hitch_spec.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe Hitch do
 
@@ -14,6 +14,34 @@ describe Hitch do
     Hitch::Author.stub(:available_pairs).and_return(hitch_pairs)
   end
 
+  describe '.expire_command' do
+    before do
+      Hitch.stub(:bin_path).and_return('/usr/local/bin/hitch')
+    end
+
+    context 'with a valid string' do
+      let(:time_string) { '8' }
+      it 'returns the system command to call' do
+        Hitch.expire_command(time_string).should == 'sleep 28800 && /usr/local/bin/hitch --unhitch&'
+      end
+    end
+
+    context 'with a valid integer' do
+      let(:time_string) { 8 }
+      it 'returns the system command to call' do
+        Hitch.expire_command(time_string).should == 'sleep 28800 && /usr/local/bin/hitch --unhitch&'
+      end
+    end
+
+    context 'with an invalid string' do
+      let(:time_string) { 'BAR' }
+      it 'raises an error' do
+        expect {Hitch.expire_command(time_string)}.to raise_error(StandardError)
+      end
+    end
+
+  end
+
   describe '.author_command' do
 
     context 'when pairing' do

data/spec/{helper.rb → spec_helper.rb}

@@ -1,11 +1,12 @@
-require 'yaml'
-require 'highline'
+require 'rspec'
 require 'fileutils'
 require 'tempfile'
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'hitch')
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
+  config.color_enabled = true
+  config.formatter = 'progress'
   config.before(:each) do
     Hitch.stub(:hitchrc).and_return(Tempfile.new('hitchrc').path)
     Hitch.stub(:hitch_export_authors).and_return(Tempfile.new('hitch_export_authors').path)

metadata

@@ -1,109 +1,85 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hitch
-version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 1
-  version: 0.6.1
+version: !ruby/object:Gem::Version
+  version: 0.7.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Rogelio J. Samour
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-10 00:00:00 -04:00
-default_executable: hitch
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-05 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70190445636280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.6.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: highline
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70190445636280
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: &70190445635800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
-        version: 1.5.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.2
   type: :runtime
-  version_requirements: *id002
-description: 
+  prerelease: false
+  version_requirements: *70190445635800
+description: Git author attribution helper for pair programmers.
 email: rogelio@therubymug.com
-executables: 
+executables:
 - hitch
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- Rakefile
-- bin/hitch
-- lib/hitch.rb
+files:
 - lib/hitch/author.rb
 - lib/hitch/ui.rb
-- spec/helper.rb
+- lib/hitch/version.rb
+- lib/hitch.rb
+- bin/hitch
+- Rakefile
+- MIT_LICENSE
+- README.md
 - spec/hitch/author_spec.rb
 - spec/hitch/ui_spec.rb
 - spec/hitch_spec.rb
-has_rdoc: true
+- spec/spec_helper.rb
 homepage: http://github.com/therubymug/hitch
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: Hitch allows developers to be properly credited when Pair Programming and using Git.
-test_files: 
-- spec/helper.rb
+summary: Hitch allows developers to be properly credited when Pair Programming and
+  using Git.
+test_files:
 - spec/hitch/author_spec.rb
 - spec/hitch/ui_spec.rb
 - spec/hitch_spec.rb
+- spec/spec_helper.rb