merge latest changes from branch 1.5

.gitignore

@@ -10,6 +10,7 @@ test/integration/yaml_suite/log
 test/integration/yaml_suite/yaml_tests*.json
 test/integration/yaml_suite/index*.js
 src/elasticsearch*/
+src/bower*/
 junit-*.xml
 elasticsearch*.log
 sauce_connect.lo*

Gruntfile.js

@@ -8,7 +8,7 @@ module.exports = function (grunt) {
     init: true,
     config: {
       distDir: __dirname + '/dist',
-      bowerSubmodule: __dirname + '/src/bower-elasticsearch-js',
+      bowerSubmodule: __dirname + '/src/bower_es_js',
       meta: {
         banner: '/*! <%= package.name %> - v<%= package.version %> - ' +
           '<%= grunt.template.today("yyyy-mm-dd") %>\n' +

grunt/browser_clients.js

@@ -31,7 +31,7 @@ module.exports = function (grunt) {
     'browser_clients:build',
     'run:clone_bower_repo',
     'copy:dist_to_bower',
-    'run:release_bower_subm_tag'
+    'run:release_bower_tag'
   ]);
 
   grunt.registerTask('_upload_archive', function (type) {

grunt/config/jshint.js

@@ -1,7 +1,7 @@
 module.exports = {
   source: {
     src: [
-      'src/**/*.js -src/elasticsearch*/**/* -src/bower-elasticsearch-js/**/*',
+      'src/**/*.js -src/elasticsearch*/**/* -<%= bowerSubmodule %>/**/*',
       'scripts/**/*.js',
       'test/**/*.js -test/browser_integration/yaml_tests.js',
       'grunt/**/*.js',

grunt/config/run.js

@@ -32,7 +32,7 @@ var config = {
   clone_bower_repo: {
     exec: [
       'test -d src/bower_es_js',
-      'git clone git@github.com:elasticsearch/bower-elasticsearch-js.git src/bower_es_js'
+      'git clone git@github.com:elasticsearch/bower-elasticsearch-js.git <%= bowerSubmodule %>'
     ].join(' || '),
     options: {
       quiet: true

scripts/release/bower.js

@@ -4,7 +4,7 @@ var async = require('async');
 var _ = require('lodash');
 
 var root = require('path').join(__dirname, '../..');
-var bowerDir = root + '/src/bower-elasticsearch-js';
+var bowerDir = root + '/src/bower_es_js';
 
 // get both the bower and node package files
 var bowerJson = require(bowerDir + '/bower.json');