Utilisation de pathlib

lib/tamarin.py

@@ -1,4 +1,4 @@
-import os, glob, subprocess, configparser, codecs, sys
+import os, glob, subprocess, configparser, codecs, sys, pathlib
 
 def run_profile_hooks(profile, step, **kwargs):
   hooks_dir = get_hooks_dir()
@@ -9,51 +9,57 @@ def run_profile_hooks(profile, step, **kwargs):
     trimmed_hook_name = hook_name.strip(' \t\n\r')
     if not trimmed_hook_name:
       continue
-    hook_path = os.path.join(hooks_dir, trimmed_hook_name)
+    hook_path = hooks_dir.joinpath(trimmed_hook_name)
     run([hook_path], **kwargs)
 
 def get_base_dir():
-  return os.path.realpath(os.path.dirname(os.path.abspath(__file__)) + "/..")
+  base_dir = pathlib.Path(__file__).absolute().parent.parent.resolve()
+  return base_dir
 
 def get_hooks_dir():
-  return os.path.realpath(os.path.dirname(os.path.abspath(__file__)) + "/../hooks")
+  hooks_dir = get_base_dir().joinpath('hooks')
+  return hooks_dir
 
 def get_lib_dir():
-  return os.path.realpath(os.path.dirname(os.path.abspath(__file__)) + "/../lib")
+  lib_dir = get_base_dir().joinpath('lib')
+  return lib_dir
 
 def get_utils_dir():
-  return os.path.realpath(os.path.dirname(os.path.abspath(__file__)) + "/../utils")
+  utils_dir = get_base_dir().joinpath('utils')
+  return utils_dir
+
+def get_profiles_dir():
+  profiles_dir = get_base_dir().joinpath('profiles')
+  return profiles_dir
+
+def get_workspace_dir():
+    """Return the absolute path to the tamarin workspace ($HOME/.tamarin)"""
+    home = pathlib.Path(os.environ["HOME"])
+    workspace_dir = home.joinpath('.tamarin')
+    return workspace_dir
+
+def get_workspace_subdir(subdir):
+    """Return the absolute path to a subdirectory in tamarin workspace"""
+    subdir_path = get_workspace_dir().joinpath(subdir)
+    subdir_path.mkdir(parents=True, exist_ok=True)
+    return subdir_path
 
 def load_profile(profile_name, debug=False):
   profile_filename = profile_name+".conf"
-  for profile_file in get_available_profiles():
+  profile_path = get_profiles_dir().joinpath(profile_filename)
-    if profile_filename == os.path.basename(profile_file):
+  if profile_path.exists():
     config = configparser.ConfigParser()
-      with codecs.open(profile_file, encoding = 'utf-8', mode = 'r') as handle:
+    with codecs.open(profile_path, encoding = 'utf-8', mode = 'r') as handle:
       config.read_file(handle)
       return config
   return None
 
-def get_profiles_dir():
-  return os.path.realpath(os.path.dirname(os.path.abspath(__file__)) + "/../profiles")
-
 def get_available_profiles():
-    return glob.glob(get_profiles_dir() + '/*.conf')
+  return get_profiles_dir().glob('*.conf')
 
 def get_available_profile_names():
     profile_files = get_available_profiles()
-    return [os.path.splitext(os.path.basename(f))[0] for f in profile_files]
+    return [p.stem for p in profile_files]
-
-def get_workspace_dir():
-    """Return the absolute path to the tamarin workspace ($HOME/.tamarin)"""
-    home = os.environ["HOME"]
-    return os.path.join(os.sep, home, '.tamarin')
-
-def get_workspace_subdir(subdir):
-    """Return the absolute path to a subdirectory in tamarin workspace"""
-    dir_path = os.path.join(os.sep, get_workspace_dir(), subdir)
-    os.makedirs(dir_path, exist_ok=True)
-    return dir_path
 
 def run(cmd, captureOutput=False, pty=False, debug=False, **kwargs):
     """Execute an arbitrary command on the system"""

package

@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 
-import argparse, sys, shutil, os, subprocess
+import argparse, sys, shutil, os, subprocess, pathlib
 
