* **This is a Beta release of Google Cloud Natural Language.** This API is @@ -79,7 +77,7 @@ function Language(options) { scopes: [ 'https://www.googleapis.com/auth/cloud-platform' ], - userAgent: PKG.name + '/' + PKG.version + packageJson: require('../package.json') }; common.GrpcService.call(this, config, options); diff --git a/packages/language/test/index.js b/packages/language/test/index.js index 13a9af7d227..535a3e1ccd9 100644 --- a/packages/language/test/index.js +++ b/packages/language/test/index.js @@ -22,8 +22,6 @@ var googleProtoFiles = require('google-proto-files'); var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; -var PKG = require('../package.json'); - var fakeUtil = extend(true, {}, util); function FakeDocument() { @@ -98,7 +96,7 @@ describe('Language', function() { scopes: [ 'https://www.googleapis.com/auth/cloud-platform' ], - userAgent: PKG.name + '/' + PKG.version + packageJson: require('../package.json') }); }); }); diff --git a/packages/logging/package.json b/packages/logging/package.json index 148c9afb519..2137fcc173e 100644 --- a/packages/logging/package.json +++ b/packages/logging/package.json @@ -52,7 +52,7 @@ "stackdriver" ], "dependencies": { - "@google-cloud/common": "^0.4.0", + "@google-cloud/common": "^0.5.0", "arguejs": "^0.2.3", "arrify": "^1.0.0", "extend": "^3.0.0", diff --git a/packages/logging/src/index.js b/packages/logging/src/index.js index d52885a3410..c20563681cd 100644 --- a/packages/logging/src/index.js +++ b/packages/logging/src/index.js @@ -46,8 +46,6 @@ var Log = require('./log.js'); */ var Sink = require('./sink.js'); -var PKG = require('../package.json'); - /** *
* **This is a Beta release of Stackdriver Logging.** This API is not covered @@ -85,7 +83,7 @@ function Logging(options) { scopes: [ 'https://www.googleapis.com/auth/cloud-platform' ], - userAgent: PKG.name + '/' + PKG.version + packageJson: require('../package.json') }; common.GrpcService.call(this, config, options); diff --git a/packages/logging/test/index.js b/packages/logging/test/index.js index 215a88c3ab0..a5cacbd4123 100644 --- a/packages/logging/test/index.js +++ b/packages/logging/test/index.js @@ -23,8 +23,6 @@ var googleProtoFiles = require('google-proto-files'); var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; -var PKG = require('../package.json'); - var extended = false; var fakeStreamRouter = { extend: function(Class, methods) { @@ -147,7 +145,7 @@ describe('Logging', function() { assert.deepEqual(calledWith.scopes, [ 'https://www.googleapis.com/auth/cloud-platform' ]); - assert.strictEqual(calledWith.userAgent, PKG.name + '/' + PKG.version); + assert.deepEqual(calledWith.packageJson, require('../package.json')); }); }); diff --git a/packages/prediction/package.json b/packages/prediction/package.json index e6739988f77..f888d087fa0 100644 --- a/packages/prediction/package.json +++ b/packages/prediction/package.json @@ -50,7 +50,7 @@ "prediction" ], "dependencies": { - "@google-cloud/common": "^0.1.0", + "@google-cloud/common": "^0.5.0", "JSONStream": "^1.0.7", "arrify": "^1.0.0", "extend": "^3.0.0", diff --git a/packages/prediction/src/index.js b/packages/prediction/src/index.js index a53df586fbc..eecb91d930c 100644 --- a/packages/prediction/src/index.js +++ b/packages/prediction/src/index.js @@ -33,8 +33,6 @@ var util = require('util'); */ var Model = require('./model.js'); -var PKG = require('../package.json'); - /** * The [Google Prediction API](https://cloud.google.com/prediction/docs/getting-started) * provides pattern-matching and machine learning capabilities. Given a set of @@ -70,7 +68,7 @@ function Prediction(options) { 'https://www.googleapis.com/auth/prediction', 'https://www.googleapis.com/auth/devstorage.read_only' ], - userAgent: PKG.name + '/' + PKG.version + packageJson: require('../package.json') }; common.Service.call(this, config, options); diff --git a/packages/prediction/test/index.js b/packages/prediction/test/index.js index 283c418ee04..22111064f44 100644 --- a/packages/prediction/test/index.js +++ b/packages/prediction/test/index.js @@ -24,8 +24,6 @@ var proxyquire = require('proxyquire'); var Service = require('@google-cloud/common').Service; var util = require('@google-cloud/common').util; -var PKG = require('../package.json'); - function FakeModel() { this.calledWith_ = arguments; } @@ -114,7 +112,7 @@ describe('Prediction', function() { 'https://www.googleapis.com/auth/prediction', 'https://www.googleapis.com/auth/devstorage.read_only' ]); - assert.strictEqual(calledWith.userAgent, PKG.name + '/' + PKG.version); + assert.deepEqual(calledWith.packageJson, require('../package.json')); }); }); diff --git a/packages/pubsub/package.json b/packages/pubsub/package.json index cf6decc3391..8f9fed2b64b 100644 --- a/packages/pubsub/package.json +++ b/packages/pubsub/package.json @@ -50,7 +50,7 @@ "pubsub" ], "dependencies": { - "@google-cloud/common": "^0.4.0", + "@google-cloud/common": "^0.5.0", "arguejs": "^0.2.3", "arrify": "^1.0.0", "extend": "^3.0.0", diff --git a/packages/pubsub/src/iam.js b/packages/pubsub/src/iam.js index 036e5e8751a..30501f8471d 100644 --- a/packages/pubsub/src/iam.js +++ b/packages/pubsub/src/iam.js @@ -73,7 +73,8 @@ function IAM(pubsub, id) { scopes: [ 'https://www.googleapis.com/auth/pubsub', 'https://www.googleapis.com/auth/cloud-platform' - ] + ], + packageJson: require('../package.json') }; this.id = id; diff --git a/packages/pubsub/src/index.js b/packages/pubsub/src/index.js index 8a5b237c62c..d76f4968a95 100644 --- a/packages/pubsub/src/index.js +++ b/packages/pubsub/src/index.js @@ -38,8 +38,6 @@ var Subscription = require('./subscription.js'); */ var Topic = require('./topic.js'); -var PKG = require('../package.json'); - /** * [Google Cloud Pub/Sub](https://developers.google.com/pubsub/overview) is a * reliable, many-to-many, asynchronous messaging service from Google Cloud @@ -73,7 +71,7 @@ function PubSub(options) { 'https://www.googleapis.com/auth/pubsub', 'https://www.googleapis.com/auth/cloud-platform' ], - userAgent: PKG.name + '/' + PKG.version + packageJson: require('../package.json') }; this.options = options; diff --git a/packages/pubsub/test/iam.js b/packages/pubsub/test/iam.js index dc394497ddb..d13eda5c7d3 100644 --- a/packages/pubsub/test/iam.js +++ b/packages/pubsub/test/iam.js @@ -65,6 +65,7 @@ describe('IAM', function() { 'https://www.googleapis.com/auth/pubsub', 'https://www.googleapis.com/auth/cloud-platform' ]); + assert.deepEqual(config.packageJson, require('../package.json')); assert.strictEqual(options, PUBSUB.options); }); diff --git a/packages/pubsub/test/index.js b/packages/pubsub/test/index.js index f4c72c91947..111e31f098e 100644 --- a/packages/pubsub/test/index.js +++ b/packages/pubsub/test/index.js @@ -22,8 +22,6 @@ var extend = require('extend'); var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; -var PKG = require('../package.json'); - var SubscriptionCached = require('../src/subscription.js'); var SubscriptionOverride; @@ -124,7 +122,7 @@ describe('PubSub', function() { 'https://www.googleapis.com/auth/pubsub', 'https://www.googleapis.com/auth/cloud-platform' ]); - assert.strictEqual(calledWith.userAgent, PKG.name + '/' + PKG.version); + assert.deepEqual(calledWith.packageJson, require('../package.json')); }); it('should set the defaultBaseUrl_', function() { diff --git a/packages/resource/package.json b/packages/resource/package.json index 37d969c7e4e..b9e35b85edc 100644 --- a/packages/resource/package.json +++ b/packages/resource/package.json @@ -50,7 +50,7 @@ "resource" ], "dependencies": { - "@google-cloud/common": "^0.1.0", + "@google-cloud/common": "^0.5.0", "extend": "^3.0.0", "is": "^3.0.1" }, diff --git a/packages/resource/src/index.js b/packages/resource/src/index.js index 88f0134cf29..0a9df2fdd31 100644 --- a/packages/resource/src/index.js +++ b/packages/resource/src/index.js @@ -31,8 +31,6 @@ var util = require('util'); */ var Project = require('./project.js'); -var PKG = require('../package.json'); - /** *
* **This is a Beta release of Cloud Resource Manager.** This feature is not @@ -69,7 +67,7 @@ function Resource(options) { baseUrl: 'https://cloudresourcemanager.googleapis.com/v1beta1', scopes: ['https://www.googleapis.com/auth/cloud-platform'], projectIdRequired: false, - userAgent: PKG.name + '/' + PKG.version + packageJson: require('../package.json') }; common.Service.call(this, config, options); diff --git a/packages/resource/test/index.js b/packages/resource/test/index.js index d0ac5dc8631..07a39e6adf5 100644 --- a/packages/resource/test/index.js +++ b/packages/resource/test/index.js @@ -24,8 +24,6 @@ var proxyquire = require('proxyquire'); var Service = require('@google-cloud/common').Service; var util = require('@google-cloud/common').util; -var PKG = require('../package.json'); - function FakeProject() { this.calledWith_ = [].slice.call(arguments); } @@ -126,7 +124,7 @@ describe('Resource', function() { 'https://www.googleapis.com/auth/cloud-platform' ]); assert.strictEqual(resource.projectIdRequired, false); - assert.strictEqual(calledWith.userAgent, PKG.name + '/' + PKG.version); + assert.deepEqual(calledWith.packageJson, require('../package.json')); }); }); diff --git a/packages/storage/package.json b/packages/storage/package.json index fae6ce61107..425b7c814c3 100644 --- a/packages/storage/package.json +++ b/packages/storage/package.json @@ -50,7 +50,7 @@ "storage" ], "dependencies": { - "@google-cloud/common": "^0.1.0", + "@google-cloud/common": "^0.5.0", "arrify": "^1.0.0", "async": "^1.4.2", "concat-stream": "^1.5.0", diff --git a/packages/storage/src/index.js b/packages/storage/src/index.js index 7ebb266e8c9..7531f884ed4 100644 --- a/packages/storage/src/index.js +++ b/packages/storage/src/index.js @@ -43,8 +43,6 @@ var Channel = require('./channel.js'); */ var File = require('./file.js'); -var PKG = require('../package.json'); - /*! Developer Documentation * * Invoke this method to create a new Storage object bound with pre-determined @@ -83,7 +81,7 @@ function Storage(options) { scopes: [ 'https://www.googleapis.com/auth/devstorage.full_control' ], - userAgent: PKG.name + '/' + PKG.version + packageJson: require('../package.json') }; common.Service.call(this, config, options); diff --git a/packages/storage/test/index.js b/packages/storage/test/index.js index b581c73c5ed..178a6fc19ed 100644 --- a/packages/storage/test/index.js +++ b/packages/storage/test/index.js @@ -24,8 +24,6 @@ var proxyquire = require('proxyquire'); var Service = require('@google-cloud/common').Service; var util = require('@google-cloud/common').util; -var PKG = require('../package.json'); - function FakeChannel() { this.calledWith_ = arguments; } @@ -110,7 +108,7 @@ describe('Storage', function() { assert.deepEqual(calledWith.scopes, [ 'https://www.googleapis.com/auth/devstorage.full_control' ]); - assert.strictEqual(calledWith.userAgent, PKG.name + '/' + PKG.version); + assert.deepEqual(calledWith.packageJson, require('../package.json')); }); }); diff --git a/packages/translate/package.json b/packages/translate/package.json index 397f548e6e7..9de7d3b72dc 100644 --- a/packages/translate/package.json +++ b/packages/translate/package.json @@ -50,7 +50,7 @@ "translate" ], "dependencies": { - "@google-cloud/common": "^0.2.0", + "@google-cloud/common": "^0.5.0", "arrify": "^1.0.0", "extend": "^3.0.0", "is": "^3.0.1", diff --git a/packages/translate/src/index.js b/packages/translate/src/index.js index c05be0e6bf4..1db4ca5cbdb 100644 --- a/packages/translate/src/index.js +++ b/packages/translate/src/index.js @@ -384,7 +384,7 @@ Translate.prototype.request = function(reqOpts, callback) { key: this.key }, headers: { - 'User-Agent': PKG.name + '/' + PKG.version + 'User-Agent': common.util.getUserAgentFromPackageJson(PKG) } }); diff --git a/packages/translate/test/index.js b/packages/translate/test/index.js index b6969c9ff7f..bcd05f90ceb 100644 --- a/packages/translate/test/index.js +++ b/packages/translate/test/index.js @@ -21,8 +21,6 @@ var extend = require('extend'); var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; -var PKG = require('../package.json'); - var makeRequestOverride; var fakeUtil = extend({}, util, { makeRequest: function() { @@ -386,6 +384,15 @@ describe('Translate', function() { describe('request', function() { it('should make the correct request', function(done) { + var userAgent = 'user-agent/0.0.0'; + + var getUserAgentFn = fakeUtil.getUserAgentFromPackageJson; + fakeUtil.getUserAgentFromPackageJson = function(packageJson) { + fakeUtil.getUserAgentFromPackageJson = getUserAgentFn; + assert.deepEqual(packageJson, require('../package.json')); + return userAgent; + }; + var reqOpts = { uri: '/test', a: 'b', @@ -401,7 +408,7 @@ describe('Translate', function() { key: translate.key }, headers: { - 'User-Agent': PKG.name + '/' + PKG.version + 'User-Agent': userAgent } }); var BASE_URL = 'https://www.googleapis.com/language/translate/v2'; diff --git a/packages/vision/package.json b/packages/vision/package.json index ab3040b3055..07f457bf0b8 100644 --- a/packages/vision/package.json +++ b/packages/vision/package.json @@ -50,7 +50,7 @@ "vision" ], "dependencies": { - "@google-cloud/common": "^0.3.0", + "@google-cloud/common": "^0.5.0", "arguejs": "^0.2.3", "arrify": "^1.0.0", "async": "^1.4.2", diff --git a/packages/vision/src/index.js b/packages/vision/src/index.js index c4b1255bcac..662c9e5151c 100644 --- a/packages/vision/src/index.js +++ b/packages/vision/src/index.js @@ -32,8 +32,6 @@ var request = require('request'); var rgbHex = require('rgb-hex'); var util = require('util'); -var PKG = require('../package.json'); - var VERY_UNLIKELY = 0; var UNLIKELY = 1; var POSSIBLE = 2; @@ -72,7 +70,7 @@ function Vision(options) { scopes: [ 'https://www.googleapis.com/auth/cloud-platform' ], - userAgent: PKG.name + '/' + PKG.version + packageJson: require('../package.json') }; common.Service.call(this, config, options); diff --git a/packages/vision/test/index.js b/packages/vision/test/index.js index 5862407e5d6..7790d726ac2 100644 --- a/packages/vision/test/index.js +++ b/packages/vision/test/index.js @@ -29,8 +29,6 @@ var Service = require('@google-cloud/common').Service; var tmp = require('tmp'); var util = require('@google-cloud/common').util; -var PKG = require('../package.json'); - var fakeUtil = extend({}, util); function FakeService() { @@ -101,7 +99,7 @@ describe('Vision', function() { assert.deepEqual(calledWith.scopes, [ 'https://www.googleapis.com/auth/cloud-platform' ]); - assert.strictEqual(calledWith.userAgent, PKG.name + '/' + PKG.version); + assert.deepEqual(calledWith.packageJson, require('../package.json')); }); });