cem_win_spec 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c696f02eb008ce0a8814400ac7f7f73467ad1479cac4e1017628b3175b15b9b
-  data.tar.gz: 53c8c23400dbfce024c51913eb789b4b5d97fdf94a7da2ff24a819252ad92b3e
+  metadata.gz: 7d4530fab1780a403202924db23059ee908aee18579749d5309aeda74f73e1ad
+  data.tar.gz: a5b9e26782c793d8ccafa9cd95cec199acd2fddc04bb7d8366c637140f020d05
 SHA512:
-  metadata.gz: '083d1dd5d584ff4041f5a418f896a6a658edab678746d4b967366402a7f6d7f02588d3e3954add7423e410ff0ef4b289fc908b81b0855151e6419d3a360d6186'
-  data.tar.gz: b7c9b995ba7f80adfe9f095bb5b42b0d7d66221d6446a6d43cadaf4469a1c518583300004defc3359b3e4ceeb70f1ad703b39c700772f85938d43b3023f9f6c1
+  metadata.gz: 768194d5fea142be421c43082de2820c79a8d406bee1ce97b4e59a80182078de8fbeb2648a33271f40970d98d14156cc9a9854c6e5ee6b06c066be13f90070df
+  data.tar.gz: 40aed8c14cd610c59438f6b97f869f99563fbb38ce7a48cdda33b10041c2d72dafd143253a84ccf94acd6a98af7ddf4f6d6ec521f624462171c7dec9aaa0efa1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cem_win_spec (0.1.12)
+    cem_win_spec (0.1.14)
       parallel_tests (~> 3.4)
       puppet_forge (~> 6.1)
       winrm (~> 2.3)

data/exe/cem-win-spec

@@ -20,9 +20,9 @@ parser = OptionParser.new do |opts|
   end
 
   opts.on('-p', '--puppet-version [VERSION]', 'Puppet version to test against') do |version|
-    unless %w[7 8].include?(version)
+    unless %w[7 8 9].include?(version)
       warn "Unknown Puppet version: #{version}"
-      warn 'Valid versions are: 7, 8'
+      warn 'Valid versions are: 7, 8, 9'
       puts opts
       exit 1
     end
@@ -30,9 +30,9 @@ parser = OptionParser.new do |opts|
   end
 
   opts.on('-r', '--ruby-version [VERSION]', 'Ruby version to test against') do |version|
-    unless %w[2 3].include?(version)
+    unless %w[2 3 4].include?(version)
       warn "Unknown Ruby version: #{version}"
-      warn 'Valid versions are: 2, 3'
+      warn 'Valid versions are: 2, 3, 4'
       puts opts
       exit 1
     end

data/lib/cem_win_spec/test_runner.rb

@@ -66,6 +66,27 @@ module CemWinSpec
       end
     end
 
+    def install_ruby(**opts)
+      new_command('Install ruby', **opts) do
+        tool_dir = remote_ruby_tool_dir
+        choco_ver = remote_choco_ruby_version
+        ruby_ver = remote_ruby_version
+        next unless tool_dir && choco_ver && ruby_ver
+
+        remote_run(
+          [
+            "$rubyBin = '#{tool_dir}\\bin'",
+            "$uList = (uru ls 2>&1 | Out-String)",
+            "if (-not (Test-Path $rubyBin)) { choco install ruby --version=#{choco_ver} -y --no-progress }",
+            "if ($uList -notmatch '#{ruby_ver}') { uru admin add $rubyBin }",
+          ],
+          ruby_cmd: false,
+          add_envs: false,
+          chdir: false,
+        )
+      end
+    end
+
     def setup_ruby(**opts)
       @setup_ruby ||= new_command('Set up ruby', **opts) do
         remote_run(

data/lib/cem_win_spec/version.rb

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

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

@@ -11,10 +11,17 @@ module CemWinSpec
       PUPPET_VER_TO_RUBY_VER = {
         '7' => '278',
         '8' => '322',
+        '9' => '405',
       }.freeze
       TOOL_DIR_BY_RUBY_VER = {
-        '278' => 'C:/tools/ruby/2.7.8',
-        '322' => 'C:/tools/ruby/3.2.2',
+        '278' => 'C:\tools\ruby\2.7.8',
+        '322' => 'C:\tools\ruby\3.2.2',
+        '405' => 'C:\tools\ruby\4.0.5',
+      }.freeze
+      CHOCO_VERSION_BY_RUBY_VER = {
+        '278' => '2.7.8',
+        '322' => '3.2.2',
+        '405' => '4.0.5',
       }.freeze
 
       attr_accessor :working_dir, :env_vars, :puppet_version
@@ -34,8 +41,8 @@ module CemWinSpec
         end
 
         ver = value.to_s
-        raise ArgumentError, 'puppet_version only supports major versions 7 and 8' unless ver.match?(/^(7|8).*/)
-        unless ver.match?(/^(7|8)(\.\d+)?\.\d+$/)
+        raise ArgumentError, 'puppet_version only supports major versions 7, 8, and 9' unless ver.match?(/^(7|8|9).*/)
+        unless ver.match?(/^(7|8|9)(\.\d+)?\.\d+$/)
           ver = "#{ver}.0"
         end
 
@@ -73,6 +80,18 @@ module CemWinSpec
         PUPPET_VER_TO_RUBY_VER[puppet_version.split('.')[0]]
       end
 
+      def ruby_tool_dir
+        return nil unless ruby_version
+
+        TOOL_DIR_BY_RUBY_VER[ruby_version]
+      end
+
+      def choco_ruby_version
+        return nil unless ruby_version
+
+        CHOCO_VERSION_BY_RUBY_VER[ruby_version]
+      end
+
       # Formats the command to be run
       # @param cmd [String, Array[String]] the command to be run
       # @param ruby_cmd [Boolean] Whether the command is a ruby command and should be ran

data/lib/cem_win_spec.rb

@@ -51,6 +51,7 @@ module CemWinSpec
       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}"
@@ -128,6 +129,12 @@ module CemWinSpec
     end
   end
 
+  def self.install_ruby(runner, **opts)
+    validate_output(no_output_strat: :debug) do
+      runner.install_ruby(**opts).run
+    end
+  end
+
   def self.setup_remote_ruby(runner, module_dir, **opts)
     validate_output do
       runner.setup_ruby(operation_timeout: 300,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cem_win_spec
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.14
 platform: ruby
 authors:
 - Heston Snodgrass
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-08-28 00:00:00.000000000 Z
+date: 2026-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm