git_pivotal_tracker 0.0.4 → 0.0.5

data/lib/git_pivotal_tracker/finish.rb

@@ -11,8 +11,9 @@ module GitPivotalTracker
 
       if options[:rebase]
         puts "Fetching origin and rebasing #{current_branch}"
+        log repository.git.checkout({:raise => true}, integration_branch)
         log repository.git.pull({:raise => true})
-        log repository.git.rebase({:raise => true}, integration_branch)
+        log repository.git.rebase({:raise => true}, integration_branch, current_branch)
       end
 
       puts "Merging #{current_branch} into #{integration_branch}"

data/lib/git_pivotal_tracker/story.rb

@@ -14,10 +14,9 @@ module GitPivotalTracker
       puts "URL:   #{story.url}"
       puts "Story: #{story.name}"
 
-      default_suffix = story.name.downcase.gsub(/\W+/, '_')
-      print "Enter branch name [#{default_suffix}]: "
+      print "Enter branch name [#{branch_suffix story}]: "
       suffix = gets.chomp
-      suffix = default_suffix if suffix == ""
+      suffix = branch_suffix(story) if suffix == ""
 
       branch = "#{story.story_type}-#{story.id}-#{suffix}"
       puts "Checking out a new branch '#{branch}'"
@@ -44,6 +43,10 @@ module GitPivotalTracker
       conditions[:story_type] = type unless type == 'story'
       project.stories.all(conditions).first
     end
+
+    def branch_suffix(story)
+      story.name.sub(/^\W+/, '').sub(/\W+$/, '').gsub(/\W+/, '_').downcase
+    end
   end
 
   class Bug < Story; end

data/lib/git_pivotal_tracker/version.rb

@@ -1,3 +1,3 @@
 module GitPivotalTracker
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/spec/fixtures/finish_story.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <story>
-  <name>Pause the film</name>
+  <name> Pause the film!</name>
   <description>As a moderator,
 I can pause the film
 In order to allow another activity to take place (discussion, etc).</description>

data/spec/fixtures/one_story.xml

@@ -10,7 +10,7 @@
     <description>As a moderator,
 I can pause the film
 In order to allow another activity to take place (discussion, etc).</description>
-    <name>Pause the film</name>
+    <name> Pause the film!</name>
     <requested_by>Ben Lindsey</requested_by>
     <created_at type="datetime">2011/07/14 23:06:28 UTC</created_at>
     <updated_at type="datetime">2011/07/14 23:13:24 UTC</updated_at>

data/spec/fixtures/start_story.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <story>
-  <name>Pause the film</name>
+  <name> Pause the film!</name>
   <description>As a moderator,
 I can pause the film
 In order to allow another activity to take place (discussion, etc).</description>

data/spec/fixtures/story.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <story>
   <id>1234567890</id>
-  <name>Pause the film</name>
+  <name> Pause the film!</name>
   <description>As a moderator,
 I can pause the film
 In order to allow another activity to take place (discussion, etc).</description>

data/spec/git_pivotal_tracker/finish_spec.rb

@@ -53,7 +53,7 @@ describe GitPivotalTracker::Finish do
 
     it "merges the topic branch into the integration branch with a merge commit" do
       finish.run!.should == 0
-      @repo.head.name.should == @current_head.branch
+      @repo.head.name.should == @current_head.name
       @repo.commits.first.parents.should have(2).items
       @repo.heads.detect { |h| h.name == @current_head.name }.commit.sha.should == @sha
     end
@@ -62,7 +62,7 @@ describe GitPivotalTracker::Finish do
       before do
         finish.options[:rebase] = 1
         finish.repository.git.should_receive(:pull).with(:raise => true)
-        finish.repository.git.should_receive(:rebase).with({:raise => true}, @current_head.name)
+        finish.repository.git.should_receive(:rebase).with({:raise => true}, @current_head.name, @new_branch)
       end
 
       it "succeeds" do

metadata

@@ -2,7 +2,7 @@
 name: git_pivotal_tracker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Ben Lindsey
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-19 00:00:00 -07:00
+date: 2011-07-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency