modsvaskr 0.1.12 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c41c160023d7591e52e7b93fde57bc33462627d61714384aa3051c8f8052f99
-  data.tar.gz: 4e30b5822a983d6e57772ba65e19d7b8b657163c5b3c4d275bb55a61376c9e2c
+  metadata.gz: 6caea974a5397c715e9db769996a3f54743087b12fbdacb99afd362ade4f8ede
+  data.tar.gz: 8af266d6861b5a3b8c44b0ddbb9d73771b6afe731edd0637d27f4426d7552119
 SHA512:
-  metadata.gz: 61ced31f7a9f75bb9679e47045cdfd38d6071f1eb91587cab8a3aa83c8c6d2de559402e3995b65f020a1acf6ce31d2ca96e31341960906c87f0717991a669f1e
-  data.tar.gz: c7e3610bc8f62f290fa586e66489f5f4e69b40942814a0ba56237716c925cb5ee7878152f58f9dfc94746242d84dd48bd67f96a37e903db3169cafd19ee2f533
+  metadata.gz: 55f3a256e428d8ac50dce938915f0eb4910f6b9281a56ef69eb140556a7d41058d431cc28520bfe982e859be4e083afedbe39f9d7897caf6ad7f952672b61ced
+  data.tar.gz: e444a4bc0e219245a3b29ce9d01183f64792fbed1d6e4fe7e8a09cffa124577a19af100309e85b237315bd6d3c5b46544507989e9f08e8ac542f7b04386eb6ec

data/lib/modsvaskr/config.rb

@@ -15,14 +15,14 @@ module Modsvaskr
       @config = YAML.safe_load(File.read(file)) || {}
       # Parse all game types plugins
       # Hash<Symbol, Class>
-      @game_types = Dir.glob("#{__dir__}/games/*.rb").map do |game_type_file|
+      @game_types = Dir.glob("#{__dir__}/games/*.rb").to_h do |game_type_file|
         require game_type_file
         base_name = File.basename(game_type_file, '.rb')
         [
           base_name.to_sym,
           Games.const_get(base_name.split('_').collect(&:capitalize).join.to_sym)
         ]
-      end.to_h
+      end
     end
 
     # Get the games list

data/lib/modsvaskr/games/skyrim_se.rb

@@ -50,6 +50,10 @@ module Modsvaskr
           dawnguard.esm
           hearthfires.esm
           dragonborn.esm
+          ccbgssse001-fish.esm
+          ccqdrsse001-survivalmode.esl
+          ccbgssse037-curios.esl
+          ccbgssse025-advdsgs.esm
         ]
       end
 
@@ -60,7 +64,7 @@ module Modsvaskr
       # * Array<String>: List of all active plugins, including masters
       def read_load_order
         game_esps +
-          File.read("#{ENV['USERPROFILE']}/AppData/Local/Skyrim Special Edition/plugins.txt").split("\n").map do |line|
+          File.read("#{ENV.fetch('USERPROFILE')}/AppData/Local/Skyrim Special Edition/plugins.txt").split("\n").map do |line|
             line =~ /^\*(.+)$/ ? Regexp.last_match(1).downcase : nil
           end.compact
       end

data/lib/modsvaskr/in_game_tests_runner.rb

@@ -54,7 +54,7 @@ module Modsvaskr
     def run(selected_tests)
       unknown_tests_suites = selected_tests.keys - @available_tests_suites
       log "[ In-game testing #{@game.name} ] - !!! The following in-game tests suites are not supported: #{unknown_tests_suites.join(', ')}" unless unknown_tests_suites.empty?
-      tests_to_run = selected_tests.reject { |tests_suite, _tests| unknown_tests_suites.include?(tests_suite) }
+      tests_to_run = selected_tests.except(*unknown_tests_suites)
       return if tests_to_run.empty?
 
       FileUtils.mkdir_p "#{@game.path}/Data/SKSE/Plugins/StorageUtilData"
@@ -171,7 +171,7 @@ module Modsvaskr
             # Check for which reason the game has stopped, and eventually end the testing session.
             # Careful as this JSON file can be written by Papyrus that treat strings as case insensitive.
             # cf. https://github.com/xanderdunn/skaar/wiki/Common-Tasks
-            auto_test_config = JSON.parse(File.read(auto_test_config_file))['string'].map { |key, value| [key.downcase, value.downcase] }.to_h
+            auto_test_config = JSON.parse(File.read(auto_test_config_file))['string'].to_h { |key, value| [key.downcase, value.downcase] }
             if auto_test_config['stopped_by'] == 'user'
               log "[ In-game testing #{@game.name} ] - Tests have been stopped by user."
               break
@@ -199,12 +199,12 @@ module Modsvaskr
                 File.write(
                   "#{@game.path}/Data/SKSE/Plugins/StorageUtilData/AutoTest_#{first_tests_suite_to_run}_Statuses.json",
                   JSON.pretty_generate(
-                    'string' => ((last_test_statuses[first_tests_suite_to_run] || []) + [[first_test_to_run, '']]).map do |(test_name, test_status)|
+                    'string' => ((last_test_statuses[first_tests_suite_to_run] || []) + [[first_test_to_run, '']]).to_h do |(test_name, test_status)|
                       [
                         test_name,
                         test_name == first_test_to_run ? 'failed_ctd' : test_status
                       ]
-                    end.to_h
+                    end
                   )
                 )
                 # Notify the callbacks updating test statuses

data/lib/modsvaskr/tests_runner.rb

@@ -21,14 +21,14 @@ module Modsvaskr
       @config = config
       @game = game
       # Parse tests suites
-      @tests_suites = Dir.glob("#{__dir__}/tests_suites/*.rb").map do |tests_suite_file|
+      @tests_suites = Dir.glob("#{__dir__}/tests_suites/*.rb").to_h do |tests_suite_file|
         tests_suite = File.basename(tests_suite_file, '.rb').to_sym
         require "#{__dir__}/tests_suites/#{tests_suite}.rb"
         [
           tests_suite,
           TestsSuites.const_get(tests_suite.to_s.split('_').collect(&:capitalize).join.to_sym).new(tests_suite, @game)
         ]
-      end.to_h
+      end
       @tests_info_file = "#{@game.path}/Data/Modsvaskr/Tests/TestsInfo.json"
     end
 
@@ -136,7 +136,7 @@ module Modsvaskr
           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,
+            tests_suite:,
             in_game_tests: selected_in_game_tests_downcase,
             selected_tests: suite_selected_tests
           }
@@ -175,12 +175,12 @@ module Modsvaskr
       unless defined?(@tests_info_cache)
         @tests_info_cache =
           if File.exist?(@tests_info_file)
-            JSON.parse(File.read(@tests_info_file)).map do |tests_suite_str, tests_suite_info|
+            JSON.parse(File.read(@tests_info_file)).to_h do |tests_suite_str, tests_suite_info|
               [
                 tests_suite_str.to_sym,
                 tests_suite_info.transform_values { |test_info| test_info.transform_keys(&:to_sym) }
               ]
-            end.to_h
+            end
           else
             {}
           end

data/lib/modsvaskr/tests_suite.rb

@@ -52,7 +52,7 @@ module Modsvaskr
 
     # Remove all tests from this suite
     def clear_tests
-      File.unlink(json_statuses_file) if File.exist?(json_statuses_file)
+      FileUtils.rm_f(json_statuses_file)
     end
 
     private

data/lib/modsvaskr/tests_suites/interior_cell.rb

@@ -46,14 +46,14 @@ module Modsvaskr
           flatten.
           sort.
           uniq.
-          map do |cell_name|
+          to_h do |cell_name|
             [
               cell_name,
               {
                 name: "Load cell #{cell_name}"
               }
             ]
-          end.to_h
+          end
       end
 
     end

