hitch 0.5.3 → 0.6.0

data/Rakefile

@@ -1,18 +1,27 @@
+require 'spec/rake/spectask'
+
+task :default => :spec
+
+desc "Run specs"
+Spec::Rake::SpecTask.new do |t|
+  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.spec_opts = %w(-fs --color)
+end
+
 begin
   require 'jeweler'
-  require 'lib/hitch'
-  require 'fileutils'
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = %q{hitch}
-    gemspec.version = Hitch::VERSION
+    gemspec.version = '0.6.0'
     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 Samour", "Les Hill"]
+    gemspec.authors = ["Rogelio J. Samour"]
     gemspec.files = %w( README.rdoc Rakefile ) + Dir["{bin,lib}/**/*"].sort
     gemspec.extra_rdoc_files = ["README.rdoc"]
-    gemspec.executables = ["hitch", "unhitch", "hitchrc"]
+    gemspec.executables = ["hitch"]
+    gemspec.add_development_dependency "rspec", ">= 1.3.0"
     gemspec.add_dependency('highline', '>= 1.5.0')
   end
   Jeweler::GemcutterTasks.new

data/bin/hitch

@@ -1,9 +1,34 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
 require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib hitch]))
-include Hitch
 
-if personal_info
-  hitch
+args = ARGV
+options = []
+opts = OptionParser.new do |opts|
+  opts.banner = "Usage: hitch [options] first_pair_username second_pair_username"
+  opts.separator ""
+  opts.separator "General options:"
+  opts.on("-s", "--setup", "Print out shell goodies") do
+    options = [:setup]
+  end
+  opts.on("-u", "--unhitch", "Clear pair information") do
+    options = [:unhitch]
+  end
+  opts.separator ""
+  opts.separator "Common options:"
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts opts
+    exit
+  end
+  opts.on_tail("-v", "--version", "Show version") do
+    abort "hitch v#{Hitch.version}"
+  end
 end
+if args.any?
+  opts.parse!(args)
+  options = [:export, args] if options.empty?
+else
+  options = [:print_info]
+end
+
+Hitch.send(*options)

data/lib/hitch.rb

@@ -1,284 +1,134 @@
 require 'highline'
 require 'yaml'
-require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib hitch options]))
+
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib hitch author]))
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib hitch ui]))
 
 module Hitch
 
-  # :stopdoc:
-  VERSION = '0.5.3'
-  LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
-  PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
-  # :startdoc:
+  VERSION = '0.6.0'
 
-  # Returns the version string for the library.
-  #
   def self.version
     VERSION
   end
 
-  # Returns the library path for the module. If any arguments are given,
-  # they will be joined to the end of the libray path using
-  # <tt>File.join</tt>.
-  #
-  def self.libpath( *args )
-    args.empty? ? LIBPATH : ::File.join(LIBPATH, args.flatten)
-  end
-
-  # Returns the lpath for the module. If any arguments are given,
-  # they will be joined to the end of the path using
-  # <tt>File.join</tt>.
-  #
-  def self.path( *args )
-    args.empty? ? PATH : ::File.join(PATH, args.flatten)
-  end
-
-  # Utility method used to require all files ending in .rb that lie in the
-  # directory below this file that has the same name as the filename passed
-  # in. Optionally, a specific _directory_ name can be passed in such that
-  # the _filename_ does not have to be equivalent to the directory.
-  #
-  def self.require_all_libs_relative_to( fname, dir = nil )
-    dir ||= ::File.basename(fname, '.*')
-    search_me = ::File.expand_path(
-        ::File.join(::File.dirname(fname), dir, '**', '*.rb'))
-
-    Dir.glob(search_me).sort.each {|rb| require rb}
-  end
-
-  HighLine.track_eof = false
-
-  def write_hitchrc
-    personal_info['current_pair'] = current_pair
-    File.open(hitchrc, File::CREAT|File::TRUNC|File::RDWR, 0644) do |out|
-      YAML.dump(personal_info, out)
+  def self.print_info
+    if Hitch.pairing?
+      Hitch::UI.highline.say("#{Hitch.git_author_name} <#{Hitch.git_author_email}>")
     end
   end
 
