pt-flow 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77fb3dc8e8d07bdfbaf223f39de7e54a65e4e438
-  data.tar.gz: 9d69c63af251e2b325f57194b3dbfb17bb4ea3d3
+  metadata.gz: 5dad96a8e3224c8cbe72165d4a2cf1b8739668ce
+  data.tar.gz: 81195faf964969a93f3a1c6e2c298938682b276c
 SHA512:
-  metadata.gz: 868f82165f1cf1079feb7edbce03e775150eefa48f994ca35f67f81a05717a6bdd254275134db825e49045e6388df03eedf243e9c2a88c79759ac039a05e2640
-  data.tar.gz: b51f189779b071d1f2af038c382070a68420dc8f7789fed2654f3720d5ee266a633e8621b1db020d6dc4d648d78e041a01f3623552b537e14faea7b341f7b07d
+  metadata.gz: 7aaac10e0375f9b6cfd33c9ae7faa3d78ff1178ab848497dd21206f0aa6616317c10b79c9cb76b7bf97e6958be4fa5b57993f9bbb5b965d2623ef39463648bf0
+  data.tar.gz: b834fc75da1bb618cdde7255a371679c9fa005fca3630b353210eb747a75c63bed44392e613887f60c1123797d954f723e693c4fc9e891240dad61ff4879ca17

data/README.md

@@ -24,8 +24,10 @@ $ git start --include-icebox
 
 $ git finish
 # pushes branch, finishes task on pt, and opens new pull request
-# reviewer comments :+1: to approve on github
-# committer presses merge button on github which delivers task on pivotal tracker
+# pressing merge button on github delivers task on pivotal tracker
+
+$ git finish --wip
+# pushes branch and submits [WIP] pull request
 
 $ git cleanup
 # cleans up local/remote story branches already merged with current release branch

data/lib/pt-flow/ui.rb

@@ -36,11 +36,13 @@ module PT::Flow
 
     def finish
       run "git push origin #{branch} -u"
-      finish_task current_task
       if @params.include?('--deliver')
         deliver!
+      elsif @params.include?('--wip')
+        open_url pull_request_url('[WIP]')
       else
-        open_url draft_pr_url
+        finish_task current_task
+        open_url pull_request_url
       end
     end
 
@@ -92,8 +94,9 @@ module PT::Flow
       task_title
     end
 
-    def draft_pr_url
-      repo.url + "/compare/#{branch.target}...#{branch}?expand=1&title=#{URI.escape(task_title)}"
+    def pull_request_url(prefix = nil)
+      title = URI.escape "#{prefix} #{task_title}".strip
+      repo.url + "/compare/#{branch.target}...#{branch}?expand=1&title=#{title}"
     end
 
     def deliver!

data/lib/pt-flow/version.rb

@@ -1,5 +1,5 @@
 module PT
   module Flow
-    VERSION = '2.4.0'
+    VERSION = '2.5.0'
   end
 end

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

@@ -88,6 +88,7 @@ module PT::Flow
     describe '#finish' do
       context 'ssh repo' do
         before do
+          ENV['BROWSER'] = ''
           system('git checkout -B new_feature')
           system('git remote rm origin')
           system('git remote add origin git@github.com:cookpad/pt-flow.git')
@@ -98,7 +99,6 @@ module PT::Flow
 
         context 'no options' do
           it "pushes the current branch to origin, flags the story as finished, and opens github pull request URL" do
-            ENV['BROWSER'] = ''
             UI.any_instance.should_receive(:run).with('git push origin new_feature.this-is-for-comments.4460038 -u')
             UI.any_instance.should_receive(:run).with("open \"https://github.com/cookpad/pt-flow/compare/new_feature...new_feature.this-is-for-comments.4460038?expand=1&title=This%20is%20for%20comments%20[Delivers%20%234460038]\"")
             UI.new('finish')
@@ -107,6 +107,14 @@ module PT::Flow
           end
         end
 
+        context 'give option --wip' do
+          it "pushes the current branch to origin, and opens github [WIP] pull request URL" do
+            UI.any_instance.should_receive(:run).with('git push origin new_feature.this-is-for-comments.4460038 -u')
+            UI.any_instance.should_receive(:run).with("open \"https://github.com/cookpad/pt-flow/compare/new_feature...new_feature.this-is-for-comments.4460038?expand=1&title=[WIP]%20This%20is%20for%20comments%20[Delivers%20%234460038]\"")
+            UI.new('finish', ['--wip'])
+          end
+        end
+
         context 'given option --deliver' do
           it "pushes the current branch to origin, flags the story as finished, opens github pull request, merges it in and returns to master and pulls" do
             UI.any_instance.should_receive(:run).with('git push origin new_feature.this-is-for-comments.4460038 -u')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pt-flow
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Jens Balvig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pt