Remove ramda dependency + misc refactoring.

bin/webgme

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
-var Command = require('commander').Command,
-    program = new Command(),
-    version = require('../package.json').version;
+const Command = require('commander').Command;
+const program = new Command();
+const {version} = require('../package.json');
 
 /* * * * * * * * * * Components * * * * * * * * * */
 var descs = {

package.json

@@ -40,7 +40,6 @@
     "nop": "^1.0.0",
     "plural": "^0.1.6",
     "q": "^1.4.1",
-    "ramda": "^0.15.1",
     "requirejs": "^2.1.18",
     "rimraf": "^2.4.0",
     "webgme-engine": "^2.23.0"

src/AddonManager.js

@@ -10,7 +10,6 @@
 
 'use strict';
 var _ = require('lodash'),
-    R = require('ramda'),
     path = require('path'),
     rm_rf = require('rimraf'),
     fs = require('fs'),
@@ -72,9 +71,7 @@ AddonManager.prototype.new = function(options, callback) {
         }
 
         // Get the src, test paths
-        var setupConfig = R.mapObjIndexed(function(empty, type) {
-            return `${type}/addons/${name}`;
-        }, {src: null});
+        const setupConfig = {src: `src/addons/${name}`};
 
         // Store the addon info in the webgme-setup.json file
 

src/BaseManager.js

@@ -6,7 +6,6 @@ var _ = require('lodash'),
     fs = require('fs'),
     rm_rf = require('rimraf'),
     exists = require('exists-file'),
-    R = require('ramda'),
     mkdir = require('mkdirp'),
     Logger = require('./Logger'),
     utils = require('./utils'),
@@ -180,8 +179,8 @@ BaseManager.prototype._createWebGMEFiles = function(project) {
     // Config files
     fs.mkdirSync(configDir);
     fs.readdirSync(path.join(__dirname, 'res', 'config'))
-        .map(R.pipe(R.nthArg(0), path.join.bind(path, 'config')))  // Add 'config/' for each
-        .forEach(BaseManager._copyFileToProject.bind(null, project, ''));
+        .map(filename => path.join('config', filename))
+        .forEach(path => BaseManager._copyFileToProject(project, '', path));
 
     // Create app.js
     BaseManager._copyFileToProject(project, '', 'app.js');

src/DecoratorManager.js

@@ -10,7 +10,6 @@
 
 'use strict';
 var _ = require('lodash'),
-    R = require('ramda'),
     path = require('path'),
     exists = require('exists-file'),
     rm_rf = require('rimraf'),
@@ -66,9 +65,9 @@ DecoratorManager.prototype.new = function(options, callback) {
         }
 
         // Get the src, test paths
-        var setupConfig = R.mapObjIndexed(function(empty, type) {
-            return `${type}/decorators/${name}Decorator`;
-        }, {src: null});
+        const setupConfig = {
+            src: `src/decorators/${name}Decorator`
+        };
 
         // Store the decorator info in the webgme-setup.json file
 

src/LayoutManager.js

@@ -10,7 +10,6 @@
 
 'use strict';
 var _ = require('lodash'),
-    R = require('ramda'),
     path = require('path'),
     rm_rf = require('rimraf'),
     fs = require('fs'),
@@ -44,9 +43,9 @@ LayoutManager.prototype.new = function(options, callback) {
         }
 
         // Get the src, test paths
-        var layoutConfig = R.mapObjIndexed(function(empty, type) {
-            return `${type}/layouts/${options.layoutID}`;
-        }, {src: null});
+        const layoutConfig = {
+            src: `src/layouts/${options.layoutID}`
+        };
 
         // Store the layout info in the webgme-setup.json file
         self._register(options.layoutID, layoutConfig);

src/PluginManager.js

@@ -10,7 +10,6 @@
 
 'use strict';
 var _ = require('lodash'),
-    R = require('ramda'),
     path = require('path'),
     exists = require('exists-file'),
     rm_rf = require('rimraf'),
@@ -73,9 +72,9 @@ PluginManager.prototype.new = function(options, callback) {
         }
 
         // Get the src, test paths
-        var paths = R.mapObjIndexed(function(empty, type) {
-            return `${type}/plugins/${config.pluginID}`;
-        }, {src: null, test: null});
+        const paths = _.fromPairs(
+            ['src', 'test'].map(type => [type, `${type}/plugins/${config.pluginID}`])
+        );
 
         // Store the plugin info in the webgme-setup.json file
         var pluginConfig = {

src/RouterManager.js

@@ -11,7 +11,6 @@
 
 'use strict';
 var _ = require('lodash'),
-    R = require('ramda'),
     path = require('path'),
     exists = require('exists-file'),
     rm_rf = require('rimraf'),

src/VisualizerManager.js

@@ -10,7 +10,6 @@
 
 'use strict';
 var _ = require('lodash'),
-    R = require('ramda'),
     path = require('path'),
     rm_rf = require('rimraf'),
     fs = require('fs'),
@@ -50,9 +49,9 @@ VisualizerManager.prototype.new = function(options, callback) {
         }
 
         // Get the src, test paths
-        var paths = R.mapObjIndexed(function(empty, type) {
-            return `src/visualizers/${type}s/${id}`;
-        }, {widget: null, panel: null});
+        const paths = _.fromPairs(
+            ['widget', 'panel'].map(type => [type, `src/visualizers/${type}s/${id}`])
+        );
 
         // Store the visualizer info in the webgme-setup.json file
 

src/shim/AddonGenerator.js

@@ -3,7 +3,6 @@
 
 var TEST_FIXTURE_DIR = '../../globals',
     _ = require('lodash'),
-    R = require('ramda'),
     path = require('path'),
     utils = require('../utils'),
     PluginShim = require('./PluginShim'),
@@ -36,7 +35,7 @@ AddonGenerator.prototype.main = function(callback) {
         }
 
         // Fix any file names
-        R.values(self.blobClient.artifacts).forEach(function(artifact) {
+        Object.values(self.blobClient.artifacts).forEach(function(artifact) {
             artifact.files.forEach(fixFilePath);
             artifact.files.forEach(function(file) {
                 self.logger.info('Saving file at '+file.name);

src/shim/DecoratorGenerator.js

@@ -2,7 +2,6 @@
 'use strict';
 
 var _ = require('lodash'),
-    R = require('ramda'),
     utils = require('../utils'),
     PluginShim = require('./PluginShim'),
     requirejs = require('requirejs'),
@@ -32,7 +31,7 @@ DecoratorGenerator.prototype.main = function(callback) {
         }
 
         // Fix any file names
-        R.values(self.blobClient.artifacts).forEach(function(artifact) {
+        Object.values(self.blobClient.artifacts).forEach(function(artifact) {
             artifact.files.forEach(fixFilePath);
             artifact.files.forEach(function(file) {
                 self.logger.info('Saving file at '+file.name);

src/shim/LayoutGenerator.js

@@ -3,7 +3,6 @@
 
 var TEST_FIXTURE_DIR = '../../globals',
     _ = require('lodash'),
-    R = require('ramda'),
     path = require('path'),
     utils = require('../utils'),
     PluginShim = require('./PluginShim'),
@@ -34,7 +33,7 @@ LayoutGenerator.prototype.main = function(callback) {
         }
 
         // Fix any file names
-        R.values(self.blobClient.artifacts).forEach(function(artifact) {
+        Object.values(self.blobClient.artifacts).forEach(function(artifact) {
             artifact.files.forEach(fixFilePath);
             // Fix the require path for the unit test
             var test = artifact.files.filter(function(file) {

src/shim/PluginGenerator.js

@@ -3,7 +3,6 @@
 
 var TEST_FIXTURE_DIR = '../../globals',
     _ = require('lodash'),
-    R = require('ramda'),
     path = require('path'),
     utils = require('../utils'),
     PluginShim = require('./PluginShim'),
@@ -26,31 +25,28 @@ var fixFilePath = function(file) {
 
 // Make the src/plugins test/plugins directories as needed
 PluginGenerator.prototype.main = function(callback) {
-    var self = this;
-    WebGMEPluginGenerator.prototype.main.call(this, function(e, result) {
+    WebGMEPluginGenerator.prototype.main.call(this, (e, result) => {
         if (e) {
-            self.logger.error(e);
+            this.logger.error(e);
             return callback(e);
         }
 
         // Fix any file names
-        R.values(self.blobClient.artifacts).forEach(function(artifact) {
+        Object.values(this.blobClient.artifacts).forEach(artifact => {
             artifact.files.forEach(fixFilePath);
             // Fix the require path for the unit test
-            var test = artifact.files.filter(function(file) {
-                return file.name.indexOf('test') === 0;
-            })[0];
+            const test = artifact.files
+                .find(file => file.name.startsWith('test'));
             if (test) {  // If they are generating test file
-                self.fixFixturePath(test);
+                this.fixFixturePath(test);
             }
 
-            artifact.files.forEach(function(file) {
-                self.logger.info('Saving file at '+file.name);
-            });
+            artifact.files
+                .forEach(file => this.logger.info(`Saving file at ${file.name}`));
         });
 
         // Save all BlobClient Artifacts to the fs
-        utils.saveFilesFromBlobClient(self.blobClient);
+        utils.saveFilesFromBlobClient(this.blobClient);
         callback();
     });
 };

src/shim/PluginShim.js

@@ -4,9 +4,7 @@
 var TEST_FIXTURE_DIR = '../../globals',
     BlobClient = require('./blobClient'),
     _ = require('lodash'),
-    path = require('path'),
     utils = require('../utils'),
-    R = require('ramda'),
     requirejs = require('requirejs');
 
 utils.loadPaths(requirejs);
@@ -23,8 +21,7 @@ var PluginShim = function(plugin, logger, config) {
     this.META = {};
 };
 
-_.extend(PluginShim.prototype, 
-    PluginBase.prototype);
+_.extend(PluginShim.prototype, PluginBase.prototype);
 
 PluginShim.prototype.initialize = function(logger, blob) {
     this.blobClient = blob;

src/shim/RouterGenerator.js

@@ -2,7 +2,6 @@
 'use strict';
 
 var _ = require('lodash'),
-    R = require('ramda'),
     utils = require('../utils'),
     PluginShim = require('./PluginShim'),
     requirejs = require('requirejs'),
@@ -44,7 +43,7 @@ RouterGenerator.prototype.main = function(callback) {
         }
 
         // Fix any file names
-        R.values(self.blobClient.artifacts).forEach(function(artifact) {
+        Object.values(self.blobClient.artifacts).forEach(function(artifact) {
             artifact.files.forEach(function(file) {
                 fixFilePath(routerName, file);
                 self.logger.info('Saving file at '+file.name);

src/shim/VisualizerGenerator.js

@@ -2,7 +2,6 @@
 'use strict';
 
 var _ = require('lodash'),
-    R = require('ramda'),
     path = require('path'),
     utils = require('../utils'),
     PluginShim = require('./PluginShim'),
@@ -42,7 +41,7 @@ VisualizerGenerator.prototype.main = function(callback) {
         }
 
         // Fix any file names
-        R.values(self.blobClient.artifacts).forEach(function(artifact) {
+        Object.values(self.blobClient.artifacts).forEach(function(artifact) {
             artifact.files.forEach(self._fixFilePaths.bind(self));
 
             artifact.files.forEach(function(file) {

src/utils.js

@@ -11,8 +11,7 @@ var _ = require('lodash'),
     fs = require('fs'),
     path = require('path'),
     exists = require('exists-file'),
-    assert = require('assert'),
-    R = require('ramda');
+    assert = require('assert');
 
 var getRootPath = function(startPath) {
     // Walk back from current path until you find a webgme-setup.json file
@@ -188,11 +187,10 @@ var updateWebGMEConfig = function(startPath) {
  * @return {String[]}
  */
 var getPathsFromConfigGroup = function(config) {
-    return R.mapObj(function(componentType) {  // ie, plugin/seed/etc OBJECT
-        return R.values(componentType).map(function(component) {
-            return component.src || component.path;
-        });
-    }, config);
+    return Object.values(config).map(componentType =>  // ie, plugin/seed/etc OBJECT
+        Object.values(componentType)
+            .map(component => component.src || component.path)
+    );
 };
 
 var unique = function(array) {
@@ -204,8 +202,7 @@ var unique = function(array) {
 };
 
 var getWebGMEConfigContent = function(startPath) {
-    var arrays,
-        config = getConfig(startPath),
+    var config = getConfig(startPath),
         paths = {},
         categories = ['components', 'dependencies'],
         configGroupPaths = categories
@@ -216,13 +213,12 @@ var getWebGMEConfigContent = function(startPath) {
 
     // Merge the arrays for each componentType
     Object.keys(configGroupPaths[0]).forEach(function(type) {
-        arrays = configGroupPaths.map(function(group) {
-            // Remove duplicates
-            return unique(group[type]);
-        });
+        const configPaths = _.flatMap(
+            configGroupPaths,
+            group => unique(group[type])
+        );
 
-        paths[type] = arrays.reduce(R.concat)  // Merge all paths
-            .map(R.replace.bind(R, /\\/g, '/'));  // Convert to use '/' for path separator
+        paths[type] = configPaths.map(p => p.replace(/\\/g, '/'));  // Convert to use '/' for path separator
     });
 
     // Update visualizers to use the 'panel' entry (if applicable)

test/cli.spec.js

@@ -6,7 +6,6 @@ const {version} = require('../package.json');
 var spawn = require('child_process').spawn,
     path = require('path'),
     fs = require('fs'),
-    R = require('ramda'),
     assert = require('assert'),
     utils = require(__dirname+'/res/utils'),
     binPath = path.join(__dirname, '..', 'bin', 'webgme'),
@@ -148,10 +147,7 @@ describe('cli', function() {
             var testFn = function(res, err, done) {
                 var contents = ['plugin', 'seed'];
                 assert.equal(res.indexOf('Usage'), -1);
-                contents.forEach(R.pipe(
-                    res.indexOf.bind(res),
-                    assert.notEqual.bind(assert, -1)
-                ));
+                contents.forEach(content => assert(res.includes(content)));
                 done();
             };
             testCliCall(['ls'], testFn, done);