modsvaskr 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28b576d46d408e4fe202990e9cad4f2ed3cf5fc314a9784ce03989110052f1ff
-  data.tar.gz: d91f3542270e772fa527a443af63b36e4ef15202977b6da1a95cfbe21c205aff
+  metadata.gz: dbeaf699d4603223071a9caae99b832d690b2a8d0e944c601a4f1b0cb015a0bb
+  data.tar.gz: f1e0538f49674f83d459180d1a62b5b5d00a4d45721fcead5f58516d247547ac
 SHA512:
-  metadata.gz: 2bb5af17b950cadbc37977542b4c90c450a53be908ee8bd86ff627e2dedf79e600de34df2fe36491f09bb11104035da62f74b161c67ef09a23b92aa72ef8c37f
-  data.tar.gz: beab3bf9208b2c9c39502f3f9ab000ca669ad25fa3155b286ab49ddae35799e88eb5bd4d48207b11afcc72878d07a34d7f0f0e8e60a31f5e37f6819b9af25972
+  metadata.gz: 9e786f5797a20ea302d55c5af01e1b3f80b0fb52a539e21ab8e19dec302e7ed15b44360df0b48bc545a626497e3483c1849002b8b025acd377d3cbc2ff39205b
+  data.tar.gz: 691350a1b4c5222bf5f5c65511f4ad0cd8d8b595b44db5d845300c0a92a18555e8bb7f4d3bb284f2dd109152d2dc477d4eadd41f06d5fbebd802cc4bc1050086

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)

data/lib/modsvaskr/version.rb

@@ -1,5 +1,5 @@
 module Modsvaskr
 
-  VERSION = '0.1.1'
+  VERSION = '0.1.6'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modsvaskr
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.6
 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