Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 19 additions & 16 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
var home = process.env[(process.platform == 'win32') ? 'USERPROFILE' : 'HOME'];
var defaultConfigFile = home + '/.recli.yml';
var r = require('rethinkdb'),
rhist = require('repl.history'),
coffee = require('coffee-script'),
const home = process.env[(process.platform == 'win32') ? 'USERPROFILE' : 'HOME'];
const defaultConfigFile = home + '/.recli.yml';
const r = require('rethinkdb'),
coffee = require('coffeescript'),
repl = require('repl'),
util = require('util'),
os = require('os'),
Expand All @@ -26,10 +25,10 @@ var r = require('rethinkdb'),
.alias('version', 'v')
.argv;

var writer = function(rawResult) {
var result;
const writer = function(rawResult) {
let result;
if (opts.stream) {
var i = 0;
let i = 0;
result = '';
for (i in rawResult) {
result += JSON.stringify(rawResult[i]) + os.EOL;
Expand All @@ -50,8 +49,8 @@ exports.recli = function() {
} else if (opts.version) {
console.log(pj.version);
} else {
var globalSettings = {};
var userSettings = {};
let globalSettings = {};
let userSettings = {};
if (opts.file) {
// Only load global config file if a file has not been specified
if (opts.file === defaultConfigFile) {
Expand All @@ -77,12 +76,12 @@ exports.recli = function() {
throw err;
} else {
if (opts._.length) {
var code = opts._.join(' ');
let code = opts._.join(' ');
if (opts.coffee) {
code = coffee.compile(code, {bare: true});
}

var re = eval(code);
const re = eval(code);
misc.evalResult(conn, re, function(e, result) {
if (e) {
throw e;
Expand All @@ -96,9 +95,9 @@ exports.recli = function() {
}
});
} else {
var cli = repl.start({prompt: "recli> ",
const cli = repl.start({prompt: "recli> ",
eval: misc.replEval,
writer: writer});
writer});
cli.context.r = r;
cli.context.conn = conn;
cli.context.coffee = opts.coffee;
Expand All @@ -107,12 +106,16 @@ exports.recli = function() {
console.log('');
process.exit();
});
rhist(cli, home + '/.recli_history');

cli.setupHistory(home + '/.recli_history', (err) => {
if (err) {
throw err;
}
})
}
}
});
}
};

exports.recli();

4 changes: 2 additions & 2 deletions lib/misc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var vm = require('vm'),
coffee = require('coffee-script')
const vm = require('vm'),
coffee = require('coffeescript')

// Make the rethinkdb result suitable for output
exports.evalResult = function(conn, result, callback) {
Expand Down
Loading