ppqs 2.5.2__tar.gz → 2.6.1__tar.gz

{ppqs-2.5.2/src/ppqs.egg-info → ppqs-2.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ppqs
-Version: 2.5.2
+Version: 2.6.1
 Summary: Python project quick scripts
 Author-email: Karl Wette <karl.wette@anu.edu.au>
 License-Expression: MIT

{ppqs-2.5.2 → ppqs-2.6.1}/pyproject.toml

@@ -52,6 +52,7 @@ convention = "google"
 
 [tool.pytest.ini_options]
 minversion = "6.0"
+pythonpath = ["src"]
 addopts = "--cov=py_proj_quick_scripts --cov-report=term-missing --cov-fail-under=100"
 testpaths = ["test"]
 

{ppqs-2.5.2 → ppqs-2.6.1/src/ppqs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ppqs
-Version: 2.5.2
+Version: 2.6.1
 Summary: Python project quick scripts
 Author-email: Karl Wette <karl.wette@anu.edu.au>
 License-Expression: MIT

{ppqs-2.5.2 → ppqs-2.6.1}/src/py_proj_quick_scripts/__init__.py

@@ -19,14 +19,12 @@ else:  # pragma: no cover
     import tomli as tomllib
 
 __author__ = "Karl Wette"
-__version__ = "2.5.2"
+__version__ = "2.6.1"
 
 
 class MissingPyProjectError(Exception):
     """Raise if 'pyproject.toml' could not be found."""
 
-    pass
-
 
 class InvalidScriptError(Exception):
     """Raise for invalid 'pyproject.toml' script errors."""
@@ -41,6 +39,10 @@ class InvalidScriptError(Exception):
         return f"{self.pyproject_path}: {self.msg}"
 
 
+class InvalidScriptCallError(InvalidScriptError):
+    """Raise for invalid calls of 'pyproject.toml' scripts."""
+
+
 def find_pyproject():
     """Look for pyproject.toml in current/parent directories."""
 
@@ -228,15 +230,25 @@ def print_help(project_name, scripts):
     print(help_header + list_of_scripts + f"\n\nppqs version: {__version__}")
 
 
-def run_script(scripts, script_name, argv, cwd, has_been_run):
+def run_script(pyproject_path, scripts, script_name, argv, cwd, has_been_run):
     """Run a script."""
 
     col_width = shutil.get_terminal_size().columns
 
-    # Mark script has having been run
+    # Mark script as having been run
     has_been_run.add(script_name)
 
+    # Get script
     script = scripts[script_name]
+
+    # Check that script was correctly passed arguments
+    script_takes_argv = any("..." in command for command in script["commands"])
+    if not script_takes_argv and len(argv) > 0:
+        msg = "script '{}' does not take arguments ('{}')".format(
+            script_name, "', '".join(argv)
+        )
+        raise InvalidScriptCallError(pyproject_path, msg)
+
     for command in script["commands"]:
         cmd = []
 
@@ -245,7 +257,9 @@ def run_script(scripts, script_name, argv, cwd, has_been_run):
                 if "*" in arg.parts[-1]:
 
                     # Expand wildcards in last path element
-                    cmd.extend(sorted(glob.glob(str(arg), recursive=False)))
+                    cmd.extend(
+                        sorted(glob.glob(str(arg), root_dir=cwd, recursive=False))
+                    )
 
                 else:
                     cmd.append(str(arg))
@@ -264,7 +278,9 @@ def run_script(scripts, script_name, argv, cwd, has_been_run):
             # - silently ignore scripts which have already been run
             script_name_r = cmd[1]
             if script_name_r not in has_been_run:
-                run_script(scripts, script_name_r, cmd[2:], cwd, has_been_run)
+                run_script(
+                    pyproject_path, scripts, script_name_r, cmd[2:], cwd, has_been_run
+                )
             continue
 
         elif cmd[0] == "python":
@@ -376,4 +392,4 @@ def cli(*argv):
         else:
             cwd = pyproject_path.parent
             has_been_run = set()
-            run_script(scripts, argv[0], argv[1:], cwd, has_been_run)
+            run_script(pyproject_path, scripts, argv[0], argv[1:], cwd, has_been_run)

{ppqs-2.5.2 → ppqs-2.6.1}/test/test_cli.py

@@ -8,7 +8,7 @@ import os
 
 import pytest
 
-from py_proj_quick_scripts import InvalidScriptError, cli
+from py_proj_quick_scripts import InvalidScriptCallError, InvalidScriptError, cli
 
 from . import in_dir, write_file
 
@@ -120,5 +120,8 @@ def test_recursion(pyproject_path, capfd):
         assert captured.out == "Hello friend!\nGoodbye\n"
         assert captured.err == ""
 
+        with pytest.raises(InvalidScriptCallError):
+            cli("farewell", "someone")
+
         with pytest.raises(InvalidScriptError):
             cli("no-script")