Comparing version 0.0.6 to 0.0.7
@@ -31,3 +31,3 @@ var _ = require('lodash'); | ||
this.options = options; | ||
this.version = version; | ||
this.version = version; | ||
this.nodes = []; | ||
@@ -42,3 +42,3 @@ }; | ||
return this.emit('log', level); | ||
} | ||
} | ||
@@ -51,3 +51,3 @@ // Otherwise log a new message object. | ||
node: null, | ||
message: message | ||
message: message | ||
}); | ||
@@ -61,3 +61,3 @@ }; | ||
_.times(this.options.nodes, function (index) { | ||
nodes.push(_.cloneDeep(self.options.config)); | ||
nodes.push(_.cloneDeep(self.options.config)); | ||
}); | ||
@@ -73,5 +73,8 @@ } else { | ||
config: config, | ||
path: path | ||
path: path | ||
}; | ||
var node = new Node(options); | ||
if (self.options.clusterNameOverride) { | ||
options.clusterNameOverride = self.options.clusterNameOverride; | ||
} | ||
var node = new Node(options); | ||
var log = _.bindKey(self, 'log'); | ||
@@ -87,3 +90,3 @@ node.on('log', log); | ||
var self = this; | ||
return resolvePath(this.options).then(function (path) { | ||
@@ -94,3 +97,3 @@ var startNodes = function () { | ||
var promises = _.map(nodes, function (node) { | ||
return node.start(); | ||
return node.start(); | ||
}); | ||
@@ -110,3 +113,3 @@ return Promises.all(promises); | ||
var promises = _.map(this.nodes, function (node) { | ||
return node.shutdown(); | ||
return node.shutdown(); | ||
}); | ||
@@ -133,4 +136,4 @@ return Promises.all(promises).nodeify(cb); | ||
/** | ||
* Installs the current version of Elasticsearch | ||
* @param {function} cb The node style callback | ||
* Installs the current version of Elasticsearch | ||
* @param {function} cb The node style callback | ||
* @returns {Promise} | ||
@@ -137,0 +140,0 @@ */ |
@@ -16,2 +16,3 @@ var child_process = require('child_process'); | ||
this.config = options.config; | ||
this.clusterNameOverride = options.clusterNameOverride; | ||
}; | ||
@@ -27,3 +28,8 @@ | ||
// the path of the executable | ||
if (self.clusterNameOverride) { | ||
args.push('-D'); | ||
args.push('es.cluster.name='+self.clusterNameOverride); | ||
} | ||
// the path of the executable | ||
var path = join(self.path, 'bin', 'elasticsearch'); | ||
@@ -30,0 +36,0 @@ |
@@ -7,3 +7,3 @@ var _ = require('lodash'); | ||
* Resolve the latest version | ||
* @param {string} version A semver string | ||
* @param {string} version A semver string | ||
* @param {function} cb The node style callback | ||
@@ -14,3 +14,9 @@ * @returns {Promise} | ||
return getLatestTags().then(function (tags) { | ||
tags = _.sortBy(tags, 'name').reverse(); | ||
tags = _.map(tags, function (tag) { | ||
tag.name = tag.name.replace(/\.(beta|rc)/i, '-$1'); | ||
return tag; | ||
}); | ||
tags.sort(function (v1, v2) { | ||
return semver.gt(v1.name, v2.name); | ||
}).reverse(); | ||
var length = tags.length; | ||
@@ -17,0 +23,0 @@ for (var i = 0; i<length; i++) { |
{ | ||
"name": "libesvm", | ||
"version": "0.0.6", | ||
"version": "0.0.7", | ||
"description": "libesvm is a library for managning an Elasticsearch process for development and testing.", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
37280
982