Compare commits
	
		
			28 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 94c5567b75 | |||
| 7b37506d4e | |||
| a401633b73 | |||
| 948a8e64d7 | |||
| 9e8fbac573 | |||
| 362740a55f | |||
| 3edc08b0ed | |||
| 15d7e6cbfc | |||
| 6824210da0 | |||
| 41d2d04958 | |||
| e490c6f730 | |||
| bdf4815145 | |||
| 84fdf8b139 | |||
| 545896821d | |||
| c7516458bd | |||
| c2f92e63c5 | |||
| d4116aefdb | |||
| 0f5f1f7772 | |||
| 7722187ea5 | |||
| 734a21c925 | |||
| bb36beb682 | |||
| 3417ca83ed | |||
| dea6264c34 | |||
| b6ca597ca5 | |||
| 1539d49426 | |||
| 51fbc906a0 | |||
| 0e3732cade | |||
| 4f968472c8 | 
| @@ -6,10 +6,6 @@ cache: | ||||
|   - .yarn/ | ||||
|   key: "$CI_BUILD_STAGE" | ||||
|  | ||||
| before_script: | ||||
|   - yarn global add npmci@3.0.29 | ||||
|   - npmci docker login | ||||
|  | ||||
| stages: | ||||
| - security | ||||
| - test | ||||
| @@ -23,6 +19,7 @@ mirror: | ||||
|   - npmci git mirror | ||||
|   tags: | ||||
|   - docker | ||||
|   - notpriv | ||||
|  | ||||
| snyk: | ||||
|   stage: security | ||||
| @@ -32,6 +29,26 @@ snyk: | ||||
|     - npmci command snyk test | ||||
|   tags: | ||||
|   - docker | ||||
|   - notpriv | ||||
|  | ||||
| codequality: | ||||
|   stage: security | ||||
|   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] | ||||
|   tags: | ||||
|   - docker | ||||
|   - priv | ||||
|  | ||||
| testLEGACY: | ||||
|   stage: test | ||||
| @@ -42,6 +59,7 @@ testLEGACY: | ||||
|   coverage: /\d+.?\d+?\%\s*coverage/ | ||||
|   tags: | ||||
|   - docker | ||||
|   - notpriv | ||||
|   allow_failure: true | ||||
|  | ||||
| testLTS: | ||||
| @@ -53,6 +71,7 @@ testLTS: | ||||
|   coverage: /\d+.?\d+?\%\s*coverage/ | ||||
|   tags: | ||||
|   - docker | ||||
|   - notpriv | ||||
|      | ||||
| testSTABLE: | ||||
|   stage: test | ||||
| @@ -63,18 +82,19 @@ testSTABLE: | ||||
|   coverage: /\d+.?\d+?\%\s*coverage/ | ||||
|   tags: | ||||
|   - docker | ||||
|   - notpriv | ||||
|  | ||||
| release: | ||||
|   stage: release | ||||
|   script: | ||||
|   - npmci node install stable | ||||
|   - npmci npm prepare | ||||
|   - npmci command npm install | ||||
|   - npmci command npmts | ||||
|   - npmci npm publish | ||||
|   only: | ||||
|   - tags | ||||
|   tags: | ||||
|   - docker | ||||
|   - notpriv | ||||
|  | ||||
| trigger: | ||||
|   stage: trigger | ||||
| @@ -84,6 +104,7 @@ trigger: | ||||
|   - tags | ||||
|   tags: | ||||
|   - docker | ||||
|   - notpriv | ||||
|  | ||||
| pages: | ||||
|   image: hosttoday/ht-docker-node:npmci | ||||
| @@ -93,6 +114,7 @@ pages: | ||||
|     - npmci command npmpage | ||||
|   tags: | ||||
|     - docker | ||||
|     - notpriv | ||||
|   only: | ||||
|     - tags | ||||
|   artifacts: | ||||
|   | ||||
| @@ -1,5 +1,3 @@ | ||||
| pages/ | ||||
| coverage/ | ||||
| test/ | ||||
| node_modules/ | ||||
| config.json | ||||
| test/ | ||||
| .yarn/ | ||||
|   | ||||
							
								
								
									
										8
									
								
								.snyk
									
									
									
									
									
								
							
							
						
						
									
										8
									
								
								.snyk
									
									
									
									
									
								
							| @@ -1,15 +1,15 @@ | ||||
| # Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities. | ||||
| version: v1.10.2 | ||||
| version: v1.12.0 | ||||
| # ignores vulnerabilities until expiry date; change duration by modifying expiry date | ||||
| ignore: | ||||
|   'npm:shelljs:20140723': | ||||
|     - shelljs: | ||||
|         reason: None given | ||||
|         expires: '2018-05-04T20:41:54.426Z' | ||||
|         expires: '2018-06-02T22:48:10.660Z' | ||||
|     - smartshell > shelljs: | ||||
|         reason: None given | ||||
|         expires: '2018-05-04T20:41:54.426Z' | ||||
|         expires: '2018-06-02T22:48:10.660Z' | ||||
|     - smartssh > shelljs: | ||||
|         reason: None given | ||||
|         expires: '2018-05-04T20:41:54.426Z' | ||||
|         expires: '2018-06-02T22:48:10.660Z' | ||||
| patch: {} | ||||
|   | ||||
							
								
								
									
										100
									
								
								docs/index.md
									
									
									
									
									
								
							
							
						
						
									
										100
									
								
								docs/index.md
									
									
									
									
									
								
							| @@ -1,100 +0,0 @@ | ||||
| # npmci | ||||
|  | ||||
| node and docker in gitlab ci on steroids | ||||
|  | ||||
| ## Availabililty | ||||
|  | ||||
| [](https://www.npmjs.com/package/npmci) | ||||
| [](https://GitLab.com/gitzone/npmci) | ||||
| [](https://github.com/gitzone/npmci) | ||||
| [](https://gitzone.gitlab.io/npmci/) | ||||
|  | ||||
| ## Status for master | ||||
|  | ||||
| [](https://GitLab.com/gitzone/npmci/commits/master) | ||||
| [](https://GitLab.com/gitzone/npmci/commits/master) | ||||
| [](https://www.npmjs.com/package/npmci) | ||||
| [](https://david-dm.org/gitzonetools/npmci) | ||||
| [](https://www.bithound.io/github/gitzonetools/npmci/master/dependencies/npm) | ||||
| [](https://www.bithound.io/github/gitzonetools/npmci) | ||||
| [](https://nodejs.org/dist/latest-v6.x/docs/api/) | ||||
| [](https://nodejs.org/dist/latest-v6.x/docs/api/) | ||||
| [](http://standardjs.com/) | ||||
|  | ||||
| ## Usage | ||||
|  | ||||
| Use TypeScript for best in class instellisense. | ||||
|  | ||||
| npmci is designed to work in docker CI environments. The following docker images come with npmci presinstalled: | ||||
|  | ||||
| Docker Hub: | ||||
|  | ||||
| * [hosttoday/ht-docker-node:npmci](https://hub.docker.com/r/hosttoday/ht-docker-node/)   | ||||
|   has LTS node version and npmci preinstalled. | ||||
| * [hosttoday/ht-docker-dbase](https://hub.docker.com/r/hosttoday/ht-docker-dbase/)   | ||||
|   based on docker:git, can be used to build docker images in conjunction with docker:dind | ||||
|  | ||||
| npmci can be called from commandline: | ||||
|  | ||||
| ```shell | ||||
| # Install any node version: | ||||
| npmci install lts # will install latest LTS node version and update PATH for node and npm versions | ||||
| npmci install stable # will install latest stable node version and update PATH for node and npm | ||||
| npmci install legacy # will install latest legacy node version and update PATH for node and npm | ||||
| npmci install x.x.x #  will install any specific node version. | ||||
|  | ||||
| # Install any node version, install dependencies and run test in cwd: | ||||
| npmci test lts # will install latest lts node version and run "npm install" and "npm test". | ||||
| npmci test stable # will install latest stable node version and run "npm install" and "npm test". | ||||
| npmci test legacy # will install latest legacy node version and run "npm install" and "npm test". | ||||
| npmci test x.x.x # will install any specific node version and run "npm install" and "npm test". | ||||
| npmci test docker # will test any build image with tests defined in ./npmci/dockertest_1.sh to ./npmci/dockertest_100.sh | ||||
| ## npmci test docker will look at all Dockerfiles and look for according tags on GitLab container registry | ||||
|  | ||||
|  | ||||
| # prepare tools | ||||
| npmci prepare npm # will look for $NPMCI_TOKEN_NPM env var and create .npmrc, so npm is authenticated | ||||
| npmci prepare docker # will look for $NPMCI_LOGIN_DOCKER in form username|password and authenticate docker | ||||
| npmci prepare docker-gitlab # will authenticate docker for gitlab container registry | ||||
|  | ||||
| # build containers | ||||
| npmci build docker # will build containers | ||||
| ## all Dockerfiles named Dockerfile* are picked up. | ||||
| ## specify tags like this Dockerfile_[tag] | ||||
| ## uploads all built images as [username]/[reponame]:[tag]_test to GitLab | ||||
| ## then test in next step with "npmci test docker" | ||||
|  | ||||
| # publish npm module | ||||
| npmci publish npm # will look vor $NPMCI_TOKEN_NPM env var and push any module in cwd to npm | ||||
| npmci publish docker | ||||
|  | ||||
| # trigger webhooks | ||||
| npmci trigger # will look for NPMCI_TRIGGER_1 to NPMCI_TRIGGER_100 in form domain|id|token|ref|name   | ||||
| ``` | ||||
|  | ||||
| ## Configuration | ||||
|  | ||||
| npmci supports the use of npmextra. | ||||
|  | ||||
| To configure npmci create a `npmextra.json` file at the root of your project | ||||
|  | ||||
| ```json | ||||
| { | ||||
|   "npmci": { | ||||
|     "globalNpmTools": ["npm-check-updates", "protractor", "npmts", "gitzone"] | ||||
|   } | ||||
| } | ||||
| ``` | ||||
|  | ||||
| **Available options** | ||||
|  | ||||
| | setting        | example                       | description                                                                                       | | ||||
| | -------------- | ----------------------------- | ------------------------------------------------------------------------------------------------- | | ||||
| | globalNpmTools | "globalNpmTools": ["gitbook"] | Will look for the specified package names locally and (if not yet present) install them from npm. | | ||||
|  | ||||
| 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) | ||||
|  | ||||
| [](https://push.rocks) | ||||
							
								
								
									
										22
									
								
								docs/ssh.md
									
									
									
									
									
								
							
							
						
						
									
										22
									
								
								docs/ssh.md
									
									
									
									
									
								
							| @@ -1,22 +0,0 @@ | ||||
| # SSH | ||||
|  | ||||
| npmci allows easy usage of ssh: | ||||
|  | ||||
| ## Add the SSH KEY to the environment | ||||
|  | ||||
| To make npmci aware of any SSH KEY add it to the environment in the following format | ||||
|  | ||||
| ``` | ||||
| # Key | ||||
| NPMCI_SSHKEY_[A_NAME_FROM_YOU] | ||||
| # Value: | ||||
| [targeted host]|[privatekey as base64]|*** | ||||
| ``` | ||||
|  | ||||
| ## Use npmci cli tool in your ci script | ||||
|  | ||||
| ``` | ||||
| npmci prepare ssh | ||||
| npmci command git remote add heroku ssh://git@heroku.com/[you project name].git | ||||
| npmci command git push heroku master | ||||
| ``` | ||||
| @@ -5,11 +5,8 @@ | ||||
|         "cli": true | ||||
|     }, | ||||
|     "npmci": { | ||||
|         "globalNpmTools": [ | ||||
|             "npmts" | ||||
|         ], | ||||
|         "npmGlobalTools": [ | ||||
|             "npmts" | ||||
|             "@gitzone/npmts" | ||||
|         ], | ||||
|         "npmAccessLevel": "public" | ||||
|     }, | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| { | ||||
|   "name": "@shipzone/npmci", | ||||
|   "version": "3.0.31", | ||||
|   "version": "3.0.46", | ||||
|   "description": "node and docker in gitlab ci on steroids", | ||||
|   "main": "dist/index.js", | ||||
|   "typings": "dist/index.d.ts", | ||||
| @@ -26,6 +26,7 @@ | ||||
|     "tapbundle": "^2.0.0" | ||||
|   }, | ||||
|   "dependencies": { | ||||
|     "@pushrocks/smartcli": "^3.0.1", | ||||
|     "@types/lodash": "^4.14.74", | ||||
|     "@types/shelljs": "^0.7.4", | ||||
|     "@types/through2": "^2.0.33", | ||||
| @@ -38,7 +39,6 @@ | ||||
|     "request": "^2.81.0", | ||||
|     "shelljs": "^0.8.1", | ||||
|     "smartanalytics": "^2.0.9", | ||||
|     "smartcli": "^2.0.7", | ||||
|     "smartdelay": "^1.0.3", | ||||
|     "smartfile": "^4.2.20", | ||||
|     "smartparam": "^1.0.2", | ||||
|   | ||||
							
								
								
									
										73
									
								
								readme.md
									
									
									
									
									
								
							
							
						
						
									
										73
									
								
								readme.md
									
									
									
									
									
								
							| @@ -25,6 +25,79 @@ node and docker in gitlab ci on steroids | ||||
|  | ||||
| Use TypeScript for best in class instellisense. | ||||
|  | ||||
| npmci is designed to work in docker CI environments. The following docker images come with npmci presinstalled: | ||||
|  | ||||
| Docker Hub: | ||||
|  | ||||
| * [hosttoday/ht-docker-node:npmci](https://hub.docker.com/r/hosttoday/ht-docker-node/)   | ||||
|   has LTS node version and npmci preinstalled. | ||||
| * [hosttoday/ht-docker-dbase](https://hub.docker.com/r/hosttoday/ht-docker-dbase/)   | ||||
|   based on docker:git, can be used to build docker images in conjunction with docker:dind | ||||
|  | ||||
| npmci can be called from commandline and handle a lot of tasks durug ci: | ||||
|  | ||||
| ```shell | ||||
| # Handle node versions | ||||
| npmci node install stable # will install latest stable node version and update PATH for node and npm | ||||
| npmci node install lts # will install latest LTS node version and update PATH for node and npm versions | ||||
| npmci node install legacy # will install latest legacy node version and update PATH for node and npm | ||||
| npmci node install x.x.x #  will install any specific node version. | ||||
|  | ||||
| # Handle npm and yarn tasks | ||||
| npmcu npm login # logs in npm using the auth key provided at env var "NPMCI_TOKEN_NPM" | ||||
| npmci npm install  # installs dependencies using npm or yarn dependending on availablity | ||||
| npmci npm test # tests the package | ||||
| npmci npm publish # builds a package and publishes it | ||||
|  | ||||
| # handle docker tasks | ||||
| npmci docker prepare | ||||
| ## npmci test docker will look at all Dockerfiles and look for according tags on GitLab container registry | ||||
|  | ||||
|  | ||||
| # prepare tools | ||||
| npmci prepare npm # will look for $NPMCI_TOKEN_NPM env var and create .npmrc, so npm is authenticated | ||||
| npmci prepare docker # will look for $NPMCI_LOGIN_DOCKER in form username|password and authenticate docker | ||||
| npmci prepare docker-gitlab # will authenticate docker for gitlab container registry | ||||
|  | ||||
| # build containers | ||||
| npmci docker build # will build containers | ||||
| ## all Dockerfiles named Dockerfile* are picked up. | ||||
| ## specify tags like this Dockerfile_[tag] | ||||
| ## uploads all built images as [username]/[reponame]:[tag]_test to GitLab | ||||
| ## then test in next step with "npmci test docker" | ||||
|  | ||||
| # publish npm module | ||||
| npmci publish npm # will look vor $NPMCI_TOKEN_NPM env var and push any module in cwd to npm | ||||
| npmci publish docker | ||||
|  | ||||
| # trigger webhooks | ||||
| npmci trigger # will look for NPMCI_TRIGGER_1 to NPMCI_TRIGGER_100 in form domain|id|token|ref|name   | ||||
| ``` | ||||
|  | ||||
| ## Configuration | ||||
|  | ||||
| npmci supports the use of npmextra. | ||||
|  | ||||
| To configure npmci create a `npmextra.json` file at the root of your project | ||||
|  | ||||
| ```json | ||||
| { | ||||
|   "npmci": { | ||||
|     "globalNpmTools": ["npm-check-updates", "protractor", "npmts", "gitzone"] | ||||
|   } | ||||
| } | ||||
| ``` | ||||
|  | ||||
| **Available options** | ||||
|  | ||||
| | setting        | example                       | description                                                                                       | | ||||
| | -------------- | ----------------------------- | ------------------------------------------------------------------------------------------------- | | ||||
| | globalNpmTools | "globalNpmTools": ["gitbook"] | Will look for the specified package names locally and (if not yet present) install them from npm. | | ||||
|  | ||||
| For further information read the linked docs at the top of this README. | ||||
|  | ||||
| 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) | ||||
|   | ||||
| @@ -66,15 +66,27 @@ let publish = async () => { | ||||
|     npmAccessCliString = `--access=${config.npmAccessLevel}`; | ||||
|   } | ||||
|  | ||||
|   // -> preparing | ||||
|   plugins.beautylog.log(`now preparing environment:`); | ||||
|   prepare(); | ||||
|   await bash(`npm -v`); | ||||
|  | ||||
|   // -> build it | ||||
|   await bash(`yarn install`); | ||||
|   await bash(`yarn run build`); | ||||
|  | ||||
|   // -> make sure npm is authenticated | ||||
|   prepare(); | ||||
|   plugins.beautylog.success(`Nice!!! The build for the publication was successfull!`); | ||||
|   plugins.beautylog.log(`Lets clean up so we don't publish any packages that don't belong to us:`); | ||||
|   // -> clean up before we publish stuff | ||||
|   await bash(`rm -r .yarn`); | ||||
|   await bash(`rm -r node_modules`); | ||||
|  | ||||
|   plugins.beautylog.success(`Cleaned up!:`); | ||||
|  | ||||
|   // -> publish it | ||||
|   plugins.beautylog.log(`now invoking npm to publish the package!`); | ||||
|   await bash(`npm publish ${npmAccessCliString}`); | ||||
|   plugins.beautylog.success(`Package was successfully published!`); | ||||
| }; | ||||
|  | ||||
| let install = async (): Promise<void> => { | ||||
|   | ||||
| @@ -11,112 +11,104 @@ import * as NpmciEnv from './npmci.env'; | ||||
|  | ||||
| import * as npmciMods from './npmci.mods'; | ||||
|  | ||||
| let smartcli = new plugins.smartcli.Smartcli(); | ||||
| smartcli.addVersion(npmciInfo.version); | ||||
| const npmciSmartcli = new plugins.smartcli.Smartcli(); | ||||
| npmciSmartcli.addVersion(npmciInfo.version); | ||||
|  | ||||
| // clean | ||||
| smartcli | ||||
| npmciSmartcli | ||||
|   .addCommand('clean') | ||||
|   .then(async argv => { | ||||
|   .subscribe(async argv => { | ||||
|     let modClean = await npmciMods.modClean.load(); | ||||
|     await modClean.clean(); | ||||
|   }) | ||||
|   .catch(err => { | ||||
|   }, err => { | ||||
|     console.log(err); | ||||
|     process.exit(1); | ||||
|   }); | ||||
|  | ||||
| // cloudflare | ||||
| smartcli | ||||
| npmciSmartcli | ||||
|   .addCommand('cloudflare') | ||||
|   .then(async argvArg => { | ||||
|   .subscribe(async argvArg => { | ||||
|     let modPurge = await npmciMods.modCloudflare.load(); | ||||
|     await modPurge.handleCli(argvArg); | ||||
|   }) | ||||
|   .catch(err => { | ||||
|   }, err => { | ||||
|     console.log(err); | ||||
|   }); | ||||
|  | ||||
| // command | ||||
| smartcli | ||||
| npmciSmartcli | ||||
|   .addCommand('command') | ||||
|   .then(async argv => { | ||||
|   .subscribe(async argv => { | ||||
|     let modCommand = await npmciMods.modCommand.load(); | ||||
|     await modCommand.command(); | ||||
|   }) | ||||
|   .catch(err => { | ||||
|   }, err => { | ||||
|     console.log(err); | ||||
|     process.exit(1); | ||||
|   }); | ||||
|  | ||||
| // command | ||||
| smartcli | ||||
| npmciSmartcli | ||||
|   .addCommand('git') | ||||
|   .then(async argvArg => { | ||||
|   .subscribe(async argvArg => { | ||||
|     let modGit = await npmciMods.modGit.load(); | ||||
|     await modGit.handleCli(argvArg); | ||||
|   }) | ||||
|   .catch(err => { | ||||
|   }, err => { | ||||
|     console.log(err); | ||||
|     process.exit(1); | ||||
|   }); | ||||
|  | ||||
| // build | ||||
| smartcli | ||||
| npmciSmartcli | ||||
|   .addCommand('docker') | ||||
|   .then(async argvArg => { | ||||
|   .subscribe(async argvArg => { | ||||
|     let modDocker = await npmciMods.modDocker.load(); | ||||
|     await modDocker.handleCli(argvArg); | ||||
|   }) | ||||
|   .catch(err => { | ||||
|   }, err => { | ||||
|     console.log(err); | ||||
|     process.exit(1); | ||||
|   }); | ||||
|  | ||||
| // node | ||||
| smartcli | ||||
| npmciSmartcli | ||||
|   .addCommand('node') | ||||
|   .then(async argvArg => { | ||||
|   .subscribe(async argvArg => { | ||||
|     let modNode = await npmciMods.modNode.load(); | ||||
|     await modNode.handleCli(argvArg); | ||||
|   }) | ||||
|   .catch(err => { | ||||
|   }, err => { | ||||
|     console.log(err); | ||||
|     process.exit(1); | ||||
|   }); | ||||
|  | ||||
| // npm | ||||
| smartcli | ||||
| npmciSmartcli | ||||
|   .addCommand('npm') | ||||
|   .then(async argvArg => { | ||||
|   .subscribe(async argvArg => { | ||||
|     let modNpm = await npmciMods.modNpm.load(); | ||||
|     await modNpm.handleCli(argvArg); | ||||
|   }) | ||||
|   .catch(err => { | ||||
|   }, err => { | ||||
|     console.log(err); | ||||
|   }); | ||||
|  | ||||
| // trigger | ||||
| smartcli | ||||
| npmciSmartcli | ||||
|   .addCommand('ssh') | ||||
|   .then(async argvArg => { | ||||
|   .subscribe(async argvArg => { | ||||
|     let modSsh = await npmciMods.modSsh.load(); | ||||
|     await modSsh.handleCli(argvArg); | ||||
|   }) | ||||
|   .catch(err => { | ||||
|   }, err => { | ||||
|     console.log(err); | ||||
|     process.exit(1); | ||||
|   }); | ||||
|  | ||||
| // trigger | ||||
| smartcli | ||||
| npmciSmartcli | ||||
|   .addCommand('trigger') | ||||
|   .then(async argv => { | ||||
|   .subscribe(async argv => { | ||||
|     let modTrigger = await npmciMods.modTrigger.load(); | ||||
|     await modTrigger.trigger(); | ||||
|   }) | ||||
|   .catch(err => { | ||||
|   }, err => { | ||||
|     console.log(err); | ||||
|     process.exit(1); | ||||
|   }); | ||||
|  | ||||
| smartcli.startParse(); | ||||
| npmciSmartcli.startParse(); | ||||
|   | ||||
| @@ -5,7 +5,7 @@ export import path = require('path'); | ||||
| export import projectinfo = require('projectinfo'); | ||||
| export import q = require('smartq'); | ||||
| export let request = require('request'); | ||||
| export import smartcli = require('smartcli'); | ||||
| export import smartcli = require('@pushrocks/smartcli'); | ||||
| export import smartdelay = require('smartdelay'); | ||||
| export import smartfile = require('smartfile'); | ||||
| export import shelljs = require('shelljs'); | ||||
|   | ||||
							
								
								
									
										121
									
								
								yarn.lock
									
									
									
									
									
								
							
							
						
						
									
										121
									
								
								yarn.lock
									
									
									
									
									
								
							| @@ -2,6 +2,18 @@ | ||||
| # yarn lockfile v1 | ||||
|  | ||||
|  | ||||
| "@pushrocks/smartcli@^3.0.1": | ||||
|   version "3.0.1" | ||||
|   resolved "https://registry.yarnpkg.com/@pushrocks/smartcli/-/smartcli-3.0.1.tgz#330ca93f83ecaa23f9213cefa23270105a7728fc" | ||||
|   dependencies: | ||||
|     "@types/yargs" "^11.0.0" | ||||
|     beautylog "^6.1.10" | ||||
|     lik "^2.0.5" | ||||
|     rxjs "^6.0.0" | ||||
|     smartparam "1.0.2" | ||||
|     smartq "^1.1.8" | ||||
|     yargs "^11.0.0" | ||||
|  | ||||
| "@types/chai-as-promised@^7.1.0": | ||||
|   version "7.1.0" | ||||
|   resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-7.1.0.tgz#010b04cde78eacfb6e72bfddb3e58fe23c2e78b9" | ||||
| @@ -9,14 +21,14 @@ | ||||
|     "@types/chai" "*" | ||||
|  | ||||
| "@types/chai-string@^1.4.0": | ||||
|   version "1.4.0" | ||||
|   resolved "https://registry.yarnpkg.com/@types/chai-string/-/chai-string-1.4.0.tgz#c8b78deb9ae53e86c05a446c256138faeaff53c1" | ||||
|   version "1.4.1" | ||||
|   resolved "https://registry.yarnpkg.com/@types/chai-string/-/chai-string-1.4.1.tgz#3a9d22716c27f2759bf272a4dbbdb593f18399e3" | ||||
|   dependencies: | ||||
|     "@types/chai" "*" | ||||
|  | ||||
| "@types/chai@*", "@types/chai@^4.1.2": | ||||
|   version "4.1.2" | ||||
|   resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.1.2.tgz#f1af664769cfb50af805431c407425ed619daa21" | ||||
|   version "4.1.3" | ||||
|   resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.1.3.tgz#b8a74352977a23b604c01aa784f5b793443fb7dc" | ||||
|  | ||||
| "@types/cron@^1.2.1": | ||||
|   version "1.3.0" | ||||
| @@ -51,8 +63,8 @@ | ||||
|   resolved "https://registry.yarnpkg.com/@types/js-base64/-/js-base64-2.3.1.tgz#c39f14f129408a3d96a1105a650d8b2b6eeb4168" | ||||
|  | ||||
| "@types/lodash@4.x.x", "@types/lodash@^4.14.55", "@types/lodash@^4.14.68", "@types/lodash@^4.14.74", "@types/lodash@^4.14.97": | ||||
|   version "4.14.106" | ||||
|   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.106.tgz#6093e9a02aa567ddecfe9afadca89e53e5dce4dd" | ||||
|   version "4.14.108" | ||||
|   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.108.tgz#02656af3add2e5b3174f830862c47421c00ef817" | ||||
|  | ||||
| "@types/minimatch@*", "@types/minimatch@3.x.x", "@types/minimatch@^3.0.3": | ||||
|   version "3.0.3" | ||||
| @@ -62,13 +74,9 @@ | ||||
|   version "2.0.29" | ||||
|   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-2.0.29.tgz#5002e14f75e2d71e564281df0431c8c1b4a2a36a" | ||||
|  | ||||
| "@types/node@*": | ||||
|   version "9.6.2" | ||||
|   resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.2.tgz#e49ac1adb458835e95ca6487bc20f916b37aff23" | ||||
|  | ||||
| "@types/node@^8.0.10": | ||||
|   version "8.10.2" | ||||
|   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.2.tgz#f1fb9c73414832c5b00ee954c4bbf68394e2e526" | ||||
| "@types/node@*", "@types/node@^8.0.10": | ||||
|   version "8.10.12" | ||||
|   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.12.tgz#dcb66f6de39074a296534bd1a256a3c6a1c8f5b5" | ||||
|  | ||||
| "@types/q@0.x.x": | ||||
|   version "0.0.37" | ||||
| @@ -83,8 +91,8 @@ | ||||
|   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.0.5.tgz#02b9d43a1a8e7503d15ed2fecb15ebb18c519b1d" | ||||
|  | ||||
| "@types/shelljs@^0.7.2", "@types/shelljs@^0.7.4": | ||||
|   version "0.7.8" | ||||
|   resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.7.8.tgz#4b4d6ee7926e58d7bca448a50ba442fd9f6715bd" | ||||
|   version "0.7.9" | ||||
|   resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.7.9.tgz#3abecb72d9cad9cd4b0e7cb86ed10a97d93ba602" | ||||
|   dependencies: | ||||
|     "@types/glob" "*" | ||||
|     "@types/node" "*" | ||||
| @@ -125,9 +133,9 @@ | ||||
|   version "1.3.1" | ||||
|   resolved "https://registry.yarnpkg.com/@types/which/-/which-1.3.1.tgz#7802c380887986ca909008afea4e08025b130f8d" | ||||
|  | ||||
| "@types/yargs@^10.0.1": | ||||
|   version "10.0.2" | ||||
|   resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-10.0.2.tgz#cc4ea921877874d1261e2c44b89807bc836e1b12" | ||||
| "@types/yargs@^11.0.0": | ||||
|   version "11.0.0" | ||||
|   resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-11.0.0.tgz#124b9ed9c65b7091cc36da59ae12cbd47d8745ea" | ||||
|  | ||||
| accepts@~1.3.4: | ||||
|   version "1.3.5" | ||||
| @@ -202,8 +210,8 @@ aws-sign2@~0.7.0: | ||||
|   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" | ||||
|  | ||||
| aws4@^1.6.0: | ||||
|   version "1.6.0" | ||||
|   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e" | ||||
|   version "1.7.0" | ||||
|   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289" | ||||
|  | ||||
| backo2@1.0.2: | ||||
|   version "1.0.2" | ||||
| @@ -326,8 +334,8 @@ chai@^4.1.2: | ||||
|     type-detect "^4.0.0" | ||||
|  | ||||
| chalk@^2.0.1, chalk@^2.1.0: | ||||
|   version "2.3.2" | ||||
|   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65" | ||||
|   version "2.4.1" | ||||
|   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" | ||||
|   dependencies: | ||||
|     ansi-styles "^3.2.1" | ||||
|     escape-string-regexp "^1.0.5" | ||||
| @@ -344,12 +352,12 @@ cli-cursor@^2.1.0: | ||||
|     restore-cursor "^2.0.0" | ||||
|  | ||||
| cli-spinners@^1.0.1: | ||||
|   version "1.3.0" | ||||
|   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.3.0.tgz#6ba8b357395f07b7981c1acc2614485ee8c02a2d" | ||||
|   version "1.3.1" | ||||
|   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.3.1.tgz#002c1990912d0d59580c93bd36c056de99e4259a" | ||||
|  | ||||
| cliui@^4.0.0: | ||||
|   version "4.0.0" | ||||
|   resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.0.0.tgz#743d4650e05f36d1ed2575b59638d87322bfbbcc" | ||||
|   version "4.1.0" | ||||
|   resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49" | ||||
|   dependencies: | ||||
|     string-width "^2.1.1" | ||||
|     strip-ansi "^4.0.0" | ||||
| @@ -364,8 +372,8 @@ clone-stats@^1.0.0: | ||||
|   resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680" | ||||
|  | ||||
| clone@^2.1.1: | ||||
|   version "2.1.2" | ||||
|   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" | ||||
|   version "2.1.1" | ||||
|   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb" | ||||
|  | ||||
| cloneable-readable@^1.0.0: | ||||
|   version "1.1.2" | ||||
| @@ -910,8 +918,8 @@ leakage@^0.3.0: | ||||
|     pretty-bytes "^4.0.2" | ||||
|  | ||||
| left-pad@^1.1.3: | ||||
|   version "1.2.0" | ||||
|   resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.2.0.tgz#d30a73c6b8201d8f7d8e7956ba9616087a68e0ee" | ||||
|   version "1.3.0" | ||||
|   resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e" | ||||
|  | ||||
| lik@^1.0.38: | ||||
|   version "1.0.43" | ||||
| @@ -925,7 +933,7 @@ lik@^1.0.38: | ||||
|     smartq "^1.1.6" | ||||
|     typings-global "^1.0.20" | ||||
|  | ||||
| lik@^2.0.2, lik@^2.0.5: | ||||
| lik@^2.0.5: | ||||
|   version "2.0.5" | ||||
|   resolved "https://registry.yarnpkg.com/lik/-/lik-2.0.5.tgz#1338a3201828b557fa91a5b8a6013743ff720e10" | ||||
|   dependencies: | ||||
| @@ -944,8 +952,8 @@ locate-path@^2.0.0: | ||||
|     path-exists "^3.0.0" | ||||
|  | ||||
| lodash@^4.17.4: | ||||
|   version "4.17.5" | ||||
|   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" | ||||
|   version "4.17.10" | ||||
|   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" | ||||
|  | ||||
| log-symbols@^2.1.0: | ||||
|   version "2.2.0" | ||||
| @@ -998,14 +1006,14 @@ minimist@^1.2.0: | ||||
|   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" | ||||
|  | ||||
| moment-timezone@^0.5.x: | ||||
|   version "0.5.14" | ||||
|   resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.14.tgz#4eb38ff9538b80108ba467a458f3ed4268ccfcb1" | ||||
|   version "0.5.16" | ||||
|   resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.16.tgz#661717d5f55b4d2c2e002262d726c83785192a5a" | ||||
|   dependencies: | ||||
|     moment ">= 2.9.0" | ||||
|  | ||||
| "moment@>= 2.9.0": | ||||
|   version "2.22.0" | ||||
|   resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.0.tgz#7921ade01017dd45186e7fee5f424f0b8663a730" | ||||
|   version "2.22.1" | ||||
|   resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad" | ||||
|  | ||||
| ms@2.0.0: | ||||
|   version "2.0.0" | ||||
| @@ -1275,8 +1283,8 @@ require-reload@0.2.2: | ||||
|   resolved "https://registry.yarnpkg.com/require-reload/-/require-reload-0.2.2.tgz#29a7591846caf91b6e8a3cda991683f95f8d7d42" | ||||
|  | ||||
| resolve@^1.1.6: | ||||
|   version "1.6.0" | ||||
|   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.6.0.tgz#0fbd21278b27b4004481c395349e7aba60a9ff5c" | ||||
|   version "1.7.1" | ||||
|   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3" | ||||
|   dependencies: | ||||
|     path-parse "^1.0.5" | ||||
|  | ||||
| @@ -1288,14 +1296,20 @@ restore-cursor@^2.0.0: | ||||
|     signal-exit "^3.0.2" | ||||
|  | ||||
| rxjs@^5.4.2, rxjs@^5.4.3: | ||||
|   version "5.5.8" | ||||
|   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.8.tgz#b2b0809a57614ad6254c03d7446dea0d83ca3791" | ||||
|   version "5.5.10" | ||||
|   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.10.tgz#fde02d7a614f6c8683d0d1957827f492e09db045" | ||||
|   dependencies: | ||||
|     symbol-observable "1.0.1" | ||||
|  | ||||
| rxjs@^6.0.0: | ||||
|   version "6.1.0" | ||||
|   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.1.0.tgz#833447de4e4f6427b9cec3e5eb9f56415cd28315" | ||||
|   dependencies: | ||||
|     tslib "^1.9.0" | ||||
|  | ||||
| safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: | ||||
|   version "5.1.1" | ||||
|   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" | ||||
|   version "5.1.2" | ||||
|   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" | ||||
|  | ||||
| set-blocking@^2.0.0: | ||||
|   version "2.0.0" | ||||
| @@ -1354,19 +1368,6 @@ smartchai@^2.0.0: | ||||
|     chai-as-promised "^7.1.1" | ||||
|     chai-string "^1.4.0" | ||||
|  | ||||
| smartcli@^2.0.7: | ||||
|   version "2.0.12" | ||||
|   resolved "https://registry.yarnpkg.com/smartcli/-/smartcli-2.0.12.tgz#e31008539813cb0bf1122a9281521a2f0f1e0224" | ||||
|   dependencies: | ||||
|     "@types/yargs" "^10.0.1" | ||||
|     beautylog "^6.1.10" | ||||
|     lik "^2.0.2" | ||||
|     rxjs "^5.4.3" | ||||
|     smartparam "1.0.2" | ||||
|     smartq "^1.1.6" | ||||
|     typings-global "^1.0.20" | ||||
|     yargs "^11.0.0" | ||||
|  | ||||
| smartdelay@^1.0.3, smartdelay@^1.0.4: | ||||
|   version "1.0.4" | ||||
|   resolved "https://registry.yarnpkg.com/smartdelay/-/smartdelay-1.0.4.tgz#791c1a4ee6770494064c10b1d2d2b8e6f3105b82" | ||||
| @@ -1630,8 +1631,8 @@ strip-indent@^2.0.0: | ||||
|   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68" | ||||
|  | ||||
| supports-color@^5.3.0: | ||||
|   version "5.3.0" | ||||
|   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0" | ||||
|   version "5.4.0" | ||||
|   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" | ||||
|   dependencies: | ||||
|     has-flag "^3.0.0" | ||||
|  | ||||
| @@ -1693,6 +1694,10 @@ tsclass@^1.0.12: | ||||
|   version "1.0.18" | ||||
|   resolved "https://registry.yarnpkg.com/tsclass/-/tsclass-1.0.18.tgz#bb96bf45b45e9ed8f3a6ca51f763b4d2db821dfb" | ||||
|  | ||||
| tslib@^1.9.0: | ||||
|   version "1.9.0" | ||||
|   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8" | ||||
|  | ||||
| tunnel-agent@^0.6.0: | ||||
|   version "0.6.0" | ||||
|   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" | ||||
|   | ||||
		Reference in New Issue
	
	Block a user