Comparing version 0.0.4 to 0.0.5
@@ -7,5 +7,6 @@ var esvm = require('./index'); | ||
var ProgressBar = require('progress'); | ||
var os = require('os'); | ||
var options = { | ||
version: '~1.2.0', | ||
version: '*', | ||
directory: process.env.HOME+'/.esvm', | ||
@@ -15,11 +16,7 @@ plugins: ['elasticsearch/marvel/latest'], | ||
fresh: false, // Download a fresh copy | ||
nodes: 2, | ||
nodes: 1, | ||
config: { | ||
cluster: { | ||
name: 'My Test Cluster' | ||
} | ||
cluster: { name: os.hostname() } | ||
} | ||
}; | ||
var cluster = esvm.createCluster(options); | ||
@@ -34,2 +31,3 @@ var levels = { | ||
var cluster = esvm.createCluster(options); | ||
cluster.on('log', function (log) { | ||
@@ -63,3 +61,3 @@ var bar, pattern; | ||
}).then(function () { | ||
return cluster.start(); | ||
return cluster.start(); | ||
}).then(function () { | ||
@@ -66,0 +64,0 @@ process.on('SIGINT', function () { |
@@ -61,3 +61,5 @@ var _ = require('lodash'); | ||
} else { | ||
nodes = this.options.nodes; | ||
nodes = _.map(this.options.nodes, function (node) { | ||
return _.defaults(node, self.options.config); | ||
}); | ||
} | ||
@@ -89,3 +91,3 @@ | ||
}); | ||
return Promises.all(promises).nodeify(cb); | ||
return Promises.all(promises); | ||
}; | ||
@@ -92,0 +94,0 @@ var dataPath = join(path, 'data'); |
@@ -7,3 +7,3 @@ var _ = require('lodash'); | ||
* Install plugins in a array | ||
* @param {object} options Options object | ||
* @param {object} options Options object | ||
* @param {array} options.plugins The list of plugins. Can be a string or an object with a name and path | ||
@@ -17,6 +17,6 @@ * @param {string} options.path The path to the install | ||
log('INFO', 'Installing plugins'); | ||
return Promises.resolve(options.plugins).each(function (plugin) { | ||
return installPlugin({ log: log, path: options.path, plugin: plugin }); | ||
return Promises.resolve(options.plugins || []).each(function (plugin) { | ||
return installPlugin({ log: log, path: options.path, plugin: plugin }); | ||
}).nodeify(cb); | ||
}; | ||
{ | ||
"name": "libesvm", | ||
"version": "0.0.4", | ||
"version": "0.0.5", | ||
"description": "libesvm is a library for managning an Elasticsearch process for development and testing.", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
Sorry, the diff of this file is not supported yet
36751
966