pt-flow 2.3.3 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3417f0205e095a48916e3d0f552cf5f3d0bbc0f0
-  data.tar.gz: fbd919c18003139a2e80183e926e8a5f323864ec
+  metadata.gz: 77fb3dc8e8d07bdfbaf223f39de7e54a65e4e438
+  data.tar.gz: 9d69c63af251e2b325f57194b3dbfb17bb4ea3d3
 SHA512:
-  metadata.gz: 60bf3a5a51ba64f18a5bc0d3b57901e898422b82da97bea867c779d52bec36b8a3ef6cb09fecf7dde39a65488f99e36194943e2b77ccb379cba3a18547f0de46
-  data.tar.gz: 5e23a328a5638bde3323fe49df738bd52a57b2feac5c629a24adc7a6f7fe332f9153afdcf6b00524b3fa135aa6598a6f81cbcf089253c8ac0ffe202d19b711a6
+  metadata.gz: 868f82165f1cf1079feb7edbce03e775150eefa48f994ca35f67f81a05717a6bdd254275134db825e49045e6388df03eedf243e9c2a88c79759ac039a05e2640
+  data.tar.gz: b51f189779b071d1f2af038c382070a68420dc8f7789fed2654f3720d5ee266a633e8621b1db020d6dc4d648d78e041a01f3623552b537e14faea7b341f7b07d

data/README.md

@@ -23,13 +23,10 @@ $ git start --include-icebox
 # same as git start, including contents of icebox
 
 $ git finish
-# pushes branch, finishes task on pt, and creates a pull request
+# 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
 
-$ git finish --draft
-# Opens github pull request screen rather than auto-submitting
-
 $ git cleanup
 # cleans up local/remote story branches already merged with current release branch
 ```

data/lib/pt-flow/ui.rb

@@ -35,10 +35,13 @@ module PT::Flow
     end
 
     def finish
-      run("git push origin #{branch} -u")
-      pull_request
-      finish_task(current_task)
-      deliver! if @params.include?('--deliver')
+      run "git push origin #{branch} -u"
+      finish_task current_task
+      if @params.include?('--deliver')
+        deliver!
+      else
+        open_url draft_pr_url
+      end
     end
 
     def cleanup
@@ -89,16 +92,12 @@ module PT::Flow
       task_title
     end
 
-    def pull_request
-      if @params.include?('--draft')
-        pr_url = repo.url + "/compare/#{branch.target}...#{branch}?expand=1&title=#{URI.escape(task_title)}"
-        run "open \"#{pr_url}\""
-      else
-        run("hub pull-request -b #{branch.target} -h #{repo.user}:#{branch} -m \"#{task_title}\"")
-      end
+    def draft_pr_url
+      repo.url + "/compare/#{branch.target}...#{branch}?expand=1&title=#{URI.escape(task_title)}"
     end
 
     def deliver!
+      run "hub pull-request -b #{branch.target} -h #{repo.user}:#{branch} -m \"#{task_title}\""
       finished_branch = branch
       title = task_title
       run "git checkout #{finished_branch.target}"
@@ -107,6 +106,14 @@ module PT::Flow
       run "git push origin #{finished_branch.target}"
     end
 
+    def open_url(url)
+      if ENV['BROWSER'] == 'echo'
+        title url
+      else
+        run "open \"#{url}\""
+      end
+    end
+
     def run(command)
       title(command)
       error("Error running: #{command}") unless system(command)

data/lib/pt-flow/version.rb

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

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

@@ -97,9 +97,10 @@ module PT::Flow
         end
 
         context 'no options' do
-          it "pushes the current branch to origin, flags the story as finished, and opens a github pull request" 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("hub pull-request -b new_feature -h cookpad:new_feature.this-is-for-comments.4460038 -m \"This is for comments [Delivers #4460038]\"")
+            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')
             current_branch.should == 'new_feature.this-is-for-comments.4460038'
             WebMock.should have_requested(:put, "#{endpoint}/projects/102622/stories/4460038").with(body: /<current_state>finished<\/current_state>/)
@@ -117,14 +118,6 @@ module PT::Flow
             UI.new('finish', ['--deliver'])
           end
         end
-
-        context 'given option --draft' do
-          it "pushes the current branch to origin, flags the story as finished, and opens github 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=This%20is%20for%20comments%20[Delivers%20%234460038]\"")
-            UI.new('finish', ['--draft'])
-          end
-        end
       end
     end
 
@@ -140,7 +133,7 @@ module PT::Flow
 
       it "pushes the current branch to origin, flags the story as finished, and opens a github pull request" 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("hub pull-request -b new_feature -h balvig:new_feature.this-is-for-comments.4460038 -m \"This is for comments [Delivers #4460038]\"")
+        UI.any_instance.should_receive(:run).with("open \"https://github.com/balvig/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')
       end
     end
@@ -154,7 +147,7 @@ module PT::Flow
 
       it "prepends title with Bugfix: " do
         UI.any_instance.should_receive(:run).with('git push origin master.this-is-a-bug.4492080 -u')
-        UI.any_instance.should_receive(:run).with("hub pull-request -b master -h cookpad:master.this-is-a-bug.4492080 -m \"Bugfix: This is a bug [Delivers #4492080]\"")
+        UI.any_instance.should_receive(:run).with("open \"https://github.com/cookpad/pt-flow/compare/master...master.this-is-a-bug.4492080?expand=1&title=Bugfix:%20This%20is%20a%20bug%20[Delivers%20%234492080]\"")
         UI.new('finish')
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pt-flow
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.4.0
 platform: ruby
 authors:
 - Jens Balvig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pt
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Some extra methods for the pt gem to use in our dev flow.