From 449eaf70f0b1c3e8ad207066e9a406c52f2fa3f7 Mon Sep 17 00:00:00 2001
From: coderaiser <coderaiser@cloudcmd.io>
Date: Fri, 23 Dec 2016 11:44:05 +0200
Subject: [PATCH] feature(cloudcmd) lib/server -> server

---
 .gitignore                          |  2 +-
 bin/cloudcmd.js                     |  4 ++--
 bin/legacy.js                       |  6 +++---
 package.json                        | 14 ++++++--------
 {lib/server => server}/auth.js      |  0
 {lib => server}/cloudcmd.js         | 15 +++++++--------
 {lib/server => server}/config.js    |  4 ++--
 {lib/server => server}/exit.js      |  0
 {lib/server => server}/markdown.js  |  0
 {lib/server => server}/plugins.js   |  0
 {lib/server => server}/prefixer.js  |  0
 {lib/server => server}/repl.js      |  0
 {lib/server => server}/rest.js      |  2 +-
 {lib/server => server}/root.js      |  0
 {lib/server => server}/route.js     |  2 +-
 {lib => server}/server.js           |  6 ++----
 {lib/server => server}/validate.js  |  0
 test/before.js                      |  2 +-
 test/rest/config.js                 |  2 +-
 test/{lib => server}/cloudcmd.js    |  4 ++--
 test/{lib => server}/cloudfunc.html |  0
 test/{lib => server}/cloudfunc.js   |  2 +-
 test/{lib => server}/config.js      |  2 +-
 test/{lib => server}/util.js        |  0
 test/{lib => server}/validate.js    |  0
 25 files changed, 31 insertions(+), 36 deletions(-)
 rename {lib/server => server}/auth.js (100%)
 rename {lib => server}/cloudcmd.js (94%)
 rename {lib/server => server}/config.js (98%)
 rename {lib/server => server}/exit.js (100%)
 rename {lib/server => server}/markdown.js (100%)
 rename {lib/server => server}/plugins.js (100%)
 rename {lib/server => server}/prefixer.js (100%)
 rename {lib/server => server}/repl.js (100%)
 rename {lib/server => server}/rest.js (99%)
 rename {lib/server => server}/root.js (100%)
 rename {lib/server => server}/route.js (99%)
 rename {lib => server}/server.js (93%)
 rename {lib/server => server}/validate.js (100%)
 rename test/{lib => server}/cloudcmd.js (93%)
 rename test/{lib => server}/cloudfunc.html (100%)
 rename test/{lib => server}/cloudfunc.js (98%)
 rename test/{lib => server}/config.js (93%)
 rename test/{lib => server}/util.js (100%)
 rename test/{lib => server}/validate.js (100%)

diff --git a/.gitignore b/.gitignore
index 876c9c88..ae081cf2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,7 @@ modules/fancybox/sprite.psd
 modules/currify/dist/currify.js
 
 legacy
-lib_
+server_
 
 .nyc_output
 
diff --git a/bin/cloudcmd.js b/bin/cloudcmd.js
index cbf12957..92c1b8e7 100755
--- a/bin/cloudcmd.js
+++ b/bin/cloudcmd.js
@@ -3,7 +3,7 @@
 'use strict';
 
 const Info = require('../package');
-const DIR_SERVER = '../lib/server/';
+const DIR_SERVER = '../server/';
 
 const exit = require(DIR_SERVER + 'exit');
 const config = require(DIR_SERVER + 'config');
