git_tracking 0.1.1 → 0.1.2

data/lib/git_tracking.rb

@@ -54,8 +54,15 @@ class GitTracking
 
     def post_commit
       @api_key = config.last_api_key
-      story = get_story(config.last_story_id)
-      story.notes.create(:text => config.last_commit_info)
+      if config.last_story_completed?
+        completed = GitTracking.highline.ask("Does this commit complete the story?", ["yes", "no"]) do |q|
+          q.default = "yes"
+        end
+        if completed == "yes"
+          story = get_story(config.last_story_id)
+          story.notes.create(:text => config.commits_for_last_story)
+        end
+      end
     end
 
     def pivotal_project

data/lib/git_tracking/config.rb

@@ -28,9 +28,15 @@ class GitTracking
       @config[:keys].invert[last_api_key]
     end
 
-    def last_commit_info
-      info = `git log -n 1`.split("\n")
-      info = "#{info.first}\n#{info.last}"
+    def last_story_completed?
+      !!`git log -n 1`.match(/complete|finish/i)
+    end
+
+    def commits_for_last_story
+      commits = `git log --grep='#{self.last_story_id}'`.split(/^commit /).map{|c| c.split("\n")}
+      commits.each do |cl|
+        cl.map!(&:strip).reject!{|c| c == "" || c.match(/^\W*$|^Author|^Date|^\[#\d{6,7}\]/) }
+      end.flatten.join("\n")
     end
 
     def author

data/lib/git_tracking/version.rb

@@ -1,3 +1,3 @@
 class GitTracking
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/config_spec.rb

@@ -1,4 +1,4 @@
-require 'lib/git_tracking'
+require 'git_tracking'
 
 describe GitTracking::Config do
   before(:all) do
@@ -15,7 +15,11 @@ describe GitTracking::Config do
     system "git config git-tracking.last-story-id '#{@orig_last_story_id}'"
   end
 
-  after(:each) { File.delete(".git_tracking") if File.exists?(".git_tracking") }
+  after(:each) do
+    File.delete "foo.txt" if File.exists? "foo.txt"
+    File.delete ".git_tracking" if File.exists?(".git_tracking")
+  end
+
   let(:config) { GitTracking::Config.new }
 
   it "#initialize should merge in config from .git_tracking file" do
@@ -91,29 +95,6 @@ describe GitTracking::Config do
     config.authors.should == ["Joe", "Bob", "Steve"]
   end
 
-  describe "#last_commit_info" do
-    before(:all) do
-      File.rename ".git", ".git_old" if File.exists? ".git"
-    end
-    before(:each) do
-      system "git init; git add README; git commit -m 'initial commit'"
-    end
-    after(:each) do
-      File.delete "foo.txt" if File.exists? "foo.txt"
-      system "rm -rf .git" if File.exists? ".git"
-    end
-    after(:all) do
-      File.rename ".git_old", ".git" if File.exists? ".git_old"
-    end
-
-    it "should return info about the last commit" do
-      f = File.new("foo.txt", "w") {|f| f.puts "lalala"}
-      system "git add foo.txt"
-      system "git commit -m '[#1235] Story info\n  - best commit evar'"
-      config.last_commit_info.should match(/commit \w{40,40}\n      - best commit evar/)
-    end
-  end
-
   it "#last_story_id should return the git-tracking.last-story-id from git config" do
     system "git config git-tracking.last-story-id '736741'"
     config.last_story_id.should == '736741'
@@ -144,6 +125,50 @@ describe GitTracking::Config do
     config.last_email.should == "foo@bar.com"
   end
 
+  context "specs that require messing with git" do
+    before(:all) do
+      File.rename ".git", ".git_old" if File.exists? ".git"
+    end
+    after(:all) do
+      File.rename ".git_old", ".git" if File.exists? ".git_old"
+    end
+    before(:each) do
+      system "git init; git add README; git commit -m 'initial commit'"
+    end
+    after(:each) do
+      system "rm -rf .git" if File.exists? ".git"
+      File.delete "foo.txt" if File.exists? "foo.txt"
+      File.delete "bar.txt" if File.exists? "bar.txt"
+    end
+
+    it "#commits_for_last_story should return all commit messages with a given story id" do
+      f = File.new("foo.txt", "w") {|f| f.puts "lalala"}
+      system "git add foo.txt"
+      system "git commit -m '[#1235932] Story info\n  - best commit evar'"
+      f = File.new("bar.txt", "w") {|f| f.puts "lalala"}
+      system "git add bar.txt"
+      system "git commit -m '[#1235932] Story info\n  - finishing the best feature evar'"
+      config.should_receive(:last_story_id).and_return('1235932')
+      config.commits_for_last_story.should match(/[0-9a-f]{40}\n- finishing the best feature evar\n[0-9a-f]{40}\n- best commit evar/)
+    end
+
+    describe "#last_story_completed?" do
+      it "should return true if the last commit message contains 'completed' or 'finished'" do
+        f = File.new("foo.txt", "w") {|f| f.puts "lalala"}
+        system "git add foo.txt"
+        system "git commit -m '[#1235] Story info\n  - Completes best commit evar'"
+        config.last_story_completed?.should be_true
+      end
+
+      it "should return false if the last commit message doesn't contain 'completed' or 'finished'" do
+        f = File.new("foo.txt", "w") {|f| f.puts "lalala"}
+        system "git add foo.txt"
+        system "git commit -m '[#1235] Story info\n  - best commit evar'"
+        config.last_story_completed?.should be_false
+      end
+    end
+  end
+
   describe "#project_id" do
     it "should return the project_id" do
       config.instance_eval { @config[:project_id] = '7472' }

data/spec/detect_spec.rb

@@ -1,4 +1,4 @@
-require 'lib/git_tracking'
+require 'git_tracking'
 
 describe GitTracking, "detect" do
   before(:all) do

data/spec/git_tracking_spec.rb

@@ -44,15 +44,47 @@ STRING
     end
   end
 
-  it ".post_commit should create a comment on the story with the commit msg and hash" do
-    story = mock("story")
-    notes = mock("notes")
-    GitTracking.stub(:get_story).and_return(story)
-    GitTracking.should_not_receive(:story_id)
-    story.should_receive(:notes).and_return(notes)
-    GitTracking.config.should_receive(:last_commit_info).and_return("984752 [#27491] Best commit evar")
-    notes.should_receive(:create).with(:text => "984752 [#27491] Best commit evar")
-    GitTracking.post_commit
+  describe ".post_commit" do
+    let(:story) {mock("story")}
+    let(:notes) {mock("notes")}
+    before(:each) do
+      GitTracking.config.stub(:last_api_key).and_return("12345")
+      GitTracking.stub(:get_story).and_return(story)
+      story.stub(:notes).and_return(notes)
+      GitTracking.should_not_receive(:story_id) # avoid double-prompting
+    end
+
+    it "should do nothing if the story is not finished" do
+      GitTracking.config.should_receive(:last_story_completed?).and_return(false)
+      GitTracking.highline.should_not_receive(:ask)
+      GitTracking.config.should_not_receive(:commits_for_story)
+      notes.should_not_receive(:create)
+      GitTracking.post_commit
+    end
+
+    it "should create a comment on the story with the commit msg and hash if the story is finished" do
+      commits = <<COMMITS
+commit 12345678
+  - Did stuff
+commit 98765456
+  - Did more stuff
+commit 97230182
+  - Finished stuff
+COMMITS
+      GitTracking.config.should_receive(:last_story_completed?).and_return(true)
+      GitTracking.highline.should_receive(:ask).with("Does this commit complete the story?", ["yes", "no"]).and_return("yes")
+      GitTracking.config.should_receive(:commits_for_last_story).and_return(commits)
+      notes.should_receive(:create).with(:text => commits)
+      GitTracking.post_commit
+    end
+
+    it "should allow the user to indicate the story was not finished" do
+      GitTracking.config.should_receive(:last_story_completed?).and_return(true)
+      GitTracking.highline.should_receive(:ask).with("Does this commit complete the story?", ["yes", "no"]).and_return("no")
+      GitTracking.config.should_not_receive(:commits_for_last_story)
+      notes.should_not_receive(:create)
+      GitTracking.post_commit
+    end
   end
 
   describe ".story" do
@@ -145,6 +177,7 @@ STRING
     it "should get the token" do
       project = mock("project")
       PivotalTracker::Project.should_receive(:find).and_return(project)
+      GitTracking.should_receive(:project_id).and_return("87655")
       GitTracking.should_receive(:api_key).and_return("alksjd9123lka")
       GitTracking.pivotal_project.should == project
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Steve Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-08 00:00:00 -08:00
+date: 2010-11-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency