From 9849b324f48a7705977462a2289a656fdcf53d59 Mon Sep 17 00:00:00 2001
From: Izel Nakri <contact@izelnakri.com>
Date: Sat, 25 Nov 2017 11:48:55 +0100
Subject: [PATCH] small enchancements to cli

---
 cli.js       | 8 +++++++-
 package.json | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/cli.js b/cli.js
index 13c8404..859a38a 100644
--- a/cli.js
+++ b/cli.js
@@ -97,7 +97,7 @@ function generateModelFiles() {
 
   if (!fs.existsSync(`${memServerDirectory}/models/${modelFileName}.js`)) {
     fs.writeFileSync(`${memServerDirectory}/models/${modelFileName}.js`, `import Model from 'memserver/model';
-    
+
 export default Model({
 
 });`);
@@ -112,6 +112,10 @@ export default Model({
 }
 
 function openConsole() {
+  if (process.cwd().includes('memserver')) {
+    throw new Error(chalk.red('[MemServer CLI] You are in the memserver directory, go to the root of your project to start memserver console.'));
+  }
+  
   const MemServer = require('./lib/index.js');
   const repl = require('repl');
 
@@ -136,5 +140,7 @@ function getMemServerDirectory() {
     const targetIndex = cwd.lastIndexOf('memserver') + 9;
 
     return cwd.slice(0, targetIndex);
+  } else if (fs.readdirSync('.').includes('memserver')) {
+    return `${cwd}/memserver`;
   }
 }
diff --git a/package.json b/package.json
index 3271e64..f38ced0 100644
--- a/package.json
+++ b/package.json
@@ -33,13 +33,13 @@
     "jsdom": "^11.3.0",
     "pretender": "^1.6.0",
     "qs": "^6.5.1",
-    "route-recognizer": "^0.3.3",
     "rollup": "^0.50.0",
     "rollup-plugin-commonjs": "^8.2.6",
     "rollup-plugin-node-builtins": "^2.1.2",
     "rollup-plugin-node-globals": "^1.1.0",
     "rollup-plugin-node-resolve": "^3.0.0",
-    "rollup-plugin-virtual": "^1.0.1"
+    "rollup-plugin-virtual": "^1.0.1",
+    "route-recognizer": "^0.3.3"
   },
   "devDependencies": {
     "cors": "^2.8.4",