modsvaskr 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c7e455fc3db208e896aa655d1dba0fd91f948cf2dfd1acb5787d2d723ab9e0a
-  data.tar.gz: 012ee74df256dc2f3b3b2b1d33677c2b926b7a58b73f2398d05073e68a197394
+  metadata.gz: 3a5763808fa45e04cd82bcaf607b12729ca43b5c2a40b8e3476abb3f012154e2
+  data.tar.gz: 428994ca324ac277fcfcb3e76f2c0a88ee6f8a53d0e862fbdbf7b6abca5323ed
 SHA512:
-  metadata.gz: ab3dac575ad2d9266c6d3167d76c586cae9e5fe7b5169166117ffd09adad1f4c990e20d37f66a3d369fb5694dbe4bd241122ccee33f9008820599bedd74a3459
-  data.tar.gz: 4c5801dc0f8e71a3ebe33be2d42338f1ac73a2afae775d70a0374a212c7c14864027983f95f8267f24ddad22cce4efd5c3f8a15ab3a094b22c080c4cafea161e
+  metadata.gz: 629deb5ebde244b3d4eee1d0195aa6c8e84a96282a6968fc99e95a878e911d98bb3d50dd9538ede549163225e54bec1a92e3ac6c5befdca6dc15d3b4bc7c925b
+  data.tar.gz: 62f17178509041879839df331bcb6db369484159d6b13fe4a2c542ea70878a8571294dd006f68ae92ed0150f65b53daad8c10fbcd1563e2ea07796fedf5c7dff

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
@@ -210,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/in_game_tests_suite.rb

@@ -0,0 +1,39 @@
+module Modsvaskr
+
+  # Mixin adding methods to map directly a tests suite to an in-game tests suite
+  # Uses the following methods:
+  # * *in_game_tests_suite* -> Symbol: Name of the in-gamer tests suite on which we forward the tests run
+  module InGameTestsSuite
+
+    # Get the list of tests to be run in-game for a given list of test names.
+    # [API] - This method is mandatory for tests needing to be run in-game.
+    #
+    # Parameters::
+    # * *tests* (Array<String>): List of test names
+    # Result::
+    # * Hash<Symbol, Array<String> >: List of in-game test names, per in-game tests suite
+    def in_game_tests_for(tests)
+      { in_game_tests_suite => tests }
+    end
+
+    # Set statuses based on the result of AutoTest statuses.
+    # AutoTest names are case insensitive.
+    # [API] - This method is mandatory for tests needing to be run in-game.
+    #
+    # Parameters::
+    # * *tests* (Array<String>): List of test names
+    # * *auto_test_statuses* (Hash<Symbol, Hash<String, String> >): In-game test statuses, per in-game test name, per in-game tests suite
+    # Result::
+    # * Array<[String, String]>: Corresponding list of [test name, test status]
+    def parse_auto_tests_statuses_for(tests, auto_test_statuses)
+      in_game_test_statuses = auto_test_statuses[in_game_tests_suite] || {}
+      tests.map do |test_name|
+        test_downcase = test_name.downcase
+        _in_game_test, in_game_test_status = in_game_test_statuses.find { |search_in_game_test, _search_in_game_test_status| search_in_game_test.downcase == test_downcase }
+        in_game_test_status.nil? ? nil : [test_name, in_game_test_status]
+      end.compact
+    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/tests_suites/exterior_cell.rb

@@ -1,9 +1,21 @@
+require 'modsvaskr/in_game_tests_suite'
+
 module Modsvaskr
 
   module TestsSuites
 
     class ExteriorCell < TestsSuite
 
+      include InGameTestsSuite
+
+      # Return the in-game tests suite to which we forward the tests to be run
+      #
+      # Result::
+      # * Symbol: In-game tests suite
+      def in_game_tests_suite
+        :locations
+      end
+
       # Discover the list of tests information that could be run.
       # [API] - This method is mandatory
       #
@@ -98,30 +110,6 @@ module Modsvaskr
         tests
       end
 
-      # Get the list of tests to be run in-game for a given list of test names.
-      # [API] - This method is mandatory for tests needing to be run in-game.
-      #
-      # Parameters::
-      # * *tests* (Array<String>): List of test names
-      # Result::
-      # * Hash<Symbol, Array<String> >: List of in-game test names, per in-game tests suite
-      def in_game_tests_for(tests)
-        { locations: tests }
-      end
-
-      # Set statuses based on the result of AutoTest statuses.
-      # AutoTest names are case insensitive.
-      # [API] - This method is mandatory for tests needing to be run in-game.
-      #
-      # Parameters::
-      # * *tests* (Array<String>): List of test names
-      # * *auto_test_statuses* (Hash<Symbol, Array<[String, String]> >): Ordered list of AutoTest [test name, test status], per AutoTest tests suite
-      # Result::
-      # * Array<[String, String]>: Corresponding list of [test name, test status]
-      def parse_auto_tests_statuses_for(tests, auto_test_statuses)
-        auto_test_statuses.key?(:locations) ? auto_test_statuses[:locations] : []
-      end
-
     end
 
   end

data/lib/modsvaskr/tests_suites/interior_cell.rb

@@ -1,9 +1,21 @@
+require 'modsvaskr/in_game_tests_suite'
+
 module Modsvaskr
 
   module TestsSuites
 
     class InteriorCell < TestsSuite
 
+      include InGameTestsSuite
+
+      # Return the in-game tests suite to which we forward the tests to be run
+      #
+      # Result::
+      # * Symbol: In-game tests suite
+      def in_game_tests_suite
+        :locations
+      end
+
       # Discover the list of tests information that could be run.
       # [API] - This method is mandatory
       #
