cem_win_spec 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c59006dbfceccc0e0581630b0091722aa31a5644440bb906572c8429a654c37a
-  data.tar.gz: 91d3e8e17c961d90e90dd5895376418279062ace8ee3b3327d24a511b7287a98
+  metadata.gz: 155b49bb4366a1b2fca4237d9da909e05093d907a5e7ff326f4d7a9c4e75f375
+  data.tar.gz: f374c915ab3afcf1636315c02b869fdd4690291070f8429418108d292a922cce
 SHA512:
-  metadata.gz: cddc71efc46c8a5a0872ee5670b6bdcff1b77904190e18e87f3fa728f2bdb8c533bef7382e8df918337b87811fc21ac04a4b0bd0f358774911a78279f9709968
-  data.tar.gz: d52050dd876973fadb74a801b198e88f56341ee125a96a6407594376d6155a3a02a7037576ec10f775346660a7d5fd34ee75e26966ef7011889c45ad968a9e02
+  metadata.gz: 5709e80190d88d38826deae83c379a948d5e7de72202891db48b00521801ef56e9718a64c681b17ccc7eb82a275af72c955737fef9ee2ab62a8c1fbdccb0aa51
+  data.tar.gz: 3ec1282194e8a3afe8df90e3e13e7bd80428bf9d2a70f7d7b8fe6aea0437460bc3b35e8f7e19e8d3a55ded60076b489b078ba80b551b25aa917ccb9cdc0526d0

data/Gemfile.lock

@@ -1,10 +1,9 @@
 PATH
   remote: .
   specs:
-    cem_win_spec (0.1.3)
+    cem_win_spec (0.1.5)
       parallel_tests (~> 3.4)
       puppet_forge (~> 4.1)
-      tty-spinner (~> 0.9)
       winrm (~> 2.3)
       winrm-fs (~> 1.3)
 
@@ -16,7 +15,7 @@ GEM
     coderay (1.1.3)
     diff-lcs (1.5.0)
     erubi (1.12.0)
-    faraday (2.7.5)
+    faraday (2.7.10)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-follow_redirects (0.3.0)
@@ -83,9 +82,6 @@ GEM
     rubyntlm (0.6.3)
     rubyzip (2.3.2)
     semantic_puppet (1.1.0)
-    tty-cursor (0.7.1)
-    tty-spinner (0.9.3)
-      tty-cursor (~> 0.7)
     unicode-display_width (2.1.0)
     winrm (2.3.6)
       builder (>= 2.1.2)
@@ -103,6 +99,7 @@ GEM
       winrm (~> 2.0)
 
 PLATFORMS
+  arm64-darwin-22
   x86_64-darwin-19
   x86_64-darwin-20
 

data/cem_win_spec.gemspec

@@ -30,7 +30,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "winrm", "~> 2.3"
   spec.add_dependency "winrm-fs", "~> 1.3"
-  spec.add_dependency "tty-spinner", "~> 0.9"
   spec.add_dependency "puppet_forge", "~> 4.1"
   spec.add_dependency "parallel_tests", "~> 3.4"
   spec.add_development_dependency "pry"

data/lib/cem_win_spec/test_runner.rb

@@ -44,7 +44,7 @@ module CemWinSpec
 
     def enable_symlinks(**opts)
       @enable_symlinks ||= new_command('Enable symlinks', **opts) do
-        remote_exec('fsutil behavior set SymlinkEvaluation L2L:1 R2R:1 L2R:1 R2L:1')
+        remote_run('fsutil behavior set SymlinkEvaluation L2L:1 R2R:1 L2R:1 R2L:1')
       end
     end
 
@@ -76,8 +76,13 @@ module CemWinSpec
 
     def setup_ruby(**opts)
       @setup_ruby ||= new_command('Set up ruby', **opts) do
-        remote_run('bundle config disable_platform_warnings true')
-        remote_run('bundle install')
+        remote_run(
+          [
+            'bundle config disable_platform_warnings true',
+            'bundle config set --local without \'local_development\'',
+            'bundle install',
+          ],
+        )
       end
     end
 

