diff options
Diffstat (limited to '')
| -rw-r--r-- | task.bat | 1 | ||||
| -rw-r--r-- | taskipy/pyproject.py | 8 | ||||
| -rw-r--r-- | taskipy/task.py | 23 | ||||
| -rw-r--r-- | taskipy/task_runner.py | 20 |
4 files changed, 44 insertions, 8 deletions
diff --git a/task.bat b/task.bat new file mode 100644 index 0000000..3be1261 --- /dev/null +++ b/task.bat @@ -0,0 +1 @@ +python %~dp0taskipy\cli.py %*
diff --git a/taskipy/pyproject.py b/taskipy/pyproject.py index 1ffcb3e..e7fd74e 100644 --- a/taskipy/pyproject.py +++ b/taskipy/pyproject.py @@ -16,8 +16,8 @@ from taskipy.exceptions import ( class PyProject: def __init__(self, base_dir: Path): - pyproject_path = PyProject.__find_pyproject_path(base_dir) - self.__items = PyProject.__load_toml_file(pyproject_path) + self.__pyproject_path = PyProject.__find_pyproject_path(base_dir) + self.__items = PyProject.__load_toml_file(self.__pyproject_path) @property def tasks(self) -> Dict[str, Task]: @@ -33,6 +33,10 @@ class PyProject: return tasks @property + def dirpath(self) -> Path: + return self.__pyproject_path.parent + + @property def variables(self) -> Dict[str, Variable]: try: toml_vars = self.__items['tool']['taskipy'].get('variables', {}) diff --git a/taskipy/task.py b/taskipy/task.py index 61fd718..a065fd8 100644 --- a/taskipy/task.py +++ b/taskipy/task.py @@ -9,6 +9,7 @@ class Task: self.__task_command = self.__extract_task_command(task_toml_contents) self.__task_description = self.__extract_task_description(task_toml_contents) self.__task_use_vars = self.__extract_task_use_vars(task_toml_contents) + self.__task_workdir = self.__extract_task_workdir(task_toml_contents) @property def name(self) -> str: @@ -19,6 +20,10 @@ class Task: return self.__task_command @property + def workdir(self) -> Optional[str]: + return self.__task_workdir + + @property def description(self) -> str: return self.__task_description @@ -36,7 +41,7 @@ class Task: raise MalformedTaskError(self.__task_name, f'task\'s "use_vars" arg has to be bool type got {type(value)}') return value - raise MalformedTaskError(self.__task_name, 'tasks must be strings, or dicts that contain { cmd, help, use_vars }') + raise MalformedTaskError(self.__task_name, 'tasks must be strings, or dicts that contain { cmd, cwd, help, use_vars }') def __extract_task_command(self, task_toml_contents: object) -> str: if isinstance(task_toml_contents, str): @@ -48,7 +53,19 @@ class Task: except KeyError: raise MalformedTaskError(self.__task_name, 'the task item does not have the "cmd" property') - raise MalformedTaskError(self.__task_name, 'tasks must be strings, or dicts that contain { cmd, help, use_vars }') + raise MalformedTaskError(self.__task_name, 'tasks must be strings, or dicts that contain { cmd, cwd, help, use_vars }') + + def __extract_task_workdir(self, task_toml_contents: object) -> Optional[str]: + if isinstance(task_toml_contents, str): + return None + + if isinstance(task_toml_contents, dict): + value = task_toml_contents.get('cwd') + if value is not None and not isinstance(value, str): + raise MalformedTaskError(self.__task_name, f'task\'s "cwd" arg has to be str type got {type(value)}') + return value + + raise MalformedTaskError(self.__task_name, 'tasks must be strings, or dicts that contain { cmd, cwd, help, use_vars }') def __extract_task_description(self, task_toml_contents: object) -> str: if isinstance(task_toml_contents, str): @@ -60,4 +77,4 @@ class Task: except KeyError: return '' - raise MalformedTaskError(self.__task_name, 'tasks must be strings, or dicts that contain { cmd, help, use_vars}') + raise MalformedTaskError(self.__task_name, 'tasks must be strings, or dicts that contain { cmd, cwd, help, use_vars }') diff --git a/taskipy/task_runner.py b/taskipy/task_runner.py index ab81012..d9cd6f4 100644 --- a/taskipy/task_runner.py +++ b/taskipy/task_runner.py @@ -23,9 +23,9 @@ else: class TaskRunner: def __init__(self, cwd: Union[str, Path]): - working_dir = cwd if isinstance(cwd, Path) else Path(cwd) - self.__working_dir = working_dir - self.__project = PyProject(working_dir) + cwd_as_path = cwd if isinstance(cwd, Path) else Path(cwd) + self.__project = PyProject(cwd_as_path) + self.__working_dir = self.__get_working_dir() or cwd_as_path def list(self): """lists tasks to stdout""" @@ -34,6 +34,7 @@ class TaskRunner: def run(self, task_name: str, args: List[str]) -> int: pre_command, command, post_command = self.__get_formatted_commands(task_name) + self.__working_dir = self.__get_working_dir(task_name) or self.__working_dir if pre_command is not None: exit_code = self.__run_command_and_return_exit_code(pre_command) @@ -194,3 +195,16 @@ class TaskRunner: process.send_signal(signum) return signal_handler + + def __get_working_dir(self, task_name: Optional[str] = None) -> Optional[Path]: + cwd: Optional[str] = self.__project.settings.get("cwd", None) + + if task_name is not None: + cwd = self.__project.tasks[task_name].workdir or cwd + + if cwd is not None: + path = self.__project.dirpath / cwd + if path.exists(): + return path + + return None |