git_tracker 1.0.2 → 1.1.0

data/README.md

@@ -70,6 +70,18 @@ the top)*
 
 You should then add a [useful and responsible commit message][tpope]. :heart:
 
+### Valid branch names
+
+*git_tracker* allows you to include the story number any where in the branch
+name, optionally prefixing it with a hash (`#`). Examples:
+
+  - `best_feature_ever_#8675309`
+  - `best_feature_ever_8675309`
+  - `8675309_best_feature_ever`
+  - `#8675309_best_feature_ever`
+  - `your_name/8675309_best_feature_ever`
+  - `your_name/#8675309_best_feature_ever`
+
 ### Passing commit messages via command line
 
 If you pass a commit message on the command line the hook will still add the

data/lib/git_tracker/branch.rb

@@ -3,7 +3,7 @@ require 'English'
 module GitTracker
   module Branch
     def self.story_number
-      current[/#(?<number>\d+)/, :number]
+      current[/#?(?<number>\d+)/, :number]
     end
 
     def self.current

data/lib/git_tracker/version.rb

@@ -1,3 +1,3 @@
 module GitTracker
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/spec/git_tracker/branch_spec.rb

@@ -4,44 +4,55 @@ describe GitTracker::Branch do
   subject { described_class }
 
   def stub_branch(ref, exit_status = 0)
+    allow_message_expectations_on_nil
     subject.stub(:`) { ref }
     $?.stub(:exitstatus) { exit_status }
   end
 
-  context 'not in a Git repository' do
-    it 'aborts with non-zero exit status' do
+  describe '.current' do
+    it 'shells out to git, looking for the current HEAD' do
+      stub_branch('refs/heads/herpty_derp_de')
+      subject.should_receive('`').with('git symbolic-ref HEAD')
+      subject.current
+    end
+
+    it 'aborts with non-zero exit status when not in a Git repository' do
       stub_branch(nil, 128)
 
       -> { subject.current }.should raise_error SystemExit
     end
   end
 
-  context "Current branch has a story number" do
-    before do
-      stub_branch('refs/heads/a_very_descriptive_name_#8675309')
-    end
-
-    it "shells out to git, looking for the current HEAD" do
-      subject.should_receive('`').with('git symbolic-ref HEAD')
-      subject.story_number
+  describe '.story_number' 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'
+      end
+
+      it "finds the story without a leading hash" do
+        stub_branch('refs/heads/a_very_descriptive_name_1235309')
+        subject.story_number.should == '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'
+      end
     end
 
-    it "finds the story" do
-      subject.story_number.should == '8675309'
+    context "The current branch doesn't 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
+      end
     end
-  end
-
-  context "The current branch doesn't 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
-    end
-  end
 
-  context "Not on a branch (HEAD doesn't exist)" do
-    it "finds no story" do
-      stub_branch('')
-      subject.story_number.should_not be
+    context "Not on a branch (HEAD doesn't exist)" do
+      it "finds no story" do
+        stub_branch('')
+        subject.story_number.should_not be
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_tracker
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70233021591920 !ruby/object:Gem::Requirement
+  requirement: &70367025411540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70233021591920
+  version_requirements: *70367025411540
 - !ruby/object:Gem::Dependency
   name: rspec-spies
-  requirement: &70233021587380 !ruby/object:Gem::Requirement
+  requirement: &70367025410760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70233021587380
+  version_requirements: *70367025410760
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70233021586580 !ruby/object:Gem::Requirement
+  requirement: &70367025410280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *70233021586580
+  version_requirements: *70367025410280
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70233021585440 !ruby/object:Gem::Requirement
+  requirement: &70367025409820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.2'
   type: :development
   prerelease: false
-  version_requirements: *70233021585440
+  version_requirements: *70367025409820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70233021583740 !ruby/object:Gem::Requirement
+  requirement: &70367025409440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233021583740
+  version_requirements: *70367025409440
 description: ! "    Some simple tricks that make working with Pivotal Tracker even\n
   \   better... and easier... um, besier!\n"
 email: