chore(package): update and remove unnecessary deps

dszakallas · dszakallas · commit d2cb54e7c00d · 2017-02-20T10:15:51.000+01:00
diff --git a/circle.yml b/circle.yml
@@ -18,7 +18,7 @@ test:
   override:
     - ./scripts/run-ci.sh ./scripts/prepare.sh
     - ./scripts/run-ci.sh ./scripts/lint.sh
-    - ./scripts/run-ci.sh ./scripts/node-matrix.sh ./scripts/prepare.sh ./scripts/test-unit.sh ./scripts/test-cover.sh ./scripts/test-e2e.sh && ./scripts/run-ci.sh ./scripts/test-instrumentations.sh:
+    - ./scripts/run-ci.sh ./scripts/node-matrix.sh ./scripts/prepare.sh ./scripts/test-unit.sh ./scripts/test-coverage.sh ./scripts/test-e2e.sh && ./scripts/run-ci.sh ./scripts/test-instrumentations.sh:
         parallel: true
 
 deployment:
diff --git a/package.json b/package.json
@@ -22,18 +22,17 @@
   },
   "main": "lib/index.js",
   "scripts": {
-    "lint": "eslint lib example e2e",
+    "install": "npm i @risingstack/v8-profiler --build-from-source || exit 0",
+    "lint": "./scripts/lint.sh",
     "test": "npm run test-unit",
-    "test-e2e": "cd ./test/e2e && npm test",
     "test-unit": "mocha 'lib/**/*.spec.js'",
-    "test-cls": "cd ./test/instrumentations && npm run test-cls",
-    "test-module": "cd ./test/instrumentations && npm run test-e2e",
-    "cover": "istanbul cover _mocha 'lib/**/*.spec.js'",
-    "changelog": "conventional-changelog -p angular -o CHANGELOG.md -r 500",
+    "test-e2e": "./scripts/test-e2e.sh",
+    "test-instrumentations": "./scripts/test-instrumentations.sh",
+    "test-coverage": "./scripts/test-coverage.sh",
     "semantic-release": "semantic-release pre && npm publish && semantic-release post",
     "semantic-release-pre": "semantic-release pre",
     "semantic-release-post": "semantic-release post",
-    "install": "npm i @risingstack/v8-profiler --build-from-source || exit 0"
+    "which": "which"
   },
   "repository": {
     "type": "git",
@@ -42,12 +41,15 @@
   "bugs": {
     "url": "https://github.com/RisingStack/trace-nodejs/issues"
   },
+  "engines": {
+    "node": ">=0.12"
+  },
   "dependencies": {
     "bl": "1.2.0",
     "continuation-local-storage": "3.2.0",
-    "debug": "2.6.0",
+    "debug": "2.6.1",
     "https-proxy-agent": "1.0.0",
-    "js-yaml": "3.7.0",
+    "js-yaml": "3.8.1",
     "json-stringify-safe": "5.0.1",
     "lodash.assign": "4.2.0",
     "lodash.defaults": "4.2.0",
@@ -58,11 +60,11 @@
     "lodash.isnumber": "3.0.3",
     "lodash.uniq": "4.5.0",
     "lodash.remove": "4.7.0",
-    "lodash.some": "^4.6.0",
-    "qs": "6.3.0",
+    "lodash.some": "4.6.0",
+    "qs": "6.3.1",
     "semver": "5.3.0",
     "sync-request": "3.0.1",
-    "uuid": "^3.0.1"
+    "uuid": "3.0.1"
   },
   "optionalDependencies": {
     "microtime": "2.1.2",
@@ -71,20 +73,20 @@
     "@risingstack/v8-profiler": "5.7.0"
   },
   "devDependencies": {
-    "chai": "3.5.0",
-    "conventional-changelog": "1.1.0",
-    "eslint": "2.10.2",
-    "eslint-config-standard": "5.3.1",
-    "eslint-plugin-promise": "1.0.8",
-    "eslint-plugin-standard": "1.3.2",
-    "istanbul": "0.4.5",
-    "lodash.defaultsdeep": "^4.5.1",
-    "mocha": "3.2.0",
-    "nock": "9.0.2",
-    "pre-commit": "1.2.1",
-    "semantic-release": "6.3.2",
-    "sinon": "1.17.6",
-    "sinon-chai": "2.8.0"
+    "chai": "^3.5.0",
+    "conventional-changelog": "^1.1.0",
+    "eslint": "^3.15.0",
+    "eslint-config-standard": "^6.2.1",
+    "eslint-plugin-promise": "^3.4.1",
+    "eslint-plugin-standard": "^2.0.1",
+    "istanbul": "^0.4.5",
+    "lodash": "^4.17.4",
+    "mocha": "^3.2.0",
+    "nock": "^9.0.6",
+    "pre-commit": "^1.2.2",
+    "semantic-release": "^6.3.2",
+    "sinon": "^1.17.7",
+    "sinon-chai": "^2.8.0"
   },
   "pre-commit": [
     "lint",
diff --git a/scripts/lint.sh b/scripts/lint.sh
@@ -5,4 +5,6 @@ source ./scripts/util/env-node.sh
 
 nvm use $NODE_VERSION
 
-npm run lint
+eslint=$(npm run which --loglevel silent -- eslint)
+
+$eslint lib example test
diff --git a/scripts/prepare.sh b/scripts/prepare.sh
@@ -7,4 +7,3 @@ nvm use $NODE_VERSION
 
 rm -rf node_modules
 npm install >/dev/null
-npm link >/dev/null 2>&1
diff --git a/scripts/test-coverage.sh b/scripts/test-coverage.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -e
+source ./scripts/util/env-essential.sh
 source ./scripts/util/env-node.sh
 
 nvm use $NODE_VERSION
@@ -10,4 +11,7 @@ else
     dir=./coverage/v$NODE_VERSION
 fi
 
-npm run cover -- --dir $dir
+istanbul=$(npm run which --loglevel silent -- istanbul)
+mocha=$(npm run which --loglevel silent -- _mocha)
+
+$istanbul cover $mocha 'lib/**/*.spec.js' --dir $dir
diff --git a/scripts/test-instrumentations.sh b/scripts/test-instrumentations.sh
@@ -1,11 +1,12 @@
 #!/usr/bin/env bash
 set -e
+source ./scripts/util/env-essential.sh
 source ./scripts/util/env-node.sh
 
 nvm use $NODE_VERSION_FW
 
 if [[ -z $INSTR_TARGET_VERSIONS ]]; then
-    INSTR_TARGET_VERSIONS=some
+    INSTR_TARGET_VERSIONS=one
 fi
 
 cd ./test/instrumentations
diff --git a/test/e2e/apiCalls.spec.js b/test/e2e/apiCalls.spec.js
@@ -80,7 +80,7 @@ apiCalls.forEach(function (name) {
           }
         }
       })
