Move abspath() to file_utils (#1769)

Co-authored-by: Clément Martin <[email protected]>
Co-authored-by: Sorin Sbarnea <[email protected]>

Author: 3 people

src/ansiblelint/cli.py

@@ -16,7 +16,12 @@
     DEFAULT_RULESDIR,
     INVALID_CONFIG_RC,
 )
-from ansiblelint.file_utils import expand_path_vars, guess_project_dir, normpath
+from ansiblelint.file_utils import (
+    abspath,
+    expand_path_vars,
+    guess_project_dir,
+    normpath,
+)
 
 _logger = logging.getLogger(__name__)
 _PATH_VARS = [
@@ -25,22 +30,6 @@
 ]
 
 
-def abspath(path: str, base_dir: str) -> str:
-    """Make relative path absolute relative to given directory.
-
-    Args:
-       path (str): the path to make absolute
-       base_dir (str): the directory from which make \
-                       relative paths absolute
-    """
-    if not os.path.isabs(path):
-        # Don't use abspath as it assumes path is relative to cwd.
-        # We want it relative to base_dir.
-        path = os.path.join(base_dir, path)
-
-    return os.path.normpath(path)
-
-
 def expand_to_normalized_paths(
     config: Dict[str, Any], base_dir: Optional[str] = None
 ) -> None:

src/ansiblelint/file_utils.py

@@ -28,6 +28,22 @@
 _logger = logging.getLogger(__package__)
 
 
+def abspath(path: str, base_dir: str) -> str:
+    """Make relative path absolute relative to given directory.
+
+    Args:
+       path (str): the path to make absolute
+       base_dir (str): the directory from which make \
+                       relative paths absolute
+    """
+    if not os.path.isabs(path):
+        # Don't use abspath as it assumes path is relative to cwd.
+        # We want it relative to base_dir.
+        path = os.path.join(base_dir, path)
+
+    return os.path.normpath(path)
+
+
 def normpath(path: Union[str, BasePathLike]) -> str:
     """
     Normalize a path in order to provide a more consistent output.

test/TestRunner.py

@@ -23,8 +23,7 @@
 import pytest
 
 from ansiblelint import formatters
-from ansiblelint.cli import abspath
-from ansiblelint.file_utils import Lintable
+from ansiblelint.file_utils import Lintable, abspath
 from ansiblelint.rules import RulesCollection
 from ansiblelint.runner import Runner