fix(core): update

2019-07-17 11:48:31 +02:00 · 2019-07-17 11:48:31 +02:00 · 4cb6aa03e6
commit 4cb6aa03e6
parent 8b85b6c8bc
19 changed files with 1639 additions and 252 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,22 @@
-node_modules/
+.nogit/
+
+# artifacts
 coverage/
-pages/
 public/
-test/temp/
+pages/
+
+# installs
+node_modules/
+
+# caches
+.yarn/
+.cache/
+.rpt2_cache
+
+# builds
+dist/
+dist_web/
+dist_serve/
+dist_ts_web/
+
+# custom
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,5 +1,5 @@
-# gitzone standard
-image: hosttoday/ht-docker-node:npmci
+# gitzone ci_default
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci

 cache:
  paths:
@ -26,6 +26,7 @@ mirror:
 snyk:
  stage: security
  script:
+    - npmci npm prepare
    - npmci command npm install -g snyk
    - npmci command npm install --ignore-scripts
    - npmci command snyk test
@ -36,21 +37,11 @@ snyk:
 # ====================
 # 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:
  stage: test
  script:
+  - npmci npm prepare
  - npmci node install lts
  - npmci npm install
  - npmci npm test
@ -58,13 +49,14 @@ testLTS:
  tags:
  - docker
  - notpriv
-    
-testSTABLE:
+
+testBuild:
  stage: test
  script:
-  - npmci node install stable
+  - npmci npm prepare
+  - npmci node install lts
  - npmci npm install
-  - npmci npm test
+  - npmci command npm run build
  coverage: /\d+.?\d+?\%\s*coverage/
  tags:
  - docker
@ -73,7 +65,7 @@ testSTABLE:
 release:
  stage: release
  script:
-  - npmci node install stable
+  - npmci node install lts
  - npmci npm publish
  only:
  - tags
@ -86,19 +78,11 @@ release:
 # ====================
 codequality:
  stage: metadata
-  image: docker:stable
  allow_failure: true
-  services:
-    - docker:stable-dind
  script:
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-    - docker run
-        --env SOURCE_CODE="$PWD"
-        --volume "$PWD":/code
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
-  artifacts:
-    paths: [codeclimate.json]
+    - npmci command npm install -g tslint typescript
+    - npmci npm install
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
  tags:
  - docker
  - priv
@ -117,9 +101,10 @@ pages:
  image: hosttoday/ht-docker-node:npmci
  stage: metadata
  script:
-    - npmci command npm install -g typedoc typescript
+    - npmci command npm install -g @gitzone/tsdoc
+    - npmci npm prepare
    - npmci npm install
-    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
+    - npmci command tsdoc
  tags:
    - docker
    - notpriv
@ -130,13 +115,3 @@ pages:
    paths:
    - public
  allow_failure: true
-
-windowsCompatibility:
-  image: stefanscherer/node-windows:10-build-tools
-  stage: metadata
-  script:
-  - npm install & npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - windows
-  allow_failure: true
--- a/5
+++ b/5
@ -1,5 +0,0 @@
-FROM hosttoday/ht-docker-node:npmts
-COPY ./ /node-app
-WORKDIR /node-app
-RUN npm install
-RUN npm test
--- a/README.md
+++ b/README.md
@ -1,27 +1,20 @@
-# smartssh
-
+# @pushrocks/smartssh
 setups SSH quickly and in a painless manner

