habsi/elasticsearch-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed an issue preventing the API generator from running, and batched the git-fetch calls for each es branch

Browse Source
This commit is contained in:
Spencer Alger
2014-04-30 09:34:28 -07:00
parent 17e95f836f
commit a82f8e14d3
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/_spawn.js
View File

@ -44,6 +44,6 @@ function _spawn(cmd, args, opts, cb) {
return cp; return cp;
} }
_spawn.exec = function (cmd, cb) { _spawn.exec = function (cmd, opts, cb) {
return _spawn('/bin/sh', ['-c', cmd], cb); return _spawn('/bin/sh', ['-c', cmd], opts, cb);
}; };

8
scripts/generate/index.js
View File

@ -89,8 +89,8 @@ function cloneStep() {
}; };
} }
function fetchBranchStep(branch) { function fetchBranchesStep() {
return spawnStep('git', ['fetch', '--depth', '1', 'origin', branch], sourceDir); return spawnStep('git', ['fetch', '--depth', '1', 'origin'].concat(branches), sourceDir);
} }
function removePrevArchive(branch) { function removePrevArchive(branch) {
@ -123,12 +123,12 @@ function generateStep(branch) {
} }
var steps = [ var steps = [
cloneStep() cloneStep(),
fetchBranchesStep()
]; ];
branches.forEach(function (branch) { branches.forEach(function (branch) {
if (argv.update) steps.push(removePrevArchive(branch)); if (argv.update) steps.push(removePrevArchive(branch));
steps.push( steps.push(
fetchBranchStep(branch),
createArchive(branch), createArchive(branch),
generateStep(branch) generateStep(branch)
); );

2
scripts/generate/js_api.js
View File

@ -18,7 +18,7 @@ module.exports = function (branch, done) {
var docVars; // slightly modified clone of apiSpec for the docs var docVars; // slightly modified clone of apiSpec for the docs
var branchSuffix = utils.branchSuffix(branch); var branchSuffix = utils.branchSuffix(branch);
var esDir = fromRoot('src/elasticsearch_' + _.snakeCase(branch)); var esDir = fromRoot('src/_elasticsearch_' + _.snakeCase(branch));
var aliases; var aliases;
try { try {
aliases = require('./aliases_' + _.snakeCase(branch)); aliases = require('./aliases_' + _.snakeCase(branch));

2
scripts/generate/yaml_tests.js
View File

@ -11,7 +11,7 @@ module.exports = function (branch, done) {
var _ = require(fromRoot('src/lib/utils')); var _ = require(fromRoot('src/lib/utils'));
var tests = {}; // populated in readYamlTests var tests = {}; // populated in readYamlTests
var esDir = fromRoot('src/elasticsearch_' + _.snakeCase(branch)); var esDir = fromRoot('src/_elasticsearch_' + _.snakeCase(branch));
// generate the yaml tests // generate the yaml tests
async.series([ async.series([