rubocop: resolve issues on rubocop 1.84.1

Signed-off-by: Philip Li <philip.li@intel.com>

Author: rli9

lib/bash.rb

@@ -52,30 +52,47 @@ def run(*args, **options, &block)
 
       cmd = TTY::Command.new(printer: verbose ? :pretty : :null, uuid: false, **options)
 
+      args = prepare_args(args, unsetenv_others)
+
+      result = cmd.run!(*args) do |out, err|
+        # TTY::Command yields chunks, split them to match line-based expectation.
+        (out || err).each_line { |line| block.call(line.chomp) } if stream
+      end
+
+      handle_result(result, args, returns, options, stream, block)
+    rescue TTY::Command::TimeoutExceeded
+      raise TimeoutError, args.join(' ')
+    end
+
+    private
+
+    def prepare_args(args, unsetenv_others)
       env = args.first.is_a?(Hash) ? args.shift : {}
 
       if unsetenv_others
-        # Manually construct `env -i` command because TTY::Command unsetenv_others is unreliable
-        env_vars = env.map { |k, v| "#{k}=#{v}" }
-        args = if args.size == 1
-                 ['env', '-i'] + env_vars + ['bash', '-c', args.first]
-               else
-                 ['env', '-i'] + env_vars + args
-               end
+        construct_env_i_args(args, env)
       else
-        # Normalize args to force bash for single strings (legacy support)
-        args = ['bash', '-c', args.first] if args.size == 1
-        args.unshift(env) unless env.empty?
+        construct_bash_args(args, env)
       end
+    end
 
-      result = cmd.run!(*args) do |out, err|
-        next unless stream
-
-        # Streaming mode: yield lines to block
-        # TTY::Command yields chunks, split them to match line-based expectation.
-        (out || err).each_line { |line| block.call(line.chomp) }
+    def construct_env_i_args(args, env)
+      env_vars = env.map { |k, v| "#{k}=#{v}" }
+      base = ['env', '-i'] + env_vars
+      if args.size == 1
+        base + ['bash', '-c', args.first]
+      else
+        base + args
       end
+    end
+
+    def construct_bash_args(args, env)
+      args = ['bash', '-c', args.first] if args.size == 1
+      args.unshift(env) unless env.empty?
+      args
+    end
 
+    def handle_result(result, args, returns, options, stream, block)
       # Legacy Bash.run behavior (Post-run yield) if NOT streaming
       # Note: legacy behavior requires yielding (stdout, stderr, exit_status)
       if block && !stream
@@ -86,8 +103,6 @@ def run(*args, **options, &block)
       end
 
       result.out.chomp
-    rescue TTY::Command::TimeoutExceeded
-      raise TimeoutError.new(args.join(' '))
     end
   end
 end

spec/bash_spec.rb

@@ -96,11 +96,6 @@
         expect(out).to be_empty
       end
 
-      it 'clears environment when unsetenv_others: true (legacy alias)' do
-        out = described_class.run('echo $LKP_TEST_ENV_VAR', unsetenv_others: true)
-        expect(out).to be_empty
-      end
-
       it 'passes specific env vars even with unsetenv_others: true' do
         out = described_class.run({ 'PRESERVED' => 'yes' }, 'echo $PRESERVED', unsetenv_others: true)
         expect(out).to eq('yes')

stats/zoneinfo

@@ -6,9 +6,9 @@ tag = ''
 def puts_vals(tag, node, zone, line)
   vals = line.split
   if tag == 'pages' && vals.size >= 2
-    puts "node#{node}.#{zone}.pages.#{vals[vals.size - 2]}: #{vals[vals.size - 1]}"
+    puts "node#{node}.#{zone}.pages.#{vals[-2]}: #{vals[-1]}"
   elsif tag == 'node' && vals.size >= 2
-    puts "node#{node}.#{vals[vals.size - 2]}: #{vals[vals.size - 1]}"
+    puts "node#{node}.#{vals[-2]}: #{vals[-1]}"
   elsif line =~ /\s*([a-zA-Z].*):\s*([0-9]+)/
     puts "node#{node}.#{zone}.#{$1.tr(' ', '_')}: #{$2}"
   end