-      require('@risingstack/trace')
+      require('../..')
       t.pass('Trace loaded into server')
       // http server
       var app = express()
diff --git a/test/e2e/clientUnreachable.spec.js b/test/e2e/clientUnreachable.spec.js
@@ -25,7 +25,6 @@ var cpOpts = {
   }
 }
 
-
 test('client Unreachable',
   {
     // FIXME: I patched nock, so it can gunzip requests on appropriate
@@ -36,11 +35,11 @@ test('client Unreachable',
     timeout: TEST_TIMEOUT,
     childProcessOpts: cpOpts
   }, function (t) {
-    var timesCalled = 0
     serviceMocks.mockServiceKeyRequest({
       url: TRACE_COLLECTOR_API_URL,
       apiKey: TRACE_API_KEY,
       callback: function () {
+        t.pass('Service key requested')
         return [200, { key: TEST_TRACE_SERVICE_KEY }]
       }
     })
@@ -54,7 +53,7 @@ test('client Unreachable',
         process.exit(0)
       }
     })
-    require('@risingstack/trace')
+    require('../..')
     t.pass('Trace loaded into server')
     // http server
     var app = express()
diff --git a/test/e2e/crash/index.spec.js b/test/e2e/crash/index.spec.js
@@ -1,30 +1,29 @@
-'use strict'
-
-var express = require('express')
-var bodyParser = require('body-parser')
-var test = require('tape')
-var spawnSync = require('spawn-sync')
-var defaultsDeep = require('lodash.defaultsdeep')
-var path = require('path')
-// var semver = require('semver')
-
-var TRACE_API_KEY = 'headers.payload.signature'
-var TRACE_SERVICE_NAME = 'service-name'
-var TEST_WEB_SERVER_PORT = process.env.TEST_WEBSERVER_PORT || 44332
-var TEST_TIMEOUT = 10000
-
-var env = {
-  TRACE_API_KEY: TRACE_API_KEY,
-  TRACE_SERVICE_NAME: TRACE_SERVICE_NAME,
-  TRACE_COLLECT_INTERVAL: 100,
-  TRACE_UPDATE_INTERVAL: 100000,
-  TRACE_COLLECTOR_API_URL: 'http://127.0.0.1:' + TEST_WEB_SERVER_PORT
-}
-
+// 'use strict'
+//
+// var express = require('express')
+// var bodyParser = require('body-parser')
+// var test = require('tape')
+// var spawnSync = require('spawn-sync')
+// var defaultsDeep = require('lodash').defaultsDeep
+// var path = require('path')
+// // var semver = require('semver')
+//
+// var TRACE_API_KEY = 'headers.payload.signature'
+// var TRACE_SERVICE_NAME = 'service-name'
+// var TEST_WEB_SERVER_PORT = process.env.TEST_WEBSERVER_PORT || 44332
+// var TEST_TIMEOUT = 10000
+//
+// var env = {
+//   TRACE_API_KEY: TRACE_API_KEY,
+//   TRACE_SERVICE_NAME: TRACE_SERVICE_NAME,
+//   TRACE_COLLECT_INTERVAL: 100,
+//   TRACE_UPDATE_INTERVAL: 100000,
+//   TRACE_COLLECTOR_API_URL: 'http://127.0.0.1:' + TEST_WEB_SERVER_PORT
+// }
+//
 // test('should report crash', {
 //   timeout: TEST_TIMEOUT,
-//   skip: true
-//   // skip: !semver.satisfies(process.version, '>= 6')
+//   skip: true // !semver.satisfies(process.version, '>= 6')
 // }, function (t) {
 //   var app = express()
 //   app.use(bodyParser.json())
diff --git a/test/e2e/crash/testee.js b/test/e2e/crash/testee.js
@@ -1,2 +1,2 @@
-require('@risingstack/trace')
+require('../../..')
 not.exist() // eslint-disable-line
diff --git a/test/e2e/initialization.spec.js b/test/e2e/initialization.spec.js
@@ -4,7 +4,7 @@ require('string.prototype.startswith')
 
 var test = require('./utils/test')
 var serviceMocks = require('./utils/serviceMocks')
-var pkg = require('@risingstack/trace/package.json')
+var pkg = require('../../package.json')
 
 var TRACE_COLLECTOR_API_URL = 'https://trace-collector-api.risingstack.com'
 var TRACE_API_KEY = 'headers.payload.signature'
@@ -48,7 +48,7 @@ test('should get service key',
         process.exit(0)
       }
     })
