modsvaskr 0.0.4 → 0.1.0

data/lib/modsvaskr/tests_suites/interior_cell.rb

@@ -44,16 +44,15 @@ module Modsvaskr
         ]
       end
 
-      # Get the list of tests to be run in the AutoTest mod for a given list of test names.
-      # AutoTest names are case insensitive.
+      # 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<String, Array<String> >: List of AutoTest mod test names, per AutoTest mod tests suite
-      def auto_tests_for(tests)
-        { 'Locations' => tests }
+      # * 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.
@@ -62,11 +61,11 @@ module Modsvaskr
       #
       # Parameters::
       # * *tests* (Array<String>): List of test names
-      # * *auto_test_statuses* (Hash<String, Array<[String, String]> >): Ordered list of AutoTest [test name, test status], per AutoTest tests suite
+      # * *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'] : []
+        auto_test_statuses.key?(:locations) ? auto_test_statuses[:locations] : []
       end
 
     end

data/lib/modsvaskr/tests_suites/npc.rb

@@ -20,16 +20,15 @@ module Modsvaskr
         tests
       end
 
-      # Get the list of tests to be run in the AutoTest mod for a given list of test names.
-      # AutoTest names are case insensitive.
+      # 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<String, Array<String> >: List of AutoTest mod test names, per AutoTest mod tests suite
-      def auto_tests_for(tests)
-        { 'NPCs' => tests }
+      # * 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.
@@ -38,11 +37,11 @@ module Modsvaskr
       #
       # Parameters::
       # * *tests* (Array<String>): List of test names
-      # * *auto_test_statuses* (Hash<String, Array<[String, String]> >): Ordered list of AutoTest [test name, test status], per AutoTest tests suite
+      # * *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'] : []
+        auto_test_statuses.key?(:npcs) ? auto_test_statuses[:npcs] : []
       end
 
     end

data/lib/modsvaskr/tests_suites/npc_head.rb

@@ -0,0 +1,51 @@
+module Modsvaskr
+
+  module TestsSuites
+
+    class NpcHead < TestsSuite
+
+      # Discover the list of tests information that could be run.
+      # [API] - This method is mandatory
+      #
+      # Result::
+      # * Hash< String, Hash<Symbol,Object> >: Ordered hash of test information, per test name
+      def discover_tests
+        tests = {}
+        @game.xedit.run_script('DumpInfo', only_once: true)
+        CSV.read("#{@game.xedit.install_path}/Edit Scripts/Modsvaskr_ExportedDumpInfo.csv", encoding: 'windows-1251:utf-8').each do |row|
+          tests["#{row[0].downcase}/#{row[2].to_i(16)}"] = {
+            name: "Take head screenshot of #{row[0]} - #{row[3]}"
+          } if row[1].downcase == 'npc_'
+        end
+        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
+
+end

data/lib/modsvaskr/ui.rb

@@ -23,17 +23,45 @@ module Modsvaskr
     # Run the UI
     def run
       begin
-        CursesMenu.new 'Modsvaskr - Stronghold of Mods' do |main_menu|
+        last_modsvaskr_version = nil
+        gem_list_stdout = `gem list modsvaskr --remote`
+        gem_list_stdout.split("\n").each do |line|
+          if line =~ /^modsvaskr \((.+?)\)/
+            last_modsvaskr_version = $1
+            break
+          end
+        end
+        log "!!! Could not get latest Modsvaskr version. Output of gem list modsvaskr --remote:\n#{gem_list_stdout}" if last_modsvaskr_version.nil?
+        key_presses = @config.auto_keys.map do |key_str|
+          case key_str
+          when 'KEY_ENTER', 'KEY_ESCAPE'
+            CursesMenu.const_get(key_str.to_sym)
+          when /^KEY_\w+$/
+            Curses.const_get(key_str.to_sym)
+          else
+            key_str
+          end
+        end
+        CursesMenu.new(
+          "Modsvaskr v#{Modsvaskr::VERSION} - Stronghold of Mods#{!last_modsvaskr_version.nil? && last_modsvaskr_version != Modsvaskr::VERSION ? " - !!! New version available: #{last_modsvaskr_version}" : ''}",
+          key_presses: key_presses
+        ) do |main_menu|
           @config.games.each do |game|
             main_menu.item "#{game.name} (#{game.path})" do
