modsvaskr 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf22182b9e2f38b08900947b107bac303c8d9c6eebbc7b10ce80b88a899fd4da
-  data.tar.gz: 58a6a9f16573766eec853391ef1aa0efd2a649a691e530a16bbc8de0268c11b9
+  metadata.gz: 891a0a4201c62018b26798acd86da140eb757f5633665d29ab2aadbb39fdb8e3
+  data.tar.gz: e03c3b7816308b0a153d890f09f86cfadc892c0da1537770fedf4ecbdea5aca7
 SHA512:
-  metadata.gz: 87849b6c50f3cc08db5d150fada9511ff412ab2458310a2f6e64c6126f7037e7e656a379c383b7598449e728be0f925bdb06df39a2e760895c4c9b3a1aca85ff
-  data.tar.gz: 10edfe86882d700c6a052276810b9e21aff2022a89e6b4d082ca03ab4eedb00a8ac0604e93a637492778823c7720133103c72d5adeb06d1240ada02d58a75fb5
+  metadata.gz: 34f1d6bf79e7301e8bfb12d8ab2dcb6372f62589bd4c6a7f508e4636d337dc2c72e90db41c06ce2a3a65f49f8ae308eb0b11910fd206906aa92c817ba6529932
+  data.tar.gz: 2035854e4ac51da63b9a6fc7006289b88a307acd92aa8213613dcb10306d787b49dcc40ec087740aaf932a1b56668820fbe3e595887d0df014eaba85b96da201

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,11 +211,15 @@ module Modsvaskr
                 end
               end
               # We will start again. Leave some time to interrupt if we want.
+              unless @config.no_prompt
+                # 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
+                rescue Timeout::Error
                   nil
                 end
               if key_pressed

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)
@@ -146,15 +147,18 @@ module Modsvaskr
           # This is a callback called for each in-game test status change.
           # Update the tests results based on what has been run in-game.
           # Find all tests suites that are subscribed to those in-game tests.
-          in_game_tests_subscriptions[in_game_tests_suite].each do |tests_suite_subscription|
-            selected_in_game_tests_statuses = in_game_tests_statuses.slice(*tests_suite_subscription[:in_game_tests])
-            unless selected_in_game_tests_statuses.empty?
-              tests_suite = @tests_suites[tests_suite_subscription[:tests_suite]]
-              tests_suite.set_statuses(
-                tests_suite.
-                  parse_auto_tests_statuses_for(tests_suite_subscription[:selected_tests], { in_game_tests_suite => selected_in_game_tests_statuses }).
-                  select { |(test_name, _test_status)| tests_suite_subscription[:selected_tests].include?(test_name) }
-              )
+          # Be careful that updates can be given for in-game tests suites we were not expecting
+          if in_game_tests_subscriptions.key?(in_game_tests_suite)
+            in_game_tests_subscriptions[in_game_tests_suite].each do |tests_suite_subscription|
+              selected_in_game_tests_statuses = in_game_tests_statuses.slice(*tests_suite_subscription[:in_game_tests])
+              unless selected_in_game_tests_statuses.empty?
+                tests_suite = @tests_suites[tests_suite_subscription[:tests_suite]]
+                tests_suite.set_statuses(
+                  tests_suite.
+                    parse_auto_tests_statuses_for(tests_suite_subscription[:selected_tests], { in_game_tests_suite => selected_in_game_tests_statuses }).
+                    select { |(test_name, _test_status)| tests_suite_subscription[:selected_tests].include?(test_name) }
+                )
+              end
             end
           end
         end

data/lib/modsvaskr/version.rb

@@ -1,5 +1,5 @@
 module Modsvaskr
 
-  VERSION = '0.1.0'
+  VERSION = '0.1.5'
 
 end

metadata

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