-  def hitchrc
-    @hitchrc ||= File.expand_path("~/.hitchrc")
-  end
-
-  def personal_info
-    if File.exists?(hitchrc)
-      @personal_info ||= YAML::load_file(hitchrc)
-    else
-      @personal_info ||= {}
-    end
+  def self.export(pairs)
+    Hitch.current_pair = pairs
+    write_export_file
+    print_info
   end
 
-  def hitch_pairs
-    @hitch_pairs ||= File.expand_path("~/.hitch_pairs")
+  def self.unhitch
+    Hitch.current_pair = []
+    write_export_file
   end
 
-  def pairs
-    if File.exists?(hitch_pairs)
-      @pairs ||= YAML::load_file(hitch_pairs)
+  def self.author_command
+    if Hitch.pairing?
+      "export GIT_AUTHOR_NAME='#{Hitch.git_author_name}' GIT_AUTHOR_EMAIL='#{Hitch.git_author_email}'"
     else
-      @pairs ||= {}
+      "unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL"
     end
   end
 
-  def write_hitch_pairs
-    File.open(hitch_pairs, File::CREAT|File::TRUNC|File::RDWR, 0644) do |out|
-      YAML.dump(pairs, out)
-    end
-  end
-
-  def ui
-    @ui ||= HighLine.new
+  def self.group_email
+    config[:group_email] ||= Hitch::UI.prompt_for_group_email
   end
 
-  def exporting_hitch_authors
-    !!hitch_options.export_hitch_authors
+  def self.group_email=(email)
+    config[:group_email] = email
+    write_file
   end
 
-  def write_hitch_authors
-    File.open(File.expand_path('~/.hitch_export_authors'), "w") do |f|
-      f.puts "# "
-      f.puts "export GIT_AUTHOR_NAME='#{hitch_name}'"
-      f.puts "export GIT_AUTHOR_EMAIL='#{hitch_email}'"
-    end
+  def self.current_pair
+    config[:current_pair] ||= []
   end
 
-  def write_gitconfig
-    clean_gitconfig
-    File.open(hitch_options.current_gitconfig, "a+") do |f|
-      f.puts "# start - lines added by hitch #"
-      f.puts "[user]"
-      f.puts "\tname = '#{hitch_name}'"
-      f.puts "\temail = #{hitch_email}"
-      f.puts "# end - lines added by hitch #"
+  def self.current_pair=(pairs)
+    config[:current_pair] = []
+    pairs.each do |author|
+      if Hitch::Author.find(author)
+        config[:current_pair] << author
+      else
+        if new_author = Hitch::UI.prompt_for_pair(author)
+          config[:current_pair] << author
+        end
+      end
     end
+    write_file
   end
 
-  def add_pair(git_name)
-    current_pair << git_name
-    current_pair.sort!
-    current_pair.uniq!
+  def self.git_author_name
+    current_pair.sort.map {|pair| Hitch::Author.find(pair)}.join(' and ')
   end
 
-  def current_pair
-    @current_pair ||= (personal_info['current_pair'] or [])
+  def self.git_author_email
+    "#{group_prefix}+#{current_pair.sort.join('+')}@#{group_domain}"
   end
 
-  def hitch_name
-    my_pairs_and_i.map {|github, name| name}.join(' and ')
+  def self.group_prefix
+    group_email.split('@').first
   end
 
-  def hitch_email
-    "#{group_prefix}+#{my_pairs_and_i.map{|github, name| github}.join('+')}@#{group_domain}"
+  def self.group_domain
+    group_email.split('@').last
   end
 
-  def my_pairs_and_i
-    and_i = current_pair.map {|github| [github, pairs[github]]}
-    and_i.sort_by {|github, name| github }
-  end
-
-  def group_prefix
-    personal_info['group_email'].split('@').first
-  end
+  def self.setup
+    Hitch::UI.highline.say <<-stp
 
