From 0fb378e5d01db85ea35cabd1009e204bcdf92b92 Mon Sep 17 00:00:00 2001 From: Austen Collins Date: Sun, 18 Oct 2015 22:36:20 -0700 Subject: [PATCH] jaws: change utils var name to jawsutils --- lib/Jaws.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/Jaws.js b/lib/Jaws.js index b0bf4cd06..98d09fa85 100644 --- a/lib/Jaws.js +++ b/lib/Jaws.js @@ -1,7 +1,7 @@ 'use strict'; const path = require('path'), - utils = require('./utils/index'), + JawsUtils = require('./utils/index'), JawsCLI = require('./utils/cli'), JawsError = require('./jaws-error'), Promise = require('bluebird'), @@ -23,7 +23,7 @@ class Jaws { this._awsAdminKeyId = config.awsAdminKeyId; this._awsAdminSecretKey = config.awsAdminSecretKey; this._version = require('./../package.json').version; - this._projectRootPath = utils.findProjectRootPath(process.cwd()); + this._projectRootPath = JawsUtils.findProjectRootPath(process.cwd()); this._projectJson = false; this.actions = {}; this.hooks = {}; @@ -70,7 +70,7 @@ class Jaws { //}; // Load plugins: defaults - var defaults = utils.readAndParseJsonSync(path.join(__dirname, './defaults/defaults.json')); + var defaults = JawsUtils.readAndParseJsonSync(path.join(__dirname, './defaults/defaults.json')); this._loadPlugins(defaults.plugins); // Load plugins: project @@ -78,6 +78,8 @@ class Jaws { this._loadPlugins(this._projectJson.plugins); } + // Load plugins: aws-module + // Set commands } @@ -188,7 +190,6 @@ class Jaws { let plugin = plugins[i]; if (plugin.path) { - // Load from path plugin = require(path.join(__dirname, plugin.path)); _this.addPlugin(new plugin(_this, plugin.config ? plugin.config : null));