Skip to content

Commit

Permalink
Only create config folder in 'start' command
Browse files Browse the repository at this point in the history
  • Loading branch information
xPaw authored and astorije committed Aug 26, 2017
1 parent 6ba2b8a commit 252dca3
Show file tree
Hide file tree
Showing 8 changed files with 94 additions and 48 deletions.
15 changes: 11 additions & 4 deletions src/command-line/add.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
"use strict";

var ClientManager = new require("../clientManager");
var colors = require("colors/safe");
var program = require("commander");
var Helper = require("../helper");
const colors = require("colors/safe");
const program = require("commander");
const fs = require("fs");
const Helper = require("../helper");
const Utils = require("./utils");

program
.command("add <name>")
.description("Add a new user")
.on("--help", Utils.extraHelp)
.action(function(name) {
if (!fs.existsSync(Helper.USERS_PATH)) {
log.error(`${Helper.USERS_PATH} does not exist.`);
return;
}

const ClientManager = require("../clientManager");

if (Helper.config.public) {
log.warn(`Users have no effect in ${colors.bold("public")} mode.`);
}
Expand Down
14 changes: 10 additions & 4 deletions src/command-line/config.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
"use strict";

var program = require("commander");
var child = require("child_process");
var colors = require("colors/safe");
var Helper = require("../helper");
const program = require("commander");
const child = require("child_process");
const colors = require("colors/safe");
const fs = require("fs");
const Helper = require("../helper");
const Utils = require("./utils");

program
.command("config")
.description(`Edit configuration file located at ${colors.green(Helper.CONFIG_PATH)}.`)
.on("--help", Utils.extraHelp)
.action(function() {
if (!fs.existsSync(Helper.CONFIG_PATH)) {
log.error(`${Helper.CONFIG_PATH} does not exist.`);
return;
}

var child_spawn = child.spawn(
process.env.EDITOR || "vi",
[Helper.CONFIG_PATH],
Expand Down
17 changes: 12 additions & 5 deletions src/command-line/edit.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@
"use strict";

var ClientManager = new require("../clientManager");
var program = require("commander");
var child = require("child_process");
var colors = require("colors/safe");
var Helper = require("../helper");
const program = require("commander");
const child = require("child_process");
const colors = require("colors/safe");
const fs = require("fs");
const Helper = require("../helper");
const Utils = require("./utils");

program
.command("edit <name>")
.description(`Edit user file located at ${colors.green(Helper.getUserConfigPath("<name>"))}.`)
.on("--help", Utils.extraHelp)
.action(function(name) {
if (!fs.existsSync(Helper.USERS_PATH)) {
log.error(`${Helper.USERS_PATH} does not exist.`);
return;
}

const ClientManager = require("../clientManager");

var users = new ClientManager().getUsers();

if (users === undefined) { // There was an error, already logged
Expand Down
24 changes: 3 additions & 21 deletions src/command-line/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@

global.log = require("../log.js");

var program = require("commander");
var colors = require("colors/safe");
var fs = require("fs");
var fsextra = require("fs-extra");
var path = require("path");
var Helper = require("../helper");
const program = require("commander");
const colors = require("colors/safe");
const Helper = require("../helper");
const Utils = require("./utils");

program.version(Helper.getVersion(), "-v, --version")
Expand All @@ -28,21 +25,6 @@ if (!home) {

Helper.setHome(home);

if (!fs.existsSync(Helper.CONFIG_PATH)) {
fsextra.ensureDirSync(Helper.HOME);
fs.chmodSync(Helper.HOME, "0700");
fsextra.copySync(path.resolve(path.join(
__dirname,
"..",
"..",
"defaults",
"config.js"
)), Helper.CONFIG_PATH);
log.info(`Configuration file created at ${colors.green(Helper.CONFIG_PATH)}.`);
}

fsextra.ensureDirSync(Helper.USERS_PATH);

require("./start");
require("./config");
require("./list");
Expand Down
13 changes: 10 additions & 3 deletions src/command-line/list.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"use strict";

var ClientManager = new require("../clientManager");
var program = require("commander");
var colors = require("colors/safe");
const colors = require("colors/safe");
const program = require("commander");
const fs = require("fs");
const Helper = require("../helper");
const Utils = require("./utils");

Expand All @@ -11,6 +11,13 @@ program
.description("List all users")
.on("--help", Utils.extraHelp)
.action(function() {
if (!fs.existsSync(Helper.USERS_PATH)) {
log.error(`${Helper.USERS_PATH} does not exist.`);
return;
}

const ClientManager = require("../clientManager");

if (Helper.config.public) {
log.warn(`Users have no effect in ${colors.bold("public")} mode.`);
}
Expand Down
13 changes: 10 additions & 3 deletions src/command-line/remove.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
"use strict";

var ClientManager = new require("../clientManager");
var program = require("commander");
var colors = require("colors/safe");
const colors = require("colors/safe");
const program = require("commander");
const fs = require("fs");
const Helper = require("../helper");
const Utils = require("./utils");

program
.command("remove <name>")
.description("Remove an existing user")
.on("--help", Utils.extraHelp)
.action(function(name) {
if (!fs.existsSync(Helper.USERS_PATH)) {
log.error(`${Helper.USERS_PATH} does not exist.`);
return;
}

const ClientManager = require("../clientManager");
const manager = new ClientManager();

try {
Expand Down
16 changes: 11 additions & 5 deletions src/command-line/reset.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
"use strict";

var ClientManager = new require("../clientManager");
var fs = require("fs");
var program = require("commander");
var colors = require("colors/safe");
var Helper = require("../helper");
const colors = require("colors/safe");
const program = require("commander");
const fs = require("fs");
const Helper = require("../helper");
const Utils = require("./utils");

program
.command("reset <name>")
.description("Reset user password")
.on("--help", Utils.extraHelp)
.action(function(name) {
if (!fs.existsSync(Helper.USERS_PATH)) {
log.error(`${Helper.USERS_PATH} does not exist.`);
return;
}

const ClientManager = require("../clientManager");

var users = new ClientManager().getUsers();

if (users === undefined) { // There was an error, already logged
Expand Down
30 changes: 27 additions & 3 deletions src/command-line/start.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
"use strict";

var program = require("commander");
var server = require("../server");
var Helper = require("../helper");
const colors = require("colors/safe");
const fs = require("fs");
const fsextra = require("fs-extra");
const path = require("path");
const program = require("commander");
const Helper = require("../helper");
const Utils = require("./utils");

program
Expand All @@ -15,6 +18,10 @@ program
.description("Start the server")
.on("--help", Utils.extraHelp)
.action(function(options) {
initalizeConfig();

const server = require("../server");

var mode = Helper.config.public;
if (options.public) {
mode = true;
Expand All @@ -29,3 +36,20 @@ program

server();
});

function initalizeConfig() {
if (!fs.existsSync(Helper.CONFIG_PATH)) {
fsextra.ensureDirSync(Helper.HOME);
fs.chmodSync(Helper.HOME, "0700");
fsextra.copySync(path.resolve(path.join(
__dirname,
"..",
"..",
"defaults",
"config.js"
)), Helper.CONFIG_PATH);
log.info(`Configuration file created at ${colors.green(Helper.CONFIG_PATH)}.`);
}

fsextra.ensureDirSync(Helper.USERS_PATH);
}

0 comments on commit 252dca3

Please sign in to comment.