cem_win_spec 0.1.19 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89ae98b894e4d0965c831a47940426268153b411113dda8a10dace9fa05dce06
-  data.tar.gz: 2315921be226f4c42168a892503bee868a03fab4b46a2e67387ea39d6e8859b5
+  metadata.gz: efd3d9ac13844df9283ce7419eea9b8610bd6be5cf847d476e901013184e6766
+  data.tar.gz: 3ce28460af05c2ed44125fc1b6b3546e29ac16dd6ac48e2b89a61c09d85adc7d
 SHA512:
-  metadata.gz: 826181f87b44ed940664a52c83dd1c87594ee8244bf6f6c62f5d83550be0bd1c4389791ba34dda3c03348d4efb9e71c0d36c7cd2b24f552ff55d7ccd0f91cde8
-  data.tar.gz: 9d9e8a200be47c099e30701bf495c384f851ee578bf852d625ea674124c628e6772d4168b239680dc0f4a889cf29d182f2905eb8f51cb30d835d84151458094f
+  metadata.gz: 8e27a9e63a5b75da679c1708bddcb34593bb4e4995fe94d009261652fa63ac5a0117988aa4568ab2d2d55cce40e42c1960a72255c8c858abbf18e377765e9c36
+  data.tar.gz: 3f344fe737234a8c2fb4b6eb4fc4f09393c6cd6d6f90322df5abdc1fbdafa64d1c53842cc09318d515c76fc2255a06d6dbe92b2a95f515e7a3f07da57231b543

data/exe/cem-win-spec

@@ -39,8 +39,8 @@ parser = OptionParser.new do |opts|
     options[:ruby_version] = version
   end
 
-  opts.on('-o', '--operation [OPERATION]', 'Operation to perform (spec, clean_fixture_cache)') do |operation|
-    unless %w[spec clean_fixture_cache].include?(operation)
+  opts.on('-o', '--operation [OPERATION]', 'Operation to perform (spec, install_ruby, clean_fixture_cache)') do |operation|
+    unless %w[spec install_ruby clean_fixture_cache].include?(operation)
       warn "Unknown operation: #{operation}"
       puts opts
       exit 1

data/lib/cem_win_spec/test_runner.rb

@@ -79,7 +79,102 @@ module CemWinSpec
         ]
         if installer_url
           installer_filename = File.basename(installer_url)
