Skip to content

Commit d19b4a9

Browse files
jmdobryjmdobry
committed
Speed up build.
1 parent a093c57 commit d19b4a9

File tree

6 files changed

+40
-31
lines changed

6 files changed

+40
-31
lines changed

‎functions/ocr/app/index.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,15 @@
1616
// [START ocr_setup]
1717
var async = require('async');
1818
var config = require('./config.json');
19-
var gcloud = require('google-cloud');
2019

2120
// Get a reference to the Pub/Sub component
22-
var pubsub = gcloud.pubsub();
21+
var pubsub = require('@google-cloud/pubsub')();
2322
// Get a reference to the Cloud Storage component
24-
var storage = gcloud.storage();
23+
var storage = require('@google-cloud/storage')();
2524
// Get a reference to the Cloud Vision API component
26-
var vision = gcloud.vision();
25+
var vision = require('@google-cloud/vision')();
2726
// Get a reference to the Translate API component
28-
var translate = gcloud.translate({
27+
var translate = require('@google-cloud/translate')({
2928
key: config.TRANSLATE_API_KEY
3029
});
3130
// [END ocr_setup]

‎functions/ocr/app/package.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@
99
"test": "mocha -R spec -t 120000 --require intelli-espower-loader ../../../test/_setup.js test/*.test.js"
1010
},
1111
"dependencies": {
12-
"async": "^2.0.1",
13-
"google-cloud": "^0.38.3"
12+
"@google-cloud/pubsub": "^0.2.0",
13+
"@google-cloud/storage": "^0.1.1",
14+
"@google-cloud/translate": "^0.2.0",
15+
"@google-cloud/vision": "^0.2.0",
16+
"async": "^2.0.1"
1417
},
1518
"devDependencies": {
1619
"mocha": "^3.0.2"

‎functions/ocr/app/test/index.test.js‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,37 +41,38 @@ function getSample () {
4141
var bucket = {
4242
file: sinon.stub().returns(file)
4343
};
44-
var pubsub = {
44+
var pubsubMock = {
4545
topic: sinon.stub().returns(topic)
4646
};
47-
var storage = {
47+
var storageMock = {
4848
bucket: sinon.stub().returns(bucket)
4949
};
50-
var vision = {
50+
var visionMock = {
5151
detectText: sinon.stub().callsArg(1)
5252
};
53-
var translate = {
53+
var translateMock = {
5454
detect: sinon.stub().callsArg(1)
5555
};
56-
var gcloudMock = {
57-
pubsub: sinon.stub().returns(pubsub),
58-
storage: sinon.stub().returns(storage),
59-
vision: sinon.stub().returns(vision),
60-
translate: sinon.stub().returns(translate)
61-
};
56+
var PubsubMock = sinon.stub().returns(pubsubMock);
57+
var StorageMock = sinon.stub().returns(storageMock);
58+
var VisionMock = sinon.stub().returns(visionMock);
59+
var TranslateMock = sinon.stub().returns(translateMock);
60+
6261
return {
6362
sample: proxyquire('../', {
64-
'google-cloud': gcloudMock,
63+
'@google-cloud/translate': TranslateMock,
64+
'@google-cloud/vision': VisionMock,
65+
'@google-cloud/pubsub': PubsubMock,
66+
'@google-cloud/storage': StorageMock,
6567
'./config.json': config
6668
}),
6769
mocks: {
68-
gcloud: gcloudMock,
69-
pubsub: pubsub,
70-
storage: storage,
70+
pubsub: pubsubMock,
71+
storage: storageMock,
7172
bucket: bucket,
7273
file: file,
73-
vision: vision,
74-
translate: translate,
74+
vision: visionMock,
75+
translate: translateMock,
7576
topic: topic
7677
}
7778
};

‎language/package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99
"system-test": "mocha -R spec -t 120000 --require intelli-espower-loader ../system-test/_setup.js system-test/*.test.js"
1010
},
1111
"dependencies": {
12-
"@google-cloud/language": "^0.1.1",
12+
"@google-cloud/language": "^0.1.2",
1313
"@google-cloud/storage": "^0.1.1",
1414
"yargs": "^5.0.0"
1515
},
1616
"devDependencies": {
17-
"mocha": "^2.5.3"
17+
"mocha": "^3.0.2",
18+
"node-uuid": "^1.4.7"
1819
}
1920
}

‎scripts/install‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ var path = require('path');
1818

1919
require('shelljs/global');
2020

21-
// Install NPM dependencies, in up to 5 directories at a time
21+
// Install NPM dependencies, in up to 7 directories at a time
2222
var queue = async.queue(function (directory, callback) {
2323
installForDirectory(directory, callback);
24-
}, 5);
24+
}, 7);
2525

2626
queueDirectories('appengine');
2727
queue.push('bigquery');
@@ -54,8 +54,13 @@ function installForDirectory(directory, callback) {
5454
async: true,
5555
cwd: path.join(__dirname, '../', directory)
5656
}, function (err) {
57-
console.log(directory + '...done');
58-
callback(err);
57+
exec('npm rebuild', {
58+
async: true,
59+
cwd: path.join(__dirname, '../', directory)
60+
}, function (err) {
61+
console.log(directory + '...done');
62+
callback(err);
63+
});
5964
});
6065
}
6166

‎scripts/uninstall‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ var path = require('path');
1818

1919
require('shelljs/global');
2020

21-
// Uninstall NPM dependencies, in up to 5 directories at a time
21+
// Uninstall NPM dependencies, in up to 7 directories at a time
2222
var queue = async.queue(function (directory, callback) {
2323
uninstallForDirectory(directory, callback);
24-
}, 5);
24+
}, 7);
2525

2626
queueDirectories('appengine');
2727
queue.push('bigquery');

0 commit comments

Comments
 (0)