diff options
| -rw-r--r-- | taskipy/task.py | 20 | ||||
| -rw-r--r-- | taskipy/task_runner.py | 6 | ||||
| -rw-r--r-- | tests/test_taskipy.py | 32 |
3 files changed, 48 insertions, 10 deletions
diff --git a/taskipy/task.py b/taskipy/task.py index c812c42..61fd718 100644 --- a/taskipy/task.py +++ b/taskipy/task.py @@ -1,3 +1,5 @@ +from typing import Optional + from taskipy.exceptions import MalformedTaskError @@ -9,29 +11,31 @@ class Task: self.__task_use_vars = self.__extract_task_use_vars(task_toml_contents) @property - def name(self): + def name(self) -> str: return self.__task_name @property - def command(self): + def command(self) -> str: return self.__task_command @property - def description(self): + def description(self) -> str: return self.__task_description @property - def use_vars(self): + def use_vars(self) -> Optional[bool]: return self.__task_use_vars - def __extract_task_use_vars(self, task_toml_contents: object) -> bool: + def __extract_task_use_vars(self, task_toml_contents: object) -> Optional[bool]: if isinstance(task_toml_contents, str): - return False + return None + if isinstance(task_toml_contents, dict): - value = task_toml_contents.get('use_vars', False) - if not isinstance(value, bool): + value = task_toml_contents.get('use_vars') + if value is not None and not isinstance(value, bool): 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 }') def __extract_task_command(self, task_toml_contents: object) -> str: diff --git a/taskipy/task_runner.py b/taskipy/task_runner.py index 0a72225..561427e 100644 --- a/taskipy/task_runner.py +++ b/taskipy/task_runner.py @@ -134,8 +134,10 @@ class TaskRunner: return nonrecursive_vars, recursive_vars - def __format_task_command(self, task: Task, variables: Optional[dict]) -> str: - if task.use_vars or self.__project.settings.get('use_vars'): + def __format_task_command(self, task: Task, variables: dict) -> str: + if task.use_vars or ( + task.use_vars is None and self.__project.settings.get('use_vars') + ): try: return task.command.format(**variables) except KeyError as e: diff --git a/tests/test_taskipy.py b/tests/test_taskipy.py index 9cf680a..a9d0b2c 100644 --- a/tests/test_taskipy.py +++ b/tests/test_taskipy.py @@ -554,6 +554,38 @@ class UseVarsTestCase(TaskipyTestCase): self.assertSubstr('hello John Doe :', stdout) self.assertEqual(exit_code, 0) + def test_use_vars_setting_override_to_false(self): + py_project_toml = ''' + [tool.taskipy.settings] + use_vars = true + + [tool.taskipy.variables] + name = "John Doe" + + [tool.taskipy.tasks] + echo = { cmd = "echo hello {name}:", use_vars = false } + ''' + cwd = self.create_test_dir_with_py_project_toml(py_project_toml) + exit_code, stdout, _ = self.run_task('echo', cwd=cwd) + self.assertSubstr('hello {name}:', stdout) + self.assertEqual(exit_code, 0) + + def test_use_vars_setting_override_to_true(self): + py_project_toml = ''' + [tool.taskipy.settings] + use_vars = false + + [tool.taskipy.variables] + name = "John Doe" + + [tool.taskipy.tasks] + echo = { cmd = "echo hello {name}:", use_vars = true } + ''' + cwd = self.create_test_dir_with_py_project_toml(py_project_toml) + exit_code, stdout, _ = self.run_task('echo', cwd=cwd) + self.assertSubstr('hello John Doe:', stdout) + self.assertEqual(exit_code, 0) + class RecursiveVariablesTestCase(TaskipyTestCase): def test_recursive_variables_can_use_other_variables(self): |