git_tracker 1.4.0 → 1.5.0

data/.gitignore

@@ -1,19 +1,12 @@
 *.gem
-*.rbc
 .bundle
-.config
-.yardoc
 Gemfile.lock
-InstalledFiles
-_yardoc
 coverage
 doc/
 lib/bundler/man
+/git-tracker
 pkg
 rdoc
-spec/reports
-test/tmp
-test/version_tmp
 tmp
 tags
 .rvmrc

data/.rspec

@@ -1,4 +1,3 @@
 --colour
 -I spec/support
 -r rspec-spies
--r pry

data/CHANGELOG.md

@@ -1,19 +1,30 @@
 ### dev
-[full changelog](https://github.com/highgroove/git_tracker/compare/v1.3.0...master)
+[full changelog](https://github.com/stevenharman/git_tracker/compare/v1.5.0...master)
+
+### 1.5.0 / 2013-02-02
+[full changelog](https://github.com/stevenharman/git_tracker/compare/v1.4.0...v1.5.0)
+
+Enhancements
+
+* Support installing via Homebrew: `brew install git-tracker`
+* Generate standalone binary via `rake standalone:build`
+
+### 1.4.0 / 2012-06-11
+[full changelog](https://github.com/stevenharman/git_tracker/compare/v1.3.1...v1.4.0)
+
 Enhancements
 
 * Support Ruby 1.8.7
-* Generate standalone binary via `rake git-tracker`
 
 ### 1.3.1 / 2012-04-23
-[full changelog](https://github.com/highgroove/git_tracker/compare/v1.3.0...v1.3.1)
+[full changelog](https://github.com/stevenharman/git_tracker/compare/v1.3.0...v1.3.1)
 
 Bug fixes
 
 * Bring back fourth Pivotal Tracker keyword, `delivered`
 
 ### 1.3.0 / 2012-04-23
-[full changelog](https://github.com/highgroove/git_tracker/compare/v1.2.0...v1.3.0)
+[full changelog](https://github.com/stevenharman/git_tracker/compare/v1.2.0...v1.3.0)
 
 Enhancements
 
@@ -24,7 +35,7 @@ Bug fixes
 * Pivotal Tracker keywords are case-insensitive
 
 ### 1.2.0 / 2012-04-21
-[full changelog](https://github.com/highgroove/git_tracker/compare/v1.1.0...v1.2.0)
+[full changelog](https://github.com/stevenharman/git_tracker/compare/v1.1.0...v1.2.0)
 
 Enhancements
 
@@ -33,11 +44,11 @@ Enhancements
 Bug fixes
 
 * Exit with non-zero status code when a commit exists [issue
-  #3](https://github.com/highgroove/git_tracker/issues/3)
+  #3](https://github.com/stevenharman/git_tracker/issues/3)
 * Exit with non-zero status code with not in a Git repository
 
 ### 1.1.0 / 2012-04-03
-[full changelog](https://github.com/highgroove/git_tracker/compare/v1.0.0...v1.1.0)
+[full changelog](https://github.com/stevenharman/git_tracker/compare/v1.0.0...v1.1.0)
 
 Enhancements
 
@@ -47,16 +58,16 @@ Bug fixes
 
 * Fix case-sensitivity issue w/English library
 * Exit with non-zero status code with not in a Git repository [issue
-  #1](https://github.com/highgroove/git_tracker/issues/1)
+  #1](https://github.com/stevenharman/git_tracker/issues/1)
 
 ### 1.0.0 / 2012-03-31
-[full changelog](https://github.com/highgroove/git_tracker/compare/v0.0.1...v1.0.0)
+[full changelog](https://github.com/stevenharman/git_tracker/compare/v0.0.1...v1.0.0)
 
 Enhancements
 
 * Hook can install itself in a Git repository
 
 ### 0.0.1 / 2012-03-23
-[full changelog](https://github.com/highgroove/git_tracker/compare/5fbbe061e721c1f86fdd5d78a4bfb4c61a0eaf5c...v0.0.1)
+[full changelog](https://github.com/stevenharman/git_tracker/compare/5fbbe061e721c1f86fdd5d78a4bfb4c61a0eaf5c...v0.0.1)
 
 * Initial release

data/README.md

@@ -1,4 +1,8 @@
-# GitTracker [![Build Status](https://secure.travis-ci.org/highgroove/git_tracker.png)](http://travis-ci.org/highgroove/git_tracker)
+# GitTracker
+
+[![Build Status](https://secure.travis-ci.org/stevenharman/git_tracker.png)](http://travis-ci.org/stevenharman/git_tracker)
+[![Dependency Status](https://gemnasium.com/stevenharman/git_tracker.png)](https://gemnasium.com/stevenharman/git_tracker)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/stevenharman/git_tracker)
 
 *GitTracker*, or *git-tracker*, is a Git hook that will scan your current
 branch name looking for something it recognizes as a [Pivotal Tracker][pt]
@@ -7,30 +11,38 @@ format][pt-format], to your commit message.
 
 ## Installation
 
-You need to get the `git-tracker` executable on your system.
+### 1) Install the `git-tracker` executable
 
-### RubyGems
+You need to get the `git-tracker` executable on your system, and then you need
+to install the *git hook* into your local Git repository.
 
-Currently, this is the only option, but I plan to have a standalone version
-ready soon.
+- via [Homebrew][homebrew] (preferred)
 
-```bash
-$ gem install git_tracker
-```
+  ```bash
+  $ brew install git-tracker
+  ```
+
+- via [RubyGems][rubygems] (if you must)
+
+  ```bash
+  $ gem install git_tracker
+  ```
+
+### 2) Install the hook
 
-Once you have the `git-tracker` executable on your system you need to install
-the hook into your local Git repository.
+You need to add the hook into each repository where you want to use it.
 
 ```bash
 # from inside a local Git repository
+# for example: /path/to/repo/
 $ git-tracker install
 ```
 
 This will put the `prepare-commit-msg` hook in the `/path/to/repo/.git/hooks`
 directory and make it executable.
 
-**NOTE:** This will need to be done for each repository that you wish to use
-the hook.
+**NOTE:** The hook needs to be installed just once for each repository in which
+you will use it.
 
 ## Usage
 
@@ -38,7 +50,7 @@ With the hook installed in a repository, create branches being sure to include
 the Pivotal Tracker story number in the branch name.
 
 ```bash
-$ git checkout -b a_useful_and_helpful_name_#8675309
+$ git checkout -b a_useful_and_helpful_name_8675309
 ```
 
 When you commit, Git will fire the hook which will find the story number in the
@@ -46,7 +58,7 @@ branch name and prepare your commit message so that it include the story number
 in the special Pivotal Tracker syntax.
 
 ```bash
-# on branch named `best_feature_ever-#8675309`
+# on branch named `best_feature_ever-8675309`
 $ git commit
 ```
 
@@ -59,7 +71,7 @@ the top)*
 [#8675309]
 # Please enter the commit message for your changes. Lines starting
 # with '#' will be ignored, and an empty message aborts the commit.
-# On branch best_feature_ever-#8675309
+# On branch best_feature_ever-8675309
 # Changes to be committed:
 #   (use "git reset HEAD <file>..." to unstage)
 #
@@ -76,7 +88,7 @@ If you pass a commit message on the command line the hook will still add the
 story number, preceded by an empty line, to the end of your message.
 
 ```bash
-# on branch named `best_feature_ever-#8675309`
+# on branch named `best_feature_ever-8675309`
 $ git commit -m'Look at this rad code, yo!'
 ```
 
@@ -92,7 +104,7 @@ However, if you include the story number in the Pivotal Tracker format in your
 commit message, the hook will do nothing.
 
 ```bash
-# on branch named `best_feature_ever-#8675309`
+# on branch named `best_feature_ever-8675309`
 $ git commit -m'[#8675309] Look at this rad code, yo!'
 ```
 
@@ -100,7 +112,7 @@ Results in this commit message:
 
 
 ```
-[#12356] Look at this rad code, yo!
+[#8675309] Look at this rad code, yo!
 ```
 
 ### Keywords
@@ -116,7 +128,7 @@ to the story ID in the commit message.
 For example:
 
 ```bash
-# on branch named `bug/redis_connection_not_initializing_#8675309`
+# on branch named `bug/redis_connection_not_initializing_8675309`
 $ git commit -am "Change the redis connection string [Fixes]"
 ```
 
@@ -134,21 +146,23 @@ Change the redis connection string [Fixes]
 name, optionally prefixing it with a hash (`#`). Examples:
 
   - `best_feature_ever_#8675309`
-  - `best_feature_ever_8675309`
+  - `best-feature-ever-8675309`
   - `8675309_best_feature_ever`
-  - `#8675309_best_feature_ever`
+  - `#8675309-best-feature-ever`
   - `your_name/8675309_best_feature_ever`
   - `your_name/#8675309_best_feature_ever`
 
 ## Contributing :octocat:
 
 1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
+2. Create your feature branch (`git checkout -b my_new_feature`)
 3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
+4. Push to the branch (`git push origin my_new_feature`)
 5. Create new Pull Request
 
 
 [pt]: https://www.pivotaltracker.com/
 [pt-format]: https://www.pivotaltracker.com/help/api?version=v3#scm_post_commit_message_syntax
 [tpope]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
+[homebrew]: http://mxcl.github.com/homebrew
+[rubygems]: http://rubygems.org/gems/git_tracker

data/Rakefile

@@ -1,12 +1,65 @@
 #!/usr/bin/env rake
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+require File.expand_path('../lib/git_tracker/version', __FILE__)
 
-RSpec::Core::RakeTask.new(:spec)
-task :default => :spec
+# Skip these tasks when being installed by Homebrew
+unless ENV['HOMEBREW_BREW_FILE']
 
-file 'git-tracker' => FileList.new('lib/git_tracker.rb, lib/git_tracker/*.rb') do |task|
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+  task :default => :spec
+
+  # Rubygems tasks
+  namespace :gem do
+    require 'bundler/gem_tasks'
+  end
+
+  desc "Create tag v#{GitTracker::VERSION}, build, and push to GitHub, Rubygems, and Homebrew"
+  task :release => ['gem:release', 'standalone:homebrew']
+
+end
+
+# standalone and Homebrew
+file 'git-tracker' => FileList.new('lib/git_tracker.rb', 'lib/git_tracker/*.rb') do |task|
   $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
   require 'git_tracker/standalone'
   GitTracker::Standalone.save(task.name)
 end
+
+namespace :standalone do
+
+  desc 'Build standalone script'
+  task :build => 'git-tracker'
+
+  desc 'Build and install standalone script'
+  task :install => 'standalone:build' do
+    prefix = ENV['PREFIX'] || ENV['prefix'] || '/usr/local'
+
+    FileUtils.mkdir_p "#{prefix}/bin"
+    FileUtils.cp 'git-tracker', "#{prefix}/bin", :preserve => true
+  end
+
+  task :homebrew do
+    Dir.chdir `brew --prefix`.chomp do
+      sh 'git checkout -q master'
+      sh 'git pull -q origin master'
+
+      formula_file = 'Library/Formula/git-tracker.rb'
+      sha = `curl -#L https://github.com/stevenharman/git_tracker/tarball/v#{GitTracker::VERSION} | shasum`.split(/\s+/).first
+      abort unless $?.success? and sha.length == 40
+
+      formula = File.read formula_file
+      formula.sub! /\bv\d+(\.\d+)*/, "v#{GitTracker::VERSION}"
+      formula.sub! /\b[0-9a-f]{40}\b/, sha
+      File.open(formula_file, 'w') {|f| f << formula }
+
+      branch = "git_tracker-v#{GitTracker::VERSION}"
+      sh "git checkout -q -B #{branch}"
+      sh "git commit -m 'upgrade git-tracker to v#{GitTracker::VERSION}' -- #{formula_file}"
+      sh "git push -u stevenharman #{branch}"
+      sh "hub pull-request 'upgrade git-tracker to v#{GitTracker::VERSION}'"
+
+      sh "git checkout -q master"
+    end
+  end
+end
+

data/git_tracker.gemspec

@@ -6,16 +6,15 @@ Gem::Specification.new do |gem|
   gem.version       = GitTracker::VERSION
   gem.authors       = ["Steven Harman"]
   gem.email         = ["steveharman@gmail.com"]
-  gem.homepage      = "https://github.com/highgroove/git_tracker"
+  gem.homepage      = "https://github.com/stevenharman/git_tracker"
   gem.summary       = %q{Teaching Git about Pivotal Tracker.}
   gem.description   = <<-EOF
     Some simple tricks that make working with Pivotal Tracker even
     better... and easier... um, besier!
   EOF
 
-  gem.add_development_dependency "rspec", "~> 2.9"
+  gem.add_development_dependency "rspec", "~> 2.12"
   gem.add_development_dependency "rspec-spies", "~> 2.0"
-  gem.add_development_dependency "pry", "~> 0.9"
   gem.add_development_dependency "activesupport", "~> 3.2"
   gem.add_development_dependency "rake"
 

data/lib/git_tracker.rb

@@ -1,8 +1,7 @@
+require 'git_tracker/version'
 require 'git_tracker/hook'
 require 'git_tracker/repository'
 require 'git_tracker/prepare_commit_message'
 require 'git_tracker/runner'
 require 'git_tracker/branch'
 require 'git_tracker/commit_message'
-require 'git_tracker/version'
-

data/lib/git_tracker/runner.rb

@@ -17,6 +17,10 @@ module GitTracker
     def self.install
       Hook.install
     end
+
+    def self.test_command
+      puts 'git-tracker is here. How are you?'
+    end
   end
 
 end

data/lib/git_tracker/standalone.rb

@@ -8,7 +8,7 @@ module GitTracker
 # This file is generated code. DO NOT send patches for it.
 #
 # Original source files with comments are at:
-# https://github.com/highgroove/git_tracker
+# https://github.com/stevenharman/git_tracker
 #
 
 preamble

data/lib/git_tracker/version.rb

@@ -1,3 +1,3 @@
 module GitTracker
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

data/spec/git_tracker/branch_spec.rb

@@ -29,31 +29,36 @@ describe GitTracker::Branch do
     context 'Current branch has a story number' do
       it 'finds the story that starts with a hash' do
         stub_branch('refs/heads/a_very_descriptive_name_#8675309')
-        subject.story_number.should == '8675309'
+        expect(subject.story_number).to eq('8675309')
       end
 
       it 'finds the story without a leading hash' do
         stub_branch('refs/heads/a_very_descriptive_name_1235309')
-        subject.story_number.should == '1235309'
+        expect(subject.story_number).to eq('1235309')
       end
 
       it 'finds the story following a forward hash' do
         stub_branch('refs/heads/alindeman/8675309_got_her_number')
-        subject.story_number.should == '8675309'
+        expect(subject.story_number).to eq('8675309')
+      end
+
+      it 'finds the story in a branch with hyphens' do
+        stub_branch('refs/heads/stevenharman/got-her-number-8675309')
+        expect(subject.story_number).to eq('8675309')
       end
     end
 
     context 'The current branch does not have a story number' do
       it 'finds no story' do
-        stub_branch('refs/heads/a_very_descriptive_name_without_a_#number')
-        subject.story_number.should_not be
+        stub_branch('refs/heads/a_very_descriptive_name-without_a_#number')
+        expect(subject.story_number).to_not be
       end
     end
 
     context 'Not on a branch (HEAD does not exist)' do
       it 'finds no story' do
         stub_branch('')
-        subject.story_number.should_not be
+        expect(subject.story_number).to_not be
       end
     end
   end

data/spec/git_tracker/commit_message_spec.rb

@@ -9,7 +9,7 @@ describe GitTracker::CommitMessage do
   let(:file) { 'COMMIT_EDITMSG' }
 
   it 'requires path to the temporary commit message file' do
-    lambda { GitTracker::CommitMessage.new }.should raise_error ArgumentError
+    expect { GitTracker::CommitMessage.new }.to raise_error ArgumentError
   end
 
   def stub_commit_message(story_text)
@@ -20,13 +20,13 @@ describe GitTracker::CommitMessage do
     %w[fix Fixed FIXES Complete completed completes FINISH finished Finishes Deliver delivered DELIVERS].each do |keyword|
       it "detects the #{keyword} keyword" do
         stub_commit_message("Did the darn thing. [#{keyword}]")
-        subject.keyword.should == keyword
+        expect(subject.keyword).to eq(keyword)
       end
     end
 
     it 'does not find the keyword when it does not exist' do
       stub_commit_message('Did the darn thing. [Something]')
-      subject.keyword.should_not be
+      expect(subject.keyword).to_not be
     end
   end
 
@@ -34,57 +34,57 @@ describe GitTracker::CommitMessage do
     context 'commit message contains the special Pivotal Tracker story syntax' do
       it 'allows just the number' do
         stub_commit_message('[#8675309]')
-        subject.should be_mentions_story('8675309')
+        expect(subject).to be_mentions_story('8675309')
       end
 
       it 'allows multiple numbers' do
         stub_commit_message('[#99 #777 #8675309 #111222]')
-        subject.should be_mentions_story('99')
-        subject.should be_mentions_story('777')
-        subject.should be_mentions_story('8675309')
-        subject.should be_mentions_story('111222')
+        expect(subject).to be_mentions_story('99')
+        expect(subject).to be_mentions_story('777')
+        expect(subject).to be_mentions_story('8675309')
+        expect(subject).to be_mentions_story('111222')
       end
 
       it 'allows state change before number' do
         stub_commit_message('[Fixes #8675309]')
-        subject.should be_mentions_story('8675309')
+        expect(subject).to be_mentions_story('8675309')
       end
 
       it 'allows state change after the number' do
         stub_commit_message('[#8675309 Delivered]')
-        subject.should be_mentions_story('8675309')
+        expect(subject).to be_mentions_story('8675309')
       end
 
       it 'allows surrounding text' do
         stub_commit_message('derp de #herp [Fixes #8675309] de herp-ity derp')
-        subject.should be_mentions_story('8675309')
+        expect(subject).to be_mentions_story('8675309')
       end
     end
 
     context 'commit message doesn not contain the special Pivotal Tracker story syntax' do
       it 'requires brackets' do
         stub_commit_message('#8675309')
-        subject.should_not be_mentions_story('8675309')
+        expect(subject).to_not be_mentions_story('8675309')
       end
 
       it 'requires a pound sign' do
         stub_commit_message('[8675309]')
-        subject.should_not be_mentions_story('8675309')
+        expect(subject).to_not be_mentions_story('8675309')
       end
 
       it 'does not allow the bare number' do
         stub_commit_message('8675309')
-        subject.should_not be_mentions_story('8675309')
+        expect(subject).to_not be_mentions_story('8675309')
       end
 
       it 'does not allow multiple state changes' do
         stub_commit_message('[Fixes Deploys #8675309]')
-        subject.should_not be_mentions_story('8675309')
+        expect(subject).to_not be_mentions_story('8675309')
       end
 
       it 'does not allow comments' do
         stub_commit_message('#[#8675309]')
-        subject.should_not be_mentions_story('8675309')
+        expect(subject).to_not be_mentions_story('8675309')
       end
     end
   end
@@ -99,22 +99,21 @@ describe GitTracker::CommitMessage do
     end
 
     it 'handles no existing message' do
-      stub_original_commit_message("\n\n# some other comments\n")
-      subject.append('[#8675309]')
-
-      fake_file.content.should == <<-COMMIT_MESSAGE.strip_heredoc
+      commit_message = <<-COMMIT_MESSAGE.strip_heredoc
 
 
         [#8675309]
         # some other comments
       COMMIT_MESSAGE
-    end
 
-    it 'preserves existing messages' do
-      stub_original_commit_message("A first line\n\nWith more here\n# other comments\n")
+      stub_original_commit_message("\n\n# some other comments\n")
       subject.append('[#8675309]')
 
-      fake_file.content.should == <<-COMMIT_MESSAGE.strip_heredoc
+      expect(fake_file.content).to eq(commit_message)
+    end
+
+    it 'preserves existing messages' do
+      commit_message = <<-COMMIT_MESSAGE.strip_heredoc
         A first line
 
         With more here
@@ -122,13 +121,15 @@ describe GitTracker::CommitMessage do
         [#8675309]
         # other comments
       COMMIT_MESSAGE
-    end
 
-    it 'preserves line breaks in comments' do
-      stub_original_commit_message("# comment #1\n# comment B\n# comment III")
+      stub_original_commit_message("A first line\n\nWith more here\n# other comments\n")
       subject.append('[#8675309]')
 
-      fake_file.content.should == <<-COMMIT_MESSAGE.strip_heredoc
+      expect(fake_file.content).to eq(commit_message)
+    end
+
+    it 'preserves line breaks in comments' do
+      commit_message = <<-COMMIT_MESSAGE.strip_heredoc
 
 
         [#8675309]
@@ -136,6 +137,11 @@ describe GitTracker::CommitMessage do
         # comment B
         # comment III
       COMMIT_MESSAGE
+
+      stub_original_commit_message("# comment #1\n# comment B\n# comment III")
+      subject.append('[#8675309]')
+
+      expect(fake_file.content).to eq(commit_message)
     end
   end
 end

data/spec/git_tracker/hook_spec.rb

@@ -3,7 +3,7 @@ require 'git_tracker/hook'
 require 'active_support/core_ext/string/strip'
 
 describe GitTracker::Hook do
-  subject { described_class }
+  subject(:hook) { described_class }
   let(:root) { '/path/to/git/repo/toplevel' }
   let(:hook_path) { File.join(root, '.git', 'hooks', 'prepare-commit-msg') }
 
@@ -13,8 +13,8 @@ describe GitTracker::Hook do
     end
 
     it 'installs to the root of the Git repository' do
-      subject.should_receive(:install_at).with(root)
-      subject.install
+      hook.should_receive(:install_at).with(root)
+      hook.install
     end
   end
 
@@ -26,22 +26,24 @@ describe GitTracker::Hook do
 
     it 'writes the hook into the hooks directory' do
       File.should_receive(:open).with(hook_path, 'w')
-      subject.install_at(root)
+      hook.install_at(root)
     end
 
     it 'makes the hook executable' do
-      subject.install_at(root)
-      fake_file.mode.should == 0755
+      hook.install_at(root)
+      expect(fake_file.mode).to eq(0755)
     end
 
     it 'writes the hook code in the hook file' do
-      subject.install_at(root)
-      fake_file.content.should == <<-HOOK_CODE.strip_heredoc
+      hook_code = <<-HOOK_CODE.strip_heredoc
         #!/usr/bin/env bash
 
         git-tracker prepare-commit-msg "$@"
 
       HOOK_CODE
+
+      hook.install_at(root)
+      expect(fake_file.content).to eq(hook_code)
     end
   end
 

data/spec/git_tracker/prepare_commit_message_spec.rb

@@ -19,19 +19,19 @@ describe GitTracker::PrepareCommitMessage do
   describe '.new' do
 
     it 'requires the name of the commit message file' do
-      lambda { subject.new }.should raise_error(ArgumentError)
+      expect { subject.new }.to raise_error(ArgumentError)
     end
 
     it 'remembers the name of the commit message file' do
-      subject.new('FILE1').file.should == 'FILE1'
+      expect(subject.new('FILE1').file).to eq('FILE1')
     end
 
     it 'optionally accepts a message source' do
-      hook = subject.new('FILE1', 'merge').source.should == 'merge'
+      expect(hook = subject.new('FILE1', 'merge').source).to eq('merge')
     end
 
     it 'optionally accepts the SHA-1 of a commit' do
-      hook = subject.new('FILE1', 'commit', 'abc1234').commit_sha.should == 'abc1234'
+      expect(hook = subject.new('FILE1', 'commit', 'abc1234').commit_sha).to eq('abc1234')
     end
   end
 
@@ -45,7 +45,7 @@ describe GitTracker::PrepareCommitMessage do
       let(:hook) { described_class.new('FILE2', 'commit', '60a086f3') }
 
       it 'exits with status code 0' do
-        lambda { hook.run }.should succeed
+        expect { hook.run }.to succeed
       end
     end
 
@@ -53,7 +53,7 @@ describe GitTracker::PrepareCommitMessage do
       let(:story) { nil }
 
       it 'exits without updating the commit message' do
-        lambda { hook.run }.should succeed
+        expect { hook.run }.to succeed
         GitTracker::CommitMessage.should_not have_received(:append)
       end
     end
@@ -90,7 +90,7 @@ describe GitTracker::PrepareCommitMessage do
         end
 
         it 'exits without updating the commit message' do
-          lambda { hook.run }.should succeed
+          expect { hook.run }.to succeed
           GitTracker::CommitMessage.should_not have_received(:append)
         end
       end

data/spec/git_tracker/repository_spec.rb

@@ -13,19 +13,19 @@ describe GitTracker::Repository do
 
     it 'gets the path to the top-level directory of the local Repository' do
       $?.stub(:exitstatus) { 0 }
-      subject.root.should == '/path/to/git/repo/root'
+      expect(subject.root).to eq('/path/to/git/repo/root')
     end
 
     it 'aborts when not in a git repository' do
       $?.stub(:exitstatus) { 128 }
-      lambda { subject.root }.should_not succeed
+      expect { subject.root }.to_not succeed
     end
   end
 
   describe '.ensure_exists' do
     it 'aborts when not in a git repository' do
       $?.stub(:exitstatus) { 128 }
-      lambda { subject.root }.should_not succeed
+      expect { subject.root }.to_not succeed
     end
   end
 

data/spec/git_tracker/runner_spec.rb

@@ -2,37 +2,42 @@ require 'spec_helper'
 require 'git_tracker/runner'
 
 describe GitTracker::Runner do
-  subject { described_class }
+  subject(:runner) { described_class }
   let(:args) { ['a_file', 'the_source', 'sha1234'] }
 
   describe '.execute' do
     before do
-      subject.stub(:prepare_commit_msg) { true }
+      runner.stub(:prepare_commit_msg) { true }
     end
 
     it 'runs the hook, passing the args' do
-      subject.should_receive(:prepare_commit_msg).with(*args) { true }
-      subject.execute('prepare-commit-msg', *args)
+      runner.should_receive(:prepare_commit_msg).with(*args) { true }
+      runner.execute('prepare-commit-msg', *args)
     end
 
     # TODO: stop the abort from writing to stderr during tests?
     it 'does not run hooks we do not know about' do
-      lambda { subject.execute('non-existent-hook', *args) }.should_not succeed
+      expect { runner.execute('non-existent-hook', *args) }.to_not succeed
     end
   end
 
   describe '.prepare_commit_msg' do
     it 'runs the hook, passing the args' do
       GitTracker::PrepareCommitMessage.should_receive(:run).with(*args) { true }
-      subject.prepare_commit_msg(*args)
+      runner.prepare_commit_msg(*args)
     end
   end
 
   describe '.install' do
     it 'tells the hook to install itself' do
       GitTracker::Hook.should_receive(:install)
-      subject.install
+      runner.install
     end
   end
 
+  it '.test_command reports that it was run' do
+    runner.should_receive(:puts).with('git-tracker is here. How are you?')
+    runner.execute('test-command')
+  end
+
 end

data/spec/git_tracker/standalone_spec.rb

@@ -13,12 +13,12 @@ describe GitTracker::Standalone do
 
     it 'saves to the named file' do
       described_class.save('git-tracker')
-      File.size('./git-tracker').should > 100
+      expect(File.size('./git-tracker')).to be > 100
     end
 
     it 'marks the binary as executable' do
       described_class.save('git-tracker')
-      File.should be_executable('./git-tracker')
+      expect(File).to be_executable('./git-tracker')
     end
   end
 
@@ -28,33 +28,33 @@ describe GitTracker::Standalone do
     let(:standalone) { described_class.build(io).string }
 
     it 'declares a shebang' do
-      subject.should =~ /#!.+/
+      expect(subject).to match(/#!.+/)
     end
 
     it 'includes generated code notice' do
-      subject.should include('This file is generated')
+      expect(subject).to include('This file is generated')
     end
 
     it 'inlines the code' do
-      subject.should include('Hook')
-      subject.should include('Repository')
-      subject.should include('PrepareCommitMessage')
-      subject.should include('Runner')
-      subject.should include('Branch')
-      subject.should include('CommitMessage')
-      subject.should include('VERSION')
+      expect(subject).to include('Hook')
+      expect(subject).to include('Repository')
+      expect(subject).to include('PrepareCommitMessage')
+      expect(subject).to include('Runner')
+      expect(subject).to include('Branch')
+      expect(subject).to include('CommitMessage')
+      expect(subject).to include('VERSION')
     end
 
     it 'does not inline the standalone code' do
-      subject.should_not include('module Standalone')
+      expect(subject).to_not include('module Standalone')
     end
 
     it 'includes the call to execute the hook' do
-      subject.should include('GitTracker::Runner.execute(*ARGV)')
+      expect(subject).to include('GitTracker::Runner.execute(*ARGV)')
     end
 
     it 'excludes requiring git_tracker code' do
-      subject.should_not =~ /^require\s+["']git_tracker/
+      expect(subject).to_not match(/^require\s+["']git_tracker/)
     end
   end
 
@@ -67,12 +67,12 @@ describe GitTracker::Standalone do
 
     it 'uses user-level ruby binary when it is executable' do
       File.stub(:executable?).with('/usr/bin/ruby') { true }
-      subject.ruby_executable.should == '/usr/bin/ruby'
+      expect(subject.ruby_executable).to eq('/usr/bin/ruby')
     end
 
     it 'uses rbconfig ruby when user-level ruby binary not executable' do
       File.stub(:executable?).with('/usr/bin/ruby') { false }
-      subject.ruby_executable.should == '/some/other/bin/ruby'
+      expect(subject.ruby_executable).to eq('/some/other/bin/ruby')
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_tracker
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-12 00:00:00.000000000 Z
+date: 2013-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: rspec-spies
   requirement: !ruby/object:Gem::Requirement
@@ -43,22 +43,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +115,7 @@ files:
 - spec/support/commit_message_helper.rb
 - spec/support/fake_file.rb
 - spec/support/matchers/exit_code_matchers.rb
-homepage: https://github.com/highgroove/git_tracker
+homepage: https://github.com/stevenharman/git_tracker
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -167,3 +151,4 @@ test_files:
 - spec/support/commit_message_helper.rb
 - spec/support/fake_file.rb
 - spec/support/matchers/exit_code_matchers.rb
+has_rdoc: