git_tracker 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c53e651fd8a607936d9362324e0e0a948fce44fa
-  data.tar.gz: 761261599941040c85cdd2b04194e62e2c185623
+  metadata.gz: 3c0f0d6230bbd58a9cd887307a49954075816b47
+  data.tar.gz: a28db4cb15a1c3215bb65500a3c1c92af05f4d09
 SHA512:
-  metadata.gz: 5d53880b86ae7fc0ac8321e6c6afad45fb88c25305440852b5620ceefb18bec96b64ae11d1e7705ae5d00d5dd23dd50f046232d5b5f326e05afde3666afd1faf
-  data.tar.gz: 6b133468ef83173e980f8d93a6c6480882668ea7acf10764ad0728368fd063b2a37e9d786593e99c516b0a10dd442f7a13b8d8edb26871bdecc693c3430147f1
+  metadata.gz: 12e7efe81727277061d3b6b1896913c1ebe31786938bdce09ac83d4c50be4e26b0c8dafd12d59dfdbdb46815f0a9519237410e551cd3064ddb8bf0a023db077b
+  data.tar.gz: a60b92d7b082fba1a2ed38ef9873c09c6ec3353c3e39a0913dfa71a7285151a6be195b6d0562d0817818a77796638f166d4baea2e54002bbbc71f8ef805d7cc7

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 .bundle
+.ruby-version
 Gemfile.lock
 coverage
 doc/
@@ -9,5 +10,3 @@ pkg
 rdoc
 tmp
 tags
-.rvmrc
-.rbenv-version

data/.travis.yml

@@ -4,3 +4,8 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
+  - 2.1.1
+addons:
+  code_climate:
+    repo_token: d08131691091072810c086f65d42c36ba7ea3241629c643caa363cbc966bbb23

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 ### dev
-[full changelog](https://github.com/stevenharman/git_tracker/compare/v1.6.1...master)
+[full changelog](https://github.com/stevenharman/git_tracker/compare/v1.6.2...master)
+
+
+
+### 1.6.2 / 2014-03-26
+[full changelog](https://github.com/stevenharman/git_tracker/compare/v1.6.1...v1.6.2)
+
+Bug Fixes
+
+* Restrict Tracker story numbers to be 6-10 digits long. [Issue
+  #16](https://github.com/stevenharman/git_tracker/pull/16) ([Benjamin
+  Darfler](https://github.com/bdarfler))
 
 ### 1.6.1 / 2013-08-12
 [full changelog](https://github.com/stevenharman/git_tracker/compare/v1.6.0...v1.6.1)
@@ -56,7 +67,8 @@ Bug fixes
 
 Enhancements
 
-* Allow Pivotal Tracker keyword states: `Delivers` and `Fixes` [KensoDev](https://github.com/KensoDev)
+* Allow Pivotal Tracker keyword states: `Delivers` and `Fixes`
+  ([KensoDev](https://github.com/KensoDev))
 
 Bug fixes
 

data/Gemfile

@@ -2,3 +2,9 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in git_tracker.gemspec
 gemspec
+
+gem 'codeclimate-test-reporter', :group => :test, :require => nil
+
+# Require Simplecov explicitly. Remove this explicit dependency when
+# the following is fixed: https://github.com/colszowka/simplecov/issues/281
+gem 'simplecov', '~> 0.7.1'

data/README.md

@@ -1,8 +1,9 @@
 # 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/github/stevenharman/git_tracker.png)](https://codeclimate.com/github/stevenharman/git_tracker)
+[![Gem Version](http://img.shields.io/gem/v/git_tracker.svg)](https://rubygems.org/gems/git_tracker)
+[![Build Status](https://img.shields.io/travis/stevenharman/git_tracker.svg)](https://travis-ci.org/stevenharman/git_tracker)
+[![Code Climate](http://img.shields.io/codeclimate/github/stevenharman/git_tracker.svg)](https://codeclimate.com/github/stevenharman/git_tracker)
+[![Dependency Status](https://img.shields.io/gemnasium/stevenharman/git_tracker.svg)](https://gemnasium.com/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]

data/Rakefile

@@ -44,7 +44,7 @@ namespace :standalone do
       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
+      sha = `curl -#L https://github.com/stevenharman/git_tracker/archive/v#{GitTracker::VERSION}.tar.gz | shasum`.split(/\s+/).first
       abort unless $?.success? and sha.length == 40
 
       formula = File.read formula_file
@@ -58,7 +58,7 @@ namespace :standalone do
       sh "git push -u stevenharman #{branch}"
       sh "hub pull-request 'upgrade git-tracker to v#{GitTracker::VERSION}'"
 
-      sh "git checkout -q master"
+      sh 'git checkout -q master'
     end
   end
 end

data/bin/autospec

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'autospec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'autospec')

data/bin/rspec

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'rspec')

data/git_tracker.gemspec

@@ -2,24 +2,25 @@
 require File.expand_path('../lib/git_tracker/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.name          = "git_tracker"
+  gem.name          = 'git_tracker'
   gem.version       = GitTracker::VERSION
-  gem.authors       = ["Steven Harman"]
-  gem.email         = ["steveharman@gmail.com"]
-  gem.homepage      = "https://github.com/stevenharman/git_tracker"
+  gem.authors       = ['Steven Harman']
+  gem.email         = ['steven@harmanly.com']
+  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.14"
-  gem.add_development_dependency "activesupport", "~> 3.2"
-  gem.add_development_dependency "pry", "~> 0.9.11"
-  gem.add_development_dependency "rake"
+  gem.add_development_dependency 'rspec', '~> 2.14'
+  gem.add_development_dependency 'activesupport', '~> 3.2'
+  gem.add_development_dependency 'pry', '~> 0.9.11'
+  # Use Rake < 10.2 (requires Ruby 1.9+) until we drop Ruby 1.8.7 support
+  gem.add_development_dependency 'rake', '~> 10.1.1'
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.executables   = %w(git-tracker)
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 end

data/lib/git_tracker/branch.rb

@@ -4,7 +4,7 @@ require 'git_tracker/repository'
 module GitTracker
   module Branch
     def self.story_number
-      current[/#?(\d+)/, 1]
+      current[/#?(\d{6,10})/, 1]
     end
 
     def self.current

data/lib/git_tracker/runner.rb

@@ -1,5 +1,6 @@
 require 'git_tracker/prepare_commit_message'
 require 'git_tracker/hook'
+require 'git_tracker/version'
 
 module GitTracker
   module Runner
@@ -19,7 +20,7 @@ module GitTracker
     end
 
     def self.install
-      puts "`git-tracker install` is deprecated. Please use `git-tracker init`"
+      puts '`git-tracker install` is deprecated. Please use `git-tracker init`'
       self.init
     end
 

data/lib/git_tracker/version.rb

@@ -1,3 +1,3 @@
 module GitTracker
-  VERSION = '1.6.1'
+  VERSION = '1.6.2'
 end

data/spec/git_tracker/branch_spec.rb

@@ -6,21 +6,21 @@ describe GitTracker::Branch do
 
   def stub_branch(ref, exit_status = 0)
     allow_message_expectations_on_nil
-    branch.stub(:`) { ref }
-    $?.stub(:exitstatus) { exit_status }
+    allow(branch).to receive(:`) { ref }
+    allow($?).to receive(:exitstatus) { exit_status }
   end
 
   describe '.current' do
     it 'shells out to git, looking for the current HEAD' do
       stub_branch('refs/heads/herpty_derp_de')
-      branch.should_receive('`').with('git symbolic-ref HEAD')
+      expect(branch).to receive('`').with('git symbolic-ref HEAD')
       branch.current
     end
 
     it 'ensures in a Git repository when looking for HEAD exits with non-zero status' do
       stub_branch('', 128)
 
-      GitTracker::Repository.should_receive(:ensure_exists)
+      expect(GitTracker::Repository).to receive(:ensure_exists)
       branch.current
     end
   end
@@ -46,6 +46,18 @@ describe GitTracker::Branch do
         stub_branch('refs/heads/stevenharman/got-her-number-8675309')
         expect(branch.story_number).to eq('8675309')
       end
+      
+      it 'finds the story in a branch with a version number' do
+        stub_branch('refs/heads/stevenharman/v2.0-got-her-number-8675309')
+        expect(branch.story_number).to eq('8675309')
+      end
+    end
+
+    context 'The current branch has a number that is not a story' do
+      it 'finds no story' do
+        stub_branch('refs/heads/a_very_descriptive_name_with_some_a_version_number_v2.0')
+        expect(branch.story_number).to_not be
+      end
     end
 
     context 'The current branch does not have a story number' do

data/spec/git_tracker/commit_message_spec.rb

@@ -13,7 +13,7 @@ describe GitTracker::CommitMessage do
   end
 
   def stub_commit_message(story_text)
-    File.stub(:read).with(file) { example_commit_message(story_text) }
+    allow(File).to receive(:read).with(file) { example_commit_message(story_text) }
   end
 
   describe '#keyword' do
@@ -92,10 +92,10 @@ describe GitTracker::CommitMessage do
   describe '#append' do
     let(:fake_file) { GitTracker::FakeFile.new }
     before do
-      File.stub(:open).and_yield(fake_file)
+      allow(File).to receive(:open).and_yield(fake_file)
     end
     def stub_original_commit_message(message)
-      File.stub(:read) { message }
+      allow(File).to receive(:read) { message }
     end
 
     it 'handles no existing message' do

data/spec/git_tracker/hook_spec.rb

@@ -9,8 +9,8 @@ describe GitTracker::Hook do
 
   describe '.init' do
     before do
-      GitTracker::Repository.stub(:root) { root }
-      hook.stub(:init_at)
+      allow(GitTracker::Repository).to receive(:root) { root }
+      allow(hook).to receive(:init_at)
     end
 
     it 'initializes to the root of the Git repository' do
@@ -22,7 +22,7 @@ describe GitTracker::Hook do
   describe '.init_at' do
     let(:fake_file) { GitTracker::FakeFile.new }
     before do
-      File.stub(:open).and_yield(fake_file)
+      allow(File).to receive(:open).and_yield(fake_file)
     end
 
     it 'writes the hook into the hooks directory' do

data/spec/git_tracker/prepare_commit_message_spec.rb

@@ -7,11 +7,11 @@ describe GitTracker::PrepareCommitMessage do
   describe '.run' do
     let(:hook) { double('PrepareCommitMessage') }
     before do
-      prepare_commit_message.stub(:new) { hook }
+      allow(prepare_commit_message).to receive(:new) { hook }
     end
 
     it 'runs the hook' do
-      hook.should_receive(:run)
+      expect(hook).to receive(:run)
       prepare_commit_message.run('FILE1', 'hook_source', 'sha1234')
     end
   end
@@ -40,8 +40,8 @@ describe GitTracker::PrepareCommitMessage do
     let(:commit_message) { double('CommitMessage', :append => nil) }
 
     before do
-      GitTracker::Branch.stub(:story_number) { story }
-      GitTracker::CommitMessage.stub(:new) { commit_message }
+      allow(GitTracker::Branch).to receive(:story_number) { story }
+      allow(GitTracker::CommitMessage).to receive(:new) { commit_message }
     end
 
     context 'with an existing commit (via `-c`, `-C`, or `--amend` options)' do
@@ -64,8 +64,8 @@ describe GitTracker::PrepareCommitMessage do
     context 'branch name with a Pivotal Tracker story number' do
       let(:story) { '8675309' }
       before do
-        commit_message.stub(:mentions_story?) { false }
-        commit_message.stub(:keyword) { nil }
+        allow(commit_message).to receive(:mentions_story?) { false }
+        allow(commit_message).to receive(:keyword) { nil }
       end
 
       it 'appends the number to the commit message' do
@@ -75,7 +75,7 @@ describe GitTracker::PrepareCommitMessage do
 
       context 'keyword mentioned in the commit message' do
         before do
-          commit_message.stub(:keyword) { 'Delivers' }
+          allow(commit_message).to receive(:keyword) { 'Delivers' }
         end
 
         it 'appends the keyword and the story number' do
@@ -86,7 +86,7 @@ describe GitTracker::PrepareCommitMessage do
 
       context 'number already mentioned in the commit message' do
         before do
-          commit_message.stub(:mentions_story?).with('8675309') { true }
+          allow(commit_message).to receive(:mentions_story?).with('8675309') { true }
         end
 
         it 'exits without updating the commit message' do

data/spec/git_tracker/repository_spec.rb

@@ -6,25 +6,25 @@ describe GitTracker::Repository do
   let(:git_command) { 'git rev-parse --show-toplevel' }
   before do
     allow_message_expectations_on_nil
-    repository.stub(:`).with(git_command) { "/path/to/git/repo/root\n" }
+    allow(repository).to receive(:`).with(git_command) { "/path/to/git/repo/root\n" }
   end
 
   describe '.root' do
 
     it 'gets the path to the top-level directory of the local Repository' do
-      $?.stub(:exitstatus) { 0 }
+      allow($?).to receive(:exitstatus) { 0 }
       expect(repository.root).to eq('/path/to/git/repo/root')
     end
 
     it 'aborts when not in a git repository' do
-      $?.stub(:exitstatus) { 128 }
+      allow($?).to receive(:exitstatus) { 128 }
       expect { repository.root }.to_not succeed
     end
   end
 
   describe '.ensure_exists' do
     it 'aborts when not in a git repository' do
-      $?.stub(:exitstatus) { 128 }
+      allow($?).to receive(:exitstatus) { 128 }
       expect { repository.root }.to_not succeed
     end
   end

data/spec/git_tracker/runner_spec.rb

@@ -6,37 +6,41 @@ describe GitTracker::Runner do
   let(:args) { ['a_file', 'the_source', 'sha1234'] }
 
   describe '.execute' do
+    include OutputHelper
+
     before do
-      runner.stub(:prepare_commit_msg) { true }
+      allow(runner).to receive(:prepare_commit_msg) { true }
     end
 
     it 'runs the hook, passing the args' do
-      runner.should_receive(:prepare_commit_msg).with(*args) { true }
+      expect(runner).to 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
-      expect { runner.execute('non-existent-hook', *args) }.to_not succeed
+      errors = capture_stderr do
+        expect { runner.execute('non-existent-hook', *args) }.to_not succeed
+      end
+      expect(errors.chomp).to eq("[git_tracker] command: 'non-existent-hook' does not exist.")
     end
   end
 
   describe '.prepare_commit_msg' do
     it 'runs the hook, passing the args' do
-      GitTracker::PrepareCommitMessage.should_receive(:run).with(*args) { true }
+      expect(GitTracker::PrepareCommitMessage).to receive(:run).with(*args) { true }
       runner.prepare_commit_msg(*args)
     end
   end
 
   describe '.init' do
     it 'tells the hook to initialize itself' do
-      GitTracker::Hook.should_receive(:init)
+      expect(GitTracker::Hook).to receive(:init)
       runner.init
     end
   end
 
   it '.help reports that it was run' do
-    runner.should_receive(:puts).with(/git-tracker #{GitTracker::VERSION} is installed\./)
+    expect(runner).to receive(:puts).with(/git-tracker #{GitTracker::VERSION} is installed\./)
     runner.execute('help')
   end
 

data/spec/git_tracker/standalone_spec.rb

@@ -68,17 +68,17 @@ describe GitTracker::Standalone do
   describe '#ruby_executable' do
     subject(:standalone) { described_class }
     before do
-      RbConfig::CONFIG.stub(:[]).with('bindir') { '/some/other/bin' }
-      RbConfig::CONFIG.stub(:[]).with('ruby_install_name') { 'ruby' }
+      allow(RbConfig::CONFIG).to receive(:[]).with('bindir') { '/some/other/bin' }
+      allow(RbConfig::CONFIG).to receive(:[]).with('ruby_install_name') { 'ruby' }
     end
 
     it 'uses user-level ruby binary when it is executable' do
-      File.stub(:executable?).with('/usr/bin/ruby') { true }
+      allow(File).to receive(:executable?).with('/usr/bin/ruby') { true }
       expect(standalone.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 }
+      allow(File).to receive(:executable?).with('/usr/bin/ruby') { false }
       expect(standalone.ruby_executable).to eq('/some/other/bin/ruby')
     end
   end

data/spec/spec_helper.rb

@@ -1,6 +1,9 @@
-require 'fake_file'
-require 'commit_message_helper'
-require 'matchers/exit_code_matchers'
+if (RUBY_VERSION >= '1.9') && ENV['CODECLIMATE_REPO_TOKEN']
+  require 'codeclimate-test-reporter'
+  CodeClimate::TestReporter.start
+end
+
+Dir[File.dirname(__FILE__) + '/support/**/*.rb'].each {|f| require f }
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true

data/spec/support/output_helper.rb

@@ -0,0 +1,12 @@
+require 'stringio'
+
+module OutputHelper
+  def capture_stderr
+    old_out, new_out = $stderr, StringIO.new
+    $stderr = new_out
+    yield
+  ensure
+    $stderr = old_out
+    return new_out.string
+  end
+end

metadata

@@ -1,90 +1,92 @@
 --- !ruby/object:Gem::Specification
 name: git_tracker
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Steven Harman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.11
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.1
 description: |2
       Some simple tricks that make working with Pivotal Tracker even
       better... and easier... um, besier!
 email:
-- steveharman@gmail.com
+- steven@harmanly.com
 executables:
 - git-tracker
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- bin/autospec
 - bin/git-tracker
+- bin/rspec
 - git_tracker.gemspec
 - lib/git_tracker.rb
 - lib/git_tracker/branch.rb
@@ -107,6 +109,7 @@ files:
 - spec/support/commit_message_helper.rb
 - spec/support/fake_file.rb
 - spec/support/matchers/exit_code_matchers.rb
+- spec/support/output_helper.rb
 homepage: https://github.com/stevenharman/git_tracker
 licenses: []
 metadata: {}
@@ -116,17 +119,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Teaching Git about Pivotal Tracker.
@@ -142,3 +145,5 @@ test_files:
 - spec/support/commit_message_helper.rb
 - spec/support/fake_file.rb
 - spec/support/matchers/exit_code_matchers.rb
+- spec/support/output_helper.rb
+has_rdoc: