2.0.23

.gitignore

@@ -1,4 +1,20 @@
-node_modules/
+.nogit/
+
+# artifacts
 coverage/
 public/
 pages/
+
+# installs
+node_modules/
+
+# caches
+.yarn/
+.cache/
+.rpt2_cache
+
+# builds
+dist/
+dist_*/
+
+# custom

.gitlab-ci.yml

@@ -1,16 +1,16 @@
-# gitzone standard
+# gitzone ci_default
-image: hosttoday/ht-docker-node:npmci
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .npmci_cache/
+    - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
+  - security
-- test
+  - test
-- release
+  - release
-- metadata
+  - metadata
 
 # ====================
 # security stage
@@ -18,108 +18,114 @@ stages:
 mirror:
   stage: security
   script:
-  - npmci git mirror
+    - npmci git mirror
+  only:
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
-snyk:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
-    - npmci command npm install -g snyk
+    - npmci npm prepare
-    - npmci command npm install --ignore-scripts
+    - npmci command npm install --production --ignore-scripts
-    - npmci command snyk test
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=prod --production
   tags:
-  - docker
+    - docker
-  - notpriv
+
+auditDevDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=dev
+  tags:
+    - docker
+  allow_failure: true
 
 # ====================
 # test stage
 # ====================
-testLEGACY:
-  stage: test
-  script:
-  - npmci node install legacy
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-  allow_failure: true
 
-testLTS:
+testStable:
   stage: test
   script:
-  - npmci node install lts
+    - npmci npm prepare
-  - npmci npm install
+    - npmci node install stable
-  - npmci npm test
+    - npmci npm install
+    - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
+    - docker
-  - notpriv
 
-testSTABLE:
+testBuild:
   stage: test
   script:
-  - npmci node install stable
+    - npmci npm prepare
-  - npmci npm install
+    - npmci node install stable
-  - npmci npm test
+    - npmci npm install
+    - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
+    - docker
-  - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install stable
+    - npmci node install stable
-  - npmci npm publish
+    - npmci npm publish
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 # ====================
 # metadata stage
 # ====================
 codequality:
   stage: metadata
-  image: docker:stable
   allow_failure: true
-  services:
+  only:
-    - docker:stable-dind
+    - tags
   script:
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - npmci command npm install -g tslint typescript
-    - docker run
+    - npmci npm prepare
-        --env SOURCE_CODE="$PWD"
+    - npmci npm install
-        --volume "$PWD":/code
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
-  artifacts:
-    paths: [codeclimate.json]
   tags:
-  - docker
+    - lossless
-  - priv
+    - docker
+    - priv
 
 trigger:
   stage: metadata
   script:
-  - npmci trigger
+    - npmci trigger
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmci
   stage: metadata
   script:
-    - npmci command npm install -g npmpage
+    - npmci node install lts
-    - npmci command npmpage
+    - npmci command npm install -g @git.zone/tsdoc
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command tsdoc
   tags:
+    - lossless
     - docker
     - notpriv
   only:
@@ -127,4 +133,5 @@ pages:
   artifacts:
     expire_in: 1 week
     paths:
-    - public
+      - public
+  allow_failure: true

