[rubygems/rubygems] Improve some heredoc indentations

ruby/rubygems@6ee3a33048

Author: deivid-rodriguez

lib/rubygems/installer.rb

@@ -749,49 +749,49 @@ def verify_spec
   def app_script_text(bin_file_name)
     # NOTE: that the `load` lines cannot be indented, as old RG versions match
     # against the beginning of the line
-    <<-TEXT
-#{shebang bin_file_name}
-#
-# This file was generated by RubyGems.
-#
-# The application '#{spec.name}' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-#{gemdeps_load(spec.name)}
-version = "#{Gem::Requirement.default_prerelease}"
-
-str = ARGV.first
-if str
-  str = str.b[/\\A_(.*)_\\z/, 1]
-  if str and Gem::Version.correct?(str)
-    #{explicit_version_requirement(spec.name)}
-    ARGV.shift
-  end
-end
+    <<~TEXT
+      #{shebang bin_file_name}
+      #
+      # This file was generated by RubyGems.
+      #
+      # The application '#{spec.name}' is installed as part of a gem, and
+      # this file is here to facilitate running it.
+      #
+
+      require 'rubygems'
+      #{gemdeps_load(spec.name)}
+      version = "#{Gem::Requirement.default_prerelease}"
+
+      str = ARGV.first
+      if str
+        str = str.b[/\\A_(.*)_\\z/, 1]
+        if str and Gem::Version.correct?(str)
+          #{explicit_version_requirement(spec.name)}
+          ARGV.shift
+        end
+      end
 
-load Gem.activate_bin_path('#{spec.name}', '#{bin_file_name}', version)
-TEXT
+      load Gem.activate_bin_path('#{spec.name}', '#{bin_file_name}', version)
+    TEXT
   end
 
   def gemdeps_load(name)
     return "" if name == "bundler"
 
-    <<-TEXT
+    <<~TEXT
 
-Gem.use_gemdeps
-TEXT
+      Gem.use_gemdeps
+    TEXT
   end
 
   def explicit_version_requirement(name)
     code = "version = str"
     return code unless name == "bundler"
 
-    code += <<-TEXT
+    code += <<~TEXT
 
-    ENV['BUNDLER_VERSION'] = str
-TEXT
+      ENV['BUNDLER_VERSION'] = str
+    TEXT
   end
 
   ##
@@ -806,26 +806,26 @@ def windows_stub_script(bindir, bin_file_name)
 
     if File.exist?(File.join(bindir, ruby_exe))
       # stub & ruby.exe within same folder.  Portable
-      <<-TEXT
-@ECHO OFF
-@"%~dp0#{ruby_exe}" "%~dpn0" %*
+      <<~TEXT
+        @ECHO OFF
+        @"%~dp0#{ruby_exe}" "%~dpn0" %*
       TEXT
     elsif bindir.downcase.start_with? rb_topdir.downcase
       # stub within ruby folder, but not standard bin.  Portable
       require "pathname"
       from = Pathname.new bindir
       to   = Pathname.new "#{rb_topdir}/bin"
       rel  = to.relative_path_from from
-      <<-TEXT
-@ECHO OFF
-@"%~dp0#{rel}/#{ruby_exe}" "%~dpn0" %*
+      <<~TEXT
+        @ECHO OFF
+        @"%~dp0#{rel}/#{ruby_exe}" "%~dpn0" %*
       TEXT
     else
       # outside ruby folder, maybe -user-install or bundler.  Portable, but ruby
       # is dependent on PATH
-      <<-TEXT
-@ECHO OFF
-@#{ruby_exe} "%~dpn0" %*
+      <<~TEXT
+        @ECHO OFF
+        @#{ruby_exe} "%~dpn0" %*
       TEXT
     end
   end

test/rubygems/test_gem_installer.rb

@@ -24,31 +24,31 @@ def test_app_script_text
 
       util_make_exec @spec, ""
 
