git_tracker 1.2.0 → 1.3.0

data/README.md

@@ -68,40 +68,8 @@ the top)*
 
 ```
 
-## Keywords
-You can use the custom keywords that Pivotal Tracker provide with the API.
-
-The keywords are [Delivers] and [Fixes]
-
-If you use those keywords in your commit message, the keyword will be prepended to the story ID in the commit message.
-
-For example:
-
-```bash
-# on branch named `bug/redis_connection_not_initializing_#8675309`
-$ git commit -am "changed the redis connection string [Fixes]"
-```
-
-Will result in a this being appended to the commit message
-
-```bash
-[Fixes #8675309]
-```
-
 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
@@ -135,6 +103,42 @@ Results in this commit message:
 [#12356] Look at this rad code, yo!
 ```
 
+### Keywords
+You can use the custom keywords that Pivotal Tracker provide with the API.
+
+The keywords are `fixed`, `completed`, and `finshed` in square brackets. You
+may also use different cases forms of these verbs, such as `Fix` or `FIXES`.
+
+If you use those keywords in your commit message, the keyword will be prepended
+to the story ID in the commit message.
+
+For example:
+
+```bash
+# on branch named `bug/redis_connection_not_initializing_#8675309`
+$ git commit -am "Change the redis connection string [Fixes]"
+```
+
+Results in this commit message:
+
+```bash
+Change the redis connection string [Fixes]
+
+[Fixes #8675309]
+```
+
+### 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`
+
 ## Contributing :octocat:
 
 1. Fork it

data/lib/git_tracker/commit_message.rb

@@ -11,7 +11,7 @@ module GitTracker
     end
 
     def keyword
-      @message =~ /\[(Delivers|Fixes)\]/
+      @message =~ /\[(fix|fixes|fixed|complete|completes|completed|finish|finishes|finished)\]/io
       $1
     end
 

data/lib/git_tracker/version.rb

@@ -1,3 +1,3 @@
 module GitTracker
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/spec/git_tracker/commit_message_spec.rb

@@ -17,14 +17,16 @@ describe GitTracker::CommitMessage do
   end
 
   describe '#keyword' do
-    it 'should return the correct keyword' do
-      stub_commit_message('[Delivers]')
-      subject.keyword.should == 'Delivers'
+    %w[fix Fixed FIXES Complete completed completes FINISH finished Finishes].each do |keyword|
+      it "detects the #{keyword} keyword" do
+        stub_commit_message("Did the darn thing. [#{keyword}]")
+        subject.keyword.should == keyword
+      end
     end
 
-    it 'should return nil when there no keyword matching' do
-      stub_commit_message('[Something]')
-      subject.keyword.should be_nil
+    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
     end
   end
 

data/spec/git_tracker/prepare_commit_message_spec.rb

@@ -80,7 +80,7 @@ describe GitTracker::PrepareCommitMessage do
 
         it 'appends the keyword and the story number' do
           commit_message.should_receive(:append).with('[Delivers #8675309]')
-          hook.run 
+          hook.run
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_tracker
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-21 00:00:00.000000000 Z
+date: 2012-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec