Added dummy message class for systems with python without tk

Also, included test requirements into tox file, and fixed docs.

README.rst

@@ -331,8 +331,6 @@ Options used:
 * ``wrapper_archive`` (optional) path to the whdload archive, defaults to same
   name as configuration file with some detected archive extension. Note, that
   name is case sensitive
-* ``wrapper_archiver`` (optional) archiver to use for storage save state -
-  default ``7z``.
 
 This module is solely used with whdload distributed games (not just whdload
 slave files, but whole games, which can be found on several places on the
@@ -365,7 +363,7 @@ where the minimum dependences are:
 - `WHDLoad`_ 18.9
 - `SetPatch`_ 43.6
 
-and the ``S/startup-sequence`` should at east contain:
+and the ``S/startup-sequence`` should at least contain:
 
 .. code::
 
@@ -379,8 +377,8 @@ To leverage more pleasant UX, additionally those bits should be installed (or -
 copied into base image filesystem):
 
 - ``Assign`` and whatever commands you'll be use in scripts from your copy of
-- `uaequit`_ - this will allow to quit emulator, after quiting game
   Workbench
+- `uaequit`_ - this will allow to quit emulator, after quiting game
 - `kgiconload`_ - tool for reading icon and executing *default tool* with
   optionally defined tool types as parameters (in this case: WHDLoad)
 - `SKick`_ optionally - for kickstart relocations. Also images of corresponding
@@ -509,7 +507,7 @@ And execution is as usual:
 
 Now, similar to the archive module, it will create temporary directory, unpack
 base image there, unpack WHDLoad game archive, search for slave file, and
-preapre ``s:whdload-startup``, and finally pass all the configuration to
+prepare ``s:whdload-startup``, and finally pass all the configuration to
 fs-uae.
 
 

fs_uae_wrapper/base.py

@@ -44,7 +44,7 @@ class Base(object):
         if not self._validate_options():
             return False
 
-        self.dir = tempfile.mkdtemp()
+        self.dir = tempfile.mkdtemp(prefix='fs-uae-wrapper-')
         self._normalize_options()
         self._set_assets_paths()
 

fs_uae_wrapper/nogui_message.py

@@ -0,0 +1,18 @@
+"""
+Display message as simple text on console
+"""
+import sys
+
+
+class Message:
+    """Just a fake message window for systems without TK"""
+
+    def __init__(self, msg):
+        self.msg = msg
+        self._process = None
+
+    def show(self):
+        sys.stdout.write(self.msg + "\n")
+
+    def close(self):
+        return None

fs_uae_wrapper/utils.py

@@ -8,7 +8,11 @@ import pathlib
 import shutil
 import subprocess
 
-from fs_uae_wrapper import file_archive, message
+from fs_uae_wrapper import file_archive
+try:
+    from fs_uae_wrapper.message import Message
+except ModuleNotFoundError:
+    from fs_uae_wrapper.nogui_message import Message
 
 
 class CmdOption(dict):
@@ -64,7 +68,7 @@ def operate_archive(arch_name, operation, text, params):
     if archiver is None:
         return False
 
-    msg = message.Message(text)
+    msg = Message(text)
     if text:
         msg.show()
 

fs_uae_wrapper/whdload.py

@@ -114,10 +114,10 @@ class Wrapper(base.ArchiveBase):
         # find proper way to handle slave
         # 1. check if there are user provided params
         contents = f"cd {slave_path}\n"
-        if self.fsuae_options.get('wrapper_whdload_options'):
+        if self.all_options.get('wrapper_whdload_options'):
             contents = (f"{contents}"
                         f"C:whdload "
-                        f"{self.fsuae_options['wrapper_whdload_options']} "
+                        f"{self.all_options['wrapper_whdload_options']} "
                         f"Slave={slave_fname}\n")
         else:
             # no params, find if kgiconload is available

pyproject.toml

@@ -1,11 +1,11 @@
 [build-system]
-requires = ["setuptools >= 61.0", "wheel", "setuptools-git-versioning"]
+requires = ["setuptools >= 77.0", "wheel", "setuptools-git-versioning"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "fs-uae-wrapper"
 authors = [{name = "Roman Dobosz", email = "gryf73@gmail.com"}]
-license = {text = "BSD"}
+license = "BSD-3-Clause"
 description = "Automate archives support and state saves for fs-uae"
 readme = "README.rst"
 requires-python = ">=3.8"
@@ -15,7 +15,6 @@ classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Environment :: Console",
     "Intended Audience :: End Users/Desktop",
-    "License :: OSI Approved :: BSD License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.8",
@@ -34,7 +33,7 @@ Homepage = "https://github.com/gryf/fs-uae-wrapper"
 fs-uae-wrapper = "fs_uae_wrapper.wrapper:run"
 
 [tool.setuptools]
-py-modules = ["fs_uae_wrapper"]
+packages = ["fs_uae_wrapper"]
 
 [tool.distutils.bdist_wheel]
 universal = true

test-requirements.txt

@@ -1,5 +0,0 @@
-pytest
-pytest-cov
-pytest-pep8
-coverage
-flake8

tests/test_message.py

@@ -2,6 +2,7 @@ import os
 from unittest import TestCase, mock
 
 from fs_uae_wrapper import message
+from fs_uae_wrapper import nogui_message
 
 if os.environ.get('DISPLAY'):
     import tkinter as tk
@@ -38,6 +39,19 @@ class TestMessage(TestCase):
         msg._process.join.assert_called_once()
 
 
+class TestNOPMessage(TestCase):
+
+    @mock.patch('sys.stdout.write')
+    def test_show(self, stdout_write):
+        msg = nogui_message.Message('display that')
+        msg.show()
+        stdout_write.assert_called_once()
+
+    def test_close(self):
+        msg = nogui_message.Message('display that')
+        self.assertIsNone(msg.close())
+
+
 if os.environ.get('DISPLAY'):
     # Tkinter needs graphic environment for the widgets
     class TestSpawn(TestCase):

tests/test_whdload.py

@@ -225,7 +225,7 @@ class TestWHDLoad(TestCase):
         listdir.return_value = contents
         wrapper = whdload.Wrapper('Config.fs-uae', utils.CmdOption(), {})
         whdl_opts = 'Preload SplashDelay=0 MMU PAL'
-        wrapper.fsuae_options['wrapper_whdload_options'] = whdl_opts
+        wrapper.all_options['wrapper_whdload_options'] = whdl_opts
         with mock.patch('builtins.open', _open):
             self.assertTrue(wrapper._find_slave())
         handle = _open()

tox.ini

@@ -8,7 +8,12 @@ usedevelop=True
 setenv = COVERAGE_FILE = .coverage
 commands = py.test --cov=fs_uae_wrapper --cov-report=term-missing
 
-deps = -r{toxinidir}/test-requirements.txt
+deps =
+    pytest
+    pytest-cov
+    pytest-pep8
+    coverage
+    flake8
 
 [testenv:py3-flake8]
 basepython = python3