jolt 0.9.343__tar.gz → 0.9.347__tar.gz

{jolt-0.9.343 → jolt-0.9.347}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jolt
-Version: 0.9.343
+Version: 0.9.347
 Summary: A task executor
 Home-page: https://github.com/srand/jolt
 Author: Robert Andersson

{jolt-0.9.343 → jolt-0.9.347}/jolt/plugins/git.py

@@ -1,6 +1,7 @@
 import os
 import pygit2
 import re
+from threading import RLock
 import urllib.parse
 
 from jolt.tasks import BooleanParameter, Export, Parameter, TaskRegistry, WorkspaceResource
@@ -20,6 +21,13 @@ from jolt.error import raise_task_error_if
 log.verbose("[Git] Loaded")
 
 
+def locked(func):
+    def _f(self, *args, **kwargs):
+        with self._lock:
+            return func(self, *args, **kwargs)
+    return _f
+
+
 class GitRepository(object):
     def __init__(self, url, path, relpath, refspecs=None):
         self.path = path
@@ -35,6 +43,7 @@ class GitRepository(object):
         self._tree_hash = {}
         self._original_head = True
         self._last_rev = None
+        self._lock = RLock()
         self._init_repo()
 
     def _init_repo(self):
@@ -68,6 +77,7 @@ class GitRepository(object):
     def is_indexed(self):
         return self.is_cloned() and fs.path.exists(self._git_index())
 
+    @locked
     def clone(self):
         log.info("Cloning into {0}", self.path)
 
@@ -117,6 +127,7 @@ class GitRepository(object):
             "Failed to clone repository '{0}'", self.relpath)
 
     @utils.cached.instance
+    @locked
     def diff_unchecked(self):
         if not self.is_indexed():
             return ""
@@ -130,6 +141,7 @@ class GitRepository(object):
                                   output_on_error=True,
                                   output_rstrip=False)
 
+    @locked
     def diff(self):
         diff = self.diff_unchecked()
         dlim = config.getsize("git", "maxdiffsize", "1 MiB")
@@ -139,6 +151,7 @@ class GitRepository(object):
             .format(self.relpath, len(diff), dlim))
         return diff
 
+    @locked
     def patch(self, patch):
         if not patch:
             return
@@ -149,6 +162,7 @@ class GitRepository(object):
             log.info("Applying patch to {0}", self.path)
             self.tools.run("git apply --whitespace=nowarn {patchfile}", patchfile=patchfile)
 
+    @locked
     def head(self):
         if not self.is_cloned():
             return None
@@ -192,6 +206,7 @@ class GitRepository(object):
                 output_on_error=True)
         return tree
 
+    @locked
     def tree_hash(self, rev=None, path="/"):
         # When rev is None, the caller want the tree hash of the repository's
         # current workspace state. If no checkout has been made, that would be the
@@ -231,14 +246,17 @@ class GitRepository(object):
 
         return value
 
+    @locked
     def clean(self):
         with self.tools.cwd(self.path):
             return self.tools.run("git clean -dfx", output_on_error=True)
 
+    @locked
     def reset(self):
         with self.tools.cwd(self.path):
             return self.tools.run("git reset --hard", output_on_error=True)
 
+    @locked
     def fetch(self, commit=None):
         if commit and not self.is_valid_sha(commit):
             commit = None
@@ -252,6 +270,7 @@ class GitRepository(object):
                 what=commit or refspec or '',
                 output_on_error=True)
 
+    @locked
     def checkout(self, rev, commit=None):
         if rev == self._last_rev:
             log.debug("Checkout skipped, already @ {}", rev)
@@ -428,6 +447,7 @@ class Git(WorkspaceResource, FileInfluence):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+        self._lock = RLock()
         self.joltdir = JoltLoader.get().joltdir
 
         # Set the path to the repo
@@ -502,6 +522,7 @@ class Git(WorkspaceResource, FileInfluence):
         if force or self._must_influence() or self._revision.is_imported:
             self._acquire_ws()
 
+    @locked
     def _acquire_ws(self):
         commit = None
         if not self.git.is_cloned():

{jolt-0.9.343 → jolt-0.9.347}/jolt/plugins/ninja.py

@@ -100,8 +100,8 @@ class attributes:
                     self.info("Collecting coverage data into {covdatadir}")
 
                     for _, artifact in deps.items():
-                        if str(artifact.paths.coverage_data):
-                            tools.copy(artifact.paths.coverage_data, self.covdatadir)
+                        if artifact.paths.coverage_data:
+                            tools.copy(str(artifact.paths.coverage_data), self.covdatadir)
 
                     with tools.environ(GCOV_PREFIX=self.covdatadir):
                         yield