@@ -132,7 +132,7 @@ function version() {
 }
 
 function start(config) {
-    const SERVER = '../lib/server';
+    const SERVER = DIR_SERVER + 'server';
     
     if (args.server)
         require(SERVER)(config);
diff --git a/bin/legacy.js b/bin/legacy.js
index ca4d8f00..d93054b9 100755
--- a/bin/legacy.js
+++ b/bin/legacy.js
@@ -5,8 +5,8 @@
 const fs = require('fs');
 const path = require('path');
 
-const dir = path.join(__dirname, '../lib/server');
-const _dir = path.join(__dirname, '../legacy/lib/server');
+const dir = path.join(__dirname, '../server');
+const _dir = path.join(__dirname, '../legacy/server');
 
 const setDir = (name) => {
     return path.join(_dir, name);
@@ -20,7 +20,7 @@ fs.readdirSync(dir)
 function fillFile(name) {
     return {
         name: setDir(name),
-        data: `module.exports = require(\'../../../lib_/server/${name}\');`
+        data: `module.exports = require(\'../../server_/${name}\');`
     }
 }
 
diff --git a/package.json b/package.json
index 6a581546..ea16c761 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
   },
   "config": {
     "dirs_legacy": "client",
-    "dirs": "bin lib test"
+    "dirs": "bin server test"
   },
   "scripts": {
     "start": "node bin/cloudcmd.js",
@@ -52,13 +52,13 @@
     "lint:style": "stylelint css/*.css",
     "lint:js": "redrun jshint jscs eslint:*",
     "lint:js:es5": "redrun es5:*",
-    "eslint:bin": "eslint --rule 'no-console:0' bin test lib",
+    "eslint:bin": "eslint --rule 'no-console:0' bin test server",
     "jshint": "jshint bin/release.js",
     "jscs": "jscs --esnext $npm_package_config_dirs",
     "es5:jshint": "jshint --config .es5/.jshintrc $npm_package_config_dirs_dirs_legacy --exclude bin/release.js",
     "es5:eslint": "eslint -c .es5/.eslintrc --rule 'no-console:0' $npm_package_config_dirs_legacy --ignore-path bin/release.js",
     "test": "tape 'test/**/*.js'",
-    "watch:test": "nodemon -w lib -w test -x \"npm run test\"",
+    "watch:test": "nodemon -w server -w test -x \"npm run test\"",
     "spell": "yaspeller .",
     "wisdom": "npm run build; npm run docker:rm-old; bin/release.js",
     "postpublish": "redrun --parallel docker docker:alpine",
@@ -80,16 +80,14 @@
     "coverage": "nyc npm test",
     "report": "nyc report --reporter=text-lcov | coveralls",
     "6to5:bin": "babel bin -d legacy/bin",
-    "6to5:lib": "babel lib -d lib_",
+    "6to5:server": "babel server -d server_",
     "build": "redrun rm:* 6to5:* mkdir:* legacy:*",
     "legacy:package": "echo \"module.exports = require('../package');\" > legacy/package.js",
-    "legacy:lib:cloudcmd": "echo \"module.exports = require('../../lib_/cloudcmd');\" > legacy/lib/cloudcmd.js",
-    "legacy:lib:server": "echo \"module.exports = require('../../lib_/server');\" > legacy/lib/server.js",
-    "mkdir:server": "mkdirp legacy/lib/server",
+    "mkdir:server": "mkdirp legacy/server",
     "mkdir:json": "mkdirp legacy/json",
     "legacy:server": "bin/legacy.js",
     "legacy:help": "cp json/help.json legacy/json/",
-    "rm:legacy": "rimraf legacy"
+    "rm:legacy": "rimraf legacy server_"
   },
   "directories": {
     "man": "man"
diff --git a/lib/server/auth.js b/server/auth.js
similarity index 100%
rename from lib/server/auth.js
rename to server/auth.js
diff --git a/lib/cloudcmd.js b/server/cloudcmd.js
similarity index 94%
rename from lib/cloudcmd.js
rename to server/cloudcmd.js
index ebb069f5..6c4772c9 100644
--- a/lib/cloudcmd.js
+++ b/server/cloudcmd.js
@@ -2,18 +2,17 @@
 
 const DIR = __dirname + '/';
 const DIR_ROOT = DIR + '../';
-const DIR_SERVER = DIR + 'server/';
 const DIR_COMMON = DIR + '../common/';
 
 const cloudfunc = require(DIR_COMMON + 'cloudfunc');
 
-const auth = require(DIR_SERVER + 'auth');
-const config = require(DIR_SERVER + 'config');
-const rest = require(DIR_SERVER + 'rest');
-const route = require(DIR_SERVER + 'route');
-const validate = require(DIR_SERVER + 'validate');
-const prefixer = require(DIR_SERVER + 'prefixer');
-const pluginer = require(DIR_SERVER + 'plugins');
+const auth = require(DIR + 'auth');
+const config = require(DIR + 'config');
+const rest = require(DIR + 'rest');
+const route = require(DIR + 'route');
+const validate = require(DIR + 'validate');
+const prefixer = require(DIR + 'prefixer');
+const pluginer = require(DIR + 'plugins');
 
 const apart = require('apart');
 const join = require('join-io');
diff --git a/lib/server/config.js b/server/config.js
similarity index 98%
rename from lib/server/config.js
rename to server/config.js
index dabb7dbe..6c3aa3d8 100644
--- a/lib/server/config.js
+++ b/server/config.js
@@ -1,8 +1,8 @@
 'use strict';
 
 const DIR_SERVER = __dirname + '/';
-const DIR_COMMON = DIR_SERVER + '../../common/';
-const DIR = DIR_SERVER + '../../';
+const DIR_COMMON = DIR_SERVER + '../common/';
+const DIR = DIR_SERVER + '../';
 
 const path = require('path');
 
diff --git a/lib/server/exit.js b/server/exit.js
similarity index 100%
rename from lib/server/exit.js
rename to server/exit.js
diff --git a/lib/server/markdown.js b/server/markdown.js
similarity index 100%
rename from lib/server/markdown.js
rename to server/markdown.js
diff --git a/lib/server/plugins.js b/server/plugins.js
similarity index 100%
rename from lib/server/plugins.js
rename to server/plugins.js
diff --git a/lib/server/prefixer.js b/server/prefixer.js
similarity index 100%
rename from lib/server/prefixer.js
rename to server/prefixer.js
diff --git a/lib/server/repl.js b/server/repl.js
similarity index 100%
rename from lib/server/repl.js
rename to server/repl.js
diff --git a/lib/server/rest.js b/server/rest.js
similarity index 99%
rename from lib/server/rest.js
rename to server/rest.js
index 98ad76b3..1654d314 100644
--- a/lib/server/rest.js
+++ b/server/rest.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const DIR = './';
-const DIR_COMMON = DIR + '../../common/';
+const DIR_COMMON = DIR + '../common/';
 const path = require('path');
 
 const root = require(DIR + 'root');
diff --git a/lib/server/root.js b/server/root.js
similarity index 100%
rename from lib/server/root.js
rename to server/root.js
diff --git a/lib/server/route.js b/server/route.js
similarity index 99%
rename from lib/server/route.js
rename to server/route.js
index c89803e4..38cfcd4d 100644
--- a/lib/server/route.js
+++ b/server/route.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const DIR = __dirname + '/../../';
+const DIR = __dirname + '/../';
 const DIR_TMPL = DIR + 'tmpl/';
 const DIR_HTML = DIR + 'html/';
 const DIR_COMMON = DIR + 'common/';
diff --git a/lib/server.js b/server/server.js
similarity index 93%
rename from lib/server.js
rename to server/server.js
index 9cad1280..5505fd4e 100644
--- a/lib/server.js
+++ b/server/server.js
@@ -1,9 +1,7 @@
 'use strict';
 
-const DIR_LIB = './';
-const DIR_SERVER = DIR_LIB + 'server/';
-
-const cloudcmd = require(DIR_LIB + 'cloudcmd');
+const DIR_SERVER = './';
+const cloudcmd = require(DIR_SERVER + 'cloudcmd');
 
 const exit = require(DIR_SERVER + 'exit');
 const config = require(DIR_SERVER + 'config');
diff --git a/lib/server/validate.js b/server/validate.js
similarity index 100%
rename from lib/server/validate.js
rename to server/validate.js
diff --git a/test/before.js b/test/before.js
index fb2b3d74..f4b3c609 100644
--- a/test/before.js
+++ b/test/before.js
@@ -8,7 +8,7 @@ const io = require('socket.io');
 const writejson = require('writejson');
 const readjson = require('readjson');
 
-const cloudcmd = require('../lib/cloudcmd');
+const cloudcmd = require('../server/cloudcmd');
 const {assign} = Object;
 
 const pathConfig = os.homedir() + '/.cloudcmd.json';
diff --git a/test/rest/config.js b/test/rest/config.js
index 9ddec3a5..c2ab27f1 100644
--- a/test/rest/config.js
+++ b/test/rest/config.js
@@ -4,7 +4,7 @@ const test = require('tape');
 const promisify = require('es6-promisify');
 const pullout = require('pullout');
 const request = require('request');
-const manageConfig = require('../../lib/server/config');
+const manageConfig = require('../../server/config');
 
 const before = require('../before');
 
diff --git a/test/lib/cloudcmd.js b/test/server/cloudcmd.js
similarity index 93%
rename from test/lib/cloudcmd.js
rename to test/server/cloudcmd.js
index 5c493884..f650f4f4 100644
--- a/test/lib/cloudcmd.js
+++ b/test/server/cloudcmd.js
@@ -1,9 +1,9 @@
 'use strict';
 
 const test = require('tape');
-const DIR = '../../lib/';
+const DIR = '../../server/';
 const cloudcmd = require(DIR + 'cloudcmd');
-const config = require(DIR + 'server/config');
+const config = require(DIR + 'config');
 
 test('cloudcmd: args: no', (t) => {
     const fn = () => cloudcmd();
diff --git a/test/lib/cloudfunc.html b/test/server/cloudfunc.html
similarity index 100%
rename from test/lib/cloudfunc.html
rename to test/server/cloudfunc.html
diff --git a/test/lib/cloudfunc.js b/test/server/cloudfunc.js
similarity index 98%
rename from test/lib/cloudfunc.js
rename to test/server/cloudfunc.js
index 5d256581..815b9ba1 100644
--- a/test/lib/cloudfunc.js
+++ b/test/server/cloudfunc.js
@@ -12,7 +12,7 @@ var DIR                 = __dirname + '/../../',
     test                = require('tape'),
     
     FS_DIR              = TMPLDIR   + 'fs/',
-    EXPECT_PATH         = DIR       + 'test/lib/cloudfunc.html',
+    EXPECT_PATH         = DIR       + 'test/server/cloudfunc.html',
     
     TMPL_PATH   = [
         'file',
diff --git a/test/lib/config.js b/test/server/config.js
similarity index 93%
rename from test/lib/config.js
rename to test/server/config.js
index baed7051..c47ce35a 100644
--- a/test/lib/config.js
+++ b/test/server/config.js
@@ -2,7 +2,7 @@
 
 const test = require('tape');
 const root = '../../';
-const config = require(root + 'lib/server/config');
+const config = require(root + 'server/config');
 
 const before = require('../before');
 
diff --git a/test/lib/util.js b/test/server/util.js
similarity index 100%
rename from test/lib/util.js
rename to test/server/util.js
diff --git a/test/lib/validate.js b/test/server/validate.js
similarity index 100%
rename from test/lib/validate.js
rename to test/server/validate.js