gina 0.1.5-alpha.2 → 0.1.6-alpha.2

package/framework/{v0.1.5-alpha.2 → v0.1.6-alpha.2}/core/template/conf/env.json

@@ -26,8 +26,8 @@
       // Since overrides are possible, last defined value will be the one taken in consideration by gina
       "rootDomain": "",
       "projectPath": "{executionPath}",
-      "projectVersion": "",
-      "projectVersionMajor": "",
+      "projectVersion": "{projectVersion}",
+      "projectVersionMajor": "{projectVersionMajor}",
       "bundlesPath": "{executionPath}/bundles",
       "bundlePath": "{bundlesPath}/{bundle}",
       "sharedPath": "{executionPath}/shared",

package/framework/{v0.1.5-alpha.2 → v0.1.6-alpha.2}/lib/cmd/bundle/add.js

@@ -302,6 +302,8 @@ function Add(opt, cmd) {
         var data    = JSON.clone(self.projectData);
         var version = '0.0.1';
         var envs    = self.projects[self.projectName].envs;
+        var scopes  = self.projects[self.projectName].scopes;
+
         data.bundles[local.bundle] = {
             "_comment" : "Your comment goes here.",
             "version"   : version,
@@ -310,19 +312,27 @@ function Add(opt, cmd) {
             "link"      : "bundles/"+ local.bundle,
             "releases" : {}
         };
-        //"release/"+ local.bundle +"/prod/" + version
-        for (let i = 0, len = envs.length; i < len; ++i) {
-            let env = envs[i];
-            // ignore target for dev env
-            if ( self.projects[self.projectName]['dev_env'] == env ) {
-                continue;
+        //"release/"+ local.bundle +"/local/" +"/prod/" + version
+        for (let s = 0, sLen = scopes.length; s < sLen; ++s) {
+            let scope = scopes[s];
+            if ( typeof(data.bundles[local.bundle].releases[scope]) == 'undefined' ) {
+                data.bundles[local.bundle].releases[scope] = {}
             }
-            if ( typeof(data.bundles[local.bundle].releases[env]) == 'undefined' ) {
-                data.bundles[local.bundle].releases[env] = {}
+
+            for (let i = 0, len = envs.length; i < len; ++i) {
+                let env = envs[i];
+                // ignore target for dev env
+                if ( self.projects[self.projectName]['dev_env'] == env ) {
+                    continue;
+                }
+                if ( typeof(data.bundles[local.bundle].releases[scope][env]) == 'undefined' ) {
+                    data.bundles[local.bundle].releases[scope][env] = {}
+                }
+                data.bundles[local.bundle].releases[scope][env].target = "releases/"+ local.bundle +"/"+ scope +"/"+ env +"/" + version;
             }
-            data.bundles[local.bundle].releases[env].target = "releases/"+ local.bundle +"/"+ env +"/" + version;
         }
 
+
         try {
             lib.generator.createFileFromDataSync(data, self.projectManifestPath);
             local.projectDataWrote = true;

package/framework/{v0.1.5-alpha.2 → v0.1.6-alpha.2}/lib/cmd/bundle/restart.js

@@ -190,7 +190,7 @@ function Restart(opt, cmd) {
 
             } else {
                 //Others releases.
-                var path    = 'releases/'+ bundle +'/' + env +'/'+ pkg[bundle].version;
+                var path    = 'releases/'+ bundle +'/' + scope +'/' + env +'/'+ pkg[bundle].version;
                 var version = pkg[bundle].version;
                 p = _( root +'/'+ path );//path.replace('/' + bundle, '')
                 d = _( root +'/'+ path + '/index.js' );

package/framework/{v0.1.5-alpha.2 → v0.1.6-alpha.2}/lib/cmd/bundle/start.js

@@ -551,6 +551,7 @@ function Start(opt, cmd) {
             , d             = null
             , env           = self.projects[self.projectName]['def_env']
             , isDev         = ( self.projects[self.projectName]['dev_env'] == env ) ? true : false
+            , scope         = self.projects[self.projectName]['def_scope']
             , root          = self.projectLocation
             , bundleDir     = null
             , bundlesPath   = null
@@ -580,7 +581,7 @@ function Start(opt, cmd) {
 
             } else {
                 //Others releases.
-                path    = 'releases/'+ bundle +'/' + env +'/'+ pkg[bundle].version;
+                path    = 'releases/'+ bundle +'/' + scope +'/' + env +'/'+ pkg[bundle].version;
                 version = pkg[bundle].version;
                 p = _( root +'/'+ path );//path.replace('/' + bundle, '')
                 d = _( root +'/'+ path + '/index.js' );

package/framework/{v0.1.5-alpha.2 → v0.1.6-alpha.2}/lib/cmd/bundle/stop.js

@@ -160,16 +160,17 @@ function Stop(opt, cmd) {
 
     var isRealApp = function(bundle, callback) {
 
-        var p = null
-            , d = null
-            , env = self.projects[self.projectName]['def_env']
-            , isDev = GINA_ENV_IS_DEV
-            , root = self.projects[self.projectName].path
-            , bundleDir = null
-            , bundlesPath = null
-            , bundleInit = null
-            , pkg = null
-            , path = null
+        var p               = null
+            , d             = null
+            , env           = self.projects[self.projectName]['def_env']
+            , isDev         = GINA_ENV_IS_DEV
+            , scope         = self.projects[self.projectName]['def_scope']
+            , root          = self.projects[self.projectName].path
+            , bundleDir     = null
+            , bundlesPath   = null
+            , bundleInit    = null
+            , pkg           = null
+            , path          = null
         ;
 
         try {
@@ -194,9 +195,9 @@ function Stop(opt, cmd) {
 
             } else {
                 //Others releases.
-                path = 'releases/' + bundle + '/' + env + '/' + pkg[bundle].version;
+                path = 'releases/' + bundle + '/' + scope +'/' + env + '/' + pkg[bundle].version;
                 var version = pkg[bundle].version;
-                p = _(root + '/' + path);//path.replace('/' + bundle, '')
+                p = _(root + '/' + path);
                 d = _(root + '/' + path + '/index.js');
 
                 bundleDir = path;

package/framework/{v0.1.5-alpha.2 → v0.1.6-alpha.2}/lib/cmd/env/add.js

@@ -408,15 +408,16 @@ function Add(opt, cmd) {
     var updateManifest = function() {
         // projectManifestPath
         var env             = local.env
+            , scope         = local.scope
             , projectData   = JSON.clone(self.projectData)
         ;
 
         // for (let bundle in projectData.bundles) {
         //     if (
-        //         typeof(projectData.bundles[bundle].releases[env]) != 'undefined'
-        //         && typeof(projectData.bundles[bundle].releases[env].target) != 'undefined'
+        //         typeof(projectData.bundles[bundle].releases[scope][env]) != 'undefined'
+        //         && typeof(projectData.bundles[bundle].releases[scope][env].target) != 'undefined'
         //     ) {
-        //         delete projectData.bundles[bundle].releases[env].target
+        //         delete projectData.bundles[bundle].releases[scope][env].target
         //     }
         // }
 

package/framework/{v0.1.5-alpha.2 → v0.1.6-alpha.2}/lib/cmd/env/remove.js

@@ -116,17 +116,23 @@ function Remove(opt, cmd) {
     };
 
     var updateManifest = function() {
-        var env = local.env;
+        var env     = local.env;
+        var scopes  = self.projects[self.projectName].scopes;
         var projectData    = JSON.clone(self.projectData);
+
         for (let bundle in projectData.bundles) {
-            if (
-                typeof(projectData.bundles[bundle].releases[env]) != 'undefined'
-                && typeof(projectData.bundles[bundle].releases[env].target) != 'undefined'
-            ) {
-                delete projectData.bundles[bundle].releases[env].target
+            for (let s = 0, sLen = scopes.length; s < sLen; ++s) {
+                let scope = scopes[s];
+                if (
+                    typeof(projectData.bundles[bundle].releases[scope][env]) != 'undefined'
+                    && typeof(projectData.bundles[bundle].releases[scope][env].target) != 'undefined'
+                ) {
+                    delete projectData.bundles[bundle].releases[scope][env].target
+                }
             }
         }
 
+
         lib.generator.createFileFromDataSync(projectData, self.projectManifestPath);
 
         end()

package/framework/{v0.1.5-alpha.2 → v0.1.6-alpha.2}/lib/cmd/env/use.js

@@ -78,7 +78,7 @@ function Use(opt, cmd) {
         }
 
 
-        end('Project [ '+ self.name+' ] env `'+ projects[self.name]['def_env'] +'` set to '+ env);
+        end('Env [ '+ env +' ] selected with success');
     };
 
     var end = function (output, type, messageOnly) {

package/framework/{v0.1.5-alpha.2 → v0.1.6-alpha.2}/lib/cmd/helper.js

@@ -485,7 +485,8 @@ function CmdHelper(cmd, client, debug) {
                 var contentFile = require(conf);
                 var dic = {
                     "project"   : cmd.projectName,
-                    "version"   : "1.0.0"
+                    "version"   : "1.0.0",
+                    "scope"     : cmd.mainConfig['def_scope'][ GINA_SHORT_VERSION ]
                 };
 
                 contentFile = whisper(dic, contentFile); //data
@@ -1041,7 +1042,11 @@ function CmdHelper(cmd, client, debug) {
             return false;
         }
 
-        if ( /^project\:(add|import)/.test(cmd.task) && !cmd.bundles.length ) {
+        if (
+            /^project\:(add|import)/.test(cmd.task)
+            && typeof(cmd.projects[cmd.projectName]) != 'undefined'
+            && !cmd.bundles.length
+        ) {
             var releasesPathObj = new _(cmd.projects[cmd.projectName].path +'/releases', true);
             var _bundleConfigPath = cmd.bundlesLocation;
             var files = [], f = 0;

package/framework/{v0.1.5-alpha.2 → v0.1.6-alpha.2}/lib/cmd/project/add.js

@@ -59,6 +59,8 @@ function Add(opt, cmd) {
             }
         }
 
+        loadAssets();
+
         // creating package file
         file = new _(self.projectLocation + '/package.json', true);
         if ( !file.existsSync() ) {
@@ -146,9 +148,9 @@ function Add(opt, cmd) {
 
         loadAssets();
 
-        var conf        = _(getPath('gina').core +'/template/conf/manifest.json', true);
-        var contentFile = requireJSON(conf);
-        var packageContent = requireJSON(_(self.projectLocation + '/package.json', true));
+        var conf            = _(getPath('gina').core +'/template/conf/manifest.json', true);
+        var contentFile     = requireJSON(conf);
+        var packageContent  = requireJSON(_(self.projectLocation + '/package.json', true));
         var version = packageContent.version || "1.0.0";
         // hostname by default
         var rootDomain = os.hostname();
@@ -183,7 +185,7 @@ function Add(opt, cmd) {
         var dic = {
             "project"   : self.projectName,
             "version"   : version,
-            "scope"     : self.defaultScope,
+            "scope"     : self.defaultScope || self.mainConfig['def_scope'][ GINA_SHORT_VERSION ],
             "rootDomain": rootDomain
         };
 
@@ -240,23 +242,23 @@ function Add(opt, cmd) {
 
     var end = async function(created) {
 
-        var target = _(GINA_HOMEDIR + '/projects.json')
-            , projects = JSON.clone(self.projects)
-            , error = false
+        var target      = _(GINA_HOMEDIR + '/projects.json')
+            , projects  = JSON.clone(self.projects)
+            , error     = false
         ;
 
         projects[self.projectName] = {
             "path"              : self.projectLocation,
-            "homedir"           : self.projectHomedir,
+            "homedir"           : self.projectHomedir || _(getUserHome() +'/.'+ self.projectName, true),
             "def_prefix"        : GINA_PREFIX,
             "framework"         : "v" + GINA_VERSION,
-            "envs"              : self.envs,
-            "def_env"           : self.defaultEnv,
-            "dev_env"           : self.devEnv,
-            "scopes"            : self.scopes,
-            "def_scope"         : self.defaultScope,
-            "local_scope"       : self.localScope,
-            "production_scope"  : self.productionScope,
+            "envs"              : (self.envs && self.envs.length) ? self.envs : self.mainConfig['envs'][ GINA_SHORT_VERSION ],
+            "def_env"           : self.defaultEnv || self.mainConfig['def_env'][ GINA_SHORT_VERSION ],
+            "dev_env"           : self.devEnv || self.mainConfig['dev_env'][ GINA_SHORT_VERSION ],
+            "scopes"            : (self.scopes && self.scopes.length) ? self.scopes : self.mainConfig['scopes'][ GINA_SHORT_VERSION ],
+            "def_scope"         : self.defaultScope || self.mainConfig['def_scope'][ GINA_SHORT_VERSION ],
+            "local_scope"       : self.localScope || self.mainConfig['local_scope'][ GINA_SHORT_VERSION ],
+            "production_scope"  : self.productionScope || self.mainConfig['production_scope'][ GINA_SHORT_VERSION ],
             "protocols"         : (created) ? self.protocolsAvailable : self.protocols,
             "def_protocol"      : self.defaultProtocol,
             "schemes"           : (created) ? self.schemesAvailable : self.schemes,
@@ -655,6 +657,7 @@ function Add(opt, cmd) {
 
 
             var version = '0.0.1';
+            var scopes  = self.projects[self.projectName].scopes;
             var envs    = self.projects[self.projectName].envs;
             data.bundles[local.bundle] = {
                 "_comment" : "Your comment goes here.",
@@ -664,19 +667,26 @@ function Add(opt, cmd) {
                 "link"      : "bundles/"+ local.bundle,
                 "releases" : {}
             };
-            //"release/"+ local.bundle +"/prod/" + version
-            for (let i = 0, len = envs.length; i < len; ++i) {
-                let env = envs[i];
-                // ignore target for dev env
-                if ( self.projects[self.projectName]['dev_env'] == env ) {
-                    continue;
+            //"release/"+ local.bundle +"/local/prod/" + version
+            for (let s = 0, sLen = scopes.length; s < sLen; ++s) {
+                let scope = scopes[s];
+                if ( typeof(data.bundles[local.bundle].releases[scope]) == 'undefined' ) {
+                    data.bundles[local.bundle].releases[scope] = {}
                 }
-                if ( typeof(data.bundles[local.bundle].releases[env]) == 'undefined' ) {
-                    data.bundles[local.bundle].releases[env] = {}
+                for (let i = 0, len = envs.length; i < len; ++i) {
+                    let env = envs[i];
+                    // ignore target for dev env
+                    if ( self.projects[self.projectName]['dev_env'] == env ) {
+                        continue;
+                    }
+                    if ( typeof(data.bundles[local.bundle].releases[scope][env]) == 'undefined' ) {
+                        data.bundles[local.bundle].releases[scope][env] = {}
+                    }
+                    data.bundles[local.bundle].releases[scope][env].target = "releases/"+ local.bundle +"/"+ scope +"/"+ env +"/" + version;
                 }
-                data.bundles[local.bundle].releases[env].target = "releases/"+ local.bundle +"/"+ env +"/" + version;
             }
 
+
             ++local.b;
             addBundleToManifest(data, local.b, done);
 

package/framework/{v0.1.5-alpha.2 → v0.1.6-alpha.2}/lib/cmd/project/build.js

@@ -41,30 +41,55 @@ var console     = lib.logger;
 
 
         var bundle = self.bundles[b];
-        if (!local.envs) {
-            try {
-                local.envs = [];
-                local.manifest = requireJSON(_(self.projectManifestPath, true));
-                var targets = local.manifest.bundles[bundle].releases;
-                for (let env in targets) {
-                    local.envs.push(env);
-                }
-                if (!local.envs.length) {
-                    return end( new Error('No environment found for your build !'));
+
+        local.envs          = self.envs.slice();
+        local.scopes        = self.scopes.slice();
+        // var releasesPathObj = new _(self.projects[self.projectName].path +'/releases', true);
+        try {
+            local.manifest = JSON.clone(self.projectData);
+            // per scope
+            for (let i = 0, len = local.scopes.length; i < len; i++) {
+                let scope = local.scopes[i]
+                if ( typeof(local.manifest.bundles[bundle].releases[scope]) == 'undefined' ) {
+                    local.manifest.bundles[bundle].releases[scope] = {}
                 }
 
+                for (let e = 0, eLen = local.envs.length; e<eLen; e++) {
+                    let env = local.envs[e];
+
+                    if ( env === self.projects[self.projectName].dev_env ) {
+                        continue;
+                    }
+
+                    if ( typeof(local.manifest.bundles[bundle].releases[scope][env]) == 'undefined' ) {
+                        local.manifest.bundles[bundle].releases[scope][env] = {
+                            target: null
+                        }
+                    }
 
-            } catch(err) {
-                end(err)
+                    if ( !local.manifest.bundles[bundle].releases[scope][env].target ) {
+                        local.manifest.bundles[bundle].releases[scope][env].target = "releases/"+ bundle +"/"+ scope +"/"+ env +"/"+ local.manifest.bundles[bundle].version;
+                    }
+                }
             }
+
+
+            self.projectData = local.manifest;
+            lib.generator.createFileFromDataSync(
+                self.projectData,
+                self.projectManifestPath
+            );
+
+        } catch(err) {
+            return end(err)
         }
-        console.debug('Building bundle `'+ bundle + '@'+ self.projectName + '`');
 
-        buildEnv(b, e);
+        console.debug('Building bundle `'+ bundle + '@'+ self.projectName + '`');
+        buildEnv(self.defaultScope, b, e);
 
     }
 
-    var buildEnv = function(b, e) {
+    var buildEnv = function(scope, b, e) {
 
         if ( e > local.envs.length-1 ) {
             return buildBundle(b+1);
@@ -72,8 +97,14 @@ var console     = lib.logger;
 
         var bundle          = self.bundles[b]
             , env           = local.envs[e]
-            , manifest      = local.manifest
-            , releasePath   = self.projectLocation +'/'+ manifest.bundles[bundle].releases[env].target
+        ;
+
+        if ( env === self.projects[self.projectName].dev_env ) {
+            return buildEnv(scope, b, e+1);
+        }
+
+        var manifest        = local.manifest
+            , releasePath   = self.projectLocation +'/'+ manifest.bundles[bundle].releases[scope][env].target
             , release       = new _(releasePath, true)
             , srcPath       = _(self.bundlesLocation +'/'+ bundle, true)
         ;
@@ -89,7 +120,7 @@ var console     = lib.logger;
                 return end(err)
             }
 
-            buildEnv(b, e+1);
+            buildEnv(scope, b, e+1);
         })
     }
 

package/framework/{v0.1.5-alpha.2 → v0.1.6-alpha.2}/lib/cmd/scope/remove.js

@@ -88,9 +88,8 @@ function Remove(opt, cmd) {
         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
+                delete projectData.bundles[bundle].releases[scope]
             }
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.5-alpha.2",
+  "version": "0.1.6-alpha.2",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -51,7 +51,7 @@
   "bin": {
     "gina": "./bin/gina"
   },
-  "main": "./framework/v0.1.5-alpha.2/core/gna",
+  "main": "./framework/v0.1.6-alpha.2/core/gna",
   "scripts": {
     "prepare": "node script/prepare_version.js",
     "postpublish": "node script/post_publish.js",

package/framework/v0.1.5-alpha.2/VERSION

@@ -1 +0,0 @@
-0.1.5-alpha.2

package/framework/v0.1.5-alpha.2/core/asset/plugin/dist/vendor/gina/css/gina.min.css.map

@@ -1 +0,0 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"/usr/local/lib/node_modules/gina/framework/v0.1.5-alpha.2/core/asset/plugin/dist/vendor/gina/css/gina.min.css","sourcesContent":[]}