@@ -44,30 +56,6 @@ module Modsvaskr
         ]
       end
 
-      # Get the list of tests to be run in-game for a given list of test names.
-      # [API] - This method is mandatory for tests needing to be run in-game.
-      #
-      # Parameters::
-      # * *tests* (Array<String>): List of test names
-      # Result::
-      # * Hash<Symbol, Array<String> >: List of in-game test names, per in-game tests suite
-      def in_game_tests_for(tests)
-        { locations: tests }
-      end
-
-      # Set statuses based on the result of AutoTest statuses.
-      # AutoTest names are case insensitive.
-      # [API] - This method is mandatory for tests needing to be run in-game.
-      #
-      # Parameters::
-      # * *tests* (Array<String>): List of test names
-      # * *auto_test_statuses* (Hash<Symbol, Array<[String, String]> >): Ordered list of AutoTest [test name, test status], per AutoTest tests suite
-      # Result::
-      # * Array<[String, String]>: Corresponding list of [test name, test status]
-      def parse_auto_tests_statuses_for(tests, auto_test_statuses)
-        auto_test_statuses.key?(:locations) ? auto_test_statuses[:locations] : []
-      end
-
     end
 
   end

data/lib/modsvaskr/tests_suites/npc.rb

@@ -1,9 +1,21 @@
+require 'modsvaskr/in_game_tests_suite'
+
 module Modsvaskr
 
   module TestsSuites
 
     class Npc < TestsSuite
 
+      include InGameTestsSuite
+
+      # Return the in-game tests suite to which we forward the tests to be run
+      #
+      # Result::
+      # * Symbol: In-game tests suite
+      def in_game_tests_suite
+        :npcs
+      end
+
       # Discover the list of tests information that could be run.
       # [API] - This method is mandatory
       #
@@ -20,30 +32,6 @@ module Modsvaskr
         tests
       end
 
-      # Get the list of tests to be run in-game for a given list of test names.
-      # [API] - This method is mandatory for tests needing to be run in-game.
-      #
-      # Parameters::
-      # * *tests* (Array<String>): List of test names
-      # Result::
-      # * Hash<Symbol, Array<String> >: List of in-game test names, per in-game tests suite
-      def in_game_tests_for(tests)
-        { npcs: tests }
-      end
-
-      # Set statuses based on the result of AutoTest statuses.
-      # AutoTest names are case insensitive.
-      # [API] - This method is mandatory for tests needing to be run in-game.
-      #
-      # Parameters::
-      # * *tests* (Array<String>): List of test names
-      # * *auto_test_statuses* (Hash<Symbol, Array<[String, String]> >): Ordered list of AutoTest [test name, test status], per AutoTest tests suite
-      # Result::
-      # * Array<[String, String]>: Corresponding list of [test name, test status]
-      def parse_auto_tests_statuses_for(tests, auto_test_statuses)
-        auto_test_statuses.key?(:npcs) ? auto_test_statuses[:npcs] : []
-      end
-
     end
 
   end

data/lib/modsvaskr/tests_suites/npc_head.rb

@@ -1,9 +1,21 @@
+require 'modsvaskr/in_game_tests_suite'
+
 module Modsvaskr
 
   module TestsSuites
 
     class NpcHead < TestsSuite
 
+      include InGameTestsSuite
+
+      # Return the in-game tests suite to which we forward the tests to be run
+      #
+      # Result::
+      # * Symbol: In-game tests suite
+      def in_game_tests_suite
+        :npcshead
+      end
+
       # Discover the list of tests information that could be run.
       # [API] - This method is mandatory
       #
@@ -20,30 +32,6 @@ module Modsvaskr
         tests
       end
 
-      # Get the list of tests to be run in-game for a given list of test names.
-      # [API] - This method is mandatory for tests needing to be run in-game.
-      #
-      # Parameters::
-      # * *tests* (Array<String>): List of test names
-      # Result::
-      # * Hash<Symbol, Array<String> >: List of in-game test names, per in-game tests suite
-      def in_game_tests_for(tests)
-        { npcshead: tests }
-      end
-
-      # Set statuses based on the result of AutoTest statuses.
-      # AutoTest names are case insensitive.
-      # [API] - This method is mandatory for tests needing to be run in-game.
-      #
-      # Parameters::
-      # * *tests* (Array<String>): List of test names
-      # * *auto_test_statuses* (Hash<Symbol, Array<[String, String]> >): Ordered list of AutoTest [test name, test status], per AutoTest tests suite
-      # Result::
-      # * Array<[String, String]>: Corresponding list of [test name, test status]
-      def parse_auto_tests_statuses_for(tests, auto_test_statuses)
-        auto_test_statuses.key?(:npcshead) ? auto_test_statuses[:npcshead] : []
-      end
-
     end
 
   end

data/lib/modsvaskr/version.rb

@@ -1,5 +1,5 @@
 module Modsvaskr
 
-  VERSION = '0.1.3'
+  VERSION = '0.1.8'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modsvaskr
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.8
 platform: ruby
 authors:
 - Muriel Salvan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-20 00:00:00.000000000 Z
+date: 2021-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses_menu
@@ -107,6 +107,7 @@ files:
 - lib/modsvaskr/game.rb
 - lib/modsvaskr/games/skyrim_se.rb
 - lib/modsvaskr/in_game_tests_runner.rb
+- lib/modsvaskr/in_game_tests_suite.rb
 - lib/modsvaskr/logger.rb
 - lib/modsvaskr/run_cmd.rb
 - lib/modsvaskr/tests_runner.rb