aberlaas 2.2.0 → 2.4.0

package/LICENSE

@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) {author}
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -161,24 +161,6 @@ what most free CI tier offer). If you have access to higher end machines, you
 can update this value by passing the `--cpu-count=X` flag to your `aberlaas ci`
 call.
 
-### Auto-Releasing
-
-As an optional feature, you can have aberlaas automatically release a new
-version of your module from the CI environment when relevant.
-
-The CI will then check all the commits since the last release. If any commit is
-a `feat()` it will release a new minor version; it any commit is a `fix()` it
-will release a new patch version. For major release, you'll have to do it
-manually.
-
-This option is not enabled by default. If you need it, you need to follow those
-steps:
-
-- Run `aberlaas setup --auto-release`. It will setup the required `ENV` variables
-  and ssh keys
-- Update your `aberlaas ci` script to `aberlaas ci --auto-release`
-- Uncomment the `add_ssh_keys` in your `.circleci.yml` file
-
 ## File structure
 
 `./lib/configs` contain the default configuration for all the tools. They are
@@ -188,7 +170,7 @@ exported by the package and thus can be `require`d in userland.
 extends the configuration exported in the previous files. Copying files to
 userland allows user to change the files if they want to change the behavior.
 
-`.eslintrc.js`, `.stylelintrc.js` and `jest.config.js` are local
+`.eslintrc.js`, `stylelint.config.js` and `vite.config.js` are local
 configuration files for `aberlaas` itself. They eat their own dog food by
 referencing the same configs as above.
 

package/commands/ci/index.js

@@ -1,21 +1,10 @@
-import helper from '../../helper.js';
 import ciInfo from 'ci-info';
-import _ from 'golgoth/lodash.js';
-import pMap from 'golgoth/pMap.js';
-import readJson from 'firost/readJson.js';
 import run from 'firost/run.js';
+import commandTest from '../test/index.js';
+import commandLint from '../lint/index.js';
 import consoleInfo from 'firost/consoleInfo.js';
-import autoRelease from './autoRelease.js';
 
 export default {
-  /**
-   * Return the value of an environment variable
-   * @param {string} key Name of the variable
-   * @returns {*} Key value
-   **/
-  getEnv(key) {
-    return _.get(process, `env.${key}`);
-  },
   /**
    * Checks if currently running on a CI server
    * @returns {boolean} True if on a CI server
@@ -23,111 +12,37 @@ export default {
   isCI() {
     return ciInfo.isCI;
   },
-  /**
-   * Checks if currently running on CircleCI
-   * @returns {boolean} True if on CircleCI
-   **/
-  isCircleCI() {
-    return ciInfo.CIRCLE;
-  },
-  /**
-   * Checks if currently on a PR
-   * @returns {boolean} True if on a PR
-   **/
-  isPR() {
-    return ciInfo.isPR;
-  },
-  /**
-   * Return the name of the originating branch of the PR
-   * @returns {string} Name of the PR branch
-   **/
-  prBranch() {
-    if (!this.isPR()) {
-      return false;
-    }
-    if (this.isCircleCI()) {
-      return this.getEnv('CIRCLE_BRANCH');
-    }
-    return false;
-  },
-  /**
-   * Returns the list of scripts defined in the package.json
-   * @returns {Array} List of scripts defined
-   **/
-  async availableScripts() {
-    // Get scripts in package.json
-    const currentPackage = await readJson(helper.hostPath('package.json'));
-    return _.chain(currentPackage).get('scripts').keys().value();
-  },
-  /**
-   * Returns a list of available scripts to run
-   * @returns {Array} List of scripts to run
-   **/
-  async scriptsToRun() {
-    const availableScripts = await this.availableScripts();
-
-    // Get potential scripts to run
-    const potentialScripts = ['test', 'lint', 'build:prod'];
-
-    return _.intersection(potentialScripts, availableScripts);
-  },
-  /**
-   * Display the current node and yarn versions
-   **/
-  async displayVersion() {
-    const { stdout: nodeVersion } = await this.__run('node --version', {
-      stdout: false,
-    });
-    const { stdout: yarnVersion } = await this.__run('yarn --version', {
-      stdout: false,
-    });
-    this.__consoleInfo(`node ${nodeVersion}, yarn v${yarnVersion}`);
-  },
   /**
    * Run CI scripts and fail the job if any fails
+   * Runs lint and test by default, but can be changed with --no-test and
+   * --no-lint
    * @param {object} cliArgs CLI Argument object, as created by minimist
    * @returns {boolean} True on success, throws on error
    **/
   async run(cliArgs = {}) {
     const args = {
-      'auto-release': false,
-      'cpu-count': 2,
+      test: true,
+      lint: true,
       ...cliArgs,
     };
 
     if (!this.isCI()) {
+      this.__consoleInfo('Current system is not a CI, skipping');
       return true;
     }
 
-    await this.displayVersion();
-
-    const scripts = await this.scriptsToRun();
-    await pMap(
-      scripts,
-      async (scriptName) => {
-        let command = scriptName;
-        if (command === 'test') {
-          command = `test --maxWorkers=${args['cpu-count']}`;
-        }
-
-        await helper.yarnRun(command);
-      },
-      { concurrency: 1 },
-    );
+    if (args.test) {
+      await this.__runTest();
+    }
 
-    // Attempt to release the package if --auto-release is set
-    if (args['auto-release']) {
-      await this.autoRelease();
+    if (args.lint) {
+      await this.__runLint();
     }
 
     return true;
   },
-  /**
-   * Attempt to perform an auto-release
-   **/
-  async autoRelease() {
-    await autoRelease.run();
-  },
+  __runTest: commandTest.run.bind(commandTest),
+  __runLint: commandLint.run.bind(commandLint),
   __run: run,
   __consoleInfo: consoleInfo,
 };