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

.gitignore

@@ -8,6 +8,7 @@ test/integration/yaml_suite/log
 
 ## generated files
 test/integration/yaml_suite/yaml_tests*.json
+test/integration/yaml_suite/index*.js
 src/elasticsearch*/
 junit-*.xml
 elasticsearch*.log

grunt/config/mochacov.js

@@ -1,5 +1,7 @@
 var root = require('find-root')(__dirname);
-var utils = require(root + '/grunt/utils');
+var rootReq = function (p) { return require(require('path').resolve(root, p)); };
+var utils = rootReq('grunt/utils');
+var _ = rootReq('src/lib/utils');
 
 var config = {
   unit: {
@@ -29,7 +31,7 @@ var config = {
 
 utils.branches.forEach(function (branch) {
   config['integration_' + branch] = {
-    src: 'test/integration/yaml_suite/index' + utils.branchSuffix(branch) + '.js'
+    src: 'test/integration/yaml_suite/index' + _.snakeCase(branch) + '.js'
   };
 });
 

grunt/config/run.js

@@ -31,7 +31,7 @@ var config = {
   },
   clone_bower_repo: {
     exec: [
-      'test -d src/elasticsearch',
+      'test -d src/bower_es_js',
       'git clone git@github.com:elasticsearch/bower-elasticsearch-js.git src/bower_es_js'
     ].join(' || '),
     options: {

scripts/_utils.sh

@@ -57,7 +57,6 @@ function manage_es {
   local ES_RELEASE=$3
 
   local ROOT="$PWD"
-  local ES_SUBMODULE="$ROOT/src/elasticsearch"
   local SNAPSHOTS="$ROOT/.snapshots"
   local PIDS="$ROOT/.snapshots/pids"
 

scripts/generate/index.js

@@ -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) {

scripts/generate/js_api.js

@@ -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));

scripts/generate/yaml_tests.js

@@ -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();

test/integration/yaml_suite/index.js

@@ -1 +0,0 @@
-require('./run')('0.90');

test/integration/yaml_suite/index_0_90.js

@@ -1 +0,0 @@
-require('./run')('0.90');

test/integration/yaml_suite/index_1_0.js

@@ -1 +0,0 @@
-require('./run')('1.0');

test/integration/yaml_suite/index_1_x.js

@@ -1 +0,0 @@
-require('./run')('1.x');

test/integration/yaml_suite/index_master.js

@@ -1 +0,0 @@
-require('./run')('master');

test/integration/yaml_suite/run.js

@@ -10,7 +10,6 @@ module.exports = function (branch) {
   var es = rootReq('src/elasticsearch');
   var clientManager = require('./client_manager');
   var argv = require('./argv');
-  var branchSuffix = utils.branchSuffix(branch);
 
   describe('integration', function () {
     this.timeout(30000);
@@ -30,7 +29,7 @@ module.exports = function (branch) {
       }, done);
     });
 
-    var files = _.map(require('./yaml_tests' + branchSuffix + '.json'), function (docs, filename) {
+    var files = _.map(require('./yaml_tests_' + _.snakeCase(branch) + '.json'), function (docs, filename) {
       return new YamlFile(filename, docs);
     });