Merge branch 'main' into refactor/docs

Author: theskumar

src/dotenv/cli.py

@@ -214,9 +214,20 @@ def run_command(command: List[str], env: Dict[str, str]) -> None:
     if sys.platform == "win32":
         # execvpe on Windows returns control immediately
         # rather than once the command has finished.
-        p = Popen(command, universal_newlines=True, bufsize=0, shell=False, env=cmd_env)
+        try:
+            p = Popen(
+                command, universal_newlines=True, bufsize=0, shell=False, env=cmd_env
+            )
+        except FileNotFoundError:
+            print(f"Command not found: {command[0]}", file=sys.stderr)
+            sys.exit(1)
+
         _, _ = p.communicate()
 
         sys.exit(p.returncode)
     else:
-        os.execvpe(command[0], args=command, env=cmd_env)
+        try:
+            os.execvpe(command[0], args=command, env=cmd_env)
+        except FileNotFoundError:
+            print(f"Command not found: {command[0]}", file=sys.stderr)
+            sys.exit(1)

src/dotenv/main.py

@@ -461,6 +461,7 @@ def load_dotenv(
         verbose: Whether to output a warning the .env file is missing.
         override: Whether to override the system environment variables with the variables
             from the `.env` file.
+        interpolate: Whether to interpolate variables using POSIX variable expansion.
         encoding: Encoding to be used to read the file.
 
     Returns:
@@ -506,13 +507,12 @@ def dotenv_values(
     Keys declared without a value (e.g. bare ``FOO``) will have ``None`` as
     their dict value.
 
-    Args:
-        dotenv_path: Absolute or relative path to the ``.env`` file.
-        stream: Text stream with ``.env`` content, used if *dotenv_path* is
-            ``None``.
-        verbose: Whether to log a warning when the ``.env`` file is missing.
-        interpolate: Whether to resolve ``${VAR}`` references in values.
-        encoding: Encoding used to read the file.
+    Parameters:
+        dotenv_path: Absolute or relative path to the .env file.
+        stream: `StringIO` object with .env content, used if `dotenv_path` is `None`.
+        verbose: Whether to output a warning if the .env file is missing.
+        interpolate: Whether to interpolate variables using POSIX variable expansion.
+        encoding: Encoding to be used to read the file.
 
     If both *dotenv_path* and *stream* are ``None``, :func:`find_dotenv` is
     used to locate the ``.env`` file.

tests/test_cli.py

@@ -237,7 +237,21 @@ def test_run_without_cmd(tmp_path):
     assert "Invalid value for '-f'" in result.stderr
 
 
-def test_run_with_invalid_cmd(tmp_path):
+def test_run_with_invalid_cmd(dotenv_path, tmp_path):
+    result = run_dotenv(
+        ["--file", str(dotenv_path), "run", "i_do_not_exist"],
+        cwd=tmp_path,
+    )
+
+    check_process(result, exit_code=1)
+    assert "Command not found: i_do_not_exist" in result.stderr
+
+
+def test_run_with_env_missing_and_invalid_cmd(tmp_path):
+    """
+    Check that an .env file missing takes precedence over a command not found error.
+    """
+
     result = run_dotenv(["run", "i_do_not_exist"], cwd=tmp_path)
 
     check_process(result, exit_code=2)