v1.1.8

Author: d3v2a

.eslintrc

@@ -37,7 +37,7 @@
  "accessor-pairs": 2,
  "block-scoped-var": 2,
  "complexity": [2, 15],
- "consistent-return": 0,
+ "consistent-return": 2,
  "curly": 2,
  "default-case": 1,
  "dot-location": 0,

Commands/init.js

@@ -25,7 +25,8 @@ var checkArtisan = function checkArtisan(cmdRes) {
  return new Promise(function promiseCheckArtisan(resolve, reject) {
  var test = cmdRes.match(/\s*Laravel\s+Framework\s+(version)?\s+(.*)/);
  if (test) {
- return resolve(test);
+ resolve(test);
+ return;
  }
  reject(new Error('not a laravel framework'));
  });
@@ -100,7 +101,7 @@ var writeConf = function writeConf() {
  comment += "*\n";
  comment += "* config:\n";
  comment += "* key: name of the config in laravel\n";
- comment += "* inport: - true import without ask\n";
+ comment += "* import: - true import without ask\n";
  comment += "* - false don't import\n";
  comment += "* asis: true same as laravel\n";
  comment += "* false look for a file with the key name in lib/config folder\n";

Commands/laravelConfig.js

@@ -2,7 +2,6 @@
 /* global app,appdir */
 /* eslint global-require: 0 */
 
-var Promise = require('bluebird');
 var shelljs = require('shelljs');
 var utils = require('../lib/utilsCmd');
 var fs = require('fs-promise');
@@ -20,7 +19,8 @@ var prepareTmpFolder = function prepareTmpFolder() {
  unsafeCleanup: true
  }, function tmpDirCallback(err, name) {
  if (err) {
- return reject(err);
+ reject(err);
+ return;
  }
  fs.mkdir(name + '/Config-laravel')
  .then(function tmpdirOk() {

Commands/missingJob.js

@@ -92,11 +92,13 @@ module.exports = {
  if (!app.config('app')) {
  res.red('app config missing').ln();
  res.yellow('see manual for setup config from laravel').ln();
- return res.prompt();
+ res.prompt();
+ return;
  }
  if (Object.keys(app.config('app.job', [])).length === 0) {
  res.yellow('no job in Config/app.js').ln();
- return res.prompt();
+ res.prompt();
+ return;
  }
  global.queueOption = {};
  Job = includeAll({

Commands/modelsCreator.js

@@ -9,7 +9,8 @@ module.exports = {
  function: function run(req, res) {
  if (app.config('core.modelsCreator.models').length === 0) {
  res.yellow('Please add models to import in Config/core.js').ln();
- return res.prompt();
+ res.prompt();
+ return;
  }
  var dbModels = require('../lib/db-models');
  dbModels()

data/base/index.js

@@ -1,6 +1,6 @@
 /* eslint global-require: 0 */
 try {
- require('laravel-queue/bootstrap/app');
+ require('laravel-queue/bootstrap/app')();
 } catch(e) {
  console.log(e.message);
 }

lib/Config.js

@@ -1,5 +1,4 @@
 'use strict';
-/* global app */
 
 var include = require('include-all');
 var fs = require('fs');
@@ -30,7 +29,7 @@ var Config = function Config(appdir, logger) {
 Config.prototype.get = function get(key, def) {
  var reduce = function reduce(obj, index) {
  if (!obj) {
- return;
+ return null;
  }
  return obj[index];
  };

lib/Mail.js

@@ -2,7 +2,6 @@
 /* global appdir,app */
 // var console = app.logger(config('core.log.prefix') + ':mail');
 
-var Promise = require('bluebird');
 var ect = require('ect');
 var defaults = require('lodash/defaults');
 var nodemailer = require('nodemailer');
@@ -71,12 +70,15 @@ Mail.prototype.send = function sendMail(callback) {
  self.mailer.sendMail(mailOptions, function mailerSendMail(err, info) {
  if (err) {
  if (callback) {
- return callback(err);
+ callback(err);
+ return;
  }
- return reject(err);
+ reject(err);
+ return;
  }
  if (callback) {
- return callback(null, info);
+ callback(null, info);
+ return;
  }
  resolve(info);
  });

lib/db-models/lib/Model-export.js

@@ -1,7 +1,6 @@
 'use strict';
 /* global app */
 /* eslint new-cap: 0*/
-var Promise = require('bluebird');
 var console = app.logger(app.config('core.log.prefix') + ':model-export');
 var _ = require('lodash');
 _.mixin(require('lodash-inflection'));
@@ -29,13 +28,16 @@ ModelExport.prototype.createOutputDir = function createOutputDir() {
  return new Promise(function PromiseCreateOutputDir(resolve) {
  fs.stat(self.dir, function statDir(err, stats) {
  if (err || !stats.isDirectory()) {
- return fs.mkdir(self.dir, function mkdir(mkdirErr) {
+ fs.mkdir(self.dir, function mkdir(mkdirErr) {
  if (!mkdirErr) {
- return resolve(true);
+ resolve(true);
+ return;
  }
  });
+ return;
  }
- return resolve(true);
+ resolve(true);
+ return;
  });
  });
 };
@@ -105,7 +107,7 @@ ModelExport.prototype.createModels = function createModels() {
  }
  //for future association
  self.associate[lowerName] = modelName;
- return generatePromises.push(self.generateTemps({
+ generatePromises.push(self.generateTemps({
  tableName: table,
  modelName: modelName,
  fields: results[1][table]

lib/shell/lib/Shell.js

@@ -1,5 +1,4 @@
 'use strict';
-/* global app */
 /*eslint no-magic-numbers: 0 */
 
 var EventEmitter, Interface, Request, Response, shell, events, readline;
@@ -16,7 +15,7 @@ Interface = require('readline').Interface;
 var console;
 
 Interface.prototype.setPrompt = (function setPrompt(parent) {
- return function returnSetPromt() {
+ return function returnSetPrompt() {
  var args = Array.prototype.slice.call(arguments);
  if (!args[1]) {
  args[1] = Styles.unstyle(args[0]).length;
@@ -219,7 +218,7 @@ shell = (function exportShell(_super) {
  } else if (this.parent) {
  return this.parent.set(setting);
  }
-
+ return this;
  };
 
  Shell.prototype.prompt = function prompt() {