hitch 0.7.1 → 1.0.0

data/Gemfile

@@ -0,0 +1,10 @@
+source 'http://rubygems.org'
+
+gem 'highline', '1.6.2'
+gem 'rake'
+gem 'rspec', '~>2.6.0'
+
+unless RUBY_VERSION =~ /^1.8.6/
+  gem 'ruby-debug', :require => 'ruby-debug', :platform => 'ruby_18'
+  gem 'ruby-debug19', :require => 'ruby-debug', :platform => 'ruby_19'
+end

data/Gemfile.lock

@@ -0,0 +1,46 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    archive-tar-minitar (0.5.2)
+    columnize (0.3.4)
+    diff-lcs (1.1.3)
+    highline (1.6.2)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
+    rake (0.9.2)
+    rbx-require-relative (0.0.5)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  highline (= 1.6.2)
+  rake
+  rspec (~> 2.6.0)
+  ruby-debug
+  ruby-debug19

data/README.md

@@ -2,6 +2,8 @@ hitch
 =====
 by Rogelio J. Samour (http://blog.therubymug.com)
 
+[![Build Status](https://travis-ci.org/therubymug/hitch.png?branch=master)](https://travis-ci.org/therubymug/hitch)
+
 Description:
 -----------
 
@@ -35,15 +37,8 @@ Install:
 <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>
+* Or copy/paste [the code](lib/hitch/hitch.sh) into your ~/.bashrc or ~/.zshrc
+* As another option, copy/symlink the script to a separate file (e.g. `~/.bash/hitch.sh` or `/etc/profile.d/hitch.sh`) and source it. You can get the path using `hitch --setup-path`.
 
 Development:
 -----------
@@ -51,9 +46,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
-* 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>
+* Add tests and code for your feature
+* Create a pull request
+* Double-check TravisCI to make sure all tests pass
 
 Requirements:
 ------------

data/Rakefile

@@ -1,4 +1,122 @@
+#############################################################################
+#
+# Helper functions
+#
+#############################################################################
+
+def name
+  @name ||= Dir['*.gemspec'].first.split('.').first
+end
+
+def version
+  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
+  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
+end
+
+def date
+  Date.today.to_s
+end
+
+def gemspec_file
+  "#{name}.gemspec"
+end
+
+def gem_file
+  "#{name}-#{version}.gem"
+end
+
+def replace_header(head, header_name)
+  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
+end
+
+#############################################################################
+#
+# Standard tasks
+#
+#############################################################################
+
+require 'rspec'
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+desc "Run all specs"
+task RSpec::Core::RakeTask.new('spec')
+
+task :default => "spec"
+
+desc "Open an irb session preloaded with this library"
+task :console do
+  sh "irb -rubygems -r ./lib/#{name}.rb"
+end
+
+#############################################################################
+#
+# Custom tasks (add your own tasks here)
+#
+#############################################################################
+
+
+#############################################################################
+#
+# Packaging tasks
+#
+#############################################################################
+
+desc "Create tag v#{version} and build and push #{gem_file} to Rubygems"
+task :release => :build do
+  unless `git branch` =~ /^\* master$/
+    puts "You must be on the master branch to release!"
+    exit!
+  end
+  sh "git commit --allow-empty -a -m 'Release #{version}'"
+  sh "git tag v#{version}"
+  sh "git push origin master"
+  sh "git push origin v#{version}"
+  sh "gem push pkg/#{name}-#{version}.gem"
+end
+
+desc "Build #{gem_file} into the pkg directory"
+task :build => :gemspec do
+  sh "mkdir -p pkg"
+  sh "gem build #{gemspec_file}"
+  sh "mv #{gem_file} pkg"
+end
+
+desc "Generate #{gemspec_file}"
+task :gemspec => :validate do
+  # read spec file and split out manifest section
+  spec = File.read(gemspec_file)
+  head, manifest, tail = spec.split("  # = MANIFEST =\n")
+
+  # replace name version and date
+  replace_header(head, :name)
+  replace_header(head, :version)
+  replace_header(head, :date)
+
+  # determine file list from git ls-files
+  files = `git ls-files`.
+    split("\n").
+    sort.
+    reject { |file| file =~ /^\./ }.
+    reject { |file| file =~ /^(rdoc|pkg)/ }.
+    map { |file| "    #{file}" }.
+    join("\n")
+
+  # piece file back together and write
+  manifest = "  s.files = %w[\n#{files}\n  ]\n"
+  spec = [head, manifest, tail].join("  # = MANIFEST =\n")
+  File.open(gemspec_file, 'w') { |io| io.write(spec) }
+  puts "Updated #{gemspec_file}"
+end
+
+desc "Validate #{gemspec_file}"
+task :validate do
+  libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}"]
+  unless libfiles.empty?
+    puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir."
+    exit!
+  end
+  unless Dir['VERSION*'].empty?
+    puts "A `VERSION` file at root level violates Gem best practices."
+    exit!
+  end
+end

data/bin/hitch

@@ -1,7 +1,6 @@
 #!/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 = []
@@ -12,6 +11,9 @@ opts = OptionParser.new do |opts|
   opts.on("-s", "--setup", "Print out shell goodies") do
     options = [:setup]
   end
+  opts.on("--setup-path", "Print out path to shell goodies") do
+    options = [:print_setup_path]
+  end
   opts.on("-e N", "--expire N", Integer, "Expire pair information in N hours.") do |n|
     options = [:expire, n]
   end

data/hitch.gemspec

@@ -0,0 +1,60 @@
+# -*- encoding: utf-8 -*-
+Gem::Specification.new do |s|
+  s.specification_version = 2 if s.respond_to? :specification_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.rubygems_version = '1.3.5'
+
+  s.name = %q{hitch}
+  s.version = '1.0.0'
+  s.date = Time.now.strftime('%F')
+
+  s.description = %q{Git author attribution helper for pair programmers.}
+  s.summary = %q{Hitch allows developers to be properly credited when Pair Programming and using Git.}
+  s.authors = [%q{Rogelio J. Samour}]
+  s.email         = ["rogelio@therubymug.com"]
+  s.homepage = %q{http://github.com/therubymug/hitch}
+  s.require_paths = %w[lib]
+  s.extra_rdoc_files = %w[README.md LICENSE.md]
+  s.rdoc_options = [%q{--charset=UTF-8}]
+
+  s.executables = [%q{hitch}]
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 2.6.0"])
+      s.add_runtime_dependency(%q<highline>, [">= 1.6.2"])
+    else
+      s.add_dependency(%q<rspec>, [">= 2.6.0"])
+      s.add_dependency(%q<highline>, [">= 1.6.2"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 2.6.0"])
+    s.add_dependency(%q<highline>, [">= 1.6.2"])
+  end
+
+  ## Leave this section as-is. It will be automatically generated from the
+  ## contents of your Git repository via the gemspec task. DO NOT REMOVE
+  ## THE MANIFEST COMMENTS, they are used as delimiters by the task.
+  # = MANIFEST =
+  s.files = %w[
+    Gemfile
+    Gemfile.lock
+    LICENSE.md
+    README.md
+    Rakefile
+    bin/hitch
+    hitch.gemspec
+    lib/hitch.rb
+    lib/hitch/author.rb
+    lib/hitch/hitch.sh
+    lib/hitch/ui.rb
+    spec/hitch/author_spec.rb
+    spec/hitch/ui_spec.rb
+    spec/hitch_spec.rb
+    spec/spec_helper.rb
+  ]
+  # = MANIFEST =
+
+  s.test_files    = s.files.grep(%r{^spec/})
+end

data/lib/hitch.rb

@@ -6,6 +6,8 @@ require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib hitch ui]))
 
 module Hitch
 
+  VERSION = '1.0.0'
+
   def self.print_info
     if Hitch.pairing? && STDOUT.tty?
       Hitch::UI.highline.say("#{Hitch.git_author_name} <#{Hitch.git_author_email}>")
@@ -54,7 +56,7 @@ module Hitch
       if Hitch::Author.find(author)
         config[:current_pair] << author
       else
-        if new_author = Hitch::UI.prompt_for_pair(author)
+        if Hitch::UI.prompt_for_pair(author)
           config[:current_pair] << author
         end
       end
@@ -86,19 +88,16 @@ module Hitch
     group_email.split('@').last
   end
 
+  def self.setup_path
+    File.join(File.dirname(__FILE__), 'hitch', 'hitch.sh')
+  end
+
+  def self.print_setup_path
+    puts setup_path
+  end
+
   def self.setup
-    Hitch::UI.highline.say <<-stp
-
-      # 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
-
-    stp
+    Hitch::UI.highline.say(File.read(setup_path))
   end
 
   def self.write_file

data/lib/hitch/hitch.sh

@@ -0,0 +1,12 @@
+# Add the following to your ~/.bashrc or ~/.zshrc
+#
+# Alternatively, copy/symlink this file and source in your shell.  See `hitch --setup-path`.
+
+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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hitch
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-02 00:00:00.000000000Z
+date: 2013-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70229657686720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70229657686720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70229657686240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,22 +37,33 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *70229657686240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.2
 description: Git author attribution helper for pair programmers.
-email: rogelio@therubymug.com
+email:
+- rogelio@therubymug.com
 executables:
 - hitch
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- README.md
+- LICENSE.md
 files:
-- lib/hitch/author.rb
-- lib/hitch/ui.rb
-- lib/hitch/version.rb
-- lib/hitch.rb
-- bin/hitch
-- Rakefile
+- Gemfile
+- Gemfile.lock
 - LICENSE.md
 - README.md
+- Rakefile
+- bin/hitch
+- hitch.gemspec
+- lib/hitch.rb
+- lib/hitch/author.rb
+- lib/hitch/hitch.sh
+- lib/hitch/ui.rb
 - spec/hitch/author_spec.rb
 - spec/hitch/ui_spec.rb
 - spec/hitch_spec.rb
@@ -70,10 +86,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Hitch allows developers to be properly credited when Pair Programming and

data/lib/hitch/version.rb

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