-          cmds << "if (-not (Test-Path \"$rubyBin\")) { $inst = \"$env:TEMP\\#{installer_filename}\"; if (Get-Command curl.exe -ErrorAction SilentlyContinue) { curl.exe -sSL --retry 3 -o $inst '#{installer_url}'; if ($LASTEXITCODE -ne 0) { throw \"curl.exe failed to download #{installer_url}: exit $LASTEXITCODE\" } } else { [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; Invoke-WebRequest -Uri '#{installer_url}' -OutFile $inst -UseBasicParsing }; Start-Process -FilePath $inst -ArgumentList '/verysilent', '/dir=#{tool_dir}', '/tasks=\"\"', '/norestart' -Wait; Remove-Item $inst -Force }"
+          cmds << <<~PWSH
+            if (-not (Test-Path "$rubyBin")) {
+              $ErrorActionPreference = 'Stop'
+              try {
+                & {
+                  $ErrorActionPreference = 'Continue'
+                  Get-Process -Name 'rubyinstaller-*' -ErrorAction SilentlyContinue | ForEach-Object {
+                    Write-Host "===== install_ruby: killing lingering process $($_.Name) (PID $($_.Id)) and children ====="
+                    & taskkill.exe /F /T /PID $_.Id 2>&1 | Out-Null
+                  }
+                }
+                Start-Sleep -Seconds 2
+                $tmp = "$env:TEMP\\rubyinstaller-#{ruby_ver}.download"
+                $inst = "$env:TEMP\\#{installer_filename}"
+                $log = "$env:TEMP\\rubyinstaller-#{ruby_ver}.log"
+                if (Test-Path $tmp) { Remove-Item $tmp -Force }
+                if (Test-Path $inst) { Remove-Item $inst -Force }
+                $downloaded = $false
+                if (Get-Command curl.exe -ErrorAction SilentlyContinue) {
+                  Write-Host "===== install_ruby: downloading via curl.exe -> $tmp ====="
+                  curl.exe -sSL --retry 3 --max-time 300 -o $tmp '#{installer_url}'
+                  if ($LASTEXITCODE -eq 0) {
+                    $downloaded = $true
+                  } else {
+                    Write-Host "===== install_ruby: curl.exe failed (exit $LASTEXITCODE), falling back to Invoke-WebRequest ====="
+                    if (Test-Path $tmp) { Remove-Item $tmp -Force }
+                  }
+                }
+                if (-not $downloaded) {
+                  Write-Host "===== install_ruby: downloading via Invoke-WebRequest -> $tmp ====="
+                  [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+                  Invoke-WebRequest -Uri '#{installer_url}' -OutFile $tmp -UseBasicParsing -TimeoutSec 300
+                }
+                if (Test-Path $log) { Remove-Item $log -Force }
+                Move-Item $tmp $inst -Force
+                Write-Host "===== install_ruby: download complete ($((Get-Item $inst).Length) bytes) ====="
+
+                # WinRM sessions run with a UAC-filtered token even for local
+                # admins, so a silent installer that requires admin hangs
+                # invisibly on the UAC consent dialog. Run the installer via a
+                # scheduled task as SYSTEM to bypass UAC entirely.
+                $taskName = 'CemInstallRuby'
+                & {
+                  $ErrorActionPreference = 'Continue'
+                  Unregister-ScheduledTask -TaskName $taskName -Confirm:$false -ErrorAction SilentlyContinue | Out-Null
+                }
+                $installArgs = '/verysilent /suppressmsgboxes /dir=#{tool_dir} /tasks="" /norestart /log="' + $log + '"'
+                Write-Host "===== install_ruby: registering scheduled task '$taskName' as SYSTEM ====="
+                Write-Host "  Execute: $inst"
+                Write-Host "  Argument: $installArgs"
+                $action = New-ScheduledTaskAction -Execute $inst -Argument $installArgs
+                $principal = New-ScheduledTaskPrincipal -UserId 'SYSTEM' -LogonType ServiceAccount -RunLevel Highest
+                $settings = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -StartWhenAvailable -ExecutionTimeLimit (New-TimeSpan -Minutes 15)
+                Register-ScheduledTask -TaskName $taskName -Action $action -Principal $principal -Settings $settings -Force | Out-Null
+
+                Write-Host "===== install_ruby: starting task (600s wall-clock timeout, log: $log) ====="
+                Start-ScheduledTask -TaskName $taskName
+                $deadline = (Get-Date).AddSeconds(600)
+                $state = 'Running'
+                while ($state -eq 'Running' -and (Get-Date) -lt $deadline) {
+                  Start-Sleep -Seconds 5
+                  $state = (Get-ScheduledTask -TaskName $taskName).State
+                }
+
+                if ($state -eq 'Running') {
+                  Write-Host "===== install_ruby: TIMEOUT after 600s — stopping task and reaping installer ====="
+                  & {
+                    $ErrorActionPreference = 'Continue'
+                    Stop-ScheduledTask -TaskName $taskName -ErrorAction SilentlyContinue | Out-Null
+                    Get-Process -Name 'rubyinstaller-*' -ErrorAction SilentlyContinue | ForEach-Object {
+                      & taskkill.exe /F /T /PID $_.Id 2>&1 | Out-Null
+                    }
+                  }
+                  if (Test-Path $log) { Write-Host "----- log tail ($log):"; Get-Content $log -Tail 100 | Out-Host } else { Write-Host "  (log file $log does not exist)" }
+                  & { $ErrorActionPreference = 'Continue'; Unregister-ScheduledTask -TaskName $taskName -Confirm:$false -ErrorAction SilentlyContinue | Out-Null }
+                  throw "Ruby installer timed out after 600s"
+                }
+
+                $exitCode = (Get-ScheduledTaskInfo -TaskName $taskName).LastTaskResult
+                Write-Host "===== install_ruby: task finished (state=$state, LastTaskResult=$exitCode) ====="
+                & { $ErrorActionPreference = 'Continue'; Unregister-ScheduledTask -TaskName $taskName -Confirm:$false -ErrorAction SilentlyContinue | Out-Null }
+                if ($exitCode -ne 0) {
+                  if (Test-Path $log) { Write-Host "----- log:"; Get-Content $log | Out-Host } else { Write-Host "  (log file $log does not exist)" }
+                  throw "Ruby installer failed with LastTaskResult=$exitCode"
+                }
+                Remove-Item $inst -Force
+              } catch {
+                Write-Host "===== install_ruby: FATAL — $_ ====="
+                exit 1
+              } finally {
+                $ErrorActionPreference = 'Continue'
+              }
+            } else {
+              Write-Host "===== install_ruby: Ruby already present at $rubyBin — skipping ====="
+            }
+          PWSH
         end
         cmds << "if ($uList -notmatch '#{ruby_ver}') { uru admin add \"$rubyBin\" }"
 

data/lib/cem_win_spec/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CemWinSpec
-  VERSION = "0.1.19"
+  VERSION = "0.1.27"
 end

data/lib/cem_win_spec/win_exec/cmd/base_cmd.rb

@@ -49,6 +49,20 @@ module CemWinSpec
         @puppet_version = ver
       end
 
+      FORWARDED_ENV_VARS = %w[
+        FORGE_API_KEY
+        SCE_COVERAGE
+        COVERAGE
+        PUPPET_AUTH_TOKEN
+      ].freeze
+
+      REDACTED_ENV_VARS = %w[
+        password
+        FORGE_API_KEY
+        PUPPET_AUTH_TOKEN
+        BUNDLE_RUBYGEMS___PUPPETCORE__PUPPET__COM
+      ].freeze
+
       # Sets the environment variables that will be used to execute the command
       # @param value [Hash] the environment variables
       def env_vars=(value)
@@ -56,9 +70,10 @@ module CemWinSpec
 
         value['PUPPET_GEM_VERSION'] = "~> #{puppet_version}" if puppet_version
         value['FACTER_GEM_VERSION'] = 'https://github.com/puppetlabs/facter#main' if puppet_version
-        value['FORGE_API_KEY'] = ENV['FORGE_API_KEY'] if ENV['FORGE_API_KEY']
-        value['SCE_COVERAGE'] = ENV['SCE_COVERAGE'] if ENV['SCE_COVERAGE']
-        value['COVERAGE'] = ENV['COVERAGE'] if ENV['COVERAGE']
+        FORWARDED_ENV_VARS.each { |k| value[k] = ENV[k] if ENV[k] }
+        if ENV['PUPPET_AUTH_TOKEN'] && !ENV['BUNDLE_RUBYGEMS___PUPPETCORE__PUPPET__COM']
+          value['BUNDLE_RUBYGEMS___PUPPETCORE__PUPPET__COM'] = "forge-key:#{ENV['PUPPET_AUTH_TOKEN']}"
+        end
         value.delete('password') if value.key?('password')
         @env_vars = value
       end
@@ -111,8 +126,11 @@ module CemWinSpec
       private
 
       def log_command(cmd)
-        cmd.gsub!(/\$env:password = "\w+"/, '$env:password = [REDACTED]')
-        logger.debug "Executing command:\n#{cmd.split(%r{\n|\r\n|;\s*}).map { |c| "  #> #{c}" }.join("\n")}"
+        redacted = cmd.dup
+        REDACTED_ENV_VARS.each do |key|
+          redacted.gsub!(/\$env:#{Regexp.escape(key)} = "[^"]+"/, %($env:#{key} = [REDACTED]))
+        end
+        logger.debug "Executing command:\n#{redacted.split(%r{\n|\r\n|;\s*}).map { |c| "  #> #{c}" }.join("\n")}"
       end
 
       # Commands that, when ran, will change the ruby version. This will also set the local bundle config path

data/lib/cem_win_spec.rb

@@ -48,25 +48,30 @@ module CemWinSpec
     logger.debug 'Set up signal handler'
     working_dir = nil
     begin
-      sre_out = setup_remote_environment(runner)
-      working_dir = sre_out.stdout.chomp
-      logger.debug "Working dir: #{working_dir}"
-      install_ruby(runner, **options)
-      upload_out = upload_module(runner, working_dir)
-      module_dir = upload_out.stdout.chomp
-      logger.debug "Module dir: #{module_dir}"
-      setup_remote_ruby(runner, module_dir, **options)
-      case operation
-      when :spec
-        run_spec(runner, module_dir, **options)
-        # We set this to 0 if the tests pass because this can be set to 1 earlier by commands that fail and retry.
-        self.exit_code = 0
-      when :clean_fixture_cache
-        clean_fixture_cache(runner, module_dir, **options)
-        # We set this to 0 if the tests pass because this can be set to 1 earlier by commands that fail and retry.
+      if operation == :install_ruby
+        install_ruby(runner, **options)
         self.exit_code = 0
       else
-        raise ArgumentError, "Unknown operation: #{operation}"
+        sre_out = setup_remote_environment(runner)
+        working_dir = sre_out.stdout.chomp
+        logger.debug "Working dir: #{working_dir}"
+        install_ruby(runner, **options)
+        upload_out = upload_module(runner, working_dir)
+        module_dir = upload_out.stdout.chomp
+        logger.debug "Module dir: #{module_dir}"
+        setup_remote_ruby(runner, module_dir, **options)
+        case operation
+        when :spec
+          run_spec(runner, module_dir, **options)
+          # We set this to 0 if the tests pass because this can be set to 1 earlier by commands that fail and retry.
+          self.exit_code = 0
+        when :clean_fixture_cache
+          clean_fixture_cache(runner, module_dir, **options)
+          # We set this to 0 if the tests pass because this can be set to 1 earlier by commands that fail and retry.
+          self.exit_code = 0
+        else
+          raise ArgumentError, "Unknown operation: #{operation}"
+        end
       end
     rescue StandardError => e
       if operation == :spec && runner.retry?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cem_win_spec
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.27
 platform: ruby
 authors:
 - Heston Snodgrass