pt-flow 0.5.2 → 0.5.3

data/lib/pt-flow/ui.rb

@@ -22,6 +22,7 @@ module PT::Flow
       task = PivotalTracker::Story.find(current_task_id, @project.id)
       title = task.name.gsub('"',"'") + " [##{task.id}]"
       run("hub pull-request -b #{current_target} -h #{repo.user}:#{current_branch} \"#{title}\"")
+      run("git checkout #{current_target}")
       finish_task(task)
     end
 
@@ -42,23 +43,28 @@ module PT::Flow
       pull_request = select("Please select a pull request to review", table)
       run("git fetch")
       run("git checkout #{pull_request.head.ref}")
-      run("open #{pull_request.html_url}")
+      run("open #{pull_request.html_url}/files")
     rescue Github::Error::Unauthorized => e
       error("Error from github: #{e.message}")
     end
 
     def cleanup
+      title("Cleaning merged story branches for [#{current_target}]")
+
       # Update our list of remotes
       run("git fetch")
       run("git remote prune origin")
 
-      # Remove local branches fully merged with origin/master
-      run("git branch --merged origin/master | grep -v 'master$' | xargs git branch -D")
+      # Only clean out merged story branches for current topic
+      filter = "#{current_target}-[0-9]*$"
+
+      # Remove local branches fully merged with origin/current_target
+      run("git branch --merged origin/#{current_target} | grep '#{filter}' | xargs git branch -D")
 
       # Remove remote branches fully merged with origin/master
-      run("git branch -r --merged origin/master | sed 's/ *origin\\///' | grep -v 'master$' | xargs -I% git push origin :%")
+      run("git branch -r --merged origin/#{current_target} | sed 's/ *origin\\///' | grep '#{filter}' | xargs -I% git push origin :%")
 
-      congrats('All clean!')
+      congrats("Deleted branches merged with [#{current_target}]")
     end
 
     def help

data/lib/pt-flow/version.rb

@@ -1,5 +1,5 @@
 module PT
   module Flow
-    VERSION = "0.5.2"
+    VERSION = "0.5.3"
   end
 end

data/spec/lib/pt-flow/ui_spec.rb

@@ -67,6 +67,7 @@ describe PT::Flow::UI do
     it "pushes the current branch to origin, flags the story as finished, and opens a github pull request" do
       PT::Flow::UI.any_instance.should_receive(:run).with('git push origin new_feature-4459994')
       PT::Flow::UI.any_instance.should_receive(:run).with("hub pull-request -b new_feature -h cookpad:new_feature-4459994 \"It's an Unestimated Feature [#4459994]\"")
+      PT::Flow::UI.any_instance.should_receive(:run).with('git checkout new_feature')
       PT::Flow::UI.new %w{ finish }
       WebMock.should have_requested(:put, "#{endpoint}/projects/102622/stories/4459994").with(body: /<current_state>finished<\/current_state>/)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pt-flow
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pt
-  requirement: &70237849668400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70237849668400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hub
-  requirement: &70237849667640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70237849667640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: github_api
-  requirement: &70237849666640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70237849666640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70237849665180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *70237849665180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70237849663680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237849663680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70237849661760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237849661760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70237849659420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +117,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237849659420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Some extra methods for the pt gem to use in our dev flow.
 email:
 - jens@balvig.com
@@ -141,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1176635315291468353
+      hash: 1501218618260700308
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -150,10 +185,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1176635315291468353
+      hash: 1501218618260700308
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Some extra methods for the pt gem to use in our dev flow.