antelope-cli 1.2.2 → 1.2.3

package/ansible/onboarding-ca/README.md

@@ -66,22 +66,22 @@ Note: pass token values literally (or via a shell variable as above). Do **not**
 
 ## Inputs
 
-| var | required | example | notes |
-|-----|----------|---------|-------|
-| `brand_name` | yes | `Zenith Horizon Group` | display name → PR title |
-| `jira_key_client_branding` | yes | `ATLP-47067` | PR title prefix + branch name |
-| `bitbucket_token` | no* | *(secret)* | Atlassian API token (`ATATT…`) for the REST calls; sent via Basic auth. *Blank ⇒ fetched from 1Password (`jenkins@xsites.co.il` / `bitbucket_scoped_token`)* |
-| `bitbucket_email` | yes | `jenkins@xsites.co.il` | account that owns the token (Basic-auth username); defaults to the Jenkins service account |
-| `dest_branches` | no | `develop,master-26.9` | comma-separated override; **blank ⇒ derived from Consul** (see below). **One PR per branch** |
-| `consul_token` | no* | *(secret)* | read scope on `version/*`. *Blank ⇒ `$CONSUL_HTTP_TOKEN`, else 1Password (`New_Consul_Token` / `password`)*. Unused when `dest_branches` is set |
-| `brand_assets_folder` | no | `zenithhorizongroup` | folder name → CLI `--brand_assets_folder`, branch name; prompted separately. Blank ⇒ derived from `brand_name` (lowercased, spaces removed) |
-| `reviewers` | no | *(auto)* | default: repo's Bitbucket default-reviewers (author excluded); override with `[{account_id: "..."}]` |
-| `consul_url` | no | `https://consul.xsites.xyz` | Consul base URL for the version lookup |
+| var | required | example                                           | notes |
+|-----|----------|---------------------------------------------------|-------|
+| `brand_name` | yes | `Zenith Horizon Group`                            | display name → PR title |
+| `jira_key_client_branding` | yes | `ATLP-47067`                                      | PR title prefix + branch name |
+| `bitbucket_token` | no* | *(secret)*                                        | Atlassian API token (`ATATT…`) for the REST calls; sent via Basic auth. *Blank ⇒ fetched from 1Password (`jenkins@xsites.co.il` / `bitbucket_scoped_token`)* |
+| `bitbucket_email` | yes | `jenkins@xsites.co.il`                            | account that owns the token (Basic-auth username); defaults to the Jenkins service account |
+| `dest_branches` | no | `develop,master-26.9`                             | comma-separated override; **blank ⇒ derived from Consul** (see below). **One PR per branch** |
+| `consul_token` | no* | *(secret)*                                        | read scope on `version/*`. *Blank ⇒ `$CONSUL_HTTP_TOKEN`, else 1Password (`New_Consul_Token` / `password`)*. Unused when `dest_branches` is set |
+| `brand_assets_folder` | no | `zenithhorizongroup`                              | folder name → CLI `--brand_assets_folder`, branch name; prompted separately. Blank ⇒ derived from `brand_name` (lowercased, spaces removed) |
+| `reviewers` | no | *(auto)*                                          | default: repo's Bitbucket default-reviewers (author excluded); override with `[{account_id: "..."}]` |
+| `consul_url` | no | `https://consul.xsites.xyz`                       | Consul base URL for the version lookup |
 | `onepassword_bitbucket_item` / `_field` | no | `jenkins@xsites.co.il` / `bitbucket_scoped_token` | 1Password source for the Bitbucket token |
-| `onepassword_consul_item` / `_field` | no | `New_Consul_Token` / `password` | 1Password source for the Consul token |
-| `antelope_cli_version` | no | `1.2.0` | pinned published CLI version |
-| `work_dir` | no | `/tmp/onboard-ca/web-client-area` | clone location |
-| `git_user_name` / `git_user_email` | no | | commit identity |
+| `onepassword_consul_item` / `_field` | no | `New_Consul_Token` / `password`                   | 1Password source for the Consul token |
+| `antelope_cli_version` | no | `1.2.3`                                           | pinned published CLI version |
+| `work_dir` | no | `/tmp/onboard-ca/web-client-area`                 | clone location |
+| `git_user_name` / `git_user_email` | no |                                                   | commit identity |
 
 ## Behavior notes
 

package/ansible/onboarding-ca/roles/onboard_ca/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 # Pinned published antelope-cli version that provides the `onboarding-ca` command.
-antelope_cli_version: "1.2.0"
+antelope_cli_version: "1.2.3"
 
 # Where web-client-area is cloned on the control node.
 work_dir: "/tmp/onboard-ca/web-client-area"

package/onboarding-crm/createConfig.js

@@ -29,11 +29,11 @@ const updateConfigFile = () => {
     gaTrackingID: 'UA-70456753-2',
     colorTheme: 'theme-${brand.connectedBrandName}',
     templateTheme: 'theme-template-${brand.connectedBrandName}',
-    title: '${brand.connectedBrandName}',
+    title: '${brand.brandName}',
     favicon: '${brand.favicon}',
-    affiliatesApiUrl: '',
+    logo: '${brand.logo}',
     FCMSenderId: '${brand.FCMSenderId}',
-    brandAssetsFolder: '${brand.connectedBrandName}',
+    brandAssetsFolder: '${brand.connectedBrandName}'
   };`;
 };
 

package/onboarding-crm/themes.js

@@ -1,92 +1,92 @@
-const fs = require('fs');
-const brandModule = require('./brand.js');
-const chalk = require('chalk');
-const themesPath = 'src/ng1/assets/css/sass/materialism/themes.scss';
-
-function addColorToMap(mapName, key, value, data) {
-  const mapRegex = new RegExp(`\\$${mapName}:\\s*\\(([\\s\\S]*?)\\)`);
-  const match = data.match(mapRegex);
-  if (match) {
-    const mapContent = match[1];
-    const newMapContent = `$${mapName}: (${mapContent},\n  '${key}': ${value})`;
-    data = data.replace(mapRegex, newMapContent);
-  } else {
-    throw new Error(`Error: Could not find ${mapName} map in the file`);
-  }
-  return data;
-}
-
-// Same edits as onboarding/themes.js, driven by resolved brand state (no prompts).
-function start() {
-  const brand = brandModule.getBrand();
-  return new Promise((resolve, reject) => {
-    const themeVar = `
-    .theme-template-${brand.connectedBrandName} {
-      #logo {
-        display: inline-block;
-        width: 240px;
-        height: 120px;
-        background: url('${brand.logo}') no-repeat center center;
-        background-size: contain;
-      }
-      .navbar-toggle-container {
-        background: #222C38;
-
-        .icon-bar {
-          background: #fff !important;
-        }
-      }
-      .sidebar {
-        background: #222C38;
-        color: #ffffff;
-
-        ul a,
-        i {
-          color: #ffffff;
-        }
-
-        .brand-logo,
-        .brand-logo-text {
-          display: none;
-        }
-        .user-logged-in:after {
-          background: #26303C;
-        }
-      }
-    }
-    \n`;
-    fs.readFile(themesPath, 'utf8', (err, data) => {
-      if (err) {
-        return reject(err);
-      }
-      try {
-        data = addColorToMap(
-          'theme-colors',
-          brand.connectedBrandName,
-          brand.color ? `$${brand.connectedBrandName}` : '$corp',
-          data
-        );
-        data = addColorToMap(
-          'theme-secondary-colors',
-          brand.connectedBrandName,
-          brand.color ? `'${brand.connectedBrandName}'` : "'corp'",
-          data
-        );
-      } catch (mapError) {
-        return reject(mapError);
-      }
-      const insertionPoint = data.lastIndexOf('@each $color-name');
-      const newFileContent = data.slice(0, insertionPoint) + themeVar + data.slice(insertionPoint);
-      fs.writeFile(themesPath, newFileContent, 'utf8', (error) => {
-        if (error) {
-          reject(error);
-        } else {
-          console.log(chalk.cyan('themes.scss file updated successfully!'));
-          resolve(null);
-        }
-      });
-    });
-  });
-}
-
-module.exports = { start };
+const fs = require('fs');
+const brandModule = require('./brand.js');
+const chalk = require('chalk');
+const themesPath = 'src/ng1/assets/css/sass/materialism/themes.scss';
+
+function addColorToMap(mapName, key, value, data) {
+  const mapRegex = new RegExp(`\\$${mapName}:\\s*\\(([\\s\\S]*?)\\)`);
+  const match = data.match(mapRegex);
+  if (match) {
+    const mapContent = match[1];
+    const newMapContent = `$${mapName}: (${mapContent.replace(/\s*$/, '')},\n  '${key}': ${value}\n)`;
+    data = data.replace(mapRegex, newMapContent);
+  } else {
+    throw new Error(`Error: Could not find ${mapName} map in the file`);
+  }
+  return data;
+}
+
+// Same edits as onboarding/themes.js, driven by resolved brand state (no prompts).
+function start() {
+  const brand = brandModule.getBrand();
+  return new Promise((resolve, reject) => {
+    const themeVar = `
+    .theme-template-${brand.connectedBrandName} {
+      #logo {
+        display: inline-block;
+        width: 240px;
+        height: 120px;
+        background: url('${brand.logo}') no-repeat center center;
+        background-size: contain;
+      }
+      .navbar-toggle-container {
+        background: #222C38;
+
+        .icon-bar {
+          background: #fff !important;
+        }
+      }
+      .sidebar {
+        background: #222C38;
+        color: #ffffff;
+
+        ul a,
+        i {
+          color: #ffffff;
+        }
+
+        .brand-logo,
+        .brand-logo-text {
+          display: none;
+        }
+        .user-logged-in:after {
+          background: #26303C;
+        }
+      }
+    }
+    \n`;
+    fs.readFile(themesPath, 'utf8', (err, data) => {
+      if (err) {
+        return reject(err);
+      }
+      try {
+        data = addColorToMap(
+          'theme-colors',
+          brand.connectedBrandName,
+          brand.color ? `$${brand.connectedBrandName}` : '$corp',
+          data
+        );
+        data = addColorToMap(
+          'theme-secondary-colors',
+          brand.connectedBrandName,
+          brand.color ? `'${brand.connectedBrandName}'` : "'corp'",
+          data
+        );
+      } catch (mapError) {
+        return reject(mapError);
+      }
+      const insertionPoint = data.lastIndexOf('@each $color-name');
+      const newFileContent = data.slice(0, insertionPoint) + themeVar + data.slice(insertionPoint);
+      fs.writeFile(themesPath, newFileContent, 'utf8', (error) => {
+        if (error) {
+          reject(error);
+        } else {
+          console.log(chalk.cyan('themes.scss file updated successfully!'));
+          resolve(null);
+        }
+      });
+    });
+  });
+}
+
+module.exports = { start };

package/onboarding-crm/variablesColors.js

@@ -1,54 +1,53 @@
-const fs = require('fs');
-const brandModule = require('./brand.js');
-const chalk = require('chalk');
-const variablesColorsPath = 'src/ng1/assets/css/sass/variables-colors.scss';
-const defaultColor = '$corp';
-
-// Same edits as onboarding/variablesColors.js, driven by resolved brand state (no prompts).
-function start() {
-  return new Promise((resolve, reject) => {
-    try {
-      const { connectedBrandName, color: hexColor } = brandModule.getBrand();
-      let data = fs.readFileSync(variablesColorsPath, 'utf8');
-
-      // Check if $colors map exists in the file
-      const colorsRegex = /\$colors:\s*\(([\s\S]*?)\)/;
-      const match = data.match(colorsRegex);
-      if (match) {
-        const colorsMap = match[1];
-
-        // Append the new brand to the colors map
-        const newColorsMap = `$colors: (${colorsMap},\n '${connectedBrandName}': ${
-          hexColor ? '$' + connectedBrandName : defaultColor
-        })`;
-
-        // Replace the $colors map in the file with the new one
-        data = data.replace(colorsRegex, newColorsMap);
-      } else {
-        return reject('Error: Could not find $colors map in the file');
-      }
-
-      const brandVar = `\$${connectedBrandName}: (
-        'lighten-5': lighten(${hexColor}, 25%),
-        'lighten-4': lighten(${hexColor}, 20%),
-        'lighten-3': lighten(${hexColor}, 15%),
-        'lighten-2': lighten(${hexColor}, 10%),
-        'lighten-1': lighten(${hexColor}, 5%),
-        'base': ${hexColor},
-        'darken-1': darken(${hexColor}, 5%),
-        'darken-2': darken(${hexColor}, 10%),
-        'darken-3': darken(${hexColor}, 15%),
-        'darken-4': darken(${hexColor}, 20%),
-      );\n`;
-
-      const newData = hexColor ? brandVar + data : data;
-      fs.writeFileSync(variablesColorsPath, newData, 'utf8');
-      console.log(chalk.cyan('\nvariables-colors.scss file updated successfully!'));
-      resolve(null);
-    } catch (error) {
-      reject(error);
-    }
-  });
-}
-
-module.exports = { start };
+const fs = require('fs');
+const brandModule = require('./brand.js');
+const chalk = require('chalk');
+const variablesColorsPath = 'src/ng1/assets/css/sass/variables-colors.scss';
+const defaultColor = '$corp';
+
+// Same edits as onboarding/variablesColors.js, driven by resolved brand state (no prompts).
+function start() {
+  return new Promise((resolve, reject) => {
+    try {
+      const { connectedBrandName, color: hexColor } = brandModule.getBrand();
+      let data = fs.readFileSync(variablesColorsPath, 'utf8');
+
+      // Check if $colors map exists in the file
+      const colorsRegex = /\$colors:\s*\(([\s\S]*?)\)/;
+      const match = data.match(colorsRegex);
+      if (match) {
+        const colorsMap = match[1];
+
+        const newColorsMap = `$colors: (${colorsMap.replace(/\s*$/, '')},\n  '${connectedBrandName}': ${
+          hexColor ? '$' + connectedBrandName : defaultColor
+        }\n)`;
+
+        // Replace the $colors map in the file with the new one
+        data = data.replace(colorsRegex, newColorsMap);
+      } else {
+        return reject('Error: Could not find $colors map in the file');
+      }
+
+      const brandVar = `\$${connectedBrandName}: (
+        'lighten-5': lighten(${hexColor}, 25%),
+        'lighten-4': lighten(${hexColor}, 20%),
+        'lighten-3': lighten(${hexColor}, 15%),
+        'lighten-2': lighten(${hexColor}, 10%),
+        'lighten-1': lighten(${hexColor}, 5%),
+        'base': ${hexColor},
+        'darken-1': darken(${hexColor}, 5%),
+        'darken-2': darken(${hexColor}, 10%),
+        'darken-3': darken(${hexColor}, 15%),
+        'darken-4': darken(${hexColor}, 20%),
+      );\n`;
+
+      const newData = hexColor ? brandVar + data : data;
+      fs.writeFileSync(variablesColorsPath, newData, 'utf8');
+      console.log(chalk.cyan('\nvariables-colors.scss file updated successfully!'));
+      resolve(null);
+    } catch (error) {
+      reject(error);
+    }
+  });
+}
+
+module.exports = { start };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antelope-cli",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "CLI-Tool for automating processes for Antelope-Systems ",
   "main": "index.js",
   "bin": {