@allurereport/ci 3.0.0-beta.22 → 3.0.0-beta.24

package/dist/detect.js

@@ -6,6 +6,8 @@ import { drone } from "./detectors/drone.js";
 import { github } from "./detectors/github.js";
 import { gitlab } from "./detectors/gitlab.js";
 import { jenkins } from "./detectors/jenkins.js";
+import { local } from "./detectors/local.js";
 export const detect = () => {
-    return [amazon, azure, bitbucket, circle, drone, github, gitlab, jenkins].find((descriptor) => descriptor.detected);
+    return ([amazon, azure, bitbucket, circle, drone, github, gitlab, jenkins].find((descriptor) => descriptor.detected) ??
+        local);
 };

package/dist/detectors/amazon.js

@@ -1,5 +1,5 @@
 import { CiType } from "@allurereport/core-api";
-import { getEnv } from "../utils.js";
+import { getEnv, getReponameFromRepoUrl } from "../utils.js";
 const AMAZON_REGEXP = /^arn:aws:codebuild:([^:]+):([\d]+):(?:build|build-batch)\/([^:]+):([\da-f-]+)$/;
 const PIPELINE_REGEXP = /^(?:codepipeline\/)(.+)$/;
 export const parseArnValues = (source) => {
@@ -27,6 +27,13 @@ export const amazon = {
         const buildArn = getEnv("CODEBUILD_BUILD_ARN");
         return buildArn !== "" && parseArnValues(buildArn).length > 0;
     },
+    get repoName() {
+        const repoUrl = getEnv("CODEBUILD_SOURCE_REPO_URL");
+        if (!repoUrl) {
+            return "";
+        }
+        return getReponameFromRepoUrl(repoUrl);
+    },
     get jobUid() {
         const buildArn = getEnv("CODEBUILD_BUILD_ARN");
         const pipelineName = getPipelineName();

package/dist/detectors/azure.js

@@ -9,6 +9,10 @@ export const azure = {
     get detected() {
         return getEnv("SYSTEM_DEFINITIONID") !== "";
     },
+    get repoName() {
+        const repoName = getEnv("BUILD_REPOSITORY_NAME");
+        return repoName.split("/")?.[1] ?? repoName;
+    },
     get jobUid() {
         return `${getProjectID()}_${getDefinitionID()}`;
     },

package/dist/detectors/bitbucket.js

@@ -9,6 +9,9 @@ export const bitbucket = {
     get detected() {
         return getEnv("BITBUCKET_PIPELINE_UUID") !== "";
     },
+    get repoName() {
+        return getEnv("BITBUCKET_REPO_SLUG");
+    },
     get jobUid() {
         return getEnv("BITBUCKET_REPO_FULL_NAME");
     },

package/dist/detectors/circle.js

@@ -15,6 +15,9 @@ export const circle = {
         const path = parseURLPath(jobURL);
         return hasEnv && path !== "";
     },
+    get repoName() {
+        return getEnv("CIRCLE_PROJECT_REPONAME");
+    },
     get jobUid() {
         const jobURL = getJobURL();
         return parseURLPath(jobURL);

package/dist/detectors/drone.js

@@ -12,6 +12,9 @@ export const drone = {
     get detected() {
         return getEnv("DRONE_SYSTEM_HOST") !== "";
     },
+    get repoName() {
+        return getEnv("DRONE_REPO_NAME");
+    },
     get jobUid() {
         return getEnv("DRONE_REPO");
     },

package/dist/detectors/github.js

@@ -11,6 +11,10 @@ export const github = {
     get detected() {
         return getEnv("GITHUB_ACTIONS") !== "";
     },
+    get repoName() {
+        const repo = getRepo();
+        return repo.split("/")?.[1] ?? repo;
+    },
     get jobUid() {
         return `${getRepo()}_${getWorkflow()}`;
     },
@@ -33,7 +37,7 @@ export const github = {
         return `${job} #${runNumber}`;
     },
     get jobRunBranch() {
-        return getEnv("GITHUB_REF");
+        return getEnv("GITHUB_HEAD_REF") || getEnv("GITHUB_REF");
     },
     get pullRequestUrl() {
         const refName = getEnv("GITHUB_REF_NAME");

package/dist/detectors/gitlab.js

@@ -5,6 +5,9 @@ export const gitlab = {
     get detected() {
         return getEnv("GITLAB_CI") !== "";
     },
+    get repoName() {
+        return getEnv("CI_PROJECT_NAME");
+    },
     get jobUid() {
         return getEnv("CI_PROJECT_ID");
     },

package/dist/detectors/index.d.ts

@@ -0,0 +1,9 @@
+export { amazon } from "./amazon.js";
+export { azure } from "./azure.js";
+export { bitbucket } from "./bitbucket.js";
+export { circle } from "./circle.js";
+export { drone } from "./drone.js";
+export { github } from "./github.js";
+export { gitlab } from "./gitlab.js";
+export { jenkins } from "./jenkins.js";
+export { local } from "./local.js";

package/dist/detectors/index.js

@@ -0,0 +1,9 @@
+export { amazon } from "./amazon.js";
+export { azure } from "./azure.js";
+export { bitbucket } from "./bitbucket.js";
+export { circle } from "./circle.js";
+export { drone } from "./drone.js";
+export { github } from "./github.js";
+export { gitlab } from "./gitlab.js";
+export { jenkins } from "./jenkins.js";
+export { local } from "./local.js";

package/dist/detectors/jenkins.js

@@ -1,10 +1,17 @@
 import { CiType } from "@allurereport/core-api";
-import { getEnv } from "../utils.js";
+import { getEnv, getReponameFromRepoUrl } from "../utils.js";
 export const jenkins = {
     type: CiType.Jenkins,
     get detected() {
         return getEnv("JENKINS_URL") !== "";
     },
+    get repoName() {
+        const gitUrl = getEnv("GIT_URL");
+        if (!gitUrl) {
+            return "";
+        }
+        return getReponameFromRepoUrl(gitUrl);
+    },
     get jobUid() {
         return getEnv("JOB_NAME");
     },

package/dist/detectors/local.d.ts

@@ -0,0 +1,2 @@
+import { type CiDescriptor } from "@allurereport/core-api";
+export declare const local: CiDescriptor;

package/dist/detectors/local.js

@@ -0,0 +1,47 @@
+import { CiType } from "@allurereport/core-api";
+import { spawnSync } from "node:child_process";
+import { basename } from "node:path";
+export const local = {
+    type: CiType.Local,
+    get detected() {
+        return true;
+    },
+    get repoName() {
+        const output = spawnSync("git", ["rev-parse", "--show-toplevel"]);
+        if (output.error) {
+            return "";
+        }
+        return basename(output.stdout.toString().trim());
+    },
+    get jobUid() {
+        return "";
+    },
+    get jobUrl() {
+        return "";
+    },
+    get jobName() {
+        return "";
+    },
+    get jobRunUid() {
+        return "";
+    },
+    get jobRunUrl() {
+        return "";
+    },
+    get jobRunName() {
+        return "";
+    },
+    get jobRunBranch() {
+        const output = spawnSync("git", ["rev-parse", "--abbrev-ref", "HEAD"]);
+        if (output.error) {
+            return "";
+        }
+        return output.stdout.toString().trim();
+    },
+    get pullRequestUrl() {
+        return "";
+    },
+    get pullRequestName() {
+        return "";
+    },
+};

package/dist/utils.d.ts

@@ -1,2 +1,3 @@
 export declare const getEnv: (key: string) => string;
 export declare const parseURLPath: (urlString: string) => string;
+export declare const getReponameFromRepoUrl: (repoUrl: string) => string;

package/dist/utils.js

@@ -9,3 +9,4 @@ export const parseURLPath = (urlString) => {
         return "";
     }
 };
+export const getReponameFromRepoUrl = (repoUrl) => repoUrl.match(/\/([^/]+?)(\.git)?$/)?.[1] ?? "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/ci",
-  "version": "3.0.0-beta.22",
+  "version": "3.0.0-beta.24",
   "description": "Utilities set to get useful report data from different CI",
   "keywords": [
     "allure",
@@ -30,7 +30,7 @@
     "test": "rimraf ./out && vitest run"
   },
   "dependencies": {
-    "@allurereport/core-api": "3.0.0-beta.22"
+    "@allurereport/core-api": "3.0.0-beta.24"
   },
   "devDependencies": {
     "@stylistic/eslint-plugin": "^2.6.1",