git_reflow 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0120e898073e422bc4c2203dadfb71f60de083b
-  data.tar.gz: bf8b82ecaccfe531f2ef87d9882ac794597352e4
+  metadata.gz: 157ec9c6f9262f4f5f8f67a9b9311f7b043b01c4
+  data.tar.gz: 9c4a441992272ddfe73fbce1cbc545af55193ad9
 SHA512:
-  metadata.gz: 4647f117605853e151a65147b5ffffdcfee3a5abcf66e699fe0c6512d847da0d3ec2df0a96f48927395362227d933b52a926dc17e6abc52c023d9b671a005721
-  data.tar.gz: 5b6724e334fc187b4c1d6dc7ccd76b7e3db4155955644f46f24df5932872e7e78b6e44061c9e95e40a6be91c6c7a80bccfc8d22069d5ec4d5d54bb5a037aa212
+  metadata.gz: a08a0ac6fefbe661734ecc85d39c61b7e97dba979893857781c8fa423212704467032b1de0bbbdc49db8209329710b1d09a8a311d3b6f0241ac3df268177b883
+  data.tar.gz: 6cda20098a7eebb8deb02c4d6ec138553c90d0d71fc0ec83fbe1f0ce116836000012b9f58c4fd99327cc8161ec731a236f88192757228e85a416dc34dfaf4848

data/Gemfile.lock

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

data/circle.yml

@@ -1,16 +1,16 @@
 dependencies:
   pre:
     - rvm install 2.0.0
-    - rvm install 2.1.5
-    - rvm install 2.2.1
+    - rvm install 2.1.6
+    - rvm install 2.2.2
 
   override:
     - 'rvm-exec 2.0.0-p643 bundle install'
-    - 'rvm-exec 2.1.5 bundle install'
-    - 'rvm-exec 2.2.1 bundle install'
+    - 'rvm-exec 2.1.6 bundle install'
+    - 'rvm-exec 2.2.2 bundle install'
 
 test:
   override:
     - 'rvm-exec 2.0.0-p643 bundle exec rake'
-    - 'rvm-exec 2.1.5 bundle exec rake'
-    - 'rvm-exec 2.2.1 bundle exec rake'
+    - 'rvm-exec 2.1.6 bundle exec rake'
+    - 'rvm-exec 2.2.2 bundle exec rake'

data/lib/git_reflow/commands/review.rb

@@ -6,8 +6,7 @@ command :review do |c|
   c.flag [:t, :title], default_value: 'last commit message'
   c.flag [:m, :message], default_value: 'title'
   c.action do |global_options,options,args|
-    git_root_dir = run('git rev-parse --show-toplevel').strip
-    pull_request_msg_file = "#{git_root_dir}/.git/GIT_REFLOW_PR_MSG"
+    pull_request_msg_file = "#{GitReflow.git_root_dir}/.git/GIT_REFLOW_PR_MSG"
 
     if global_options[:title] || global_options[:message]
       review_options = {
@@ -19,13 +18,18 @@ command :review do |c|
       File.open(pull_request_msg_file, 'w') do |file|
         file.write(GitReflow.current_branch)
       end
+
       GitReflow.run("$EDITOR #{pull_request_msg_file}", with_system: true)
+
       pr_msg = File.open(pull_request_msg_file).each_line.map(&:strip).to_a
+      title  = pr_msg.shift
+
       File.delete(pull_request_msg_file)
-      title = pr_msg.shift
+
       unless pr_msg.empty? 
         pr_msg.shift if pr_msg.first.empty?
       end
+
       review_options = {'base' => args[0],'title' => title,'body' =>  pr_msg.join("\n")}
     end
 

data/lib/git_reflow/git_helpers.rb

@@ -5,6 +5,10 @@ module GitReflow
   module GitHelpers
     include Sandbox
 
+    def git_root_dir
+      @git_root_dir ||= run('git rev-parse --show-toplevel', loud: false).strip
+    end
+
     def remote_user
       return "" unless "#{GitReflow::Config.get('remote.origin.url')}".length > 0
       extract_remote_user_and_repo_from_remote_url(GitReflow::Config.get('remote.origin.url'))[:user]
@@ -58,7 +62,6 @@ module GitReflow
     end
 
     def append_to_squashed_commit_message(message = '')
-      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

data/lib/git_reflow/version.rb

@@ -1,3 +1,3 @@
 module GitReflow
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/spec/lib/git_reflow/git_helpers_spec.rb

@@ -14,6 +14,11 @@ describe GitReflow::GitHelpers do
     stub_run_for Gitacular
   end
 
+  describe ".git_root_dir" do
+    subject { Gitacular.git_root_dir }
+    it      { expect{ subject }.to have_run_command_silently "git rev-parse --show-toplevel" }
+  end
+
   describe ".remote_user" do
     subject { Gitacular.remote_user }
 
@@ -144,13 +149,13 @@ 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) { `pwd`.strip }
-    subject { Gitacular.append_to_squashed_commit_message(message) }
+    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) }
+
     it "appends the message to git's SQUASH_MSG temp file" do
-      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"
       ]

data/spec/support/command_line_helpers.rb

@@ -89,7 +89,7 @@ RSpec::Matchers.define :have_run_commands_in_order do |commands|
   supports_block_expectations
 
   failure_message do |block|
-    "expected to have run these commands in order:\n\t\t#{commands.inspect}\n\tgot:\n\t\t#{$commands_ran.inspect}"
+    "expected to have run these commands in order:\n\t\t#{commands.inspect}\n\tgot:\n\t\t#{$commands_ran.map(&:command).inspect}"
   end
 end
 

metadata

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