@@ -196,8 +196,8 @@ class attributes:
                     if not hasattr(self, "covdatadir"):
                         self.covdatadir = tools.builddir("coverage-data")
                         for _, artifact in deps.items():
-                            if str(artifact.paths.coverage_data):
-                                tools.copy(artifact.paths.coverage_data, self.covdatadir)
+                            if artifact.paths.coverage_data:
+                                tools.copy(str(artifact.paths.coverage_data), self.covdatadir)
 
                     with tools.cwd(self.covdatadir):
                         datafiles = tools.glob("**/*.gcda")
@@ -359,8 +359,8 @@ class attributes:
                     if not hasattr(self, "covdatadir"):
                         self.covdatadir = tools.builddir("coverage-data")
                         for _, artifact in deps.items():
-                            if str(artifact.paths.coverage_data):
-                                tools.copy(artifact.paths.coverage_data, self.covdatadir)
+                            if artifact.paths.coverage_data:
+                                tools.copy(str(artifact.paths.coverage_data), self.covdatadir)
 
                     reportdir = tools.builddir("coverage-report-lcov")
                     htmldir = tools.builddir("coverage-report-lcov-html")
@@ -412,7 +412,7 @@ class attributes:
 
                     reports = []
                     for _, artifact in deps.items():
-                        if str(artifact.paths.coverage_report_lcov):
+                        if artifact.paths.coverage_report_lcov:
                             reports.append(str(artifact.paths.coverage_report_lcov))
                     if reports:
                         filtered_reports = []
@@ -2280,8 +2280,8 @@ if __name__ == "__main__":
                         pass
             if self.selfsustained:
                 for _, artifact in deps.items():
-                    if str(artifact.paths.coverage_data):
-                        tools.copy(artifact.paths.coverage_data, self.covdatadir)
+                    if artifact.paths.coverage_data:
+                        tools.copy(str(artifact.paths.coverage_data), self.covdatadir)
 
     def publish(self, artifact, tools):
         if bool(getattr(self, "coverage", False)):

{jolt-0.9.343 → jolt-0.9.347}/jolt/plugins/paths.py

@@ -16,6 +16,12 @@ class PathVariable(ArtifactStringAttribute):
     def unapply(self, task, artifact):
         pass
 
+    def __bool__(self):
+        return bool(str(self))
+
+    def __eq__(self, value: str) -> bool:
+        return str(self) == str(value)
+
     def __str__(self):
         if self._value is None:
             return ""
@@ -30,6 +36,10 @@ class PathVariableSet(ArtifactAttributeSet):
     def create(self, name):
         return PathVariable(self._artifact, name)
 
+    def __getattr__(self, name):
+        attributes = self._get_attributes()
+        return attributes.get(name, None)
+
 
 @ArtifactAttributeSetProvider.Register
 class PathVariableSetProvider(ArtifactAttributeSetProvider):
@@ -41,7 +51,7 @@ class PathVariableSetProvider(ArtifactAttributeSetProvider):
             return
 
         for key, value in content["paths"].items():
-            getattr(artifact.paths, key).set_value(value, expand=False)
+            setattr(artifact.paths, key, value)
 
     def format(self, artifact, content):
         if "paths" not in content:

{jolt-0.9.343 → jolt-0.9.347}/jolt/plugins/strings.py

@@ -11,9 +11,7 @@ class StringVariableSet(object):
 
     def __getattr__(self, name):
         attributes = self._get_attributes()
-        if name not in attributes:
-            return None
-        return attributes[name]
+        return attributes.get(name, None)
 
     def __setattr__(self, name, value):
         if not isinstance(value, str):

{jolt-0.9.343 → jolt-0.9.347}/jolt/tools.py

@@ -1865,7 +1865,7 @@ class Tools(object):
 
         if type(chroot) in [cache.Artifact, cache.ArtifactToolsProxy]:
             raise_task_error_if(
-                not str(chroot.paths.rootfs), self._task,
+                not chroot.paths.rootfs, self._task,
                 "No 'rootfs' path in artifact")
             chroot = chroot.paths.rootfs
 

jolt-0.9.347/jolt/version.py

@@ -0,0 +1 @@
+__version__ = "0.9.347"

{jolt-0.9.343 → jolt-0.9.347}/jolt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jolt
-Version: 0.9.343
+Version: 0.9.347
 Summary: A task executor
 Home-page: https://github.com/srand/jolt
 Author: Robert Andersson

jolt-0.9.343/jolt/version.py

@@ -1 +0,0 @@
-__version__ = "0.9.343"