-  def group_domain
-    personal_info['group_email'].split('@').last
-  end
-
-  def clean_hitch_authors
-    authors_file = File.expand_path '~/.hitch_export_authors'
-    File.open(authors_file, 'w') do |f|
-      f.puts "unset GIT_AUTHOR_NAME"
-      f.puts "unset GIT_AUTHOR_EMAIL"
-    end
-  end
+      # Add the following to your ~/.bashrc or ~/.zshrc
+      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
 
-  def clean_gitconfig(opts={:print => false})
-    config_file = hitch_options.current_gitconfig
-    ui.say " Clearing hitch info in: #{config_file}" if opts[:print]
-    body = File.read(config_file)
-    body.gsub!(/# start - lines added by hitch #\n.*?\n# end - lines added by hitch #\n/m, '')
-    File.open(config_file + ".tmp", 'w') {|f| f.write(body)}
-    File.rename(config_file + ".tmp", config_file)
+    stp
   end
 
-  def prep_hitch_authors
-    if pairing?
-      write_hitch_authors
-    else
-      clean_hitch_authors
+  def self.write_file
+    File.open(hitchrc, File::CREAT|File::TRUNC|File::RDWR, 0644) do |out|
+      YAML.dump(config, out)
     end
   end
 
-  def prep_gitconfig
-    if pairing?
-      write_gitconfig
-    else
-      clean_gitconfig
-    end
-  end
+  private
 
-  def unhitch
-    if personal_info
-      clear_pair_info
-      write_hitchrc
-      if exporting_hitch_authors
-        clean_hitch_authors
-      else
-        clean_gitconfig(:print => true)
-      end
-      print_current_status
-    end
+  def self.config
+    @config ||= get_config
   end
 
-  def print_current_status
-    if pairing?
-      ui.say " Currently pairing with #{current_pair.join(' ')}."
-    else
-      ui.say " Currently coding solo."
+  def self.get_config
+    if File.exists?(hitchrc)
+      yamlized = YAML::load_file(hitchrc)
+      return yamlized if yamlized.kind_of?(Hash)
     end
+    return {}
   end
 
-  def print_version
-    ui.say "hitch v#{Hitch.version}"
-  end
-
-  def clear_pair_info
-    personal_info['current_pair'] = []
-  end
-
-  def pairing?
-    return false if personal_info.empty?
-    return false if personal_info['current_pair'].nil? || personal_info['current_pair'].length.zero?
-    return false if personal_info['current_pair'].length < 2
-    true
+  def self.hitchrc
+    File.expand_path('~/.hitchrc')
   end
 
-  def existing_pair?(pair)
-    pairs.any? {|github, name| github == pair}
+  def self.hitch_export_authors
+    File.expand_path('~/.hitch_export_authors')
   end
 
-  def hitch_options
-    @hitch_options ||= Options.parse(ARGV)
+  def self.pairing?
+    current_pair.any?
   end
 
-  def hitch
-    case hitch_options.action
-    when "manage_hitchrc"
-      manage_hitchrc
-    when "unhitch"
-      unhitch
-    when "hitch"
-      if ARGV.any? && ARGV.size >= 2
-        potential_pairs = ARGV
-        save_pairs = false
-        clear_pair_info
-
-        potential_pairs.each do |pair|
-          unless existing_pair?(pair)
-            ui.say("I don't know who #{pair} is.")
-            if ui.agree("Do you want to add #{pair} to ~/.hitch_pairs?  ", true)
-              pairs[pair] = ui.ask("What is #{pair}'s full name?") do |q|
-                q.validate = /\A[-(\w|.,)+\s?]+\Z/
-              end
-              add_pair(pair)
-              save_pairs ||= true
-            else
-              ui.say("Ignoring #{pair}.")
-            end
-          else
-            add_pair(pair)
-          end
-        end
-        write_hitchrc
-        write_hitch_pairs if save_pairs
-        if exporting_hitch_authors
-          prep_hitch_authors
-        else
-          prep_gitconfig
-        end
-      else
-        ui.say " Silly Rabbit! A pair is comprised of two." unless ARGV.size.zero?
-      end
-      print_current_status
-    end
-  end
-
-  def manage_hitchrc
-    begin
-      unless File.exists?(hitchrc) and !ui.agree("Do you want to overwrite your #{ENV['HOME']}/.hitchrc file?", true)
-        ui.say("Let's setup your #{ENV['HOME']}/.hitchrc file")
-
-        personal_info['group_email'] = ui.ask("What is the group email? e.g. dev@hashrocket.com will become dev+therubymug+leshill@hashrocket.com") do |q|
-          q.case     = :down
-          q.validate = /\A[a-zA-Z0-9_\.\-]+@[a-zA-Z0-9\-]+\.[a-zA-Z0-9\-\.]+\z/ # Simple email validation.
-        end
-
-        write_hitchrc
-      end
-    rescue EOFError  # HighLine throws this if @input.eof?
-      break
-    end
-
-    print_current_status
+  def self.write_export_file
+    File.open(hitch_export_authors, 'w'){|f| f.write(author_command) }
   end
-end  # module Hitch
 
-Hitch.require_all_libs_relative_to(__FILE__)
+end

data/lib/hitch/author.rb

@@ -0,0 +1,39 @@
+module Hitch
+  class Author
+
+    def self.add(author_github, author_email)
+      unless find(author_github)
+        available_pairs[author_github] = author_email
+      end
+    end
+
+    def self.find(author_github)
+      available_pairs[author_github]
+    end
+
+    def self.write_file
+      File.open(hitch_pairs, File::CREAT|File::TRUNC|File::RDWR, 0644) do |out|
+        YAML.dump(available_pairs, out)
+      end
+    end
+
+    private
+
+    def self.hitch_pairs
+      File.expand_path("~/.hitch_pairs")
+    end
+
+    def self.available_pairs
+      @available_pairs ||= get_available_pairs
+    end
+
+    def self.get_available_pairs
+      if File.exists?(hitch_pairs)
+        yamlized = YAML::load_file(hitch_pairs)
+        return yamlized if yamlized.kind_of?(Hash)
+      end
+      return {}
+    end
+
+  end
+end

data/lib/hitch/ui.rb

@@ -0,0 +1,35 @@
+HighLine.track_eof = false
+
+module Hitch
+  class UI
+
+    def self.prompt_for_group_email
+      Hitch.group_email = highline.ask("What is the group email? e.g. dev@hashrocket.com will become dev+therubymug+leshill@hashrocket.com") do |q|
+        q.case = :down
+        q.validate = /\A[a-zA-Z0-9_\.\-]+@[a-zA-Z0-9\-]+\.[a-zA-Z0-9\-\.]+\z/
+      end
+    end
+
+    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|.,)+\s?]+\Z/
+        end
+        Hitch::Author.add(new_author, author_name)
+        Hitch::Author.write_file
+        return new_author
+      else
+        highline.say("Ignoring #{new_author}.")
+      end
+      return nil
+    end
+
+    private
+
+    def self.highline
+      @highline ||= HighLine.new
+    end
+
+  end
+end

