readme & version updated

package.json updated

README.md

@@ -26,11 +26,12 @@ Options:
 
 Commands:
   create [app-name]              create a new project
-  make:controller                create a new controller
+  create [app-name] -i           create a new project in current directory
-  make:middleware                create a new middleware
+  make controller [name]         create a new controller
-  make:model                     create a new model
+  make middleware [name]         create a new middleware
-  make:route                     create a new route
+  make model [name]              create a new model
-  make:test                      create a new test
+  make route [name]              create a new route
-  make:view                      create a new view
+  make test [name]               create a new test
+  make view [name]               create a new view
   setup                          set up an existing project for nork
 ```

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nork",
-  "version": "1.1.3",
+  "version": "1.1.6",
   "description": "The best node.js 'framework' :)",
   "main": "src/app.js",
   "bin": "src/app.js",

src/app.js

@@ -30,19 +30,19 @@ const logSuccess = (msg = false) => {
 }
 
 const logHelp = (specific = false, command = false) => {
-	let spc = 40
+	let spc = 27
 
 	if (specific) {
 		// log specific help
 		if (specific == 'make') {
 			console.log(`Usage: ${specific}:[component]`)
 			console.log()
-			console.log(pad('  make:controller', spc), 'create a new controller')
+			console.log(pad('  make controller [name]', spc), 'create a new controller')
-			console.log(pad('  make:middleware', spc), 'create a new middleware')
+			console.log(pad('  make middleware [name]', spc), 'create a new middleware')
-			console.log(pad('  make:model', spc), 'create a new model')
+			console.log(pad('  make model [name]', spc), 'create a new model')
-			console.log(pad('  make:route', spc), 'create a new route')
+			console.log(pad('  make route [name]', spc), 'create a new route')
-			console.log(pad('  make:test', spc), 'create a new test')
+			console.log(pad('  make test [name]', spc), 'create a new test')
-			console.log(pad('  make:view', spc), 'create a new view')
+			console.log(pad('  make view [name]', spc), 'create a new view')
 			return
 		}
 		console.log(`Usage: ${specific} [options]`)
@@ -57,12 +57,13 @@ const logHelp = (specific = false, command = false) => {
 	console.log()
 	console.log('Commands:')
 	console.log(pad('  create [app-name]', spc), 'create a new project')
-	console.log(pad('  make:controller', spc), 'create a new controller')
+	console.log(pad('  create [app-name] -i', spc), 'create a new project in current directory')
-	console.log(pad('  make:middleware', spc), 'create a new middleware')
+	console.log(pad('  make controller [name]', spc), 'create a new controller')
-	console.log(pad('  make:model', spc), 'create a new model')
+	console.log(pad('  make middleware [name]', spc), 'create a new middleware')
-	console.log(pad('  make:route', spc), 'create a new route')
+	console.log(pad('  make model [name]', spc), 'create a new model')
-	console.log(pad('  make:test', spc), 'create a new test')
+	console.log(pad('  make route [name]', spc), 'create a new route')
-	console.log(pad('  make:view', spc), 'create a new view')
+	console.log(pad('  make test [name]', spc), 'create a new test')
+	console.log(pad('  make view [name]', spc), 'create a new view')
 	console.log(pad('  setup', spc), 'set up an existing project for nork')
 	console.log()
 	console.log('  Run', colors.cyan('nork help <command>'), 'for detailed usage of given command.')
@@ -77,6 +78,7 @@ const logHelp = (specific = false, command = false) => {
 ;(async () => {
 	if (process.argv[2] == 'create') {
 		// get info about new project
+		let projectPath
 		const data = {}
 		const questions = [
 			{
@@ -110,15 +112,16 @@ const logHelp = (specific = false, command = false) => {
 		data.author = answers.author
 
 		// copy skeleton to new project
-		fs.copySync(path.join(__dirname, './skeletons/express-' + data.lang), process.cwd())
+		process.argv.includes('-i') ? projectPath = process.cwd() : projectPath = path.join(process.cwd(), data.project_name)
+		fs.copySync(path.join(__dirname, './skeletons/express-' + data.lang), projectPath)
 
 		// edit package.json file
-		const pkgJson = require(path.join(process.cwd(), 'package.json'))
+		const pkgJson = require(path.join(projectPath, 'package.json'))
 
 		pkgJson.name = data.project_name
 		pkgJson.author = data.author
 
-		fs.writeFile(path.join(process.cwd(), 'package.json'), JSON.stringify(pkgJson, null, 2), err => {
+		fs.writeFile(path.join(projectPath, 'package.json'), JSON.stringify(pkgJson, null, 2), err => {
 			if (err) return logError(err)
 		})
 

src/skeletons/express-ts/package.json

@@ -29,7 +29,7 @@
 		"@types/ejs": "^3.0.6",
 		"@types/express": "^4.17.11",
 		"@types/fs-extra": "^9.0.12",
-		"@types/jest": "^26.0.24",
+		"@types/jest": "^27.0.1",
 		"@types/mongoose": "^5.10.5",
 		"@types/morgan": "^1.9.2",
 		"@types/node": "^14.14.41",
@@ -38,7 +38,7 @@
 		"npm-run-all": "^4.1.5",
 		"rimraf": "^3.0.2",
 		"shelljs": "^0.8.4",
-		"ts-jest": "^27.0.4",
+		"ts-jest": "^27.0.5",
 		"ts-node": "^9.1.1",
 		"typescript": "^4.2.4"
 	}