.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "current file",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "${relativeFile}"
+      ],
+      "runtimeArgs": ["-r", "@git.zone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    },
+    {
+      "name": "test.ts",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "test/test.ts"
+      ],
+      "runtimeArgs": ["-r", "@git.zone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,26 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["/npmextra.json"],
+      "schema": {
+        "type": "object",
+        "properties": {
+          "npmci": {
+            "type": "object",
+            "description": "settings for npmci"
+          },
+          "gitzone": {
+            "type": "object",
+            "description": "settings for gitzone",
+            "properties": {
+              "projectType": {
+                "type": "string",
+                "enum": ["website", "element", "service", "npm", "wcc"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

README.md

@@ -1,33 +0,0 @@
-# npmg
-
-setup your environment with the most important tools and update them easily.
-
-## Availabililty
-
-[![npm](https://gitzone.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/npmg)
-[![git](https://gitzone.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/gitzone/npmg)
-[![git](https://gitzone.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/gitzone/npmg)
-[![docs](https://gitzone.gitlab.io/assets/repo-button-docs.svg)](https://gitzone.gitlab.io/npmg/)
-
-## Status for master
-
-[![build status](https://GitLab.com/gitzone/npmg/badges/master/build.svg)](https://GitLab.com/gitzone/npmg/commits/master)
-[![coverage report](https://GitLab.com/gitzone/npmg/badges/master/coverage.svg)](https://GitLab.com/gitzone/npmg/commits/master)
-[![npm downloads per month](https://img.shields.io/npm/dm/npmg.svg)](https://www.npmjs.com/package/npmg)
-[![Dependency Status](https://david-dm.org/gitzonetools/npmg.svg)](https://david-dm.org/gitzonetools/npmg)
-[![bitHound Dependencies](https://www.bithound.io/github/gitzonetools/npmg/badges/dependencies.svg)](https://www.bithound.io/github/gitzonetools/npmg/master/dependencies/npm)
-[![bitHound Code](https://www.bithound.io/github/gitzonetools/npmg/badges/code.svg)](https://www.bithound.io/github/gitzonetools/npmg)
-[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
-
-## Usage
-
-Use TypeScript for best in class instellisense.
-
-For further information read the linked docs at the top of this README.
-
-> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
-> | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
-
-[![repo-footer](https://gitzone.gitlab.io/assets/repo-footer.svg)](https://git.zone)

assets/package_library.json

@@ -0,0 +1,13 @@
+{
+  "default": [
+    "@bubblewrap/cli",
+    "@losslessone_private/lole",
+    "@gitzone_private/gitzone",
+    "@git.zone/tsbuild",
+    "@git.zone/tsdocker",
+    "@git.zone/tsrun",
+    "nativescript",
+    "typescript",
+    "npm-check"
+  ]
+}

bin/cli.js

@@ -1,4 +0,0 @@
-#!/usr/bin/env node
-import * as tsrun from 'tsrun';
-process.env.CLI_CALL = 'true';
-require("../index.ts");

cli.js

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+process.env.CLI_CALL = 'true';
+const cliTool = require('./dist_ts/index');
+cliTool.runCli();

cli.ts.js

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+process.env.CLI_CALL = 'true';
+require('@git.zone/tsrun');
+const cliTool = require('./ts/index');
+cliTool.runCli();

docs/index.md

@@ -1,45 +0,0 @@
-# npmg
-
-setup your environment with the most important tools and update them easily.
-
-## Availabililty
-
-[![npm](https://gitzone.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/npmg)
-[![git](https://gitzone.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/gitzone/npmg)
-[![git](https://gitzone.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/gitzone/npmg)
-[![docs](https://gitzone.gitlab.io/assets/repo-button-docs.svg)](https://gitzone.gitlab.io/npmg/)
-
-## Status for master
-
-[![build status](https://GitLab.com/gitzone/npmg/badges/master/build.svg)](https://GitLab.com/gitzone/npmg/commits/master)
-[![coverage report](https://GitLab.com/gitzone/npmg/badges/master/coverage.svg)](https://GitLab.com/gitzone/npmg/commits/master)
-[![npm downloads per month](https://img.shields.io/npm/dm/npmg.svg)](https://www.npmjs.com/package/npmg)
-[![Dependency Status](https://david-dm.org/gitzonetools/npmg.svg)](https://david-dm.org/gitzonetools/npmg)
-[![bitHound Dependencies](https://www.bithound.io/github/gitzonetools/npmg/badges/dependencies.svg)](https://www.bithound.io/github/gitzonetools/npmg/master/dependencies/npm)
-[![bitHound Code](https://www.bithound.io/github/gitzonetools/npmg/badges/code.svg)](https://www.bithound.io/github/gitzonetools/npmg)
-[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
-
-## Usage
-
-Use TypeScript for best in class instellisense.
-
-To install the package type
-
-```shell
-yarn global add npmg
-```
-
-Then install a bundle by typing
-
-```shell
-npmg install
-```
-
-For further information read the linked docs at the top of this README.
-
-> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
-> | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
-
-[![repo-footer](https://gitzone.gitlab.io/assets/repo-footer.svg)](https://git.zone)

npmextra.json

@@ -7,5 +7,16 @@
       "npmts"
     ],
     "npmAccessLevel": "public"
+  },
+  "gitzone": {
+    "projectType": "npm",
+    "module": {
+      "githost": "gitlab.com",
+      "gitscope": "gitzone",
+      "gitrepo": "tools",
+      "shortDescription": "setup your environment with the most important tools and update them easily.",
+      "npmPackagename": "@git.zone/tools",
+      "license": "MIT"
+    }
   }
 }

package.json

@@ -1,16 +1,17 @@
 {
-  "name": "@gitzone/tools",
+  "name": "@git.zone/tools",
-  "version": "2.0.2",
+  "version": "2.0.23",
   "private": false,
+  "type": "module",
   "description": "setup your environment with the most important tools and update them easily.",
-  "main": "dist/index.js",
+  "main": "dist_ts/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "dist_ts/index.d.ts",
   "scripts": {
-    "test": "tsrun test/test.ts",
+    "test": "(tstest test/ --web)",
-    "build": "echo \"Not needed for now\""
+    "build": "(tsbuild --web)"
   },
   "bin": {
-    "gtools": "bin/cli.js"
+    "gtools": "cli.js"
   },
   "repository": {
     "type": "git",
@@ -29,15 +30,30 @@
   },
   "homepage": "https://github.com/GitZoneTools/npmg#readme",
   "devDependencies": {
-    "tapbundle": "^1.0.13"
+    "@git.zone/tsbuild": "^4.1.2",
+    "@git.zone/tstest": "^3.1.8"
   },
   "dependencies": {
-    "@gitzone/tsrun": "^1.0.5",
+    "@git.zone/tsrun": "^2.0.1",
-    "@pushrocks/smartcli": "^3.0.1",
+    "@push.rocks/smartcli": "^4.0.20",
-    "@types/node": "^10.3.1",
+    "@push.rocks/smartlog": "^3.1.10",
-    "beautylog": "^6.1.10",
+    "@push.rocks/smartlog-destination-local": "^9.0.2",
-    "smartenv": "^3.0.0",
+    "@push.rocks/smartshell": "^3.3.0",
-    "smartfile": "4.2.17",
+    "@types/node": "^25.2.0"
-    "smartshell": "^1.0.6"
+  },
-  }
+  "files": [
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
+  ]
 }

package_library.json

@@ -1,10 +0,0 @@
-{
-  "default":[
-    "@gitzone/npmdocker",
-    "@gitzone/npmts",
-    "@gitzone/gitzone",
-    "typescript",
-    "tslint",
-    "@gitzone/tsrun"
-  ]
-}

test/test.node.ts

@@ -0,0 +1,14 @@
+import { expect, tap } from '@git.zone/tstest/tapbundle';
+
+import * as tools from '../ts/tools.install.js';
+
+tap.test('should have install function exported', async () => {
+  expect(typeof tools.install).toEqual('function');
+});
+
+tap.test('should handle unknown package set', async () => {
+  // This will just log a warning, not throw
+  await tools.install('unknown');
+});
+
+export default tap.start();

test/test.ts

@@ -1,12 +0,0 @@
-import { expect, tap } from 'tapbundle';
-
-import * as npmgInstall from '../ts/tools.install';
-import * as smartenv from 'smartenv';
-
-let environment = new smartenv.Smartenv();
-
-tap.test("should install default list globally when parsed 'default' as argument", async () => {
-  await npmgInstall.install('default');
-});
-
-tap.start();

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@git.zone/tools',
+  version: '2.0.23',
+  description: 'setup your environment with the most important tools and update them easily.'
+}

ts/index.ts

@@ -1,2 +1,9 @@
-import plugins = require('./tools.plugins');
+import * as plugins from './tools.plugins.js';
-import * as cli from './tools.cli';
+import * as cli from './tools.cli.js';
+
+export const runCli = async () => {
+  await cli.run();
+};
+
+// Auto-run when called directly
+runCli();

ts/tools.cli.ts

@@ -1,11 +1,13 @@
-import * as plugins from './tools.plugins';
+import * as plugins from './tools.plugins.js';
-import * as toolsInstall from './tools.install';
+import * as toolsInstall from './tools.install.js';
 
-let npmgSmartcli = new plugins.smartcli.Smartcli();
+export const run = async () => {
+  const toolsCli = new plugins.smartcli.Smartcli();
 
-npmgSmartcli.addCommand('install').subscribe(async argvArg => {
+  toolsCli.addCommand('install').subscribe(async (argvArg) => {
-  toolsInstall.install('default');
+    toolsInstall.install('default');
-});
+  });
 
-npmgSmartcli.addVersion('no version set');
+  toolsCli.addVersion('no version set');
-npmgSmartcli.startParse();
+  toolsCli.startParse();
+};

ts/tools.install.ts

@@ -1,30 +1,38 @@
-import plugins = require('./tools.plugins');
+import * as plugins from './tools.plugins.js';
-import paths = require('./tools.paths');
+import * as paths from './tools.paths.js';
+import { logger } from './tools.logging.js';
 
 const installExec = async (packageNames: string[]) => {
+  const smartshellInstance = new plugins.smartshell.Smartshell({
+    executor: 'bash',
+  });
+
   let installString = '';
-  for (let packageName of packageNames) {
+  for (const packageName of packageNames) {
+    logger.log('info', `Found ${packageName}!`);
     installString = installString + `${packageName} `;
   }
-  await plugins.smartshell.exec(`yarn global remove ${installString}`);
+  // lets remove old packages
-  for (let packageName of packageNames) {
+  const uninstallCommand = `npm uninstall -g ${installString}`;
-    plugins.beautylog.info(`now preparing ${packageName}`);
+  const installCommand = `npm install -g ${installString}`;
-    plugins.beautylog.log(`Installing ${packageName}`);
+  logger.log('info', `uninstalling old packages with "${uninstallCommand}"`);
-  }
+  await smartshellInstance.exec(uninstallCommand);
-  await plugins.smartshell.exec(`npm install -g ${installString}`);
+  logger.log('info', `installing tools with ${installCommand}`);
+  await smartshellInstance.exec(installCommand);
+  logger.log('ok', `installed tools successfully!`);
 };
 
-let packageLibrary = plugins.smartfile.fs.toObjectSync(
+const packageLibrary = JSON.parse(
-  plugins.path.join(paths.packageBase, 'package_library.json')
+  plugins.fs.readFileSync(plugins.path.join(paths.assetsDir, 'package_library.json'), 'utf8')
 );
 
-export const install = async (packageSetArg: String) => {
+export const install = async (packageSetArg: string) => {
   switch (packageSetArg) {
     case 'default':
       await installExec(packageLibrary.default);
       break;
     default:
-      plugins.beautylog.warn('no set has been specified');
+      logger.log('warn', 'no set has been specified');
       break;
   }
 };

ts/tools.logging.ts

@@ -0,0 +1,15 @@
+import * as plugins from './tools.plugins.js';
+
+export const logger = new plugins.smartlog.Smartlog({
+  logContext: {
+    company: 'Some Company',
+    companyunit: 'Some CompanyUnit',
+    containerName: 'Some Containername',
+    environment: 'local',
+    runtime: 'node',
+    zone: 'gitzone',
+  },
+  minimumLogLevel: 'silly',
+});
+
+logger.addLogDestination(new plugins.smartlogDestinationLocal.DestinationLocal());

ts/tools.paths.ts

@@ -1,3 +1,8 @@
-import plugins = require('./tools.plugins');
+import * as plugins from './tools.plugins.js';
+import { fileURLToPath } from 'url';
 
-export let packageBase = plugins.path.join('__dirname', '../');
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = plugins.path.dirname(__filename);
+
+export const packageBase = plugins.path.join(__dirname, '../');
+export const assetsDir = plugins.path.join(packageBase, './assets');

ts/tools.plugins.ts

@@ -1,7 +1,11 @@
-import * as beautylog from 'beautylog';
+// node native
 import * as path from 'path';
-import * as smartcli from '@pushrocks/smartcli';
+import * as fs from 'fs';
-import * as smartfile from 'smartfile';
-import * as smartshell from 'smartshell';
 
-export { beautylog, path, smartcli, smartfile, smartshell };
+// push.rocks scope
+import * as smartlog from '@push.rocks/smartlog';
+import * as smartlogDestinationLocal from '@push.rocks/smartlog-destination-local';
+import * as smartcli from '@push.rocks/smartcli';
+import * as smartshell from '@push.rocks/smartshell';
+
+export { smartlog, smartlogDestinationLocal, path, fs, smartcli, smartshell };

tslint.json

@@ -1,3 +1,17 @@
 {
-    "extends": "tslint-config-standard"
+  "extends": ["tslint:latest", "tslint-config-prettier"],
+  "rules": {
+    "semicolon": [true, "always"],
+    "no-console": false,
+    "ordered-imports": false,
+    "object-literal-sort-keys": false,
+    "member-ordering": {
+      "options":{
+        "order": [
+          "static-method"
+        ]
+      }
+    }
+  },
+  "defaultSeverity": "warning"
 }