-    require('@risingstack/trace')
+    require('../..')
   })
 
 test('should stop', testSetup, function (t) {
@@ -78,7 +78,7 @@ test('should stop', testSetup, function (t) {
     }
   })
 
-  var trace = require('@risingstack/trace')
+  var trace = require('../..')
 
   setTimeout(function () {
     trace.stop(function (err) {
diff --git a/test/e2e/package.json b/test/e2e/package.json
@@ -5,13 +5,9 @@
     "test": "tape $(find . -name \"*.spec.js\" -not -path \"./node_modules/*\")"
   },
   "devDependencies": {
-    "@risingstack/trace": "../../",
     "body-parser": "^1.15.2",
     "express": "^4.14.0",
-    "lodash.defaultsdeep": "^4.5.1",
-    "sinon": "1.17.6",
     "nock": "git+https://github.com/szdavid92/nock.git#feat/gzip-content-type-decoder",
-    "semver": "^5.3.0",
     "spawn-sync": "^1.0.15",
     "string.prototype.startswith": "^0.2.0",
     "superagent": "3.2.1",
diff --git a/test/e2e/publicApi.spec.js b/test/e2e/publicApi.spec.js
@@ -34,7 +34,7 @@ test('should be in a transaction',
         return [200, { key: TEST_TRACE_SERVICE_KEY }]
       }
     })
-    var trace = require('@risingstack/trace')
+    var trace = require('../..')
     t.pass('Trace loaded into server')
     // http server
     var app = express()
diff --git a/test/e2e/run.sh b/test/e2e/run.sh
@@ -5,13 +5,8 @@ source ../../scripts/util/env-node.sh
 
 nvm use $NODE_VERSION
 
-rm -rf node_modules
-if [[ $(npm -v) == 2* ]]; then
-  npm link '@risingstack/trace' >/dev/null 2>&1 # faster this way
-  npm install >/dev/null 2>&1
-else
-  npm install >/dev/null 2>&1
-  npm link '@risingstack/trace' >/dev/null 2>&1
+if [[ ! -d node_modules ]]; then
+    npm install >/dev/null 2>&1
 fi
 
 npm test
diff --git a/test/e2e/utils/test.js b/test/e2e/utils/test.js
@@ -1,5 +1,5 @@
 var assign = require('lodash.assign')
-var defaultsDeep = require('lodash.defaultsdeep')
+var defaultsDeep = require('lodash').defaultsDeep
 var tape = require('tape')
 var spawnSync = require('child_process').spawnSync
 var spawnSyncFallback = require('spawn-sync')
diff --git a/test/instrumentations/Makefile b/test/instrumentations/Makefile
@@ -4,8 +4,6 @@ cur_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 cur_dir := $(dir $(cur_path))
 cur_base := $(notdir $(cur_path))
 
-export PATH := $(shell npm bin):$(PATH)
-
 # Use this variable for invoking the test runner
 export MOCHA := $(shell npm bin)/mocha
 
diff --git a/test/instrumentations/amqplib/amqplib.mk b/test/instrumentations/amqplib/amqplib.mk
@@ -42,7 +42,7 @@ $(versions:%=before_version_$(target)_%) : before_$(target)
 
 # run the test for each of the versions
 $(versions:%=test_$(target)_%) : test_% : before_version_%
-	AMQP_URL=$(db_host) $(MOCHA) $(addprefix $(cur_dir), *.spec.js) || exit 0;
+	AMQP_URL=$(amqp_url) $(MOCHA) $(addprefix $(cur_dir), *.spec.js) || exit 0;
 
 # this should run before `after` for each of the version targets
 # after the test suite
diff --git a/test/instrumentations/amqplib/amqplib.spec.js b/test/instrumentations/amqplib/amqplib.spec.js
@@ -3,9 +3,9 @@
 require('../test-setup.spec.js')
 
 var expect = require('chai').expect
-var wrapper = require('@risingstack/trace/lib/instrumentations/amqplib')
-var microtime = require('@risingstack/trace/lib/optionalDependencies/microtime')
-var Storage = require('@risingstack/trace/lib/agent/storage')
+var wrapper = require('../../../lib/instrumentations/amqplib')
+var microtime = require('../../../lib/optionalDependencies/microtime')
+var Storage = require('../../../lib/agent/storage')
 
 describe.only('amqplib', function () {
   var fakeAgent
diff --git a/test/instrumentations/ioredis/ioredis.spec.js b/test/instrumentations/ioredis/ioredis.spec.js
@@ -2,9 +2,9 @@
 
 var flatMap = require('lodash.flatmap')
 var expect = require('chai').expect
-var wrapper = require('@risingstack/trace/lib/instrumentations/ioredis')
-var Shimmer = require('@risingstack/trace/lib/utils/shimmer')
-var utils = require('@risingstack/trace/lib/instrumentations/utils')
+var wrapper = require('../../../lib/instrumentations/ioredis')
+var Shimmer = require('../../../lib/utils/shimmer')
+var utils = require('../../../lib/instrumentations/utils')
 var instrumentedCommands = utils.redisTools.instrumentedCommands
 
 describe('ioredis module wrapper', function () {
diff --git a/test/instrumentations/mongodb/mongodb.spec.cls.js b/test/instrumentations/mongodb/mongodb.spec.cls.js
diff --git a/test/instrumentations/mongodb/mongodb.spec.js b/test/instrumentations/mongodb/mongodb.spec.js
@@ -1,8 +1,8 @@
 'use strict'
-var wrapper = require('@risingstack/trace/lib/instrumentations/mongodb').instrumentations[ 0 ].post
-var COLLECTION_OPERATIONS = require('@risingstack/trace/lib/instrumentations/mongodb')._COLLECTION_OPERATIONS
-var utils = require('@risingstack/trace/lib/instrumentations/utils')
-var shimmer = require('@risingstack/trace/lib/utils/shimmer.js')
+var wrapper = require('../../../lib/instrumentations/mongodb').instrumentations[ 0 ].post
+var COLLECTION_OPERATIONS = require('../../../lib/instrumentations/mongodb')._COLLECTION_OPERATIONS
+var utils = require('../../../lib/instrumentations/utils')
+var shimmer = require('../../../lib/utils/shimmer.js')
 
 var expect = require('chai').expect
 var mongodb = require('mongodb')
diff --git a/test/instrumentations/mysql/mysql.spec.js b/test/instrumentations/mysql/mysql.spec.js
@@ -2,10 +2,10 @@
 
 require('../test-setup.spec.js')
 
-var wrapper = require('@risingstack/trace/lib/instrumentations/mysql')
+var wrapper = require('../../../lib/instrumentations/mysql')
 var expect = require('chai').expect
-var Shimmer = require('@risingstack/trace/lib/utils/shimmer')
-var utils = require('@risingstack/trace/lib/instrumentations/utils')
+var Shimmer = require('../../../lib/utils/shimmer')
+var utils = require('../../../lib/instrumentations/utils')
 
 describe('The mysql wrapper', function () {
   var CONNECTION_OPERATIONS = [
diff --git a/test/instrumentations/package.json b/test/instrumentations/package.json
diff --git a/test/instrumentations/pg/pg.mk b/test/instrumentations/pg/pg.mk
diff --git a/test/instrumentations/pg/pg.spec.js b/test/instrumentations/pg/pg.spec.js
diff --git a/test/instrumentations/promises/testPromise.js b/test/instrumentations/promises/testPromise.js
diff --git a/test/instrumentations/promises/when.spec.js b/test/instrumentations/promises/when.spec.js
diff --git a/test/instrumentations/redis/redis.spec.js b/test/instrumentations/redis/redis.spec.js

Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,3 @@ nvm use $NODE_VERSION`
`7`	`7`
`8`	`8`	`rm -rf node_modules`
`9`	`9`	`npm install >/dev/null`
`10`		`-npm link >/dev/null 2>&1`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ apiCalls.forEach(function (name) {`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`	`})`
`83`		`- require('@risingstack/trace')`
	`83`	`+ require('../..')`
`84`	`84`	`t.pass('Trace loaded into server')`
`85`	`85`	`// http server`
`86`	`86`	`var app = express()`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ var cpOpts = {`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`		`-`
`29`	`28`	`test('client Unreachable',`
`30`	`29`	`{`
`31`	`30`	`// FIXME: I patched nock, so it can gunzip requests on appropriate`
`@@ -36,11 +35,11 @@ test('client Unreachable',`
`36`	`35`	`timeout: TEST_TIMEOUT,`
`37`	`36`	`childProcessOpts: cpOpts`
`38`	`37`	`}, function (t) {`
`39`		`- var timesCalled = 0`
`40`	`38`	`serviceMocks.mockServiceKeyRequest({`
`41`	`39`	`url: TRACE_COLLECTOR_API_URL,`
`42`	`40`	`apiKey: TRACE_API_KEY,`
`43`	`41`	`callback: function () {`
	`42`	`+ t.pass('Service key requested')`
`44`	`43`	`return [200, { key: TEST_TRACE_SERVICE_KEY }]`
`45`	`44`	`}`
`46`	`45`	`})`
`@@ -54,7 +53,7 @@ test('client Unreachable',`
`54`	`53`	`process.exit(0)`
`55`	`54`	`}`
`56`	`55`	`})`
`57`		`- require('@risingstack/trace')`
	`56`	`+ require('../..')`
`58`	`57`	`t.pass('Trace loaded into server')`
`59`	`58`	`// http server`
`60`	`59`	`var app = express()`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-require('@risingstack/trace')`
	`1`	`+require('../../..')`
`2`	`2`	`not.exist() // eslint-disable-line`