-> Attention: This is still alpha, so some things won't work, not all things are implemented.
-
-## Availabililty
-
-[![npm](https://push.rocks/assets/repo-button-npm.svg)](https://www.npmjs.com/package/smartssh)
-[![git](https://push.rocks/assets/repo-button-git.svg)](https://gitlab.com/pushrocks/smartssh)
-[![git](https://push.rocks/assets/repo-button-mirror.svg)](https://github.com/pushrocks/smartssh)
-[![docs](https://push.rocks/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/smartssh/)
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartssh)
+* [gitlab.com (source)](https://gitlab.com/pushrocks/smartssh)
+* [github.com (source mirror)](https://github.com/pushrocks/smartssh)
+* [docs (typedoc)](https://pushrocks.gitlab.io/smartssh/)

 ## Status for master
-
 [![build status](https://gitlab.com/pushrocks/smartssh/badges/master/build.svg)](https://gitlab.com/pushrocks/smartssh/commits/master)
 [![coverage report](https://gitlab.com/pushrocks/smartssh/badges/master/coverage.svg)](https://gitlab.com/pushrocks/smartssh/commits/master)
-[![npm downloads per month](https://img.shields.io/npm/dm/smartssh.svg)](https://www.npmjs.com/package/smartssh)
-[![Dependency Status](https://david-dm.org/pushrocks/smartssh.svg)](https://david-dm.org/pushrocks/smartssh)
-[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/smartssh/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/smartssh/master/dependencies/npm)
-[![bitHound Code](https://www.bithound.io/github/pushrocks/smartssh/badges/code.svg)](https://www.bithound.io/github/pushrocks/smartssh)
-[![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/)
+[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/smartssh.svg)](https://www.npmjs.com/package/@pushrocks/smartssh)
+[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smartssh/badge.svg)](https://snyk.io/test/npm/@pushrocks/smartssh)
+[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)

 ## Usage

@ -55,4 +48,9 @@ sshInstance.getKey({
 sshInstance.getKeys(); // returns array of all available getKeys. Each key is in form of class sshKey
 ```

-[![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks)
+For further information read the linked docs at the top of this readme.
+
+> MIT licensed | **&copy;** [Lossless GmbH](https://lossless.gmbh)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
+
+[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://maintainedby.lossless.com)
--- a/npmextra.json
+++ b/npmextra.json
@ -2,5 +2,15 @@
  "npmci": {
    "npmGlobalTools": [],
    "npmAccessLevel": "public"
+  },
+  "gitzone": {
+    "module": {
+      "githost": "gitlab.com",
+      "gitscope": "pushrocks",
+      "gitrepo": "smartssh",
+      "shortDescription": "setups SSH quickly and in a painless manner",
+      "npmPackagename": "@pushrocks/smartssh",
+      "license": "MIT"
+    }
  }
 }
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -7,7 +7,7 @@
  "typings": "dist/index.d.ts",
  "scripts": {
    "test": "(tstest test/)",
-    "testDocker": "npmdocker",
+    "testDocker": "tsdocker",
    "build": "(tsbuild)"
  },
  "repository": {
@ -26,21 +26,32 @@
  },
  "homepage": "https://gitlab.com/pushrocks/smartssh#readme",
  "dependencies": {
-    "@pushrocks/smartfile": "^6.0.8",
+    "@pushrocks/smartfile": "^7.0.4",
    "@pushrocks/smartpath": "^4.0.1",
-    "@pushrocks/smartpromise": "^2.0.5",
-    "@pushrocks/smartshell": "^2.0.6",
-    "@pushrocks/smartstring": "^3.0.4",
-    "@types/fs-extra": "^5.0.4",
+    "@pushrocks/smartpromise": "^3.0.2",
+    "@pushrocks/smartshell": "^2.0.23",
+    "@pushrocks/smartstring": "^3.0.10",
+    "@types/fs-extra": "^8.0.0",
    "@types/minimatch": "^3.0.3",
-    "fs-extra": "^7.0.0",
+    "fs-extra": "^8.1.0",
    "minimatch": "^3.0.4"
  },
  "devDependencies": {
-    "@gitzone/tsbuild": "^2.0.22",
-    "@gitzone/tsrun": "^1.1.12",
-    "@gitzone/tstest": "^1.0.15",
-    "@pushrocks/tapbundle": "^3.0.7",
-    "@types/node": "^10.10.1"
-  }
-}
+    "@gitzone/tsbuild": "^2.1.11",
+    "@gitzone/tsdocker": "^1.2.39",
+    "@gitzone/tsrun": "^1.2.6",
+    "@gitzone/tstest": "^1.0.24",
+    "@pushrocks/tapbundle": "^3.0.11",
+    "@types/node": "^12.6.6"
+  },
+  "files": [
+    "ts/*",
+    "ts_web/*",
+    "dist/*",
+    "dist_web/*",
+    "assets/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
+}
--- a/test/temp/bitbucket.org
+++ b/test/temp/bitbucket.org
@ -0,0 +1 @@
+somePrivateKey
--- a/test/temp/bitbucket.org.pub
+++ b/test/temp/bitbucket.org.pub
@ -0,0 +1 @@
+somePublicKey
--- a/test/temp/config
+++ b/test/temp/config
@ -0,0 +1,15 @@
+Host gitlab.com
+  HostName gitlab.com
+  IdentityFile ~/.ssh/gitlab.com
+  StrictHostKeyChecking no
+
+Host bitbucket.org
+  HostName bitbucket.org
+  IdentityFile ~/.ssh/bitbucket.org
+  StrictHostKeyChecking no
+
+Host github.com
+  HostName github.com
+  IdentityFile ~/.ssh/github.com
+  StrictHostKeyChecking no
+
--- a/test/temp/example.com
+++ b/test/temp/example.com
@ -0,0 +1 @@
+someExamplePrivateKey
--- a/test/temp/example.com.pub
+++ b/test/temp/example.com.pub
@ -0,0 +1 @@
+someExamplePublicKey
--- a/test/temp/github.com
+++ b/test/temp/github.com
@ -0,0 +1 @@
+someGitHubPrivateKey
--- a/test/temp/github.com.pub
+++ b/test/temp/github.com.pub
@ -0,0 +1 @@
+someGitHubPublicKey
--- a/test/temp/gitlab.com
+++ b/test/temp/gitlab.com
@ -0,0 +1 @@
+somePrivateKey
--- a/test/temp/gitlab.com.pub
+++ b/test/temp/gitlab.com.pub
@ -0,0 +1 @@
+somePublicKey
--- a/ts/smartssh.classes.sshconfig.ts
+++ b/ts/smartssh.classes.sshconfig.ts
@ -12,7 +12,7 @@ export class SshConfig {
   * stores a config file
   */
  store(dirPathArg: string) {
-    let done = plugins.q.defer();
+    let done = plugins.smartpromise.defer();
    let configArray: configObject[] = [];
    let configString;
    for (let key in this._sshKeyArray) {
@ -45,7 +45,7 @@ export class SshConfig {
    return done.promise;
  }
  read(dirPathArg) {
-    let done = plugins.q.defer();
+    let done = plugins.smartpromise.defer();
    let configArray: configObject[];
    plugins.smartfile.fs.toStringSync(plugins.path.join(dirPathArg, 'config'));

--- a/ts/smartssh.plugins.ts
+++ b/ts/smartssh.plugins.ts
@ -1,10 +1,10 @@
 import * as fs from 'fs-extra';
 import * as minimatch from 'minimatch';
 import * as path from 'path';
-import * as q from '@pushrocks/smartpromise';
+import * as smartpromise from '@pushrocks/smartpromise';
 import * as shelljs from '@pushrocks/smartshell';
 import * as smartfile from '@pushrocks/smartfile';
 import * as smartpath from '@pushrocks/smartpath';
 import * as smartstring from '@pushrocks/smartstring';

-export { fs, minimatch, path, q, shelljs, smartfile, smartpath, smartstring };
+export { fs, minimatch, path, smartpromise, shelljs, smartfile, smartpath, smartstring };
--- a/tslint.json
+++ b/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"
 }