lib/mina/helpers/internal.rb in mina-1.2.4 vs lib/mina/helpers/internal.rb in mina-1.2.5

@@ -1,55 +1,55 @@
+# frozen_string_literal: true
+
 module Mina
   module Helpers
     module Internal
       include Helpers::Output
 
       def deploy_script
         yield
         erb fetch(:deploy_script)
       end
 
-      def erb(file, b = binding)
+      def erb(file, b = binding) # rubocop:disable Naming/MethodParameterName
         require 'erb'
         erb = ERB.new(File.read(file))
         erb.result b
       end
 
       def echo_cmd(code, ignore_verbose = false)
         if fetch(:verbose) && !ignore_verbose
-          "echo #{Shellwords.escape('$ ' + code)} &&\n#{code}"
+          "echo #{Shellwords.escape("$ #{code}")} &&\n#{code}"
         else
           code
         end
       end
 
       def indent(count, str)
         str.gsub(/^/, ' ' * count)
       end
 
       def unindent(code)
-        if code =~ /^\n([ \t]+)/
-          code = code.gsub(/^#{$1}/, '')
-        end
+        code = code.gsub(/^#{Regexp.last_match(1)}/, '') if code =~ /^\n([ \t]+)/
 
         code.strip
       end
 
       def report_time
         time_start = Time.now
         output = yield
-        print_info "Elapsed time: %.2f seconds" % [Time.now - time_start] unless fetch(:skip_report_time)
+        print_info format('Elapsed time: %.2f seconds', Time.now - time_start) unless fetch(:skip_report_time)
         output
       end
 
       def next_version
         case fetch(:version_scheme)
         when :datetime
-          Time.now.utc.strftime("%Y%m%d%H%M%S")
+          Time.now.utc.strftime('%Y%m%d%H%M%S')
         when :sequence
           "$((`ls -1 #{fetch(:releases_path)} | sort -n | tail -n 1`+1))"
         else
-          error! 'Unrecognizes version scheme. Use :datetime or :sequence'
+          error! 'Unrecognized version scheme. Use :datetime or :sequence'
         end
       end
 
       def error!(message)
         print_error message