modsvaskr 0.1.2 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 759a86a5ea5ddbba8ed9bcf56ece81b83324dca028af137e2bf948402f5900ad
-  data.tar.gz: 596259ae4f2e3904ac555eef656bd6be5f7ab18047fc87ba50263978f67a5f5d
+  metadata.gz: fd6d0c139d7abd4ebc630cb1704182149bfae4213fa5bf44d8befee491c87606
+  data.tar.gz: 4f5c1ef541e86c57093ac8633190fd473aa61d66cfff5d4454d5db691f570f03
 SHA512:
-  metadata.gz: 37902323f88d35bcdf80abb62a1e1c14d8db78dd4ecf37aa0d0a8afabba6b17fad5f653863f5f08f9a5309665bef39838ad120315919f7dca1b9a01de185ef3b
-  data.tar.gz: a24f76d9bb884fde1e1046b28e5082da0cfc451767c272a5e70eb22a0b203d211b08f92cdec173eafbbbae07b842c27f63dfb63f94fde5827ca280e5bfb2e0de
+  metadata.gz: 112d6f09e79b130dd9db2b561848dbabdbd3e771faf791d71b54a53ac09bb8928d70f6f50c0e1586689ad3519b7795e6fe16e980d3f3340da83aa702a4f0300d
+  data.tar.gz: b5531b0ecadc34ad551e874a2ac26b7a21a7698a5ceed70f9d182e32c94beb2943eb7e58d73c5004994f9c358ff207a7b94af02c12a30b866287e564414f0cba

data/lib/modsvaskr/in_game_tests_runner.rb

@@ -3,6 +3,7 @@ require 'elder_scrolls_plugin'
 require 'fileutils'
 require 'json'
 require 'time'
+require 'timeout'
 require 'modsvaskr/tests_suite'
 
 module Modsvaskr
@@ -66,8 +67,14 @@ module Modsvaskr
               }
             )
           )
-          # Clear the AutoTest test statuses
-          File.unlink("#{@game.path}/Data/SKSE/Plugins/StorageUtilData/AutoTest_#{tests_suite}_Statuses.json") if File.exist?("#{@game.path}/Data/SKSE/Plugins/StorageUtilData/AutoTest_#{tests_suite}_Statuses.json")
+          # Clear the AutoTest test statuses that we are going to run
+          statuses_file = "#{@game.path}/Data/SKSE/Plugins/StorageUtilData/AutoTest_#{tests_suite}_Statuses.json"
+          if File.exist?(statuses_file)
+            File.write(
+              statuses_file,
+              JSON.pretty_generate('string' => JSON.parse(File.read(statuses_file))['string'].delete_if { |test_name, _test_status| tests.include?(test_name) })
+            )
+          end
         end
         auto_test_config_file = "#{@game.path}/Data/SKSE/Plugins/StorageUtilData/AutoTest_Config.json"
         # Write the JSON file that contains the configuration of the AutoTest tests runner
@@ -204,21 +211,23 @@ module Modsvaskr
                 end
               end
               # We will start again. Leave some time to interrupt if we want.
-              unless @config.no_prompt
+              if @config.no_prompt
+                out 'Start again automatically as no_prompt has been set.'
+              else
                 # First, flush stdin of any pending character
                 $stdin.getc while !select([$stdin], nil, nil, 2).nil?
-              end
-              out "We are going to start again in #{@game.timeout_interrupt_tests_secs} seconds. Press Enter now to interrupt it."
-              key_pressed =
-                begin
-                  Timeout.timeout(@game.timeout_interrupt_tests_secs) { $stdin.gets }
-                rescue
-                  nil
+                out "We are going to start again in #{@game.timeout_interrupt_tests_secs} seconds. Press Enter now to interrupt it."
+                key_pressed =
+                  begin
+                    Timeout.timeout(@game.timeout_interrupt_tests_secs) { $stdin.gets }
+                  rescue Timeout::Error
+                    nil
+                  end
+                if key_pressed
+                  log "[ In-game testing #{@game.name} ] - Run interrupted by user."
+                  # TODO: Remove AutoTest start on load: it has been interrupted by the user, so we should not keep it in case the user launches the game by itself.
+                  break
                 end
-              if key_pressed
-                log "[ In-game testing #{@game.name} ] - Run interrupted by user."
-                # TODO: Remove AutoTest start on load: it has been interrupted by the user, so we should not keep it in case the user launches the game by itself.
-                break
               end
             end
           end

data/lib/modsvaskr/tests_runner.rb

@@ -131,14 +131,15 @@ module Modsvaskr
         in_game_tests.each do |tests_suite, selected_tests|
           in_game_tests_to_subscribe = @tests_suites[tests_suite].in_game_tests_for(selected_tests)
           in_game_tests_to_subscribe.each do |in_game_tests_suite, selected_in_game_tests|
+            selected_in_game_tests_downcase = selected_in_game_tests.map(&:downcase)
             in_game_tests_subscriptions[in_game_tests_suite] = [] unless in_game_tests_subscriptions.key?(in_game_tests_suite)
             in_game_tests_subscriptions[in_game_tests_suite] << {
               tests_suite: tests_suite,
-              in_game_tests: selected_in_game_tests,
+              in_game_tests: selected_in_game_tests_downcase,
               selected_tests: selected_tests
             }
             merged_in_game_tests[in_game_tests_suite] = [] unless merged_in_game_tests.key?(in_game_tests_suite)
-            merged_in_game_tests[in_game_tests_suite] = (merged_in_game_tests[in_game_tests_suite] + selected_in_game_tests).uniq
+            merged_in_game_tests[in_game_tests_suite] = (merged_in_game_tests[in_game_tests_suite] + selected_in_game_tests_downcase).uniq
           end
         end
         in_game_tests_runner = InGameTestsRunner.new(@config, @game)

data/lib/modsvaskr/version.rb

@@ -1,5 +1,5 @@
 module Modsvaskr
 
-  VERSION = '0.1.2'
+  VERSION = '0.1.7'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modsvaskr
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.7
 platform: ruby
 authors:
 - Muriel Salvan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses_menu