-              CursesMenu.new "Modsvaskr - Stronghold of Mods > #{game.name}" do |game_menu|
+              CursesMenu.new(
+                "Modsvaskr v#{Modsvaskr::VERSION} - Stronghold of Mods > #{game.name}",
+                key_presses: key_presses
+              ) do |game_menu|
                 game_menu.item 'Testing' do
                   # Read tests info
-                  tests_runner = TestsRunner.new(game)
+                  tests_runner = TestsRunner.new(@config, game)
                   # Selected test names, per test type
                   # Hash< Symbol, Hash< String, nil > >
                   selected_tests_suites = {}
-                  CursesMenu.new "Modsvaskr - Stronghold of Mods > #{game.name} > Testing" do |test_menu|
+                  CursesMenu.new(
+                    "Modsvaskr v#{Modsvaskr::VERSION} - Stronghold of Mods > #{game.name} > Testing",
+                    key_presses: key_presses
+                  ) do |test_menu|
                     tests_runner.tests_suites.each do |tests_suite|
                       statuses_for_suite = tests_runner.statuses_for(tests_suite)
                       all_tests_selected = selected_tests_suites.key?(tests_suite) &&
@@ -52,7 +80,10 @@ module Modsvaskr
                           'd' => {
                             name: 'Details',
                             execute: proc do
-                              CursesMenu.new "Modsvaskr - Stronghold of Mods > #{game.name} > Testing > Tests #{tests_suite}" do |tests_suite_menu|
+                              CursesMenu.new(
+                                "Modsvaskr v#{Modsvaskr::VERSION} - Stronghold of Mods > #{game.name} > Testing > Tests #{tests_suite}",
+                                key_presses: key_presses
+                              ) do |tests_suite_menu|
                                 statuses_for_suite.each do |(test_name, test_status)|
                                   test_selected = selected_tests_suites.key?(tests_suite) && selected_tests_suites[tests_suite].key?(test_name)
                                   tests_suite_menu.item "[#{test_selected ? '*' : ' '}] #{test_name} - #{test_status} - #{tests_runner.test_info(tests_suite, test_name)[:name]}" do
@@ -145,7 +176,10 @@ module Modsvaskr
             end
           end
           main_menu.item 'See logs' do
-            CursesMenu.new 'Modsvaskr - Stronghold of Mods > Logs' do |logs_menu|
+            CursesMenu.new(
+              'Modsvaskr - Stronghold of Mods > Logs',
+              key_presses: key_presses
+            ) do |logs_menu|
               File.read(Logger.log_file).split("\n").each do |line|
                 logs_menu.item line
               end

data/lib/modsvaskr/version.rb

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

data/xedit_scripts/Modsvaskr_DumpInfo.pas

@@ -66,7 +66,7 @@ begin
   slCsv.SaveToFile(ProgramPath + 'Edit Scripts\Modsvaskr_ExportedDumpInfo.csv');
   slCsv.Free;
   AddMessage('Export done in ' + ProgramPath + 'Edit Scripts\Modsvaskr_ExportedDumpInfo.csv');
-  Application.Terminate;
+  // Application.Terminate;
   // ExitProcess(0);
   Result := 0;
 end;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modsvaskr
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Muriel Salvan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-23 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses_menu
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: elder_scrolls_plugin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
+- !ruby/object:Gem::Dependency
+  name: sem_ver_components
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
 description: Command-line UI handling a full Mods' ecosystem for Bethesda's games.
 email:
 - muriel@x-aeon.com
@@ -50,6 +106,7 @@ files:
 - lib/modsvaskr/config.rb
 - lib/modsvaskr/game.rb
 - lib/modsvaskr/games/skyrim_se.rb
+- lib/modsvaskr/in_game_tests_runner.rb
 - lib/modsvaskr/logger.rb
 - lib/modsvaskr/run_cmd.rb
 - lib/modsvaskr/tests_runner.rb
@@ -57,6 +114,7 @@ files:
 - lib/modsvaskr/tests_suites/exterior_cell.rb
 - lib/modsvaskr/tests_suites/interior_cell.rb
 - lib/modsvaskr/tests_suites/npc.rb
+- lib/modsvaskr/tests_suites/npc_head.rb
 - lib/modsvaskr/ui.rb
 - lib/modsvaskr/version.rb
 - lib/modsvaskr/xedit.rb
@@ -80,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: 'Stronghold for mods acting like companions: The Modsvaskr'