Merge branch 'master' of https://github.com/xenoz0718/goorm

README.md

@@ -151,4 +151,4 @@ Getting Started
 License
 -------
 
-goormIDE fundamentally has a dual license. Currently being released as open source version is the AGPL v3 conforms to the open source project. Modifying the source code must be disclosed the source code using the same license. If you want to use goorm IDE commercially, you must purchase the license.([email protected])
+goormIDE fundamentally has a dual license. Currently being released as open source version is the AGPL v3 conforms to the open source project. Modifying the source code must be disclosed the source code using the same license. If you want to use goorm IDE commercially, you must purchase the license.([email protected])

README_KO.md

@@ -143,4 +143,4 @@ project.goorm
 라이센스
 ------
 
-구름은 기본적으로 듀얼 라이센스를 가지고 있습니다. 현재 오픈 소스로 공개중인 버전은 AGPLv3을 따르는 오픈 소스 프로젝트이며, 소스 코드를 수정하셔서 사용하는 경우에는 반드시 동일한 라이센스로 소스 코드를 공개하여야 합니다. 만약 구름 IDE를 상업적으로 이용하실 경우에는 라이센스를 구매하여 사용하셔야 합니다. ([email protected])
+구름은 기본적으로 듀얼 라이센스를 가지고 있습니다. 현재 오픈 소스로 공개중인 버전은 AGPLv3을 따르는 오픈 소스 프로젝트이며, 소스 코드를 수정하셔서 사용하는 경우에는 반드시 동일한 라이센스로 소스 코드를 공개하여야 합니다. 만약 구름 IDE를 상업적으로 이용하실 경우에는 라이센스를 구매하여 사용하셔야 합니다. ([email protected])

goorm.js

@@ -180,31 +180,50 @@ fs.readFile(__dirname+"/info_goorm.json", "utf8", function(err, contents) {
 
 							var readline = require('readline');
 							var crypto = require('crypto');
+							var old_write = process.stdout.write;
 
 							var rl = readline.createInterface({
 								input: process.stdin,
 								output: process.stdout
 							});
 
 							console.log('Please initialize your ID & PW ...'.yellow);
-							rl.question("Your ID : ", function(user_id) {
-							rl.question("Your PW : ", function(user_pw) {
-								var sha_pw = crypto.createHash('sha1');
-								sha_pw.update(user_pw);
-								user_pw = sha_pw.digest('hex');
+							rl.question("id : ", function(user_id) {
+								process.stdout.write('password : ')
+								process.stdout.write = function () {};
 
-								var user = {
-									'id' : user_id,
-									'pw' : user_pw
-								}
+								rl.question("password : ", function(user_pw) {
+									process.stdout.write = old_write;
+									process.stdout.write('\nconfirm password : ')
+									process.stdout.write = function () {};
 
-								config_data.users.push(user);
-								fs.writeFileSync(process.env.HOME +  '/.goorm/config.json', JSON.stringify(config_data), 'utf8');
+									rl.question("confirm password : ", function(confirm_pw) {
+										process.stdout.write = old_write;
 
-								rl.close();
+										if (user_pw != confirm_pw) {
+											console.log('\nPlease recheck your password. They are not a match.');
+											process.exit();
+										}
+										else {
+											console.log();
+										}
 
-								start();
-							});
+										var sha_pw = crypto.createHash('sha1');
+										sha_pw.update(user_pw);
+										user_pw = sha_pw.digest('hex');
+
+										var user = {
+											'id' : user_id,
+											'pw' : user_pw
+										}
+
+										config_data.users.push(user);
+										fs.writeFileSync(process.env.HOME +  '/.goorm/config.json', JSON.stringify(config_data), 'utf8');
+
+										rl.close();
+										start();
+									})
+								});
 							});
 						}
 						else {
@@ -318,31 +337,50 @@ fs.readFile(__dirname+"/info_goorm.json", "utf8", function(err, contents) {
 
 									var readline = require('readline');
 									var crypto = require('crypto');
+									var old_write = process.stdout.write;
 
 									var rl = readline.createInterface({
 										input: process.stdin,
 										output: process.stdout
 									});
 
 									console.log('Please initialize your ID & PW ...'.yellow);
-									rl.question("Your ID : ", function(user_id) {
-									rl.question("Your PW : ", function(user_pw) {
-										var sha_pw = crypto.createHash('sha1');
-										sha_pw.update(user_pw);
-										user_pw = sha_pw.digest('hex');
-
-										var user = {
-											'id' : user_id,
-											'pw' : user_pw
-										}
-
-										config_data.users.push(user);
-										fs.writeFileSync(process.env.HOME +  '/.goorm/config.json', JSON.stringify(config_data), 'utf8');
-
-										rl.close();
-
-										start();
-									});
+									rl.question("id : ", function(user_id) {
+										process.stdout.write('password : ')
+										process.stdout.write = function () {};
+
+										rl.question("password : ", function(user_pw) {
+											process.stdout.write = old_write;
+											process.stdout.write('\nconfirm password : ')
+											process.stdout.write = function () {};
+
+											rl.question("confirm password : ", function(confirm_pw) {
+												process.stdout.write = old_write;
+
+												if (user_pw != confirm_pw) {
+													console.log('\nPlease recheck your password. They are not a match.');
+													process.exit();
+												}
+												else {
+													console.log();
+												}
+
+												var sha_pw = crypto.createHash('sha1');
+												sha_pw.update(user_pw);
+												user_pw = sha_pw.digest('hex');
+
+												var user = {
+													'id' : user_id,
+													'pw' : user_pw
+												}
+
+												config_data.users.push(user);
+												fs.writeFileSync(process.env.HOME +  '/.goorm/config.json', JSON.stringify(config_data), 'utf8');
+
+												rl.close();
+												start();
+											})
+										});
 									});
 								}
 								else {
@@ -470,17 +508,83 @@ fs.readFile(__dirname+"/info_goorm.json", "utf8", function(err, contents) {
 					if(temp_dir && temp_dir[temp_dir.length - 1] != '/') temp_dir = temp_dir + '/';
 
 
-					var config_data = {
-						workspace: workspace,
-						temp_dir: temp_dir,
-						plugin_exclude_list : plugin_exclude_list
-					};
+					if(options['user']) {
+						if (options['user'] === true) {
+							console.log('Please input your id'.red);
+							console.log('node goorm set (-u/--user) [user_id]');
+							console.log('or');
+							console.log('goorm set (-u/--user) [user_id]');
+							process.exit();
+						}
+
+						var user_id = options['user'];
+
+						var readline = require('readline');
+						var crypto = require('crypto');
+						var old_write = process.stdout.write;
+
+						var rl = readline.createInterface({
+							input: process.stdin,
+							output: process.stdout
+						});
+
+						process.stdout.write('password : ')
+						process.stdout.write = function () {};
+
+						rl.question("password : ", function(user_pw) {
+							process.stdout.write = old_write;
+							process.stdout.write('\nconfirm password : ')
+							process.stdout.write = function () {};
+
+							rl.question("confirm password : ", function(confirm_pw) {
+								process.stdout.write = old_write;
+
+								if (user_pw != confirm_pw) {
+									console.log('\nPlease recheck your password. They are not a match.');
+									process.exit();
+								}
+								else {
+									console.log();
+								}
+
+								var sha_pw = crypto.createHash('sha1');
+								sha_pw.update(user_pw);
+								user_pw = sha_pw.digest('hex');
+
+								var user = {
+									'id' : user_id,
+									'pw' : user_pw
+								}
+
+								rl.close();
+
+								var config_data = {
+									workspace: workspace,
+									temp_dir: temp_dir,
+									plugin_exclude_list : plugin_exclude_list,
+									users: [user]
+								};
+
+
+								fs.writeFileSync(process.env.HOME +  '/.goorm/config.json', JSON.stringify(config_data), 'utf8');
+								console.log("goormIDE: your configs are successfully added!");
+							});
+						});
+					}
+					else {
+						var config_data = {
+							workspace: workspace,
+							temp_dir: temp_dir,
+							plugin_exclude_list : plugin_exclude_list,
+							users: users
+						};
+
+						fs.writeFileSync(process.env.HOME +  '/.goorm/config.json', JSON.stringify(config_data), 'utf8');
+						console.log("goormIDE: your configs are successfully added!");
+					}
 
 
 
-
-					fs.writeFileSync(process.env.HOME +  '/.goorm/config.json', JSON.stringify(config_data), 'utf8');
-					console.log("goormIDE: your configs are successfully added!");
 				}
 			})
 

info_goorm.json

@@ -1 +1 @@
-{"version":"1.4.1","url":"http://goorm.io","lib":[{"name":"YUI","version":"2.9.0"},{"name":"jQuery","version":"1.7.2"},{"name":"jQuery UI","version":"1.8.12"},{"name":"CodeMirror","version":"2.38.0"}]}
+{"version":"1.4.2","url":"http://goorm.io","lib":[{"name":"YUI","version":"2.9.0"},{"name":"jQuery","version":"1.7.2"},{"name":"jQuery UI","version":"1.8.12"},{"name":"CodeMirror","version":"2.38.0"}]}