data/lib/cem_win_spec/version.rb

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

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

@@ -22,12 +22,16 @@ module CemWinSpec
       end
 
       def run(cmd, *_args, **_kwargs)
+        cmd = cmd.join('; ') if cmd.is_a?(Array)
         log_command(cmd)
         shell = nil
         output = nil
         begin
           shell = conn.shell(:powershell)
-          output = shell.run(command(cmd))
+          output = shell.run(command(cmd)) do |stdout, stderr|
+            logger << stdout unless stdout.nil? || stdout.empty?
+            logger << stderr unless stderr.nil? || stderr.empty?
+          end
         rescue WinRM::WinRMAuthorizationError => e
           @available = false
           raise e

data/lib/cem_win_spec/win_exec/exec.rb

@@ -25,7 +25,6 @@ module CemWinSpec
         add_command_block(&block) unless block.nil?
         @reuse_tunnel = true
         @ignore_exitcode = false
-        @spinner = nil
         @result = nil
       end
 
@@ -96,12 +95,6 @@ module CemWinSpec
         false
       end
 
-      def spinner=(value)
-        raise ArgumentError, 'spinner must implement #auto_spin and #stop methods' unless value.respond_to?(:auto_spin) && value.respond_to?(:stop)
-
-        @spinner = value
-      end
-
       # Proxy method calls for methods that don't exist here to various other objects.
       # This allows doing things like: `win_exec.remote_exec('Get-Process')` and
       # calling the `exec` method on the `winrm_exec` object. This is done by
@@ -157,13 +150,10 @@ module CemWinSpec
       def run(*args, **kwargs)
         validate_instance_variables
         logger.info "Running #{@title}"
-        @spinner&.auto_spin
         result = run_with_tunnel { run_in_current_scope(*args, **kwargs) }
-        @spinner&.stop
         @result = Output.new(result)
         return if @result.pending_threaded?
 
-        @result.puts_combined
         unless @result.success? || ignore_exitcode?
           raise "Command failed with exit code #{@result.exitcode}: #{@result.stdout}\n#{@result.stderr}"
         end
@@ -201,13 +191,6 @@ module CemWinSpec
       def run_in_current_scope(*args, **kwargs)
         instance_exec(*args, **kwargs, &@block) # self is the "instance"
       end
-
-      def wrap_spinner
-        @spinner.auto_spin if @spinner
-        yield if block_given?
-      ensure
-        @spinner.stop if @spinner
-      end
     end
   end
 end

data/lib/cem_win_spec/win_exec/factory.rb

@@ -47,7 +47,6 @@ module CemWinSpec
         wexec.add_command_block(&block)
         wexec.reuse_tunnel = opts[:reuse_tunnel] if opts.key?(:reuse_tunnel)
         wexec.ignore_exitcode = opts[:ignore_exitcode] if opts.key?(:ignore_exitcode)
-        wexec.spinner = opts[:spinner] if opts.key?(:spinner)
         logger.debug 'Created Wexec'
         wexec
       end

data/lib/cem_win_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'tty-spinner'
 require_relative 'cem_win_spec/logging'
 require_relative 'cem_win_spec/test_runner'
 
@@ -39,32 +38,53 @@ module CemWinSpec
     logger.debug "Created TestRunner: #{runner}"
     signal_handler(runner)
     logger.debug 'Set up signal handler'
-    spinner = TTY::Spinner.new(format: :classic, interval: 1, hide_cursor: true, clear: true)
     begin
-      sre_out = setup_remote_environment(runner, spinner)
+      sre_out = setup_remote_environment(runner)
       check_output!(sre_out, runner)
       module_dir = sre_out.stdout.chomp
       logger.debug "Module dir: #{module_dir}"
-      srr_out = setup_remote_ruby(runner, module_dir, spinner, **options)
+      srr_out = setup_remote_ruby(runner, module_dir, **options)
       check_output!(srr_out, runner)
       case operation
       when :spec
-        spec_out = run_spec(runner, module_dir, spinner, **options)
+        spec_out = run_spec(runner, module_dir, **options)
         check_output!(spec_out, runner)
       when :clean_fixture_cache
-        clean_fixture_cache_out = clean_fixture_cache(runner, module_dir, spinner, **options)
+        clean_fixture_cache_out = clean_fixture_cache(runner, module_dir, **options)
         check_output!(clean_fixture_cache_out, runner)
       else
         raise ArgumentError, "Unknown operation: #{operation}"
       end
     rescue StandardError => e
-      logger.fatal "Error: #{e.message}"
-      logger.debug e.backtrace.join("\n")
-      exit 1
+      if operation == :spec
+        begin
+          logger.warn "Error running spec: #{e.message}"
+          logger.debug e.backtrace.join("\n")
+          retry_spec_on_error(runner, module_dir, **options)
+        rescue StandardError => err
+          handle_run_error(err)
+        end
+      else
+        handle_run_error(e)
+      end
     end
   end
 
-  def self.setup_remote_environment(runner, spinner)
+  def self.handle_run_error(err)
+    logger.fatal "Error: #{err.message}"
+    logger.debug err.backtrace.join("\n")
+    exit 1
+  end
+
+  def self.retry_spec_on_error(runner, module_dir, **options)
+    logger.info 'Cleaning cache and trying again...'
+    clean_fixture_cache_out = clean_fixture_cache(runner, module_dir, **options)
+    check_output!(clean_fixture_cache_out, runner)
+    spec_out = run_spec(runner, module_dir, **options)
+    check_output!(spec_out, runner)
+  end
+
+  def self.setup_remote_environment(runner)
     runner.enable_long_paths.run
     runner.enable_symlinks.run
     runner.enable_symlinks.run
@@ -74,38 +94,34 @@ module CemWinSpec
     runner.upload_module(operation_timeout: 300, receive_timeout: 310, working_dir: working_dir).run
   end
 
-  def self.setup_remote_ruby(runner, module_dir, spinner, **opts)
+  def self.setup_remote_ruby(runner, module_dir, **opts)
     runner.setup_ruby(operation_timeout: 300,
                       receive_timeout: 310,
                       working_dir: module_dir,
                       reuse_tunnel: false,
-                      spinner: spinner,
                       **opts).run
   end
 
   # Runs RSpec tests
-  def self.run_spec(runner, module_dir, spinner, **opts)
-    #runner.rspec_prep(working_dir: module_dir, reuse_tunnel: false, spinner: spinner).run
+  def self.run_spec(runner, module_dir, **opts)
     runner.rspec_tests_parallel(operation_timeout: 300,
                                 receive_timeout: 310,
                                 working_dir: module_dir,
                                 ignore_exitcode: true,
                                 reuse_tunnel: false,
-                                spinner: spinner,
                                 **opts).run
   end
 
   # Clean the remote fixture cache
   # @param options [Hash] Options for the test runner
-  def self.clean_fixture_cache(runner, module_dir, spinner, **opts)
-    runner.clean_fixture_cache(working_dir: module_dir, spinner: spinner, **opts).run
+  def self.clean_fixture_cache(runner, module_dir, **opts)
+    runner.clean_fixture_cache(working_dir: module_dir, **opts).run
   end
 
   def self.check_output!(output, runner = nil)
     unless output.success?
       runner&.iap_tunnel&.stop(wait: false, log: false)
-      logger.fatal "Command failed with exit code #{output.exitcode}"
-      exit output.exitcode
+      raise "Command failed with exit code #{output.exitcode}"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cem_win_spec
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Heston Snodgrass
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-06 00:00:00.000000000 Z
+date: 2023-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: tty-spinner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: puppet_forge
   requirement: !ruby/object:Gem::Requirement
@@ -153,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.18
 signing_key:
 specification_version: 4
 summary: Write a short summary, because RubyGems requires one.