git_reflow 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a347ec9597dc6a1500fe2b1553c1fbccf26bfdb3
-  data.tar.gz: ff80647cdef77c93294142807d85ca2b1cf919ba
+  metadata.gz: 2437a3ef9ef77a60350a4ee9c85a27c7b30f08ba
+  data.tar.gz: b7f81b792a331bc0466eb12b7a733bbd754fe562
 SHA512:
-  metadata.gz: 5f7092e8b7ff099a93bd7fe4d555bb44d4bc81941931de0218933d5fa7d97565177caf751fda46bcdd6a32f45e75fb00ef80116b27d2f0754c0e2f19043b3bab
-  data.tar.gz: 31a1f2ccd61511599d86c6e78b5da81a3f4299473e4e4a7c9c3085ca452ab6cc06c5ab9bc01ae8006423bfa6549360d10ff6a528524287a606911e11296463c9
+  metadata.gz: 94cf313fc46c9c1e5f38f6fff7e3d732b93acbf2c852c321525882af32236e19fc16b868e413901cbd229a7e183e99e26eae7165ed543437dd48780265c5e8f7
+  data.tar.gz: f1e9d43de78984a88340ea76b58c35167f28d987de03b0904b0557aed7b6855ba0ea71d45e66fe1a679cc56323ad7a7813c5db29165c5861c19ce30c6fcab806

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.5.2)
+    git_reflow (0.5.3)
       colorize (= 0.6.0)
       github_api (= 0.12.3)
       gli (= 2.12.2)

data/lib/git_reflow/git_helpers.rb

@@ -58,8 +58,9 @@ module GitReflow
     end
 
     def append_to_squashed_commit_message(message = '')
-      run "echo \"#{message}\" | cat - .git/SQUASH_MSG > ./tmp_squash_msg"
-      run 'mv ./tmp_squash_msg .git/SQUASH_MSG'
+      git_root_dir = run('git rev-parse --show-toplevel').strip
+      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"
     end
     
     private

data/lib/git_reflow/sandbox.rb

@@ -15,7 +15,9 @@ module GitReflow
       if options[:with_system] == true
         system(command)
       elsif options[:loud] == true
-        puts `#{command}`
+        output = `#{command}`
+        puts output
+        output
       else
         `#{command}`
       end

data/lib/git_reflow/version.rb

@@ -1,3 +1,3 @@
 module GitReflow
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/spec/lib/git_reflow/git_helpers_spec.rb

@@ -145,11 +145,14 @@ describe GitReflow::GitHelpers do
 
   describe ".append_to_squashed_commit_message(message)" do
     let(:message) { "do do the voodoo that you do" }
+    let(:root_dir) { `pwd`.strip }
     subject { Gitacular.append_to_squashed_commit_message(message) }
     it "appends the message to git's SQUASH_MSG temp file" do
-      expect{ subject }.to have_run_commands_in_order [
-        "echo \"#{message}\" | cat - .git/SQUASH_MSG > ./tmp_squash_msg",
-        'mv ./tmp_squash_msg .git/SQUASH_MSG'
+      stub_command("git rev-parse --show-toplevel", "#{root_dir}\n")
+      expect { subject }.to have_run_commands_in_order [
+        "git rev-parse --show-toplevel",
+        "echo \"#{message}\" | cat - #{root_dir}/.git/SQUASH_MSG > #{root_dir}/tmp_squash_msg",
+        "mv #{root_dir}/tmp_squash_msg #{root_dir}/.git/SQUASH_MSG"
       ]
     end
   end

data/spec/support/command_line_helpers.rb

@@ -1,8 +1,9 @@
 module CommandLineHelpers
   def stub_command_line
-    $commands_ran = []
-    $output       = []
-    $says         = []
+    $commands_ran     = []
+    $stubbed_commands = {}
+    $output           = []
+    $says             = []
 
     stub_run_for GitReflow
     stub_run_for GitReflow::Sandbox
@@ -17,7 +18,9 @@ module CommandLineHelpers
     module_to_stub.stub(:run) do |command, options|
       options ||= {}
       $commands_ran << Hashie::Mash.new(command: command, options: options)
+      ret_value = $stubbed_commands[command] || ""
       command = "" # we need this due to a bug in rspec that will keep this assignment on subsequent runs of the stub
+      ret_value
     end
     module_to_stub.stub(:say) do |output, type|
       $says << {message: output, type: type}
@@ -26,9 +29,11 @@ module CommandLineHelpers
 
   def reset_stubbed_command_line
     $commands_ran = []
+    $stubbed_commands = {}
   end
 
   def stub_command(command, return_value)
+    $stubbed_commands[command] = return_value
     GitReflow::Sandbox.stub(:run).with(command).and_return(return_value)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_reflow
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Valentino Stoll
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal