From c546e885774ef4662c227f639817076be54dba2f Mon Sep 17 00:00:00 2001
From: Major Taylor <majorjctaylor@gmail.com>
Date: Sun, 15 Mar 2020 06:20:12 -0400
Subject: [PATCH] vcreate: add `init` command

---
 cmd/tools/vcreate.v | 138 ++++++++++++++++++++++++++++++++++++--------
 cmd/v/v.v           |   5 +-
 2 files changed, 118 insertions(+), 25 deletions(-)

diff --git a/cmd/tools/vcreate.v b/cmd/tools/vcreate.v
index 971f21ad55..185dbe8817 100644
--- a/cmd/tools/vcreate.v
+++ b/cmd/tools/vcreate.v
@@ -2,6 +2,10 @@
 // Use of this source code is governed by an MIT license
 // that can be found in the LICENSE file.
 
+// This module follows a similar convention to Rust: `init` makes the
+// structure of the program in the _current_ directory, while `create`
+// makes the program structure in a _sub_ directory. Besides that, the
+// functionality is essentially the same.
 module main
 
 import (
@@ -18,43 +22,103 @@ fn cerror(e string){
 	eprintln('\nerror: $e')
 }
 
-fn (c Create)write_vmod() {
-	mut vmod := os.create('${c.name}/v.mod') or {
-		cerror(err)
-		exit(1)
-	}
-	vmod_content := [
+[inline]
+fn vmod_content(name, desc string) string {
+	return  [
 		'#V Project#\n',
 		'Module {',
-		'	name: \'${c.name}\',',
-		'	description: \'${c.description}\',',
+		'	name: \'${name}\',',
+		'	description: \'${desc}\',',
 		'	dependencies: []',
 		'}'
-	]
-	vmod.write(vmod_content.join('\n'))
+	].join('\n')
 }
 
-fn (c Create)write_main() {
-	mut main := os.create('${c.name}/${c.name}.v') or {
-		cerror(err)
-		exit(2)
-	}
-	main_content := [
+[inline]
+fn main_content() string {
+	return [
 		'module main\n',
 		'fn main() {',
 		'	println(\'Hello World !\')',
 		'}'
-	]
-	main.write(main_content.join('\n'))
+	].join('\n')
 }
 
-fn main() {
+[inline]
+fn gen_gitignore(name string) string {
+	return [
+		'main',
+		'$name',
+		'*.so',
+		'*.dll'
+	].join('\n')
+}
+
+fn (c &Create)create_vmod() {
+	mut vmod := os.create('${c.name}/v.mod') or {
+		cerror(err)
+		exit(1)
+	}
+	vmod.write(vmod_content(c.name, c.description))
+	vmod.close()
+}
+
+fn (c &Create)create_main() {
+	mut main := os.create('${c.name}/${c.name}.v') or {
+		cerror(err)
+		exit(2)
+	}
+	main.write(main_content())
+	main.close()
+}
+
+fn (c &Create)init_vmod() {
+	mut vmod := os.create('v.mod') or {
+		cerror(err)
+		exit(1)
+	}
+	vmod.write(vmod_content(c.name, c.description))
+	vmod.close()
+}
+
+fn (c &Create)create_git_repo(dir string) {
+	// Create Git Repo and .gitignore file
+	if !os.is_dir('${dir}/.git') {
+		os.exec('git init ${dir}') or {
+			cerror('Unable to create git repo')
+		}
+		if !os.exists('${dir}/.gitignore') {
+			mut fl := os.create('${dir}/.gitignore') or {
+				// We don't really need a .gitignore, it's just a nice-to-have
+				return
+			}
+			fl.write(gen_gitignore(c.name))
+			fl.close()
+		}
+	}
+}
+
+fn (c &Create)init_main() {
+	// The file already exists, don't over-write anything.
+	// Searching in the 'src' directory allows flexibility user module structure
+	if os.exists('${c.name}.v') || os.exists('src/${c.name}.v') {
+		return
+	}
+	mut main := os.create('${c.name}.v') or {
+		cerror(err)
+		exit(2)
+	}
+	main.write(main_content())
+	main.close()
+}
+
+fn create() {
 	mut c := Create{}
 
 	print('Input your project name: ')
 	c.name = os.get_line()
-	
-	if (os.is_dir(c.name)) {
+
+	if os.is_dir(c.name) {
 		cerror('${c.name} folder already exists')
 		exit(3)
 	}
@@ -67,7 +131,33 @@ fn main() {
 	os.mkdir(c.name) or {
 		panic(err)
 	}
-	c.write_vmod()
-	c.write_main()
-	println('Complete !')
+	c.create_vmod()
+	c.create_main()
+	c.create_git_repo(c.name)
+}
+
+fn init() {
+	if os.exists('v.mod') {
+		cerror('`v init` cannot be run on existing v modules')
+		exit(3)
+	}
+	mut c := Create{}
+	c.name = os.filename(os.getwd())
+	c.description = ''
+	c.init_vmod()
+	c.init_main()
+	c.create_git_repo('')
+	println("Change your module's description in `v.mod`")
+}
+
+fn main() {
+	if 'create' == os.args[1] {
+		create()
+	} else if 'init' == os.args[1] {
+		init()
+	} else {
+		cerror('Unknown command: ${os.args[1]}')
+		exit(1)
+	}
+	println('Complete!')
 }
diff --git a/cmd/v/v.v b/cmd/v/v.v
index 78f634186a..6e5dc86e2a 100644
--- a/cmd/v/v.v
+++ b/cmd/v/v.v
@@ -16,7 +16,6 @@ import (
 const (
 	simple_cmd = ['fmt',
 	'up', 'self',
-	'create',
 	'test', 'test-fmt', 'test-compiler',
 	'bin2v',
 	'repl',
@@ -69,6 +68,10 @@ fn main() {
 		return
 	}
 	match command {
+		'create', 'init' {
+			launch_tool(prefs.verbosity, 'vcreate')
+			return
+		}
 		'translate' {
 			println('Translating C to V will be available in V 0.3')
 			return