-sys.path.append(os.path.dirname(__file__) + '/lib')
+sys.path.append(pathlib.Path(__file__).parent.joinpath('lib').as_posix())
 
 import tamarin
 
@@ -28,18 +28,18 @@ def create_args_parser():
     return parser
 
 def build_image(build_workspace, base_image, profile_name, profile, debug=False, rebuild=False):
-    shutil.copytree(tamarin.get_base_dir(), os.path.join(build_workspace, '.tamarin'))
+    shutil.copytree(tamarin.get_base_dir(), build_workspace.joinpath('.tamarin'))
 
-    with open("{:s}/Dockerfile".format(build_workspace), 'w') as dockerfile:
+    with open(build_workspace.joinpath("Dockerfile"), 'w') as dockerfile:
         dockerfile.write("FROM {:s}\n".format(base_image))
         dockerfile.write("COPY .tamarin /tamarin\n")
 
     # Configure "containerbuild" hooks environment
     hooks_env = os.environ.copy()
-    hooks_env["PATH"] = os.environ['PATH'] + ':' + tamarin.get_lib_dir()
+    hooks_env["PATH"] = os.environ['PATH'] + ':' + tamarin.get_lib_dir().as_posix()
 
     # Run hooks
-    tamarin.run_profile_hooks(profile, 'containerbuild', cwd=build_workspace, env=hooks_env, debug=debug)
+    tamarin.run_profile_hooks(profile, 'containerbuild', cwd=build_workspace.as_posix(), env=hooks_env, debug=debug)
 
     image_tag = "tamarin:{:s}_{:s}_{:d}".format(profile_name, base_image.replace(':', '_'), os.getpid())
 
@@ -72,8 +72,9 @@ if __name__ == "__main__":
         cleanup(debug=args.debug)
 
     # Verify project directory
-    project_dir = os.path.abspath(args.project_directory)
+    project_dir = pathlib.Path(args.project_directory).absolute()
-    output_dir = os.path.abspath(args.output)
+    output_dir = pathlib.Path(args.output).absolute()
+    output_dir.mkdir(parents=True, exist_ok=True)
 
     # Load build profile
     profile = tamarin.load_profile(args.profile, debug=args.debug)
@@ -83,7 +84,7 @@ if __name__ == "__main__":
     pid = os.getpid()
     build_workspace = tamarin.get_workspace_subdir('tmp/build_{:d}'.format(pid))
 
-    shutil.copytree(tamarin.get_utils_dir(), os.path.join(build_workspace, 'utils'))
+    shutil.copytree(tamarin.get_utils_dir(), build_workspace.joinpath('utils'))
 
     base_image = args.base if args.base != '' else profile['profile']['default_image']
 
@@ -108,16 +109,16 @@ if __name__ == "__main__":
 
         # volumes definition
         docker_args += [
-            "-v", "{:s}:/src:ro".format(project_dir),
+            "-v", "{:s}:/src:z,ro".format(project_dir.as_posix()),
-            "-v", "{:s}:/dist".format(output_dir),
+            "-v", "{:s}:/dist:z".format(output_dir.as_posix()),
         ]
 
         if not args.no_lib_mounts:
             docker_args += [
-                "-v", "{:s}:/tamarin/hooks:ro".format(tamarin.get_hooks_dir()),
+                "-v", "{:s}:/tamarin/hooks:z,ro".format(tamarin.get_hooks_dir().as_posix()),
-                "-v", "{:s}:/tamarin/lib:ro".format(tamarin.get_lib_dir()),
+                "-v", "{:s}:/tamarin/lib:z,ro".format(tamarin.get_lib_dir().as_posix()),
-                "-v", "{:s}:/tamarin/profiles:ro".format(tamarin.get_profiles_dir()),
+                "-v", "{:s}:/tamarin/profiles:z,ro".format(tamarin.get_profiles_dir().as_posix()),
-                "-v", "{:s}:/tamarin/utils:ro".format(tamarin.get_utils_dir())
+                "-v", "{:s}:/tamarin/utils:z,ro".format(tamarin.get_utils_dir().as_posix())
             ]
 
         # Use environment proxy if defined