From f33962954ae7652a740ed0f0df45cc763c4e7d35 Mon Sep 17 00:00:00 2001 From: "Michael Bradley, Jr" Date: Fri, 21 Sep 2018 16:41:53 -0500 Subject: [PATCH 1/7] alpha sort devDeps --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1c7cba82c..47eafb022 100644 --- a/package.json +++ b/package.json @@ -109,10 +109,10 @@ "homepage": "https://embark.status.im/", "license": "MIT", "devDependencies": { + "chai": "4.1.2", "eslint": "4.13.1", "mocha-sinon": "1.2.0", - "sinon": "4.5.0", - "chai": "4.1.2" + "sinon": "4.5.0" }, "engines": { "node": ">=8.11.3", From bf61fe2757a63ae005986d2028e9e788f18e1c11 Mon Sep 17 00:00:00 2001 From: "Michael Bradley, Jr" Date: Fri, 21 Sep 2018 16:43:04 -0500 Subject: [PATCH 2/7] deps -- npm-run-all --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 47eafb022..3777b2e5d 100644 --- a/package.json +++ b/package.json @@ -112,6 +112,7 @@ "chai": "4.1.2", "eslint": "4.13.1", "mocha-sinon": "1.2.0", + "npm-run-all": "4.1.3", "sinon": "4.5.0" }, "engines": { From 0602661530463a2a47d06ac64b65cec96dd6118f Mon Sep 17 00:00:00 2001 From: "Michael Bradley, Jr" Date: Fri, 21 Sep 2018 16:57:26 -0500 Subject: [PATCH 3/7] pkg lock -- npm-run-all --- npm-shrinkwrap.json | 194 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 194 insertions(+) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index c667db2cc..32837b170 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1120,11 +1120,29 @@ "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=" }, + "array-filter": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz", + "integrity": "sha1-fajPLiZijtcygDWB/SH2fKzS7uw=", + "dev": true + }, "array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" }, + "array-map": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz", + "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI=", + "dev": true + }, + "array-reduce": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz", + "integrity": "sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=", + "dev": true + }, "array-union": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", @@ -2792,6 +2810,12 @@ "create-hmac": "^1.1.4" } }, + "duplexer": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", + "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=", + "dev": true + }, "duplexer3": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", @@ -3282,6 +3306,22 @@ "resolved": "https://registry.npmjs.org/event-pubsub/-/event-pubsub-4.3.0.tgz", "integrity": "sha512-z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ==" }, + "event-stream": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.6.tgz", + "integrity": "sha512-dGXNg4F/FgVzlApjzItL+7naHutA3fDqbV/zAZqDDlXTjiMnQmZKu+prImWKszeBM5UQeGvAl3u1wBiKeDh61g==", + "dev": true, + "requires": { + "duplexer": "^0.1.1", + "flatmap-stream": "^0.1.0", + "from": "^0.1.7", + "map-stream": "0.0.7", + "pause-stream": "^0.0.11", + "split": "^1.0.1", + "stream-combiner": "^0.2.2", + "through": "^2.3.8" + } + }, "eventemitter3": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz", @@ -3773,6 +3813,12 @@ "resolved": "https://registry.npmjs.org/flatmap/-/flatmap-0.0.3.tgz", "integrity": "sha1-Hxik2TgVLUlZZfnJWNkjqy3WabQ=" }, + "flatmap-stream": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/flatmap-stream/-/flatmap-stream-0.1.0.tgz", + "integrity": "sha512-Nlic4ZRYxikqnK5rj3YoxDVKGGtUjcNDUtvQ7XsdGLZmMwdUYnXf10o1zcXtzEZTBgc6GxeRpQxV/Wu3WPIIHA==", + "dev": true + }, "flatted": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/flatted/-/flatted-0.2.3.tgz", @@ -3846,6 +3892,12 @@ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" }, + "from": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz", + "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=", + "dev": true + }, "from2": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", @@ -5708,6 +5760,12 @@ "graceful-fs": "^4.1.6" } }, + "jsonify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", + "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", + "dev": true + }, "jsonlint": { "version": "1.6.3", "resolved": "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.3.tgz", @@ -6101,6 +6159,12 @@ "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" }, + "map-stream": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz", + "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=", + "dev": true + }, "map-visit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", @@ -6888,6 +6952,76 @@ "sort-keys": "^1.0.0" } }, + "npm-run-all": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.3.tgz", + "integrity": "sha512-aOG0N3Eo/WW+q6sUIdzcV2COS8VnTZCmdji0VQIAZF3b+a3YWb0AD0vFIyjKec18A7beLGbaQ5jFTNI2bPt9Cg==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.0", + "chalk": "^2.1.0", + "cross-spawn": "^6.0.4", + "memorystream": "^0.3.1", + "minimatch": "^3.0.4", + "ps-tree": "^1.1.0", + "read-pkg": "^3.0.0", + "shell-quote": "^1.6.1", + "string.prototype.padend": "^3.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "load-json-file": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", + "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "parse-json": "^4.0.0", + "pify": "^3.0.0", + "strip-bom": "^3.0.0" + } + }, + "path-type": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", + "dev": true, + "requires": { + "pify": "^3.0.0" + } + }, + "read-pkg": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", + "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", + "dev": true, + "requires": { + "load-json-file": "^4.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^3.0.0" + } + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + } + } + }, "npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", @@ -7306,6 +7440,15 @@ "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=", "dev": true }, + "pause-stream": { + "version": "0.0.11", + "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", + "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=", + "dev": true, + "requires": { + "through": "~2.3" + } + }, "pbkdf2": { "version": "3.0.16", "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz", @@ -7934,6 +8077,15 @@ "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=" }, + "ps-tree": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz", + "integrity": "sha1-tCGyQUDWID8e08dplrRCewjowBQ=", + "dev": true, + "requires": { + "event-stream": "~3.3.0" + } + }, "pseudomap": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", @@ -8729,6 +8881,18 @@ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" }, + "shell-quote": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz", + "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=", + "dev": true, + "requires": { + "array-filter": "~0.0.0", + "array-map": "~0.0.0", + "array-reduce": "~0.0.0", + "jsonify": "~0.0.0" + } + }, "shelljs": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz", @@ -9013,6 +9177,15 @@ "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz", "integrity": "sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w==" }, + "split": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", + "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==", + "dev": true, + "requires": { + "through": "2" + } + }, "split-string": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", @@ -9104,6 +9277,16 @@ "readable-stream": "^2.0.2" } }, + "stream-combiner": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz", + "integrity": "sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=", + "dev": true, + "requires": { + "duplexer": "~0.1.1", + "through": "~2.3.4" + } + }, "stream-each": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz", @@ -9168,6 +9351,17 @@ "strip-ansi": "^3.0.0" } }, + "string.prototype.padend": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz", + "integrity": "sha1-86rvfBcZ8XDF6rHDK/eA2W4h8vA=", + "dev": true, + "requires": { + "define-properties": "^1.1.2", + "es-abstract": "^1.4.3", + "function-bind": "^1.0.2" + } + }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", From 6b48726ec35a6b738c56659dba82981331878d57 Mon Sep 17 00:00:00 2001 From: "Michael Bradley, Jr" Date: Fri, 21 Sep 2018 16:44:41 -0500 Subject: [PATCH 4/7] deps -- cross-env --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 3777b2e5d..120e31372 100644 --- a/package.json +++ b/package.json @@ -110,6 +110,7 @@ "license": "MIT", "devDependencies": { "chai": "4.1.2", + "cross-env": "5.2.0", "eslint": "4.13.1", "mocha-sinon": "1.2.0", "npm-run-all": "4.1.3", From 2b1bdc6a143492499b0bad248378ff3b2cf1e8ab Mon Sep 17 00:00:00 2001 From: "Michael Bradley, Jr" Date: Fri, 21 Sep 2018 16:59:54 -0500 Subject: [PATCH 5/7] pkg lock -- cross-env --- npm-shrinkwrap.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 32837b170..0deffb49a 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -2342,6 +2342,31 @@ "sha.js": "^2.4.8" } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", From 373a67b4a30779032f890a8106c065b53ffe0d19 Mon Sep 17 00:00:00 2001 From: "Michael Bradley, Jr" Date: Thu, 6 Sep 2018 22:43:52 -0500 Subject: [PATCH 6/7] rev testdapp scripts -- INIT_CWD compat --- package.json | 11 ++++++----- test_apps/contracts_app/package.json | 3 ++- test_apps/coverage_app/package.json | 5 +++-- test_apps/test_app/package.json | 3 ++- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 120e31372..a24c45d31 100644 --- a/package.json +++ b/package.json @@ -3,11 +3,12 @@ "version": "3.2.0-develop", "description": "Embark is a framework that allows you to easily develop and deploy DApps", "scripts": { - "lint": "./node_modules/.bin/eslint lib/", - "test": "mocha test/ --no-timeouts --exit", - "testdapp_1": "cd test_apps/test_app/ && npm install && node ../../bin/embark test", - "testdapp_2": "cd test_apps/contracts_app/ && npm install && node ../../bin/embark test", - "fulltest": "npm run lint && npm run test && npm run testdapp_1 && npm run testdapp_2" + "lint": "eslint lib/", + "test": "npm-run-all lint test:*", + "test:embark": "mocha test/ --no-timeouts --exit", + "test:test_app": "cross-env DAPP=\"test_app\" npm run test_dapp", + "test:contracts_app": "cross-env DAPP=\"contracts_app\" npm run test_dapp", + "test_dapp": "cross-env-shell \"cd test_apps/$DAPP && npm install && npm test\"" }, "bin": { "embark": "./bin/embark" diff --git a/test_apps/contracts_app/package.json b/test_apps/contracts_app/package.json index 5a6a3beea..eef4bc35b 100644 --- a/test_apps/contracts_app/package.json +++ b/test_apps/contracts_app/package.json @@ -4,7 +4,8 @@ "description": "", "main": "Gruntfile.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "embark": "node ../../bin/embark", + "test": "npm run embark test" }, "author": "", "license": "ISC", diff --git a/test_apps/coverage_app/package.json b/test_apps/coverage_app/package.json index 8020497c0..6198d0af2 100644 --- a/test_apps/coverage_app/package.json +++ b/test_apps/coverage_app/package.json @@ -4,8 +4,9 @@ "description": "", "main": "Gruntfile.js", "scripts": { - "test": "../../bin/embark test", - "coverage": "istanbul report --root .embark --format html" + "coverage": "istanbul report --root .embark --format html", + "embark": "node ../../bin/embark", + "test": "npm run embark test" }, "author": "", "license": "ISC", diff --git a/test_apps/test_app/package.json b/test_apps/test_app/package.json index 586d6be88..687d7b98b 100644 --- a/test_apps/test_app/package.json +++ b/test_apps/test_app/package.json @@ -4,7 +4,8 @@ "description": "", "main": "Gruntfile.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "embark": "node ../../bin/embark", + "test": "npm run embark test" }, "author": "", "license": "ISC", From 90d5657060285071ea1eb8fe0faa41270c37d1dd Mon Sep 17 00:00:00 2001 From: "Michael Bradley, Jr" Date: Tue, 11 Sep 2018 13:11:43 -0500 Subject: [PATCH 7/7] simplify appveyor, travis scripts --- .travis.yml | 5 +---- appveyor.yml | 8 ++------ 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index da13bda1c..b65bbcef8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,4 @@ addons: before_install: - npm i -g npm@latest script: - - npm run lint - - npm run test - - npm run testdapp_1 - - npm run testdapp_2 + - npm test diff --git a/appveyor.yml b/appveyor.yml index 0a937547a..f8b7e9abd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,12 +15,8 @@ test_script: # Output useful info for debugging. - node --version - npm --version - - npm run lint - - npm run test - # tmp fix due to windows npm5 issue - - cd test_apps/test_app/extensions/embark-service && npm install - - npm run testdapp_1 - - npm run testdapp_2 + # run tests + - npm test # Don't actually build. build: off