data/spec/helper.rb

@@ -0,0 +1,14 @@
+require 'yaml'
+require 'highline'
+require 'fileutils'
+require 'tempfile'
+
+require File.join(File.dirname(__FILE__), '..', 'lib', 'hitch')
+
+Spec::Runner.configure do |config|
+  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)
+    Hitch::Author.stub(:hitch_pairs).and_return(Tempfile.new('hitch_pairs').path)
+  end
+end

data/spec/hitch/author_spec.rb

@@ -0,0 +1,57 @@
+require 'helper'
+
+describe Hitch::Author do
+
+  let(:base_pairs) do
+    {
+      'bender' => 'Bender Bending Rodriguez',
+      'fry' => 'Phillip J. Fry',
+      'leela' => 'Turanga Leela'
+    }
+  end
+
+  before { Hitch::Author.stub(:available_pairs).and_return(base_pairs) }
+
+  describe ".write_file" do
+    it "writes the contents of Hitch::Author.available_pairs to the hitch_pairs file" do
+      YAML.should_receive(:dump)
+      Hitch::Author.write_file
+    end
+  end
+
+  describe ".add" do
+
+    before { Hitch::Author.stub(:available_pairs).and_return({}) }
+
+    context "when the author is not present" do
+      it "adds the author to Hitch::Author.available_pairs" do
+        Hitch::Author.add("therubymug", "Rogelio J. Samour")
+        Hitch::Author.available_pairs.should == {"therubymug" => "Rogelio J. Samour"}
+      end
+    end
+
+  end
+
+  describe ".find" do
+
+    context "when the author is present" do
+
+      before do
+        Hitch::Author.stub(:available_pairs).and_return({"therubymug" => "Rogelio J. Samour"})
+      end
+
+      it "and_return the full name" do
+        Hitch::Author.find("therubymug").should == "Rogelio J. Samour"
+      end
+
+    end
+
+    context "when the author is not present" do
+      it "and_return nil" do
+        Hitch::Author.find("nobody").should be_nil
+      end
+    end
+
+  end
+
+end

