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

stopped using an empty suffix for test/branch stuff, so that things are less confusing down the road when versions change

Browse Source
This commit is contained in:
Spencer Alger
2014-02-05 09:46:53 -07:00
parent 4680930487
commit 70b51dfa6d
13 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/generate/index.js
View File

@ -30,6 +30,7 @@ var path = require('path');
var root = require('find-root')(__dirname);
var fromRoot = path.join.bind(path, root);
var utils = require(fromRoot('grunt/utils'));
var _ = require(fromRoot('src/lib/utils'));
var esUrl = 'https://github.com/elasticsearch/elasticsearch.git';
var branches;
@ -55,7 +56,7 @@ function isDirectory(dir) {
}
function storeDir(branch) {
return fromRoot('src/elasticsearch' + utils.branchSuffix(branch));
return fromRoot('src/elasticsearch_' + _.snakeCase(branch));
}
function spawnStep(cmd, args, cwd) {

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 branchSuffix = utils.branchSuffix(branch);
var esDir = fromRoot('src/elasticsearch' + branchSuffix);
var esDir = fromRoot('src/elasticsearch_' + _.snakeCase(branch));
var aliases;
try {
aliases = require('./aliases_' + _.snakeCase(branch));

11
scripts/generate/yaml_tests.js
View File

@ -8,11 +8,10 @@ module.exports = function (branch, done) {
var chalk = require('chalk');
var path = require('path');
var fromRoot = path.join.bind(path, require('find-root')(__dirname));
var utils = require(fromRoot('grunt/utils'));
var _ = require(fromRoot('src/lib/utils'));
var tests = {}; // populated in readYamlTests
var branchSuffix = utils.branchSuffix(branch);
var esDir = fromRoot('src/elasticsearch' + branchSuffix);
var esDir = fromRoot('src/elasticsearch_' + _.snakeCase(branch));
// generate the yaml tests
async.series([
@ -44,14 +43,14 @@ module.exports = function (branch, done) {
}
function writeYamlTests(done) {
var testFile = fromRoot('test/integration/yaml_suite/yaml_tests' + branchSuffix + '.json');
fs.writeFileSync(testFile, JSON.stringify(tests, null, ' '), 'utf8');
var testFile = fromRoot('test/integration/yaml_suite/yaml_tests_' + _.snakeCase(branch) + '.json');
fs.writeFileSync(testFile, JSON.stringify(tests, null, ' '), 'utf8');
console.log(chalk.white.bold('wrote') + ' YAML tests as JSON to', testFile);
done();
}
function writeTestIndex(done) {
var file = fromRoot('test/integration/yaml_suite/index' + branchSuffix + '.js');
var file = fromRoot('test/integration/yaml_suite/index_' + _.snakeCase(branch) + '.js');
fs.writeFileSync(file, 'require(\'./run\')(\'' + branch + '\');', 'utf8');
console.log(chalk.white.bold('wrote') + ' YAML index to', file);
done();