pt-flow 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1383db0246599cfecba2fe73fc784b868f4e2639
-  data.tar.gz: e11d6c527961ee229e531ef86cafb1da34cdbd0f
+  metadata.gz: 768dff4a6a274534a3dfe9fb6af7d7bfc5c99feb
+  data.tar.gz: ca496ea954994659d003b93c96e92a96753a7607
 SHA512:
-  metadata.gz: 1481f08cfcebd792ae88b5c72323a013e443beb0b53cb1ac6b347afe7b9532a0405bb769374b4443303acac8bdaa39955b7688d4c993108fccf12edd0f8c27b7
-  data.tar.gz: 2f3495368acf1f9b9fab00b720274e92f2274922e583e4bf1519aacb9f3d3a582e50443135080b55574469a448e97d5f40c70e9c7eb6262e9acc444c2463db9d
+  metadata.gz: 97757922cf2bb03bce2e1727620b11fdc4e4bfcd76cdd90b93bad4410d424f28cd521bbd4f60d5662149a37a99c08372ffabd92c769c7f731c5e5c4c69a68fcc
+  data.tar.gz: b822ef71c4033f5fdca6de7fc99c9f055b9e3303108435cd08d59c3601d47ff3c52e8dbb6ec32ddc47faca392633a5f7683a276272c4a4e450791c489c49cc13

data/lib/pt-flow/ui.rb

@@ -34,12 +34,9 @@ module PT::Flow
 
     def finish
       run("git push origin #{branch} -u")
-      task = PivotalTracker::Story.find(branch.task_id, @project.id)
-      title = task.name.gsub('"',"'") + " [Delivers ##{task.id}]"
-
-      run("hub pull-request -b #{branch.target} -h #{repo.user}:#{branch} -m \"#{title}\"")
-      finish_task(task)
-      merge! if @params.include?('--merge')
+      run("hub pull-request -b #{branch.target} -h #{repo.user}:#{branch} -m \"#{task_title}\"")
+      finish_task(current_task)
+      deliver! if @params.include?('--deliver')
     end
 
     def cleanup
@@ -80,11 +77,20 @@ module PT::Flow
       end
     end
 
-    def merge!
+    def current_task
+      PivotalTracker::Story.find(branch.task_id, @project.id)
+    end
+
+    def task_title
+      current_task.name.gsub('"',"'") + " [Delivers ##{current_task.id}]"
+    end
+
+    def deliver!
       finished_branch = branch
+      title = task_title
       run "git checkout #{finished_branch.target}"
       run "git pull"
-      run "git merge #{finished_branch}"
+      run "git merge #{finished_branch} --no-ff -m \"#{title}\""
       run "git push origin #{finished_branch.target}"
     end
 

data/lib/pt-flow/version.rb

@@ -1,5 +1,5 @@
 module PT
   module Flow
-    VERSION = '1.1.0'
+    VERSION = '1.1.1'
   end
 end

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

@@ -95,15 +95,15 @@ module PT::Flow
           end
         end
 
-        context 'given option --merge' do
+        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')
             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('git checkout new_feature')
             UI.any_instance.should_receive(:run).with('git pull')
-            UI.any_instance.should_receive(:run).with('git merge new_feature.this-is-for-comments.4460038')
+            UI.any_instance.should_receive(:run).with("git merge new_feature.this-is-for-comments.4460038 --no-ff -m \"This is for comments [Delivers #4460038]\"")
             UI.any_instance.should_receive(:run).with('git push origin new_feature')
-            UI.new('finish', ['--merge'])
+            UI.new('finish', ['--deliver'])
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pt-flow
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Jens Balvig