Fix issues with a HEREDOC entry in git.status (#385)

tarcinil · web-flow · commit 8345fece783d · 2020-12-22T14:26:24.000-08:00
* requiring Ruby 2.3 or better
* fixing status#pretty using &lt;&lt;~ because we only maintain on Ruby 2.3+ now
* fixing a rake warning about branch not using a decomposed argument

Signed-off-by: Vern Burton &lt;me@vernburton.com&gt;
diff --git a/git.gemspec b/git.gemspec
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.version = Git::VERSION
 
   s.require_paths = ['lib']
-  s.required_ruby_version = '>= 1.9'
+  s.required_ruby_version = '>= 2.3'
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to?(:required_rubygems_version=)
   s.requirements = ['git 1.6.0.0, or greater']
 
diff --git a/lib/git/status.rb b/lib/git/status.rb
@@ -104,7 +104,7 @@ def pretty
     end
 
     def pretty_file(file)
-      <<-FILE.strip_heredoc
+      <<~FILE
         #{file.path}
         \tsha(r) #{file.sha_repo} #{file.mode_repo}
         \tsha(i) #{file.sha_index} #{file.mode_index}
diff --git a/tests/units/test_status.rb b/tests/units/test_status.rb
@@ -9,6 +9,20 @@ def setup
     set_file_paths
   end
 
+  def test_status_pretty
+    in_temp_dir do |path|
+      git = Git.clone(@wdir, 'test_dot_files_status')
+      string = "ex_dir/ex.txt\n\tsha(r)  \n\tsha(i) e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 " \
+               "100644\n\ttype   \n\tstage  0\n\tuntrac \nexample.txt\n\tsha(r)  \n\tsha(i) " \
+               "8dc79ae7616abf1e2d4d5d97d566f2b2f6cee043 100644\n\ttype   \n\tstage  0\n\tuntrac " \
+               "\nscott/newfile\n\tsha(r)  \n\tsha(i) 5d4606820736043f9eed2a6336661d6892c820a5 " \
+               "100644\n\ttype   \n\tstage  0\n\tuntrac \nscott/text.txt\n\tsha(r)  \n\tsha(i) " \
+               "3cc71b13d906e445da52785ddeff40dad1163d49 100644\n\ttype   \n\tstage  0\n\tuntrac \n\n"
+
+      assert_equal(git.status.pretty, string)
+    end
+  end
+
   def test_dot_files_status
     in_temp_dir do |path|
       git = Git.clone(@wdir, 'test_dot_files_status')