data/spec/hitch/ui_spec.rb

@@ -0,0 +1,78 @@
+require 'helper'
+
+describe Hitch::UI do
+
+  describe '.prompt_for_group_email' do
+
+    it 'prompts for group email' do
+      Hitch::UI.highline.should_receive(:ask).with("What is the group email? e.g. dev@hashrocket.com will become dev+therubymug+leshill@hashrocket.com")
+      Hitch::UI.prompt_for_group_email
+    end
+
+    it 'returns the given group email' do
+      Hitch::UI.highline.stub(:ask).with("What is the group email? e.g. dev@hashrocket.com will become dev+therubymug+leshill@hashrocket.com").and_return('dev@hashrocket.com')
+      Hitch::UI.prompt_for_group_email.should == 'dev@hashrocket.com'
+    end
+
+    it 'sets Hitch.group_email' do
+      Hitch.should_receive('group_email=').with('dev@hashrocket.com')
+      Hitch::UI.highline.stub(:ask).with("What is the group email? e.g. dev@hashrocket.com will become dev+therubymug+leshill@hashrocket.com").and_return('dev@hashrocket.com')
+      Hitch::UI.prompt_for_group_email
+    end
+
+  end
+
+  describe '.prompt_for_pair' do
+
+    let(:new_author) { 'leela' }
+    let(:new_author_name) { 'Turanga Leela' }
+
+    before do
+      Hitch::UI.highline.stub(:ask).and_return(new_author_name)
+      Hitch::UI.highline.stub(:say)
+    end
+
+    it 'states that the new pair is not in the hitch_pairs file' do
+      Hitch::UI.highline.should_receive(:say).with("I don't know who #{new_author} is.")
+      Hitch::UI.prompt_for_pair(new_author)
+    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.prompt_for_pair(new_author)
+    end
+
+    context 'when user does not agree to add new author' do
+      it "states it's ignoring the author" do
+        Hitch::UI.highline.stub(:agree).and_return(false)
+        Hitch::UI.highline.should_receive(:say).with("Ignoring #{new_author}.")
+        Hitch::UI.prompt_for_pair(new_author)
+      end
+    end
+
+    context 'when user agrees to add new author' do
+
+      before do
+        Hitch::UI.highline.stub(:agree).and_return(true)
+      end
+
+      it "asks for the new author's name" do
+        Hitch::UI.highline.should_receive(:ask).with("What is #{new_author}'s full name?")
+        Hitch::UI.prompt_for_pair(new_author)
+      end
+
+      it "adds the new author" do
+        Hitch::Author.should_receive(:add).with(new_author, new_author_name)
+        Hitch::UI.prompt_for_pair(new_author)
+      end
+
+      it "writes the ~/.hitch_pairs file" do
+        Hitch::Author.should_receive(:write_file)
+        Hitch::UI.prompt_for_pair(new_author)
+      end
+
+    end
+
+  end
+
+end

data/spec/hitch_spec.rb

@@ -0,0 +1,205 @@
+require 'helper'
+
+describe Hitch do
+
+  let(:hitch_pairs) {{'leela' => 'Turanga Leela', 'fry' => 'Philip J. Fry'}}
+
+  let(:hitch_config) do
+    { :group_email => 'dev@hashrocket.com',
+      :current_pair => ['leela', 'fry'] }
+  end
+
+  before do
+    Hitch.stub(:config).and_return(hitch_config)
+    Hitch::Author.stub(:available_pairs).and_return(hitch_pairs)
+  end
+
+  describe '.author_command' do
+
+    context 'when pairing' do
+      it 'returns the export shell command for GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL' do
+        Hitch.current_pair = ['leela', 'fry']
+        Hitch.author_command.should == "export GIT_AUTHOR_NAME='Philip J. Fry and Turanga Leela' GIT_AUTHOR_EMAIL='dev+fry+leela@hashrocket.com'"
+      end
+    end
+
+    context 'when not pairing' do
+      it 'returns the unset shell command for GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL' do
+        Hitch.current_pair = []
+        Hitch.author_command.should == "unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL"
+      end
+    end
+
+  end
+
+  describe '.unhitch' do
+
+    let(:pairs) { ['fry', 'leela'] }
+
+    it 'sets the current pair to an empty array' do
+      Hitch.should_receive(:current_pair=).with([])
+      Hitch.unhitch
+    end
+
+    it 'writes the export file' do
+      Hitch.should_receive(:write_export_file)
+      Hitch.unhitch
+    end
+
+  end
+
+  describe '.print_info' do
+
+    context 'when pairing' do
+      it 'returns the pair name and email being used' do
+        Hitch::UI.highline.should_receive(:say).with("Philip J. Fry and Turanga Leela <dev+fry+leela@hashrocket.com>")
+        Hitch.current_pair = ['leela', 'fry']
+        Hitch.print_info
+      end
+    end
+
+    context 'when not pairing' do
+      it 'returns nothing' do
+        Hitch.current_pair = []
+        Hitch.print_info.should be_nil
+      end
+    end
+
+  end
+
+  describe '.export' do
+
+    let(:pairs) { ['fry', 'leela'] }
+
+    before do
+      Hitch.stub(:print_info)
+    end
+
+    it 'sets the current pair' do
+      Hitch.should_receive(:current_pair=).with(pairs)
+      Hitch.export(pairs)
+    end
+
+    it 'writes the export file' do
+      Hitch.should_receive(:write_export_file)
+      Hitch.export(pairs)
+    end
+
+    it 'prints out pair info' do
+      Hitch.should_receive(:print_info)
+      Hitch.export(pairs)
+    end
+
+  end
+
+  describe '.current_pair=' do
+
+    before { Hitch.stub(:write_file) }
+
+    it 'writes the hitchrc file' do
+      Hitch.should_receive(:write_file)
+      Hitch.current_pair = ['leela', 'fry']
+    end
+
+    context 'when there are no new authors' do
+      it 'sets the current pair with the authors given' do
+        Hitch.current_pair = ['leela', 'fry']
+        Hitch.current_pair.should == ['leela', 'fry']
+      end
+    end
+
+    context 'when there are new authors' do
+
+      let(:new_author) { 'therubymug' }
+
+      it "prompts for the new author's info" do
+        Hitch::UI.should_receive(:prompt_for_pair).with(new_author)
+        Hitch.current_pair = [new_author, 'fry']
+      end
+
+      it 'adds the new author to current pair' do
+        Hitch::UI.stub(:prompt_for_pair).and_return(new_author)
+        Hitch.current_pair = [new_author, 'fry']
+        Hitch.current_pair.should == [new_author, 'fry']
+      end
+
+    end
+
+  end
+
+  describe '.current_pair' do
+    it 'returns an array of Github usernames' do
+      Hitch.stub(:config).and_return(hitch_config)
+      Hitch.current_pair.should == ['leela', 'fry']
+    end
+  end
+
+  describe '.group_email' do
+
+    context 'when absent from Hitch.config' do
+      before { Hitch.stub(:config).and_return({}) }
+      it 'prompts the user for it' do
+        Hitch::UI.should_receive(:prompt_for_group_email)
+        Hitch.group_email
+      end
+    end
+
+    context 'when present in Hitch.config' do
+      it 'returns the value' do
+        Hitch.group_email.should == 'dev@hashrocket.com'
+      end
+    end
+
+  end
+
+  describe '.group_email=' do
+
+    before { Hitch.stub(:write_file) }
+
+    it 'writes the hitchrc file' do
+      Hitch.should_receive(:write_file)
+      Hitch.group_email = 'dev@hashrocket.com'
+    end
+
+    it 'sets the current pair with the authors given' do
+      Hitch.group_email = 'dev@hashrocket.com'
+      Hitch.group_email.should == 'dev@hashrocket.com'
+    end
+
+  end
+
+  describe '.group_prefix' do
+    it 'returns the user portion of the group email' do
+      Hitch.group_prefix.should == 'dev'
+    end
+  end
+
+  describe '.group_domain' do
+    it 'returns the user portion of the group email' do
+      Hitch.group_domain.should == 'hashrocket.com'
+    end
+  end
+
+  describe '.git_author_name' do
+    it 'returns all author names joined by an "and" sorted alphabetically' do
+      Hitch.git_author_name.should == 'Philip J. Fry and Turanga Leela'
+    end
+  end
+
+  describe '.git_author_email' do
+    it 'returns all author github names coalesced into the group email' do
+      Hitch.git_author_email.should == 'dev+fry+leela@hashrocket.com'
+    end
+  end
+
+  describe ".write_file" do
+    it "writes the contents of Hitch.config to the hitchrc file" do
+      YAML.should_receive(:dump)
+      Hitch.write_file
+    end
+  end
+
+  describe '.command' do
+  end
+
+end

metadata

@@ -1,56 +1,73 @@
 --- !ruby/object:Gem::Specification 
 name: hitch
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 3
-  version: 0.5.3
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
-- Rogelio Samour
-- Les Hill
+- Rogelio J. Samour
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-03-02 00:00:00 -05:00
-default_executable: 
+date: 2010-08-24 00:00:00 -04:00
+default_executable: hitch
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: highline
+  name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: highline
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 5
         - 0
         version: 1.5.0
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
 description: 
 email: rogelio@therubymug.com
 executables: 
 - hitch
-- unhitch
-- hitchrc
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- README.rdoc
 - Rakefile
 - bin/hitch
-- bin/hitchrc
-- bin/hitchstatus
-- bin/unhitch
 - lib/hitch.rb
-- lib/hitch/options.rb
+- lib/hitch/author.rb
+- lib/hitch/ui.rb
+- spec/helper.rb
+- spec/hitch/author_spec.rb
+- spec/hitch/ui_spec.rb
+- spec/hitch_spec.rb
 has_rdoc: true
 homepage: http://github.com/therubymug/hitch
 licenses: []
@@ -61,25 +78,32 @@ rdoc_options:
 require_paths: 
 - lib
 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 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Hitch allows developers to be properly credited when Pair Programming and using Git.
-test_files: []
-
+test_files: 
+- spec/helper.rb
+- spec/hitch/author_spec.rb
+- spec/hitch/ui_spec.rb
+- spec/hitch_spec.rb

data/README.rdoc

