generator-easy-ui5 3.1.3 → 3.2.1

package/CHANGELOG.md

@@ -1,13 +1,253 @@
-## 3.0.0 (2021-04-08)
+# [3.2.0](https://github.com/SAP/generator-easy-ui5/compare/v3.1.5...v3.2.0) (2022-02-03)
+
+
+### Bug Fixes
+
+* freeze version of colors.js in package.json ([#85](https://github.com/SAP/generator-easy-ui5/issues/85)) ([6b497b6](https://github.com/SAP/generator-easy-ui5/commit/6b497b6c05748b8f67617c6399a11f8e8d850d48))
+* use homedir for plugin-generators avoid EACCESS ([e326676](https://github.com/SAP/generator-easy-ui5/commit/e326676458f439f9ac01498381059229a897fa61)), closes [#84](https://github.com/SAP/generator-easy-ui5/issues/84)
+
+
+### Features
+
+* Add support for user repositories ([6b7efa6](https://github.com/SAP/generator-easy-ui5/commit/6b7efa63414c31d76a53ee1b069557c527077f39))
+* support additional GH org via NPM config ([0d33197](https://github.com/SAP/generator-easy-ui5/commit/0d33197098e010858d1ea7a0e4b172d5d6a5aa22))
+
+
+
+## [3.1.5](https://github.com/SAP/generator-easy-ui5/compare/v3.1.4...v3.1.5) (2022-01-10)
+
+
+### Bug Fixes
+
+* re-enable sub-generator update check ([c464bd1](https://github.com/SAP/generator-easy-ui5/commit/c464bd11d2cf32006fd7f42ea8f15a736cb10271))
+
+
+
+## [3.1.4](https://github.com/SAP/generator-easy-ui5/compare/v3.1.3...v3.1.4) (2021-12-07)
+
+
+### Bug Fixes
+
+* disable autoinstall of Yeoman 5.x ([de6fcaf](https://github.com/SAP/generator-easy-ui5/commit/de6fcafd164734a9e3fbbab599b7376a49fffe89))
+
+
+
+## [3.1.3](https://github.com/SAP/generator-easy-ui5/compare/v3.1.2...v3.1.3) (2021-11-25)
+
+
+
+## [3.1.2](https://github.com/SAP/generator-easy-ui5/compare/v3.1.1...v3.1.2) (2021-11-23)
+
+
+
+## [3.1.1](https://github.com/SAP/generator-easy-ui5/compare/v3.1.0...v3.1.1) (2021-11-23)
+
+
+
+# [3.1.0](https://github.com/SAP/generator-easy-ui5/compare/v3.0.3...v3.1.0) (2021-11-23)
+
+
+
+## [3.0.3](https://github.com/SAP/generator-easy-ui5/compare/v3.0.2...v3.0.3) (2021-11-15)
+
+
+
+## [3.0.2](https://github.com/SAP/generator-easy-ui5/compare/v3.0.1...v3.0.2) (2021-11-15)
+
+
+
+## [3.0.1](https://github.com/SAP/generator-easy-ui5/compare/v2.4.6...v3.0.1) (2021-05-10)
+
+
+
+## [2.4.6](https://github.com/SAP/generator-easy-ui5/compare/2.4.6...v2.4.6) (2021-02-10)
+
+
+### Bug Fixes
+
+* uiveri5 reporters ([f2e2d6d](https://github.com/SAP/generator-easy-ui5/commit/f2e2d6dae71dc580ee0d15c42baafe06ae983d4e))
+
+
+
+## [2.4.5](https://github.com/SAP/generator-easy-ui5/compare/2.4.5...v2.4.5) (2021-01-29)
+
+
+### Bug Fixes
+
+* opa test namespace and folder ([fb166b7](https://github.com/SAP/generator-easy-ui5/commit/fb166b7df06b7cd465366726ed484890ad389d96))
+
+
+
+## [2.4.4](https://github.com/SAP/generator-easy-ui5/compare/2.4.4...v2.4.4) (2021-01-25)
+
+
+
+## [2.4.3](https://github.com/SAP/generator-easy-ui5/compare/2.4.3...v2.4.3) (2021-01-08)
+
+
+
+## [2.4.2](https://github.com/SAP/generator-easy-ui5/compare/2.4.2...v2.4.2) (2020-12-18)
+
+
+
+## [2.4.1](https://github.com/SAP/generator-easy-ui5/compare/v2.4.0...v2.4.1) (2020-12-18)
+
+
+
+# [2.4.0](https://github.com/SAP/generator-easy-ui5/compare/v2.3.0...v2.4.0) (2020-12-10)
+
+
+### Features
+
+* add wdi5 as test framework ([e63ce2e](https://github.com/SAP/generator-easy-ui5/commit/e63ce2eb2ed9cc23840cb303d01fc4e7d23f2c11))
+
+
+
+# [2.3.0](https://github.com/SAP/generator-easy-ui5/compare/v2.2.4...v2.3.0) (2020-11-25)
+
+
+
+## [2.2.4](https://github.com/SAP/generator-easy-ui5/compare/v2.2.3...v2.2.4) (2020-11-10)
+
+
+
+## [2.2.3](https://github.com/SAP/generator-easy-ui5/compare/v2.2.2...v2.2.3) (2020-11-05)
+
+
+
+## [2.2.2](https://github.com/SAP/generator-easy-ui5/compare/v2.2.1...v2.2.2) (2020-10-28)
+
+
+
+## [2.2.1](https://github.com/SAP/generator-easy-ui5/compare/v2.2.0...v2.2.1) (2020-10-23)
 
-### New Features
 
-Starting with easy-ui5 v3, all templates will be outsource to repositories in the [UI5 Community](https://github.com/ui5-community/). This project is from now on a shell that will offer all generators hosted on that GitHub org. Easy-ui5 will download and install these repositories when needed.
 
-By default, it will download the repository [generator-ui5-project](https://github.com/ui5-community/generator-ui5-project/) which contains the templates that were previously integrated in easy-ui5 < 3.
+# [2.2.0](https://github.com/SAP/generator-easy-ui5/compare/v2.1.7...v2.2.0) (2020-10-16)
 
 
 
+## [2.1.7](https://github.com/SAP/generator-easy-ui5/compare/v2.1.6...v2.1.7) (2020-09-10)
+
+
+
+## [2.1.6](https://github.com/SAP/generator-easy-ui5/compare/v2.1.5...v2.1.6) (2020-08-24)
+
+
+
+## [2.1.5](https://github.com/SAP/generator-easy-ui5/compare/v2.1.4...v2.1.5) (2020-08-24)
+
+
+
+## [2.1.4](https://github.com/SAP/generator-easy-ui5/compare/v2.1.3...v2.1.4) (2020-08-06)
+
+
+
+## [2.1.3](https://github.com/SAP/generator-easy-ui5/compare/v2.1.2...v2.1.3) (2020-08-03)
+
+
+
+## [2.1.2](https://github.com/SAP/generator-easy-ui5/compare/v2.1.1...v2.1.2) (2020-06-29)
+
+
+
+## [2.1.1](https://github.com/SAP/generator-easy-ui5/compare/v2.1.0...v2.1.1) (2020-06-18)
+
+
+
+# [2.1.0](https://github.com/SAP/generator-easy-ui5/compare/v2.0.1...v2.1.0) (2020-06-15)
+
+
+
+## [2.0.1](https://github.com/SAP/generator-easy-ui5/compare/v2.0.0...v2.0.1) (2020-06-09)
+
+
+
+# [2.0.0](https://github.com/SAP/generator-easy-ui5/compare/v1.3.7...v2.0.0) (2020-06-08)
+
+
+
+## [1.3.7](https://github.com/SAP/generator-easy-ui5/compare/v1.3.6...v1.3.7) (2020-05-06)
+
+
+
+## [1.3.6](https://github.com/SAP/generator-easy-ui5/compare/v1.3.5...v1.3.6) (2020-05-06)
+
+
+
+## [1.3.5](https://github.com/SAP/generator-easy-ui5/compare/v1.3.4...v1.3.5) (2020-04-30)
+
+
+
+## [1.3.4](https://github.com/SAP/generator-easy-ui5/compare/v1.3.3...v1.3.4) (2020-04-29)
+
+
+
+## [1.3.3](https://github.com/SAP/generator-easy-ui5/compare/v1.3.2...v1.3.3) (2020-04-14)
+
+
+
+## [1.3.2](https://github.com/SAP/generator-easy-ui5/compare/v1.3.1...v1.3.2) (2020-04-02)
+
+
 ### Bug Fixes
 
-NA
+* **app:** Fix lint errors ([c4df165](https://github.com/SAP/generator-easy-ui5/commit/c4df165e35b319aedfc932ac37d2593c0fa5e526))
+* **formatter:** Fix formatter ([4f637c8](https://github.com/SAP/generator-easy-ui5/commit/4f637c81e2a916a0067d36f8d214a447a7a62212))
+
+
+### Features
+
+* **BaseController:** Adding the BaseController and formatter ([e51a66b](https://github.com/SAP/generator-easy-ui5/commit/e51a66bfcd8dea90fd27c7684264e1202bde3e47))
+* **BaseController:** Fix lint and activate install again after creation ([8697b1b](https://github.com/SAP/generator-easy-ui5/commit/8697b1bdbcc3f82bb8eb5f0e9e750b37f0d44d8f))
+
+
+
+## [1.3.1](https://github.com/SAP/generator-easy-ui5/compare/v1.3.0...v1.3.1) (2020-03-20)
+
+
+
+# [1.3.0](https://github.com/SAP/generator-easy-ui5/compare/v1.2.0...v1.3.0) (2020-03-11)
+
+
+
+# [1.2.0](https://github.com/SAP/generator-easy-ui5/compare/v1.1.1...v1.2.0) (2020-02-13)
+
+
+
+## [1.1.1](https://github.com/SAP/generator-easy-ui5/compare/v1.0.3...v1.1.1) (2019-12-13)
+
+
+
+## [1.0.3](https://github.com/SAP/generator-easy-ui5/compare/v1.0.2...v1.0.3) (2019-12-04)
+
+
+
+## [1.0.2](https://github.com/SAP/generator-easy-ui5/compare/v1.0.1...v1.0.2) (2019-11-08)
+
+
+
+## [1.0.1](https://github.com/SAP/generator-easy-ui5/compare/v1.0.0...v1.0.1) (2019-11-06)
+
+
+
+# [1.0.0](https://github.com/SAP/generator-easy-ui5/compare/v0.3.4...v1.0.0) (2019-10-30)
+
+
+
+## [0.3.4](https://github.com/SAP/generator-easy-ui5/compare/v0.3.3...v0.3.4) (2019-10-24)
+
+
+
+## [0.3.3](https://github.com/SAP/generator-easy-ui5/compare/v0.3.2...v0.3.3) (2019-10-23)
+
+
+
+## [0.3.2](https://github.com/SAP/generator-easy-ui5/compare/v0.3.1...v0.3.2) (2019-10-23)
+
+
+
+## [0.3.1](https://github.com/SAP/generator-easy-ui5/compare/v2.0.2...v0.3.1) (2019-10-23)
+
+
+

package/README.md

@@ -8,12 +8,16 @@
 
 ## Description
 
-Easy-ui5 is a [Yeoman](http://yeoman.io/) generator which enables you to create simple [SAPUI5](https://sapui5.hana.ondemand.com/)/[OpenUI5](https://openui5.hana.ondemand.com/)-based web-apps and other UI5-related projects within seconds.
+Easy-ui5 💙 is a [Yeoman](http://yeoman.io/) generator which enables you to create simple [SAPUI5](https://sapui5.hana.ondemand.com/)/[OpenUI5](https://openui5.hana.ondemand.com/)-based web-apps and other UI5-related projects within seconds.
 
 This generator has been created to simplify the creation of your UI5 prototypes. Now you can scaffold simple UI5 projects from the shell/terminal of your choice. The current best practices (such as [async](https://blogs.sap.com/2018/12/18/ui5ers-buzz-41-best-practices-for-async-loading-in-ui5/)) are already baked into our templates so you don't have to worry about the definition of the metadata files.
 
 The purpose of this generator is to guide you on your first steps with [SAPUI5](https://sapui5.hana.ondemand.com/) and [SAP BTP](https://www.sap.com/products/business-technology-platform.html) deployments. Once you are familiar with those technologies, you might want to tweak the projects to adapt them for productive use-cases (such as continuous deployment pipelines and full i18n).
 
+> Starting with easy-ui5 v3, all templates will be outsource to repositories in the [UI5 Community](https://github.com/ui5-community/). This project is from now on a shell that will offer all generators hosted on that GitHub org. Easy-ui5 will download and install these repositories when needed.
+>
+> By default, it will download the repository [generator-ui5-project](https://github.com/ui5-community/generator-ui5-project/) which contains the templates that were previously integrated in easy-ui5 < 3.
+
 ## Requirements
 
 - Get [Node.js](https://nodejs.org/en/download/)  (**version 12 or higher** ⚠️)

package/generators/app/index.js

@@ -14,34 +14,65 @@ const { throttling } = require("@octokit/plugin-throttling");
 const MyOctokit = Octokit.plugin(throttling);
 const AdmZip = require("adm-zip");
 
+// helper to retrieve config entries from npm
+//   --> npm config set easy-ui5_addGhOrg XYZ
+const NPM_CONFIG_PREFIX = "easy-ui5_";
+let npmConfig;
+const getNPMConfig = (configName) => {
+  if (!npmConfig) {
+    npmConfig = require("libnpmconfig").read();
+  }
+  return npmConfig && npmConfig[`${NPM_CONFIG_PREFIX}${configName}`]
+}
+
+// the command line options of the generator
 const generatorOptions = {
   ghAuthToken: {
     type: String,
     description:
-      `GitHub authToken to optionally access private generator repositories`,
+      "GitHub authToken to optionally access private generator repositories",
   },
   ghOrg: {
     type: String,
-    description: `GitHub organization to lookup for available generators`,
+    description: "GitHub organization to lookup for available generators",
     default: "ui5-community",
-    hidden: true // we don't want to recommend to use this option
+    hide: true // we don't want to recommend to use this option
+  },
+  subGeneratorPrefix: {
+    type: String,
+    description: "Prefix used for the lookup of the available generators",
+    default: "generator-ui5-",
+    hide: true // we don't want to recommend to use this option
+  },
+  addGhOrg: {
+    type: String,
+    description: `GitHub organization to lookup for additional available generators`,
+    hide: true, // we don't want to recommend to use this option
+    npmConfig: true
+  },
+  addSubGeneratorPrefix: {
+    type: String,
+    description: `Prefix used for the lookup of the additional available generators`,
+    default: "generator-",
+    hide: true, // we don't want to recommend to use this option
+    npmConfig: true
   },
   list: {
     type: Boolean,
-    description: `List the available subcommands of the generator`,
+    description: "List the available subcommands of the generator",
   },
   verbose: {
     type: Boolean,
-    description: `Enable detailed logging`,
+    description: "Enable detailed logging",
   },
   skipUpdate: {
     type: Boolean,
-    description: `Skip the update of the plugin generators`,
+    description: "Skip the update of the plugin generators",
   },
   plugins: {
     type: Boolean,
     alias: "p",
-    description: `Get detailed version information`,
+    description: "Get detailed version information",
   }
 };
 
@@ -49,18 +80,21 @@ const generatorArgs = {
   generator: {
     type: String,
     required: false,
-    description: `Name of the generator to invoke (without the "generator-ui5-" prefix)`,
+    description: "Name of the generator to invoke (without the \"generator-ui5-\" prefix)",
   },
   subcommand: {
     type: String,
     required: false,
-    description: `Name of the subcommand to invoke (without the "generator:" prefix)`,
+    description: "Name of the subcommand to invoke (without the \"generator:\" prefix)",
   },
 };
 
 module.exports = class extends Generator {
   constructor(args, opts) {
-    super(args, opts);
+    super(args, opts, {
+      // disable the Yeoman 5 package-manager logic (auto install)!
+      customInstallTask: "disabled"
+    });
 
     Object.keys(generatorArgs).forEach((argName) => {
       // register the argument for being displayed in the help
@@ -68,19 +102,21 @@ module.exports = class extends Generator {
     });
 
     Object.keys(generatorOptions).forEach((optionName) => {
-      if (!generatorOptions[optionName].hidden) {
-        // register the option for being displayed in the help
-        this.option(optionName, generatorOptions[optionName]);
-      } else {
-        // apply the default value for hidden options if needed
-        this.options[optionName] = this.options[optionName] || generatorOptions[optionName].default;
+      const initialValue = this.options[optionName];
+      // register the option for being displayed in the help
+      this.option(optionName, generatorOptions[optionName]);
+      const defaultedValue = this.options[optionName];
+      if (generatorOptions[optionName].npmConfig) {
+        // if a value is set, use the set value (parameter has higher precedence than npm config)
+        // => this.option(...) applies the default value to this.options[...] used as last resort
+        this.options[optionName] = initialValue || getNPMConfig(optionName) || defaultedValue;
       }
     });
   }
 
   _showBusy(statusText) {
     this._clearBusy();
-    const progressChars = ['\\', '|', '/', '-'];
+    const progressChars = ["\\", "|", "/", "-"];
     let i = 0;
     process.stdout.write(`\r${statusText}  `);
     this._busy = {
@@ -95,37 +131,58 @@ module.exports = class extends Generator {
   _clearBusy(newLine) {
     if (this._busy) {
       clearInterval(this._busy.timer);
-      process.stdout.write(`\r`.padEnd(this._busy.text.length + 3) + (newLine ? "\n" : ""));
+      process.stdout.write("\r".padEnd(this._busy.text.length + 3) + (newLine ? "\n" : ""));
       delete this._busy;
     }
   }
 
   async prompting() {
 
+    this.log(yosay(`Welcome to the ${chalk.red("easy-ui5")} generator!`));
+
+    const home = path.join(__dirname, "..", "..");
+
+    // check the permissions to Easy UI5s plugin directory which must
+    // allow read/write to install additional plugin generators
+    let pluginsHome = path.join(home, "plugin-generators");
+    try {
+      fs.accessSync(pluginsHome, fs.constants.R_OK | fs.constants.W_OK);
+    } catch (e) {
+      pluginsHome = path.join(require("os").homedir(), ".npm", "_generator-easy-ui5", "plugin-generators");
+      if (this.options.verbose) {
+        console.error(`Plugin directory: ${chalk.green(pluginsHome)}`);
+        console.error(chalk.red(e.message));
+      }
+      fs.mkdirSync(pluginsHome, { recursive: true });
+    }
+
+    // log the plugins and configuration
     if (this.options.plugins) {
       const glob = require("glob");
       const yeoman = require("yeoman-environment/package.json");
-      const home = __dirname.slice(0, -14)
 
       const components = {
-        'Node.js': process.version,
-        'home': home,
-        "yeoman-environment": yeoman.version
+        "Node.js": process.version,
+        "yeoman-environment": yeoman.version,
+        "generator-easy-ui5": require(path.join(home, "package.json")).version,
+        "home": home,
+        "pluginsHome": pluginsHome,
       };
-      glob.sync(path.join(home, "plugin-generators/*/package.json")).forEach(function (plugin) {
-        const name = plugin.match(/plugin-generators\/(.+)\/package\.json/)[1];
+
+      Object.keys(components).forEach((component) => {
+        this.log(`${chalk.green(component)}: ${components[component]}`);
+      });
+
+      this.log(chalk.green("\nAvailable generators:"));
+      glob.sync(`${pluginsHome}/*/package.json`).forEach((plugin) => {
+        const name = plugin.match(/.*\/(.+)\/package\.json/)[1];
         const lib = require(plugin);
-        components[name] = lib.version;
+        this.log(`  - ${chalk.green(name)}: ${lib.version}`);
       });
 
-      const log = this.log;
-      return Object.keys(components).forEach(function (component) {
-        log(`${chalk.green(component)}: ${components[component]}`);
-      })
+      return;
     }
 
-    this.log(yosay(`Welcome to the ${chalk.red("easy-ui5")} generator!`));
-
     // create the octokit client to retrieve the generators from GH org
     const octokit = new MyOctokit({
       userAgent: `${this.rootGeneratorName()}:${this.rootGeneratorVersion()}`,
@@ -142,7 +199,7 @@ module.exports = class extends Generator {
             return true;
           }
         },
-        onAbuseLimit: (_, options) => {
+        onAbuseLimit: () => {
           // does not retry, only logs a warning
           this.log(
             `${chalk.red("Hit the GitHub API limit again!")} Please supply an auth token with the \`--ghAuthToken\` option. For more details, run \`yo easy-ui5 --help\` `
@@ -152,19 +209,68 @@ module.exports = class extends Generator {
       }
     });
 
+    // helper for filtering repos with corresponding subGenerator prefix
+    const filterReposWithSubGeneratorPrefix = (repos, subGeneratorPrefix) => {
+      if (!Array.isArray(repos)) {
+        return [];
+      }
+      return repos.filter((repo) =>
+        repo.name.startsWith(`${subGeneratorPrefix}`)
+      ).map((repo) => {
+        return {
+          org: repo.owner?.login,
+          name: repo.name,
+          branch: repo.default_branch,
+          subGeneratorName: repo.name.substring(subGeneratorPrefix.length),
+        };
+      });
+    }
+
+    // helper to retrieve the available repositories for a GH org
+    const listGeneratorsForOrg = async (ghOrg, subGeneratorPrefix) => {
+      const response = await octokit.repos.listForOrg({
+        org: ghOrg,
+      });
+      return filterReposWithSubGeneratorPrefix(response?.data, subGeneratorPrefix);
+    }
+
+    // helper to retrieve the available repositories for a GH user
+    const listGeneratorsForUser = async (ghUser, subGeneratorPrefix) => {
+      const response = await octokit.repos.listForUser({
+        username: ghUser,
+      });
+      return filterReposWithSubGeneratorPrefix(response?.data, subGeneratorPrefix);
+    }
+
     // retrieve the available repositories
-    let reqRepos;
+    let availGenerators;
     try {
-      reqRepos = await octokit.repos.listForOrg({
-        org: this.options.ghOrg,
-      });
+      availGenerators = await listGeneratorsForOrg(this.options.ghOrg, this.options.subGeneratorPrefix);
     } catch (e) {
-      console.error(`Failed to connect to GitHub to retrieve available repository for "${this.options.ghOrg}" organization! Run with --verbose for details!`);
+      console.error(`Failed to connect to GitHub to retrieve available generators for "${this.options.ghOrg}" organization! Run with --verbose for details!`);
       if (this.options.verbose) {
         console.error(e);
       }
       return;
     }
+    try {
+      if (this.options.addGhOrg && this.options.addSubGeneratorPrefix) {
+        availGenerators = availGenerators.concat(await listGeneratorsForOrg(this.options.addGhOrg, this.options.addSubGeneratorPrefix));
+      }
+    } catch (e) {
+      if (this.options.verbose) {
+        this.log(`Failed to connect to GitHub retrieve additional generators for "${this.options.addGhOrg}" organization! Try to retrieve for user...`);
+      }
+      try {
+        availGenerators = availGenerators.concat(await listGeneratorsForUser(this.options.addGhOrg, this.options.addSubGeneratorPrefix));
+      } catch (e) {
+        console.error(`Failed to connect to GitHub to retrieve additional generators for organization or user "${this.options.addGhOrg}"! Run with --verbose for details!`);
+        if (this.options.verbose) {
+          console.error(e);
+        }
+        return;
+      }
+    }
 
     // download the generator from GH (or the test generator)
     let generatorPath;
@@ -176,11 +282,9 @@ module.exports = class extends Generator {
     } else {
 
       // check for provided generator being available on GH
-      let generator =
-        this.options.generator &&
-        reqRepos.data.find(
-          (repo) => repo.name === `generator-ui5-${this.options.generator}`
-        );
+      let generator = this.options.generator && availGenerators.find((repo) => 
+        repo.subGeneratorName === this.options.generator
+      );
 
       // if no generator is provided and doesn't exist, ask for generator name
       if (!generator) {
@@ -191,37 +295,35 @@ module.exports = class extends Generator {
             )} was not found. Please select an existing generator!`
           );
         }
-        const generatorRepos = reqRepos.data.filter((repo) =>
-          /^generator-ui5-.+/.test(repo.name)
-        );
+
         const generatorIdx = (
           await this.prompt([
             {
               type: "list",
               name: "generator",
               message: "Select your generator?",
-              choices: generatorRepos.map((repo, idx) => ({
-                name: repo.name,
+              choices: availGenerators.map((availGenerator, idx) => ({
+                name: `${availGenerator.subGeneratorName}${this.options.addGhOrg ? ` [${availGenerator.org}]` : ""}`,
                 value: idx,
               })),
             },
           ])
         ).generator;
-        generator = generatorRepos[generatorIdx];
+        generator = availGenerators[generatorIdx];
       }
 
       // fetch the available branches to retrieve the latest commit SHA
       let reqBranch;
       try {
         reqBranch = await octokit.repos.getBranch({
-          owner: this.options.ghOrg,
+          owner: generator.org,
           repo: generator.name,
-          branch: generator.default_branch,
+          branch: generator.branch,
         });
       } catch (e) {
-        console.error(`Failed to retrieve the default branch for repository "${generator.name}" for "${this.options.ghOrg}" organization! Run with --verbose for details!`);
+        console.error(chalk.red(`Failed to retrieve the default branch for repository "${generator.name}" for "${this.options.ghOrg}" organization! Run with --verbose for details!`));
         if (this.options.verbose) {
-          console.error(e);
+          console.error(chalk.red(e.message));
         }
         return;
       }
@@ -233,14 +335,10 @@ module.exports = class extends Generator {
           `Using commit ${commitSHA} from @${this.options.ghOrg}/${generator.name}#${generator.default_branch}...`
         );
       }
-      generatorPath = path.join(
-        __dirname,
-        "../../plugin-generators",
-        generator.name
-      );
+      generatorPath = path.join(pluginsHome, generator.name);
       const shaMarker = path.join(generatorPath, `.${commitSHA}`);
 
-      if (fs.existsSync(generatorPath) && this.options.skipUpdate) {
+      if (fs.existsSync(generatorPath) && !this.options.skipUpdate) {
         // check if the SHA marker exists to know whether the generator is up-to-date or not
         if (!fs.existsSync(shaMarker)) {
           if (this.options.verbose) {
@@ -259,7 +357,7 @@ module.exports = class extends Generator {
         }
         this._showBusy(`  Downloading and extracting "${generator.name}" templates`);
         const reqZIPArchive = await octokit.repos.downloadZipballArchive({
-          owner: this.options.ghOrg,
+          owner: generator.org,
           repo: generator.name,
           ref: commitSHA,
         });
@@ -294,9 +392,9 @@ module.exports = class extends Generator {
               ...process.env,
               "NO_UPDATE_NOTIFIER": true
             }
-          }).on('exit', function (code) {
+          }).on("exit", function (code) {
             resolve(code);
-          }).on('error', function (err) {
+          }).on("error", function (err) {
             reject(err);
           });
         }.bind(this));
@@ -371,7 +469,7 @@ module.exports = class extends Generator {
       }
     }
 
-    // transform the list of the subgenerators and identify the 
+    // transform the list of the subgenerators and identify the
     // default subgenerator for the default selection
     let defaultSubGenerator;
     let maxLength = 0;

package/generators/app/postinstall.js

@@ -17,7 +17,7 @@ const ghOrg = "ui5-community",
 
   function showBusy(statusText) {
     clearBusy();
-    const progressChars = ['\\', '|', '/', '-'];
+    const progressChars = ["\\", "|", "/", "-"];
     let i = 0;
     process.stdout.write(`\r${statusText}  `);
     _busy = {
@@ -32,7 +32,7 @@ const ghOrg = "ui5-community",
   function clearBusy(newLine) {
     if (_busy) {
       clearInterval(_busy.timer);
-      process.stdout.write(`\r`.padEnd(_busy.text.length + 3) + (newLine ? "\n" : ""));
+      process.stdout.write("\r".padEnd(_busy.text.length + 3) + (newLine ? "\n" : ""));
       _busy = null;
     }
   }
@@ -63,9 +63,9 @@ const ghOrg = "ui5-community",
   if (fs.existsSync(generatorPath)) {
     // check if the SHA marker exists to know whether the generator is up-to-date or not
     if (!fs.existsSync(shaMarker)) {
-      console.log(`The default generator is outdated...`);
+      console.log("The default generator is outdated...");
       // remove if the SHA marker doesn't exist => outdated!
-      showBusy(`  Removing old default templates`);
+      showBusy("  Removing old default templates");
       await rmdir(generatorPath, { recursive: true });
     }
   }
@@ -73,8 +73,8 @@ const ghOrg = "ui5-community",
 
   // re-fetch the generator and extract into local plugin folder
   if (!fs.existsSync(generatorPath)) {
-    console.log(`Extracting default templates...`);
-    showBusy(`  Downloading and extracting default templates`);
+    console.log("Extracting default templates...");
+    showBusy("  Downloading and extracting default templates");
     const reqZIPArchive = await octokit.repos.downloadZipballArchive({
       owner: ghOrg,
       repo: repoName,
@@ -100,7 +100,7 @@ const ghOrg = "ui5-community",
 
     // run yarn/npm install
     console.log("Installing the plugin dependencies...");
-    showBusy(`  Preparing the default templates`);
+    showBusy("  Preparing the default templates");
     await new Promise(function (resolve, reject) {
       spawn((hasYarn() ? "yarn" : "npm"), ["install", "--no-progress"], {
         stdio: "inherit",
@@ -109,9 +109,9 @@ const ghOrg = "ui5-community",
           ...process.env,
           "NO_UPDATE_NOTIFIER": true
         }
-      }).on('exit', function (code) {
+      }).on("exit", function (code) {
         resolve(code);
-      }).on('error', function (err) {
+      }).on("error", function (err) {
         reject(err);
       });
     }.bind(this));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-easy-ui5",
-  "version": "3.1.3",
+  "version": "3.2.1",
   "description": "Generator for UI5-based project",
   "main": "generators/app/index.js",
   "files": [
@@ -9,12 +9,15 @@
   "scripts": {
     "test": "mocha",
     "postinstall": "node generators/app/postinstall",
-    "lint": "eslint .",
+    "lint": "eslint . --fix",
     "prettier": "prettier --write .",
     "start": "yo easy-ui5 project",
     "listSubGen": "yo easy-ui5 project --list",
     "startSubGen": "yo easy-ui5 project app",
-    "workaround": "find . -name '.DS_Store' -delete"
+    "workaround": "find . -name '.DS_Store' -delete",
+    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
+    "prepare": "husky install",
+    "hooks:commit-msg": "commitlint -e"
   },
   "repository": {
     "type": "git",
@@ -40,18 +43,34 @@
     "@octokit/rest": "^18.12.0",
     "adm-zip": "^0.5.9",
     "chalk": "^4.1.2",
-    "colors": "^1.4.0",
+    "colors": "1.4.0",
     "glob": "^7.2.0",
-    "mocha": "^9.1.3",
+    "libnpmconfig": "^1.2.1",
+    "mocha": "^9.2.0",
     "rimraf": "^3.0.2",
     "yarn-or-npm": "^3.0.1",
     "yeoman-assert": "^3.1.1",
-    "yeoman-environment": "^3.8.0",
-    "yeoman-generator": "^5.4.2",
-    "yeoman-test": "^6.2.0",
+    "yeoman-environment": "^3.9.1",
+    "yeoman-generator": "^5.6.1",
+    "yeoman-test": "^6.3.0",
     "yosay": "^2.0.2"
   },
   "devDependencies": {
-    "prettier": "2.4.1"
+    "@commitlint/cli": "16.1.0",
+    "@commitlint/config-conventional": "16.0.0",
+    "conventional-changelog-cli": "^2.2.2",
+    "cz-conventional-changelog": "3.3.0",
+    "husky": "^7.0.4",
+    "prettier": "2.5.1"
+  },
+  "config": {
+    "commitizen": {
+      "path": "cz-conventional-changelog"
+    }
+  },
+  "commitlint": {
+    "extends": [
+      "@commitlint/config-conventional"
+    ]
   }
 }