data/lib/modsvaskr/ui.rb

@@ -45,13 +45,13 @@ module Modsvaskr
       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
+        key_presses:
       ) do |main_menu|
         @config.games.each do |game|
           main_menu.item "#{game.name} (#{game.path})" do
             CursesMenu.new(
               "Modsvaskr v#{Modsvaskr::VERSION} - Stronghold of Mods > #{game.name}",
-              key_presses: key_presses
+              key_presses:
             ) do |game_menu|
               game_menu.item 'Testing' do
                 # Read tests info
@@ -61,7 +61,7 @@ module Modsvaskr
                 selected_tests_suites = {}
                 CursesMenu.new(
                   "Modsvaskr v#{Modsvaskr::VERSION} - Stronghold of Mods > #{game.name} > Testing",
-                  key_presses: key_presses
+                  key_presses:
                 ) do |test_menu|
                   tests_runner.tests_suites.each do |tests_suite|
                     statuses_for_suite = tests_runner.statuses_for(tests_suite)
@@ -83,7 +83,7 @@ module Modsvaskr
                           execute: proc do
                             CursesMenu.new(
                               "Modsvaskr v#{Modsvaskr::VERSION} - Stronghold of Mods > #{game.name} > Testing > Tests #{tests_suite}",
-                              key_presses: 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)
@@ -110,7 +110,7 @@ module Modsvaskr
                       if all_tests_selected
                         selected_tests_suites.delete(tests_suite)
                       else
-                        selected_tests_suites[tests_suite] = statuses_for_suite.map { |(test_name, _test_status)| [test_name, nil] }.to_h
+                        selected_tests_suites[tests_suite] = statuses_for_suite.to_h { |(test_name, _test_status)| [test_name, nil] }
                       end
                       :menu_refresh
                     end
@@ -179,7 +179,7 @@ module Modsvaskr
         main_menu.item 'See logs' do
           CursesMenu.new(
             'Modsvaskr - Stronghold of Mods > Logs',
-            key_presses: key_presses
+            key_presses:
           ) do |logs_menu|
             File.read(Logger.log_file).split("\n").each do |line|
               logs_menu.item line

data/lib/modsvaskr/version.rb

@@ -1,5 +1,5 @@
 module Modsvaskr
 
-  VERSION = '0.1.12'
+  VERSION = '0.2.0'
 
 end

data/lib/modsvaskr/xedit.rb

@@ -53,11 +53,11 @@ module Modsvaskr
     #
     # Parameters::
     # * *csv* (String): Name of the CSV file (from Edit Scripts), without .csv
-    # * *row_block* (Proc): Code called for each CSV row
+    # * Proc: Code called for each CSV row
     #   Parameters::
     #   * *row* (Array<String>): CSV row
-    def parse_csv(csv, &row_block)
-      CSV.parse(Encoding.to_utf_8(File.read("#{install_path}/Edit Scripts/#{csv}.csv", mode: 'rb'))).each(&row_block)
+    def parse_csv(csv, &)
+      CSV.parse(Encoding.to_utf_8(File.read("#{install_path}/Edit Scripts/#{csv}.csv", mode: 'rb'))).each(&)
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modsvaskr
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.2.0
 platform: ruby
 authors:
 - Muriel Salvan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-18 00:00:00.000000000 Z
+date: 2022-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses_menu
@@ -44,42 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.18'
 - !ruby/object:Gem::Dependency
   name: sem_ver_components
   requirement: !ruby/object:Gem::Requirement
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '1.41'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '1.41'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.16'
 description: Command-line UI handling a full Mods' ecosystem for Bethesda's games.
 email:
 - muriel@x-aeon.com
@@ -152,7 +152,8 @@ files:
 homepage: https://github.com/Muriel-Salvan/modsvaskr
 licenses:
 - BSD-3-Clause
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -161,14 +162,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: 'Stronghold for mods acting like companions: The Modsvaskr'