@@ -1,76 +0,0 @@
-= hitch
-    by Rogelio J. Samour
-    http://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+leshill+therubymug@hashrocket.com) This provides the ability to create a Gravatar for the pair.
-
-== SYNOPSIS:
-
-- First, create your hitchrc by running:
-  - hitch -m
-- For therubymug and leshill to pair in the current project:
-  - hitch leshill therubymug
-- or globally:
-  - hitch -g leshill therubymug
-- To clear pair info (for the local project):
-  - hitch -u
-- To clear pair info in the global file:
-  - hitch -u -g
-- For a complete list of features:
-  - hitch -h
-- Creating a Gravatar for your pair:
-  - Once I've hitched with my pair. (e.g. hitch leshill) I have now created a unique email: dev+leshill+therubymug@hashrocket.com
-  - Then, I go to gravatar.com. Add an image to that particular email address and I'm done.
-- If you want to allow different committer vs author, then:
-  - unhitch    (unhitch the current project)
-  - unhitch -g (globally unhitch)
-  - add the following aliases to your .bashrc:
-     alias hitch='hitch -p -g'
-     alias unhitch='unhitch -p -g'
-     alias git='. ~/.hitch_export_authors && git'
-
-== REQUIREMENTS:
-
-* Git, HighLine
-
-== INSTALL:
-
-* sudo gem install therubymug-hitch
-
-== ACKNOWLEDGEMENTS:
-
-* Les Hill
-* Tim Pope
-* Bodaniel Jeanes
-
-== LICENSE:
-
-(The MIT License)
-
-Copyright (c) 2009 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/bin/hitchrc

@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib hitch]))
-include Hitch
-
-manage_hitchrc

data/bin/hitchstatus

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-
-require 'yaml'
-yaml = YAML.load(File.read(File.expand_path('~/.hitchrc')))
-pairs = yaml['current_pair']
-print pairs.join(':') if pairs

data/bin/unhitch

@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib hitch]))
-include Hitch
-
-unhitch

data/lib/hitch/options.rb

@@ -1,71 +0,0 @@
-require 'optparse'
-require 'optparse/time'
-require 'ostruct'
-
-module Hitch
-
-  class Options
-
-    def self.parse(args)
-      options = OpenStruct.new
-      options.action = "hitch"
-
-      opts = OptionParser.new do |opts|
-        opts.banner = "Usage: hitch [options] first_pair_username second_pair_username"
-        opts.separator ""
-        opts.separator "Hitch defaults to the current project's .git/config"
-        opts.separator ""
-        opts.separator "General options:"
-
-        opts.on('-p', '--preserve_gitconfig', 'Preserves your ~/.gitconfig and .git/config files.  Uses ~/.hitch_export_authors instead') do
-          options.export_hitch_authors = true
-        end
-
-        opts.on("-g", "--global", "Modifies your global ~/.gitconfig") do
-          options.current_gitconfig = File.expand_path("~/.gitconfig")
-        end
-
-        opts.on("-m", "--manage-hitchrc", "Creates or manages your personal information into ~/.hitchrc") do
-          if options.action.empty? || options.action == "hitch"
-            options.action = "manage_hitchrc"
-          else
-            abort "You can only perform one action at a time. hitch -h for more info."
-          end
-        end
-
-        opts.on("-u", "--unhitch", "Clear pair information") do
-          if options.action.empty? || options.action == "hitch"
-            options.action = "unhitch"
-          else
-            abort "You can only perform one action at a time. hitch -h for more info."
-          end
-        end
-
-        opts.separator ""
-        opts.separator "Common options:"
-
-        opts.on_tail("-h", "--help", "Show this message") do
-          puts opts
-          exit
-        end
-
-        opts.on_tail("-v", "--version", "Show version") do
-          abort "hitch v#{Hitch.version}"
-        end
-      end
-
-      opts.parse!(args)
-
-      if options.current_gitconfig.nil?
-        options.current_gitconfig = File.expand_path(File.join(Dir.pwd, ".git", "config"))
-      end
-
-      unless File.exists?(options.current_gitconfig)
-        abort "Config File: #{options.current_gitconfig} does not exist. hitch -h for more info."
-      end
-
-      options
-    end
-
-  end
-end