rbxts-orchestra 0.2.0 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/dist/run.js +1 -1
  2. package/dist/src/helpers/release.d.ts +3 -3
  3. package/dist/src/helpers/release.js +7 -7
  4. package/dist/src/helpers/release.js.map +1 -1
  5. package/package.json +1 -1
  6. package/src/helpers/release.ts +7 -7
package/dist/run.js CHANGED
@@ -32,7 +32,7 @@ var import_yargs = __toESM(require("yargs"));
32
32
  // package.json
33
33
  var package_default = {
34
34
  name: "rbxts-orchestra",
35
- version: "0.2.0",
35
+ version: "0.3.0",
36
36
  description: "A build orchestrator.",
37
37
  main: "src/index.ts",
38
38
  bin: {
package/dist/src/helpers/release.d.ts CHANGED
@@ -10,7 +10,7 @@ baseSemver: string,
10
10
  */
11
11
  commitHashEnvironments?: (keyof E)[],
12
12
  /**
13
- * A list of environments in which to include the name of the
14
- * local user in the semver string
13
+ * A list of environments in which to include the basename of the
14
+ * checked out branch in the semver string
15
15
  */
16
- userEnvironments?: (keyof E)[]): Value<E, string>;
16
+ branchEnvironments?: (keyof E)[]): Value<E, string>;
package/dist/src/helpers/release.js CHANGED
@@ -10,14 +10,14 @@ baseSemver,
10
10
  */
11
11
  commitHashEnvironments,
12
12
  /**
13
- * A list of environments in which to include the name of the
14
- * local user in the semver string
13
+ * A list of environments in which to include the basename of the
14
+ * checked out branch in the semver string
15
15
  */
16
- userEnvironments) {
16
+ branchEnvironments) {
17
17
  return (orchestra) => {
18
- let shortCommitHash, localUsername;
18
+ let shortCommitHash, currentBranch;
19
19
  try {
20
- localUsername = execSync("whoami", {
20
+ currentBranch = execSync("basename $(git rev-parse --abbrev-ref HEAD)", {
21
21
  stdio: "pipe",
22
22
  })
23
23
  .toString()
@@ -30,8 +30,8 @@ userEnvironments) {
30
30
  }
31
31
  catch { }
32
32
  let semver = baseSemver;
33
- if (localUsername && userEnvironments?.includes(orchestra.environment)) {
34
- semver += `-${localUsername}`;
33
+ if (currentBranch && branchEnvironments?.includes(orchestra.environment)) {
34
+ semver += `-${currentBranch}`;
35
35
  }
36
36
  if (shortCommitHash && commitHashEnvironments?.includes(orchestra.environment)) {
37
37
  semver += `+${shortCommitHash}`;
package/dist/src/helpers/release.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"release.js","sourceRoot":"","sources":["../../../src/helpers/release.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGzC,MAAM,UAAU,YAAY;AAC3B;;GAEG;AACH,UAAkB;AAClB;;;GAGG;AACH,sBAAoC;AACpC;;;GAGG;AACH,gBAA8B;IAE9B,OAAO,CAAC,SAAS,EAAE,EAAE;QACpB,IAAI,eAAe,EAAE,aAAa,CAAC;QACnC,IAAI,CAAC;YACJ,aAAa,GAAG,QAAQ,CAAC,QAAQ,EAAE;gBAClC,KAAK,EAAE,MAAM;aACb,CAAC;iBACA,QAAQ,EAAE;iBACV,IAAI,EAAE,CAAC;YACT,eAAe,GAAG,QAAQ,CAAC,4BAA4B,EAAE;gBACxD,KAAK,EAAE,MAAM;aACb,CAAC;iBACA,QAAQ,EAAE;iBACV,IAAI,EAAE,CAAC;QACV,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;QACV,IAAI,MAAM,GAAG,UAAU,CAAC;QAExB,IAAI,aAAa,IAAI,gBAAgB,EAAE,QAAQ,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC;YACxE,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;QAC/B,CAAC;QACD,IAAI,eAAe,IAAI,sBAAsB,EAAE,QAAQ,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC;YAChF,MAAM,IAAI,IAAI,eAAe,EAAE,CAAC;QACjC,CAAC;QAED,OAAO,MAAM,CAAC;IACf,CAAC,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"release.js","sourceRoot":"","sources":["../../../src/helpers/release.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGzC,MAAM,UAAU,YAAY;AAC3B;;GAEG;AACH,UAAkB;AAClB;;;GAGG;AACH,sBAAoC;AACpC;;;GAGG;AACH,kBAAgC;IAEhC,OAAO,CAAC,SAAS,EAAE,EAAE;QACpB,IAAI,eAAe,EAAE,aAAa,CAAC;QACnC,IAAI,CAAC;YACJ,aAAa,GAAG,QAAQ,CAAC,6CAA6C,EAAE;gBACvE,KAAK,EAAE,MAAM;aACb,CAAC;iBACA,QAAQ,EAAE;iBACV,IAAI,EAAE,CAAC;YACT,eAAe,GAAG,QAAQ,CAAC,4BAA4B,EAAE;gBACxD,KAAK,EAAE,MAAM;aACb,CAAC;iBACA,QAAQ,EAAE;iBACV,IAAI,EAAE,CAAC;QACV,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;QACV,IAAI,MAAM,GAAG,UAAU,CAAC;QAExB,IAAI,aAAa,IAAI,kBAAkB,EAAE,QAAQ,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC;YAC1E,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;QAC/B,CAAC;QACD,IAAI,eAAe,IAAI,sBAAsB,EAAE,QAAQ,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC;YAChF,MAAM,IAAI,IAAI,eAAe,EAAE,CAAC;QACjC,CAAC;QAED,OAAO,MAAM,CAAC;IACf,CAAC,CAAC;AACH,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "rbxts-orchestra",
3
- "version": "0.2.0",
3
+ "version": "0.3.0",
4
4
  "description": "A build orchestrator.",
5
5
  "main": "src/index.ts",
6
6
  "bin": {
package/src/helpers/release.ts CHANGED
@@ -12,15 +12,15 @@ export function semverString<E extends Environments>(
12
12
  */
13
13
  commitHashEnvironments?: (keyof E)[],
14
14
  /**
15
- * A list of environments in which to include the name of the
16
- * local user in the semver string
15
+ * A list of environments in which to include the basename of the
16
+ * checked out branch in the semver string
17
17
  */
18
- userEnvironments?: (keyof E)[],
18
+ branchEnvironments?: (keyof E)[],
19
19
  ): Value<E, string> {
20
20
  return (orchestra) => {
21
- let shortCommitHash, localUsername;
21
+ let shortCommitHash, currentBranch;
22
22
  try {
23
- localUsername = execSync("whoami", {
23
+ currentBranch = execSync("basename $(git rev-parse --abbrev-ref HEAD)", {
24
24
  stdio: "pipe",
25
25
  })
26
26
  .toString()
@@ -33,8 +33,8 @@ export function semverString<E extends Environments>(
33
33
  } catch {}
34
34
  let semver = baseSemver;
35
35
 
36
- if (localUsername && userEnvironments?.includes(orchestra.environment)) {
37
- semver += `-${localUsername}`;
36
+ if (currentBranch && branchEnvironments?.includes(orchestra.environment)) {
37
+ semver += `-${currentBranch}`;
38
38
  }
39
39
  if (shortCommitHash && commitHashEnvironments?.includes(orchestra.environment)) {
40
40
  semver += `+${shortCommitHash}`;