git_reflow 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb81aa92d38e6c5b348ce8838f4c387ddcd93acb
-  data.tar.gz: d9e9551ff37a67dec4593a368f8fcd72080ad1c9
+  metadata.gz: 412c28714e64f91f462fe9b108b3679a7d299f59
+  data.tar.gz: 0984ef9112a092cba604b95845b394aa986725ce
 SHA512:
-  metadata.gz: dede713a4bd84a1060afaf57de37a3edd797a64708c3e7e2ee9cfe3705ea28490f554723bfeb01b541da0becc239ad17eeeb6039d230361c3f53798a721d5c19
-  data.tar.gz: 8049748445af1ef7fe6b5d9c214d96aa06194ed430d32da8fcdb26c95aa107374b52a14da6f757aac59b1c165855622d715059bddea90973a7097ca5c698dee7
+  metadata.gz: d3d16defd3d4924b6827a3e145c7115061a7b9d14a3572cf10ef8cbdd373b348739bbb3b61092ad33a758e3a439851c55b0e4b9cb2c3b709e39ea1dac45c2d8e
+  data.tar.gz: 8d4ef3aafabe9ad955982d0248cd7cc74d1decb6817b1c69c7c0d0ffd600ed21f287be9ce28cd008d824288181a6fb55d05ae40fdfdb327b7fac7e7d372577c9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.6.6)
+    git_reflow (0.6.7)
       colorize (>= 0.7.0)
       github_api (= 0.12.3)
       gli (= 2.12.2)

data/lib/git_reflow.rb

@@ -66,13 +66,13 @@ module GitReflow
 
   def deliver(options = {})
     feature_branch    = current_branch
-    options['base'] ||= 'master'
-    fetch_destination options['base']
+    base_branch       = options['base'] || 'master'
 
-    update_destination(current_branch)
+    fetch_destination(base_branch)
+    update_destination(feature_branch)
 
     begin
-      existing_pull_request = git_server.find_open_pull_request( :from => current_branch, :to => options['base'] )
+      existing_pull_request = git_server.find_open_pull_request( :from => current_branch, :to => base_branch )
 
       if existing_pull_request.nil?
         say "No pull request exists for #{remote_user}:#{current_branch}\nPlease submit your branch for review first with \`git reflow review\`", :deliver_halted
@@ -90,9 +90,9 @@ module GitReflow
         if  options['skip_lgtm'] or ((status.nil? or status.state == "success") and (has_comments and open_comment_authors.empty?))
           puts "Merging pull request ##{existing_pull_request.number}: '#{existing_pull_request.title}', from '#{existing_pull_request.feature_branch_name}' into '#{existing_pull_request.base_branch_name}'"
 
-          update_destination(options['base'])
+          update_destination(base_branch)
           merge_feature_branch(feature_branch,
-                               :destination_branch  => options['base'],
+                               :destination_branch  => base_branch,
                                :pull_request_number => existing_pull_request.number,
                                :lgtm_authors        => git_server.approvals(existing_pull_request),
                                :message             => commit_message)
@@ -106,13 +106,13 @@ module GitReflow
             deploy_and_cleanup = always_deploy_and_cleanup || (ask "Would you like to push this branch to your remote repo and cleanup your feature branch? ") =~ /^y/i
 
             if deploy_and_cleanup
-              run_command_with_label "git push origin #{options['base']}"
+              run_command_with_label "git push origin #{base_branch}"
               run_command_with_label "git push origin :#{feature_branch}"
               run_command_with_label "git branch -D #{feature_branch}"
               puts "Nice job buddy."
             else
               puts "Cleanup halted.  Local changes were not pushed to remote repo.".colorize(:red)
-              puts "To reset and go back to your branch run \`git reset --hard origin/master && git checkout new-feature\`"
+              puts "To reset and go back to your branch run \`git reset --hard origin/#{base_branch} && git checkout #{feature_branch}\`"
             end
           else
             say "There were problems commiting your feature... please check the errors above and try again.", :error

data/lib/git_reflow/git_helpers.rb

@@ -62,10 +62,20 @@ module GitReflow
     end
 
     def append_to_squashed_commit_message(message = '')
-      run "echo \"#{message}\" | cat - #{git_root_dir}/.git/SQUASH_MSG > #{git_root_dir}/tmp_squash_msg"
-      run "mv #{git_root_dir}/tmp_squash_msg #{git_root_dir}/.git/SQUASH_MSG"
+      tmp_squash_message_path = "#{git_root_dir}/.git/tmp_squash_msg"
+      squash_message_path     = "#{git_root_dir}/.git/SQUASH_MSG"
+      File.open(tmp_squash_message_path, "w") do |file_content|
+        file_content.puts message
+        if File.exists?(squash_message_path)
+          File.foreach(squash_message_path) do |line|
+            file_content.puts line
+          end
+        end
+      end
+
+      run "mv #{tmp_squash_message_path} #{squash_message_path}"
     end
-    
+
     private
 
     def extract_remote_user_and_repo_from_remote_url(remote_url)

data/lib/git_reflow/version.rb

@@ -1,3 +1,3 @@
 module GitReflow
-  VERSION = "0.6.6"
+  VERSION = "0.6.7"
 end

data/spec/git_reflow_spec.rb

@@ -149,6 +149,8 @@ describe GitReflow do
 
 
     before do
+      GitReflow.stub(:append_to_squashed_commit_message).and_return(true)
+
       module Kernel
         def system(cmd)
           "call #{cmd}"

data/spec/lib/git_reflow/git_helpers_spec.rb

@@ -149,15 +149,24 @@ describe GitReflow::GitHelpers do
   end
 
   describe ".append_to_squashed_commit_message(message)" do
-    let(:message)  { "do do the voodoo that you do" }
-    let(:root_dir) { '/home/gitreflow' }
-    before         { allow(Gitacular).to receive(:git_root_dir).and_return(root_dir) }
-    subject        { Gitacular.append_to_squashed_commit_message(message) }
+    let(:original_squash_message) { "Oooooo, SQUASH IT" }
+    let(:message)                 { "do do the voodoo that you do" }
+    let(:root_dir)                { '/home/gitreflow' }
+    let(:squash_path)             { "#{root_dir}/.git/SQUASH_MSG" }
+    let(:tmp_squash_path)         { "#{root_dir}/.git/tmp_squash_msg" }
+    before                        { allow(Gitacular).to receive(:git_root_dir).and_return(root_dir) }
+    subject                       { Gitacular.append_to_squashed_commit_message(message) }
 
     it "appends the message to git's SQUASH_MSG temp file" do
+      tmp_file = double('file')
+      allow(File).to receive(:open).with(tmp_squash_path, "w").and_yield(tmp_file)
+      allow(File).to receive(:exists?).with(squash_path).and_return(true)
+      allow(File).to receive(:foreach).with(squash_path).and_yield(original_squash_message)
+      expect(tmp_file).to receive(:puts).with(message)
+      expect(tmp_file).to receive(:puts).with(original_squash_message)
+
       expect { subject }.to have_run_commands_in_order [
-        "echo \"#{message}\" | cat - #{root_dir}/.git/SQUASH_MSG > #{root_dir}/tmp_squash_msg",
-        "mv #{root_dir}/tmp_squash_msg #{root_dir}/.git/SQUASH_MSG"
+        "mv #{tmp_squash_path} #{squash_path}"
       ]
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_reflow
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Valentino Stoll
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal