pt-flow 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a0562587fbfa03bef4f6f3af61e2737853f4165
-  data.tar.gz: af4979a0277642e8d1aec9f03adea6053b2a87c4
+  metadata.gz: 9687945c5478e9af32ba27d0916f53833bf029e8
+  data.tar.gz: f9de9d266b17218d6f926d38904a37127cf61df3
 SHA512:
-  metadata.gz: 857b7934a8639ba42007ad16cddcf42c822de3a216c81898b90872888956f76fafda713d5a0ac4e6a20dc7469dbabf33fa68a1019a98f33b181195eb66c04737
-  data.tar.gz: af7aae768af293a9a6205d7e68eb2d6c8d7de6284b1686a072298370887675ea61a531690e111aa452b6c029aa748fe1462b87715d2b1a1ea882c4be84709dba
+  metadata.gz: 827c3e5305abea2084205d64252f86d54e4e49068d4cecfc88ca8df2e644b47874e7b18ca5a5b0a319461f6201b1f05ed890e4856b86ad54441ade4b448a226a
+  data.tar.gz: 8d74ed807e9a7265f015d93e7cc95ce015d6e18cb88ebf04e16c88d664e6d167a98bee28408e0b4e182d44f64286f0ead4e17e313dc90324cf2a6b9833b3c5d2

data/lib/pt-flow/branch.rb

@@ -20,6 +20,10 @@ module PT::Flow
       name.split('.').first
     end
 
+    def release_branch?
+      target != 'master'
+    end
+
     def task_id
       name[/\d+$/] || ''
     end

data/lib/pt-flow/ui.rb

@@ -46,10 +46,8 @@ module PT::Flow
       run "git push origin #{branch} -u"
       if @options[:deliver]
         deliver!
-      elsif @options[:wip]
-        open_url pull_request_url('[WIP]')
       else
-        finish_task current_task
+        finish_task(current_task) unless @options[:wip]
         open_url pull_request_url
       end
     end
@@ -102,11 +100,18 @@ module PT::Flow
         task_title
       end
 
-      def pull_request_url(prefix = nil)
+      def pull_request_url
         title = URI.escape "#{prefix} #{task_title}".strip
         repo.url + "/compare/#{branch.target}...#{branch}?expand=1&title=#{title}"
       end
 
+      def prefix
+        prefixes = []
+        prefixes << "[WIP]" if @options[:wip]
+        prefixes << "[#{branch.target.titleize}]" if branch.release_branch?
+        prefixes.join(" ")
+      end
+
       def deliver!
         run "hub pull-request -b #{branch.target} -h #{repo.user}:#{branch} -m \"#{task_title}\""
         finished_branch = branch

data/lib/pt-flow/version.rb

@@ -1,5 +1,5 @@
 module PT
   module Flow
-    VERSION = '2.6.1'
+    VERSION = '2.7.0'
   end
 end

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

@@ -106,17 +106,17 @@ 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
             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.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=[New%20Feature]%20This%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>/)
           end
         end
 
-        context 'give option --wip' do
+        context 'given 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.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]%20[New%20Feature]%20This%20is%20for%20comments%20[Delivers%20%234460038]\"")
             UI.new('finish', ['--wip'])
           end
         end
@@ -137,7 +137,7 @@ module PT::Flow
 
     context 'https repo' do
       before do
-        system('git checkout -B new_feature')
+        system('git checkout -B master')
         system('git remote rm origin')
         system('git remote add origin https://github.com/balvig/pt-flow.git')
 
@@ -146,8 +146,8 @@ module PT::Flow
       end
 
       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("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.any_instance.should_receive(:run).with('git push origin master.this-is-for-comments.4460038 -u')
+        UI.any_instance.should_receive(:run).with("open \"https://github.com/balvig/pt-flow/compare/master...master.this-is-for-comments.4460038?expand=1&title=This%20is%20for%20comments%20[Delivers%20%234460038]\"")
         UI.new('finish')
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pt-flow
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Jens Balvig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pt
@@ -217,3 +217,4 @@ test_files:
 - spec/support/fixture_macros.rb
 - spec/support/git_macros.rb
 - spec/support/webmock.rb
+has_rdoc: