gina 0.1.1-alpha.99 → 0.1.2-alpha.1

package/framework/v0.1.2-alpha.1/lib/cmd/scope/add.js

@@ -0,0 +1,129 @@
+var fs      = require('fs');
+
+var CmdHelper   = require('./../helper');
+var console = lib.logger;
+
+/**
+ * Add new scope for a given project
+ *
+ * TODO - updateManifest()
+ * */
+function Add(opt, cmd) {
+    var self = {}, local = {};
+
+    var init = function() {
+        // import CMD helpers
+        new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled });
+
+        // check CMD configuration
+        if ( !isCmdConfigured() ) return false;
+
+        self.projects = requireJSON(_(GINA_HOMEDIR + '/projects.json'));
+        self.bundles = [];
+        self.portsAvailable = {};
+
+        var i = 3, scopes = [];
+        for (; i<process.argv.length; ++i) {
+            if ( /^\@[a-z0-9_.]/.test(process.argv[i]) ) {
+                if ( !isValidName(process.argv[i]) ) {
+                    return end( new Error('[ '+process.argv[i]+' ] is not a valid project name. Please, try something else: @[a-z0-9_.].'))
+                }
+
+            }
+            else if (/^[a-z0-9_.]/.test(process.argv[i])) {
+                local.scope = process.argv[i];
+                scopes.push(process.argv[i]);
+            }
+        }
+
+
+        if ( typeof(self.projectName) == 'undefined') {
+            var folder = new _(process.cwd()).toArray().last();
+            if ( isDefined('project', folder) ) {
+                self.projectName = folder
+            }
+        }
+
+        if ( isDefined('project', self.projectName) && scopes.length > 0) {
+            self.scopes = scopes;
+            return saveScopes()
+        }
+
+        end( new Error('Missing argument @<project_name>'))
+    }
+
+
+    var saveScopes = function() {
+        try {
+            addScopeToProject();
+        } catch (err) {
+            return end(err)
+        }
+    }
+
+    /**
+     * Adding scopes to ~/.gina/projects.json
+     *
+     * @param {array} scopes
+     * */
+    var addScopeToProject = function() {
+        var s = 0
+            , newScopes = self.scopes
+            , projects = JSON.clone(self.projects)
+            , scopes = projects[self.projectName].scopes
+            , modified = true
+        ;
+        // to ~/.gina/projects.json
+        for (; s < newScopes.length; ++s) {
+
+            if (scopes.indexOf(newScopes[s]) < 0 ) {
+                modified = false;
+                scopes.push(newScopes[s])
+            }
+        }
+        //writing
+        lib.generator.createFileFromDataSync(
+            projects,
+            self.projectConfigPath
+        );
+        self.projectDataWrote = true;
+
+        //updateManifest()
+
+        if (modified) {
+            return end('scope `'+ local.scope +'` updated');
+        }
+
+        end('scope'+((self.scopes.length > 1) ? 's' : '')+' [ '+ self.scopes.join(', ') +' ] created');
+    }
+
+
+    var updateManifest = function() {
+
+    }
+
+
+
+    var end = function (output, type, messageOnly) {
+        var err = false;
+        if ( typeof(output) != 'undefined') {
+            if ( output instanceof Error ) {
+                err = output = ( typeof(messageOnly) != 'undefined' && /^true$/i.test(messageOnly) ) ? output.message : (output.stack||output.message);
+            }
+            if ( typeof(type) != 'undefined' ) {
+                console[type](output);
+                if ( messageOnly && type != 'log') {
+                    console.log(output);
+                }
+            } else {
+                console.log(output);
+            }
+        }
+
+        process.exit( err ? 1:0 )
+    }
+
+    init()
+};
+
+module.exports = Add

package/framework/{v0.1.1-alpha.99 → v0.1.2-alpha.1}/lib/cmd/scope/help.txt

@@ -11,12 +11,12 @@
     To add a new scope or to refresh an existing one, use the following command line.
 
     $ gina scope:add <scope_name> @<project_name>
-    
-    
+
+
     Adding/refreshing scope to a bundle
     ----------
-    
-    $ gina env:add <bundle_name>/<scope_name> @<project_name>
+
+    $ gina scope:add <bundle_name>/<scope_name> @<project_name>
 
 
 [ Removing an existing scope ]

package/framework/{v0.1.1-alpha.99/lib/cmd/env/use.js → v0.1.2-alpha.1/lib/cmd/scope/link-production.js}

@@ -1,16 +1,14 @@
 var console = lib.logger;
 /**
- * Select the default environment
+ * Link scope to production - A way of renaming production
  * */
-function Use(opt, cmd) {
+function LinkProduction(opt, cmd) {
     var self = {};
 
     var init = function() {
         self.target = _(GINA_HOMEDIR + '/projects.json');
         self.projects   = require(self.target);
 
-
-
         if ( typeof(process.argv[4]) != 'undefined') {
             if ( !isValidName(process.argv[4]) ) {
                 console.error('[ '+process.argv[4]+' ] is not a valid project name. Please, try something else: @[a-z0-9_.].');
@@ -25,26 +23,25 @@ function Use(opt, cmd) {
             }
         }
 
+        if ( typeof(process.argv[3]) != 'undefined' ) {
+            if ( !self.projects[self.name].scopes.inArray(process.argv[3]) ) {
+                console.error('Scope [ '+process.argv[3]+' ] not found');
+                process.exit(1)
+            }
+        } else {
+            console.error('Missing argument in [ gina scope:use <scope> ]');
+            process.exit(1)
+        }
+
         if ( typeof(self.name) == 'undefined' ) {
             console.error('Project name is required: @<project_name>');
             process.exit(1)
         } else if ( typeof(self.name) != 'undefined' && isDefined(self.name) ) {
-            if ( typeof(process.argv[3]) != 'undefined' ) {
-
-                if ( !self.projects[self.name].envs.inArray(process.argv[3]) ) {
-                    console.error('Environment [ '+process.argv[3]+' ] not found');
-                    process.exit(1)
-                }
-            } else {
-                console.error('Missing argument in [ gina env:use <environment> ]');
-                process.exit(1)
-            }
-            useEnv(process.argv[3], self.projects, self.target)
+            link(process.argv[3], self.projects, self.target)
         } else {
             console.error('[ '+self.name+' ] is not a valid project name.');
             process.exit(1)
         }
-
     }
 
     var isDefined = function(name) {
@@ -62,10 +59,14 @@ function Use(opt, cmd) {
         return patt.test(self.name)
     }
 
-    var useEnv = function(env, projects, target) {
-        //console.log('proj.: ', self.name, projects[self.name]);
-        if (env !== projects[self.name]['def_env']) {
-            projects[self.name]['def_env'] = env;
+    var link = function(scope, projects, target) {
+
+        if (scope !== projects[self.name]['production_scope']) {
+            if (projects[self.name]['def_scope'] === projects[self.name]['production_scope']) {
+                projects[self.name]['def_scope'] = scope
+            }
+
+            projects[self.name]['production_scope'] = scope;
             lib.generator.createFileFromDataSync(
                 projects,
                 target
@@ -76,4 +77,4 @@ function Use(opt, cmd) {
     init()
 };
 
-module.exports = Use
+module.exports = LinkProduction

package/framework/{v0.1.1-alpha.99 → v0.1.2-alpha.1}/lib/cmd/scope/list.js

@@ -10,13 +10,14 @@ function List(opt, cmd){
     var init = function(){
 
         self.projects = require(_(GINA_HOMEDIR + '/projects.json'));
+        var err = null;
 
         if ( typeof(process.argv[3]) != 'undefined') {
             if (process.argv[3] === '--all') {
                 listAll()
             } else if ( !isValidName(process.argv[3]) ) {
-                console.error('[ '+process.argv[3]+' ] is not a valid project name. Please, try something else: @[a-z0-9_.].');
-                process.exit(1);
+                err = new Error('[ '+process.argv[3]+' ] is not a valid project name. Please, try something else: @[a-z0-9_.].');
+                end(err, 'log', true);
             }
         } else {
             // is current path == project path ?
@@ -32,8 +33,8 @@ function List(opt, cmd){
         } else if ( typeof(self.name) != 'undefined' && isDefined(self.name) ) {
             listProjectOnly()
         } else {
-            console.error('[ '+self.name+' ] is not a valid project name.');
-            process.exit(1)
+            err = new Error('[ '+self.name+' ] is not a valid project name.');
+            end(err, 'log', true);
         }
     }
 
@@ -62,7 +63,7 @@ function List(opt, cmd){
         }
         list.sort();
 
-        
+
         for (let p = 0; p<list.length; ++p) {
             projects[list[p]].scopes.sort();
             str += '------------------------------------\n\r';
@@ -82,13 +83,15 @@ function List(opt, cmd){
             str += '\n\r'
         }
 
-        console.log(str)
+        console.log(str);
+        end();
     }
 
     var listProjectOnly = function (){
-        var projects = self.projects
-            , p = self.name
-            , str = '';
+        var projects    = self.projects
+            , p         = self.name
+            , str       = ''
+        ;
         console.debug('scopes ', projects[p].scopes);
         str += '------------------------------------\n\r';
         if ( !fs.existsSync(projects[p].path) ) {
@@ -98,7 +101,7 @@ function List(opt, cmd){
         str += '------------------------------------\n\r';
         for (let e = 0; e<projects[p].scopes.length; e++) {
             if (!projects[p].def_scope) continue;
-            
+
             if (projects[p].scopes[e] === projects[p].def_scope) {
                 str += '[ * ] ' + projects[p].scopes[e]
             } else {
@@ -107,9 +110,29 @@ function List(opt, cmd){
             str += '\n\r'
         }
 
-        console.log(str)
+        console.log(str);
+        end();
     };
 
+    var end = function (output, type, messageOnly) {
+        var err = false;
+        if ( typeof(output) != 'undefined') {
+            if ( output instanceof Error ) {
+                err = output = ( typeof(messageOnly) != 'undefined' && /^true$/i.test(messageOnly) ) ? output.message : (output.stack||output.message);
+            }
+            if ( typeof(type) != 'undefined' ) {
+                console[type](output);
+                if ( messageOnly && type != 'log') {
+                    console.log(output);
+                }
+            } else {
+                console.log(output);
+            }
+        }
+
+        process.exit( err ? 1:0 )
+    }
+
     init()
 };
 

package/framework/v0.1.2-alpha.1/lib/cmd/scope/remove.js

@@ -0,0 +1,122 @@
+var fs          = require('fs');
+var CmdHelper   = require('./../helper');
+var console     = lib.logger;
+
+/**
+ * Remove existing scope
+ * TODO - Prompt for confirmation: "This will remove [ scope ] for the whole project. Proceed ? Y/n: "
+ * */
+function Remove(opt, cmd) {
+    var self = {}, local = { scope: null };
+
+    var init = function() {
+        // import CMD helpers
+        new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled });
+
+        // check CMD configuration
+        if ( !isCmdConfigured() ) return false;
+
+        self.target = _(GINA_HOMEDIR + '/projects.json', true);
+        self.projects   = requireJSON(self.target);
+        var scope = local.scope = process.argv[3];
+        if ( typeof(scope) == 'undefined' || /^\@/.test(scope) ) {
+            end( new Error('Missing argument in [ gina scope:rm <scope> @<project> ]') )
+        }
+        else if ( typeof(scope) != 'undefined' ) {
+            if ( !self.projects[self.projectName].scopes.inArray(scope) ) {
+                end( new Error('Scope [ '+scope+' ] not found') )
+            }// else, continue
+        }
+
+        if ( typeof(process.argv[4]) != 'undefined') {
+            if ( !isValidName(process.argv[4]) ) {
+                end( new Error('[ '+process.argv[4]+' ] is not a valid project name. Please, try something else: @[a-z0-9_.].') );
+            }
+        } else {
+            // is current path == project path ?
+            var root = process.cwd();
+            var name = new _(root).toArray().last();
+            if ( isDefined('project', name) ) {
+                self.projectName = name
+            }
+        }
+
+        if ( typeof(self.projectName) == 'undefined' ) {
+            end( new Error('Project name is required: @<project_name>') )
+        } else if ( typeof(self.projectName) != 'undefined' && isDefined('project', self.projectName) ) {
+            removeScope(self.projects, self.target)
+        } else {
+            end( new Error('[ '+self.projectName+' ] is not a valid project name.') )
+        }
+    }
+
+    var removeScope = function(projects, target) {
+        var err = null, scope = local.scope;
+        // default `local scope` or default `production scope` cannot be removed
+        if(
+            scope === projects[self.projectName]['local_scope']
+            ||
+            scope === projects[self.projectName]['production_scope']
+            ||
+            scope === projects[self.projectName]['def_scope']
+        ) {
+            if (scope === projects[self.projectName]['def_scope']) {
+                err = new Error('Scope [ '+scope+' ] is set as "default scope" and cannot be removed until you `use` another default scope')
+            }
+            else {
+                err = new Error('Scope [ '+scope+' ] is linked as "local scope" and cannot be removed until you `link` another local scope')
+            }
+
+            return end(err, 'error', true);
+        }
+
+
+        projects[self.projectName]['scopes'].splice(projects[self.projectName]['scopes'].indexOf(scope), 1);
+        lib.generator.createFileFromDataSync(
+            projects,
+            target
+        );
+
+        // updateManifest();
+
+        end('Scope [ '+scope+' ] removed with success');
+    };
+
+    var updateManifest = function() {
+        var scope = local.scope;
+        var projectData    = JSON.clone(self.projectData);
+        for (let bundle in projectData.bundles) {
+            if (
+                typeof(projectData.bundles[bundle].releases[scope]) != 'undefined'
+                && typeof(projectData.bundles[bundle].releases[scope].target) != 'undefined'
+            ) {
+                delete projectData.bundles[bundle].releases[scope].target
+            }
+        }
+
+        lib.generator.createFileFromDataSync(projectData, self.projectManifestPath);
+    }
+
+    var end = function (output, type, messageOnly) {
+        var err = false;
+        if ( typeof(output) != 'undefined') {
+            if ( output instanceof Error ) {
+                err = output = ( typeof(messageOnly) != 'undefined' && /^true$/i.test(messageOnly) ) ? output.message : (output.stack||output.message);
+            }
+            if ( typeof(type) != 'undefined' ) {
+                console[type](output);
+                if ( messageOnly && type != 'log') {
+                    console.log(output);
+                }
+            } else {
+                console.log(output);
+            }
+        }
+
+        process.exit( err ? 1:0 )
+    }
+
+    init()
+};
+
+module.exports = Remove

package/framework/v0.1.2-alpha.1/lib/cmd/scope/use.js

@@ -0,0 +1,68 @@
+var CmdHelper   = require('./../helper');
+var console     = lib.logger;
+/**
+ * Select the default scope
+ * */
+function Use(opt, cmd) {
+    var self = {};
+
+    console.debug('scope:use called');
+
+    var init = function() {
+        self.target = _(GINA_HOMEDIR + '/projects.json');
+        self.projects   = require(self.target);
+
+        // Import CMD helpers
+        new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled });
+
+        // Check CMD configuration
+        if ( !isCmdConfigured() ) return false;
+
+        if (!self.scopes) {
+            return end( new Error('No scope found for your project `'+ self.projectName +'`') );
+        }
+
+        useScope(process.argv[3], self.projects, self.target)
+    }
+
+
+    var useScope = function(scope, projects, target) {
+        console.debug('proj.: ', scope, self.projectName, projects[self.projectName].scopes);
+        if ( !self.projects[self.projectName].scopes.inArray(scope) ) {
+            end( new Error('Scope [ '+scope+' ] not found for project `'+ self.projectName +'`'), 'error', true )
+        }
+
+        updateManifest(scope, projects);
+
+        end('Scope [ '+ scope +' ] selected with success')
+    };
+
+    var updateManifest = function(scope, projects) {
+        var projectData    = JSON.clone(self.projectData);
+        projectData.scope = scope
+
+        lib.generator.createFileFromDataSync(projectData, self.projectManifestPath);
+    }
+
+    var end = function (output, type, messageOnly) {
+        var err = false;
+        if ( typeof(output) != 'undefined') {
+            if ( output instanceof Error ) {
+                err = output = ( typeof(messageOnly) != 'undefined' && /^true$/i.test(messageOnly) ) ? output.message : (output.stack||output.message);
+            }
+            if ( typeof(type) != 'undefined' ) {
+                console[type](output);
+                if ( messageOnly && type != 'log') {
+                    console.log(output);
+                }
+            } else {
+                console.log(output);
+            }
+        }
+
+        process.exit( err ? 1:0 )
+    }
+
+    init()
+}
+module.exports = Use;

package/framework/{v0.1.1-alpha.99 → v0.1.2-alpha.1}/lib/cmd/view/add.js

@@ -18,13 +18,13 @@ function Add(opt, cmd) {
     ;
 
     var init = function() {
-        
+
         // import CMD helpers
         new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled });
 
         // check CMD configuration
         if ( !isCmdConfigured() ) return false;
-        
+
         if ( isDefined('project', self.projectName) && self.bundles.length > 0) {
 
             addViews(0)
@@ -57,8 +57,8 @@ function Add(opt, cmd) {
             , f = 0;
 
         if (source == local.source && typeof(list) == 'undefined') {//root
-            var list = [];// root list
-            for (var l=0; l<files.length; ++l) {
+            list = [];// root list
+            for (let l=0; l<files.length; ++l) {
                 list[l] = _(local.source +'/'+ files[l])
             }
         }
@@ -132,6 +132,28 @@ function Add(opt, cmd) {
         }
     }
 
+    // var checkForNamespaces = function(src) {
+    //     var routingObj = null
+    //         , namespaces = {}
+    //     ;
+    //     try {
+    //         routingObj = require(_(src + '/config/routing.json', true));
+    //         // Looking for namespaces
+    //         for (let r in routing) {
+    //             if ( typeof(routing[r].namespace) != 'undefined' ) {
+    //                 namespaces[r] = {
+    //                     namespace : routing[r].namespace
+    //                 }
+    //             }
+    //         }
+    //     } catch (err) {
+    //         console.error(err.stack);
+    //         process.exit(1);
+    //     }
+
+    //     return (namespaces.count() > 0) ? namespaces : null
+    // }
+
     /**
      * Add bundles
      *
@@ -157,10 +179,13 @@ function Add(opt, cmd) {
             local.b         = b;
             local.env       = self.projects[self.projectName]['def_env'];
             local.root      = self.projects[self.projectName].path;
+            local.src       = _(self.bundlesLocation +'/'+ bundle, true);
 
             console.info('Adding view folder for: '+ local.bundle +'@'+ self.projectName);
-            
-            local.src = _(self.bundlesLocation +'/'+ bundle, true);
+
+            // local.namespaces = checkForNamespaces(local.src);
+
+
             addConfFile()
 
         } else {
@@ -182,7 +207,7 @@ function Add(opt, cmd) {
         var folder  = _(local.src + '/templates');
 
         if ( fs.existsSync(target) || fs.existsSync(folder) ) {
-            rl.setPrompt('Found templates for [ '+ local.bundle +'@'+ self.projectName +' ]. Do you want to override ? (yes|no) > ');
+            rl.setPrompt('Found templates for [ '+ local.bundle +'@'+ self.projectName +' ]. Do you want to override ? (yes|no) > \n');
             rl.prompt();
 
             rl.on('line', function(line) {
@@ -245,7 +270,7 @@ function Add(opt, cmd) {
             local.source        = _(targetPath +'/handlers', true);
             local.isInstalled   = false;
             browse(local.source);
-            
+
             console.log('['+ local.bundle +'@'+ self.projectName +'] templates installed with success !');
             folderPublic.cp(target + '/public', function(err, targetPath){
                 if (err) {
@@ -256,7 +281,7 @@ function Add(opt, cmd) {
                 ++local.b;
                 addViews(local.b)
             });
-            
+
         });
     }
 
@@ -275,7 +300,7 @@ function Add(opt, cmd) {
                 if ( typeof(self.projectData.bundles[local.bundle]) != 'undefined') {
                     delete self.projectData.bundles[local.bundle]
                 }
-                lib.generator.createFileFromDataSync(self.projectData, self.projectPath)
+                lib.generator.createFileFromDataSync(self.projectData, self.projectManifestPath)
             }
 
             //restore ports.json

package/framework/{v0.1.1-alpha.99 → v0.1.2-alpha.1}/lib/collection/package.json

@@ -7,7 +7,7 @@
     "name": "Maritn-Luther ETOUMAN",
     "email": "contact@gina.io"
   },
-  "copyright": "Copyright (c) 2009-2022 Rhinostone <contact@gina.io>",
+  "copyright": "Copyright (c) 2009-2023 Rhinostone <contact@gina.io>",
   "engines": {
     "node": ">=0.10.22"
   },