From 0fb42d9f7522f875ec6b27a772e0976fad918813 Mon Sep 17 00:00:00 2001
From: Zalmoxisus <zalmoxisus@gmail.com>
Date: Wed, 17 Aug 2016 12:35:42 +0300
Subject: [PATCH] Refactor directories

---
 .gitignore                 | 1 -
 bin/injectServer.js        | 6 +++---
 bin/remotedev.js           | 2 +-
 bin/server.js              | 5 ++---
 {bin => lib}/getOptions.js | 0
 {bin => lib}/worker.js     | 0
 package.json               | 3 ++-
 7 files changed, 8 insertions(+), 9 deletions(-)
 rename {bin => lib}/getOptions.js (100%)
 rename {bin => lib}/worker.js (100%)

diff --git a/.gitignore b/.gitignore
index b7a60ee..2ed2cf7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 node_modules
 *.log
 .DS_Store
-lib
 coverage
 .idea
diff --git a/bin/injectServer.js b/bin/injectServer.js
index d5f7ab1..78d8013 100644
--- a/bin/injectServer.js
+++ b/bin/injectServer.js
@@ -8,11 +8,11 @@ var endFlag = '/* ' + name + ' end */';
 var serverFlags = {
   'react-native': {
     '0.0.1': '    _server(argv, config, resolve, reject);',
-    '0.31.0': "  runServer(args, config, () => console.log('\\nReact packager ready.\\n'));",
+    '0.31.0': "  runServer(args, config, () => console.log('\\nReact packager ready.\\n'));"
   },
   'react-native-desktop': {
-    '0.0.1': '    _server(argv, config, resolve, reject);',
-  },
+    '0.0.1': '    _server(argv, config, resolve, reject);'
+  }
 };
 
 function getModuleVersion(modulePath) {
diff --git a/bin/remotedev.js b/bin/remotedev.js
index 1604df9..1ea3d55 100755
--- a/bin/remotedev.js
+++ b/bin/remotedev.js
@@ -3,8 +3,8 @@ var fs = require('fs');
 var path = require('path');
 var argv = require('minimist')(process.argv.slice(2));
 var chalk = require('chalk');
-var getOptions = require('./getOptions');
 var injectServer = require('./injectServer');
+var getOptions = require('./../lib/getOptions');
 
 function readFile(filePath) {
   return fs.readFileSync(path.resolve(process.cwd(), filePath), 'utf-8');
diff --git a/bin/server.js b/bin/server.js
index d91ac8d..12b722e 100644
--- a/bin/server.js
+++ b/bin/server.js
@@ -1,9 +1,8 @@
 var assign = require('object-assign');
 var repeat = require('repeat-string');
-var getOptions = require('./getOptions');
+var getOptions = require('./../lib/getOptions');
 var getPort = require('getport');
 
-
 var LOG_LEVEL_NONE = 0;
 var LOG_LEVEL_ERROR = 1;
 var LOG_LEVEL_WARN = 2;
@@ -12,7 +11,7 @@ var LOG_LEVEL_INFO = 3;
 module.exports = function(argv) {
   var SocketCluster = require('socketcluster').SocketCluster;
   var options = assign(getOptions(argv), {
-    workerController: __dirname + '/worker.js',
+    workerController: __dirname + '/../lib/worker.js',
     allowClientPublish: false
   });
   var port = options.port;
diff --git a/bin/getOptions.js b/lib/getOptions.js
similarity index 100%
rename from bin/getOptions.js
rename to lib/getOptions.js
diff --git a/bin/worker.js b/lib/worker.js
similarity index 100%
rename from bin/worker.js
rename to lib/worker.js
diff --git a/package.json b/package.json
index 9e0602d..593668d 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
   },
   "files": [
     "bin",
+    "lib",
     "views"
   ],
   "repository": {
@@ -32,7 +33,7 @@
     "express": "^4.13.3",
     "getport": "^0.1.0",
     "minimist": "^1.2.0",
-    "object-assign": "^4.1.0",
+    "object-assign": "^4.0.0",
     "repeat-string": "^1.5.4",
     "semver": "^5.3.0",
     "socketcluster": "^5.0.4"