primitive 0.2.30__tar.gz → 0.2.31__tar.gz

{primitive-0.2.30 → primitive-0.2.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: primitive
-Version: 0.2.30
+Version: 0.2.31
 Project-URL: Documentation, https://github.com//primitivecorp/primitive-cli#readme
 Project-URL: Issues, https://github.com//primitivecorp/primitive-cli/issues
 Project-URL: Source, https://github.com//primitivecorp/primitive-cli

{primitive-0.2.30 → primitive-0.2.31}/src/primitive/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2024-present Dylan Stein <dylan@primitive.tech>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "0.2.30"
+__version__ = "0.2.31"

{primitive-0.2.30 → primitive-0.2.31}/src/primitive/agent/runner.py

@@ -116,25 +116,17 @@ class Runner:
         )
 
         # Attempt to parse the job yaml file
-        logger.info(f"Scanning directory for job file {self.job['slug']}")
-        yaml_file = Path(self.source_dir / ".primitive" / f"{self.job['slug']}.yaml")
-        yml_file = Path(self.source_dir / ".primitive" / f"{self.job['slug']}.yml")
+        job_filename = self.job_settings["repositoryFilename"]
+        logger.info(f"Scanning directory for job file {job_filename}")
 
-        if yaml_file.exists() and yml_file.exists():
-            logger.error(
-                f"Found two job descriptions with the same slug: {self.job['slug']}"
-            )
-            raise FileExistsError
+        job_config_file = Path(self.source_dir / ".primitive" / job_filename)
 
-        if yaml_file.exists() or yml_file.exists():
+        if job_config_file.exists():
             logger.info(f"Found job description for {self.job['slug']}")
-            config_file = yaml_file if yaml_file.exists() else yml_file
-            self.config = yaml.load(open(config_file, "r"), Loader=Loader)[
-                self.job["name"]
-            ]
+            self.config = yaml.load(open(job_config_file, "r"), Loader=Loader)
         else:
             logger.error(
-                f"No job description with matching slug '{self.job['slug']}' found"
+                f"No job description with matching filename '{job_filename}' found"
             )
             raise FileNotFoundError
 

{primitive-0.2.30 → primitive-0.2.31}/src/primitive/daemons/launch_agents.py

@@ -132,7 +132,7 @@ class LaunchAgent(Daemon):
     <key>ProgramArguments</key>
     <array>
         <string>{self.executable}</string>
-        <string>{self.command}</string>
+        {"".join([f"<string>{arg}</string>" for arg in self.command.split(" ") if arg.strip() != ""])}
     </array>
     <key>RunAtLoad</key>
     <true/>

{primitive-0.2.30 → primitive-0.2.31}/src/primitive/jobs/graphql/fragments.py

@@ -34,6 +34,7 @@ fragment JobRunFragment on JobRun {
     parseLogs
     parseStderr
     failureLevel
+    repositoryFilename
   }
   gitCommit {
     sha