-      expected = <<-EOF
-#!#{Gem.ruby}
-#
-# This file was generated by RubyGems.
-#
-# The application 'a' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-Gem.use_gemdeps
-
-version = \">= 0.a\"
-
-str = ARGV.first
-if str
-  str = str.b[/\\A_(.*)_\\z/, 1]
-  if str and Gem::Version.correct?(str)
-    version = str
-    ARGV.shift
-  end
-end
+      expected = <<~EOF
+        #!#{Gem.ruby}
+        #
+        # This file was generated by RubyGems.
+        #
+        # The application 'a' is installed as part of a gem, and
+        # this file is here to facilitate running it.
+        #
+
+        require 'rubygems'
+
+        Gem.use_gemdeps
+
+        version = \">= 0.a\"
+
+        str = ARGV.first
+        if str
+          str = str.b[/\\A_(.*)_\\z/, 1]
+          if str and Gem::Version.correct?(str)
+            version = str
+            ARGV.shift
+          end
+        end
 
-load Gem.activate_bin_path('a', 'executable', version)
+        load Gem.activate_bin_path('a', 'executable', version)
       EOF
 
       wrapper = installer.app_script_text "executable"
@@ -116,12 +116,12 @@ def test_check_executable_overwrite_format_executable
     end
 
     File.open File.join(util_inst_bindir, "executable"), "w" do |io|
-      io.write <<-EXEC
-#!/usr/local/bin/ruby
-#
-# This file was generated by RubyGems
+      io.write <<~EXEC
+        #!/usr/local/bin/ruby
+        #
+        # This file was generated by RubyGems
 
-gem 'other', version
+        gem 'other', version
      EXEC
     end
 
@@ -864,11 +864,11 @@ def test_use_plugin_immediately
       spec_version = spec.version
       plugin_path = File.join("lib", "rubygems_plugin.rb")
       write_file File.join(@tempdir, plugin_path) do |io|
-        io.write <<-PLUGIN
-#{self.class}.plugin_loaded = true
-Gem.post_install do
-  #{self.class}.post_install_is_called = true
-end
+        io.write <<~PLUGIN
+          #{self.class}.plugin_loaded = true
+          Gem.post_install do
+            #{self.class}.post_install_is_called = true
+          end
         PLUGIN
       end
       spec.files += [plugin_path]
@@ -1552,7 +1552,7 @@ def test_find_lib_file_after_install
     @spec = setup_base_spec
     @spec.extensions << "extconf.rb"
     write_dummy_extconf @spec.name do |io|
-      io.write <<-RUBY
+      io.write <<~RUBY
 
         CONFIG['CC'] = '$(TOUCH) $@ ||'
         CONFIG['LDSHARED'] = '$(TOUCH) $@ ||'
@@ -1564,7 +1564,7 @@ def test_find_lib_file_after_install
     write_file File.join(@tempdir, "depend")
 
     write_file File.join(@tempdir, "a.c") do |io|
-      io.write <<-C
+      io.write <<~C
         #include <ruby.h>
         void Init_a() { }
       C
@@ -1601,7 +1601,7 @@ def test_install_extension_and_script
     rb = File.join("lib", "#{@spec.name}.rb")
     @spec.files += [rb]
     write_file File.join(@tempdir, rb) do |io|
-      io.write <<-RUBY
+      io.write <<~RUBY
         # #{@spec.name}.rb
       RUBY
     end
@@ -1610,7 +1610,7 @@ def test_install_extension_and_script
     rb2 = File.join("lib", @spec.name, "#{@spec.name}.rb")
     @spec.files << rb2
     write_file File.join(@tempdir, rb2) do |io|
-      io.write <<-RUBY
+      io.write <<~RUBY
         # #{@spec.name}/#{@spec.name}.rb
       RUBY
     end
@@ -1637,7 +1637,7 @@ def test_install_extension_flat
       @spec.extensions << "extconf.rb"
 
       write_dummy_extconf @spec.name do |io|
-        io.write <<-RUBY
+        io.write <<~RUBY
 
           CONFIG['CC'] = '$(TOUCH) $@ ||'
           CONFIG['LDSHARED'] = '$(TOUCH) $@ ||'