gina 0.1.1-alpha.96 → 0.1.1-alpha.97

package/framework/{v0.1.1-alpha.96 → v0.1.1-alpha.97}/lib/cmd/framework/set.js

@@ -2,10 +2,11 @@ var console = lib.logger;
 
 function Set(opt){
 
-    var mainConfPath        = _(GINA_HOMEDIR + '/main.json')
+    var mainConfPath        = _(GINA_HOMEDIR + '/main.json', true)
         , mainConf          = require(mainConfPath)
-        , mainSettingsPath  = _(GINA_HOMEDIR +'/'+ GINA_SHORT_VERSION + '/settings.json')
+        , mainSettingsPath  = _(GINA_HOMEDIR +'/'+ GINA_SHORT_VERSION + '/settings.json', true)
         , mainSettingsConf  = require(mainSettingsPath)
+        , pack              = require(_(GINA_DIR +'/package.json', true ))
     ;
 
     var init = function(opt){
@@ -32,6 +33,11 @@ function Set(opt){
                 setPrefix(v);
             break;
 
+            case '--global_mode':
+            case '--global-mode':
+                setGlobalMode(v);
+            break;
+
             case '--log_level':
             case '--log-level':
                 setLogLevel(v);
@@ -86,6 +92,32 @@ function Set(opt){
         process['gina']['prefix'] = prefix;
         mainSettingsConf['prefix'] = prefix;
         lib.generator.createFileFromDataSync(mainSettingsConf, mainSettingsPath);
+        // update package.json
+        pack.config.prefix = prefix;
+        lib.generator.createFileFromDataSync(pack, _(GINA_DIR +'/package.json', true ));
+    }
+
+    var setGlobalMode = function(globalMode) {
+        var err = null;
+        if ( !globalMode || typeof(globalMode) == 'undefined' || globalMode == '' ) {
+            err = new Error('Global Mode cannot be left empty or undefined');
+            console.error(err.message);
+            return
+        }
+        globalMode = /^true$/i.test(globalMode) ? true : false;
+        // save to ~/.gina/main.json
+        if ( typeof(mainConf['def_global_mode']) == 'undefined' ) {
+            mainConf['def_global_mode'] = {}
+        }
+        mainConf['def_global_mode'][GINA_SHORT_VERSION] = globalMode;
+        lib.generator.createFileFromDataSync(mainConf, mainConfPath);
+        // save to ~/.gina/{GINA_VERSION_SHORT}/settings.json
+        process['gina']['global_mode'] = globalMode;
+        mainSettingsConf['global_mode'] = globalMode;
+        lib.generator.createFileFromDataSync(mainSettingsConf, mainSettingsPath);
+        // update package.json
+        pack.config.globalMode = globalMode;
+        lib.generator.createFileFromDataSync(pack, _(GINA_DIR +'/package.json', true ));
     }
 
     var setLogLevel = function(level) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.1-alpha.96",
+  "version": "0.1.1-alpha.97",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -15,7 +15,6 @@
     "gina.io",
     "ginajs"
   ],
-  "install": "npm install -g gina@latest",
   "homepage": "https://gina.io",
   "repository": {
     "type": "git",
@@ -45,14 +44,17 @@
     "node >=0.10.25"
   ],
   "config": {
-    "optionalPrefix": "~/.npm-global"
+    "optionalPrefix": "~/.npm-global",
+    "prefix": "/usr/local",
+    "globalMode": true
   },
   "bin": {
     "gina": "./bin/gina"
   },
-  "main": "./framework/v0.1.1-alpha.96/core/gna",
+  "main": "./framework/v0.1.1-alpha.97/core/gna",
   "scripts": {
     "prepare": "node ./script/prepare_version.js",
+    "postpublish": "node ./script/post_publish.js",
     "preinstall": "node ./script/pre_install.js",
     "postinstall": "node ./script/post_install.js"
   },

package/resources/home/main.json

@@ -6,6 +6,9 @@
     "def_prefix": {
         "{release}": "{prefix}"
     },
+    "def_global_mode": {
+        "{release}": "{global_mode}"
+    },
     "scopes": {
         "{release}": [
             "local",

package/resources/home/settings.json

@@ -1,6 +1,7 @@
 {
     "_comment": "To update these values, go through the command line arguments: --tmpdir=/some/path/tmp --logdir=/some/path/logs",
     "prefix": "{prefix}",
+    "global_mode": "{global_mode}",
     "version": "{version}",
     "env": "{env}",
     "env_is_dev": "{env_is_dev}",

package/resources/package.json.template

@@ -15,42 +15,46 @@
     "gina.io",
     "ginajs"
   ],
+  "homepage": "https://gina.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/rhinostone/gina.git"
   },
   "bugs": {
-    "url" : "https://github.com/rhinostone/gina/issues",
-    "email" : "bugs@gina.io"
+    "url": "https://github.com/rhinostone/gina/issues",
+    "email": "bugs@gina.io"
   },
   "author": {
-    "name": "Rhinostone",
-    "email": "contact@gina.io"
+    "name": "Martin-Luther ETOUMAN",
+    "email": "martin-luther.etouman@gina.io"
   },
+  "contributors": [
+    {
+      "name": "Martin-Luther ETOUMAN",
+      "email": "martin-luther.etouman@gina.io"
+    },
+    {
+      "name": "Fabrice DELANEAU",
+      "email": "fabrice.delaneau@gina.io",
+      "url": "https://fdelaneau.com"
+    }
+  ],
   "copyright": "Copyright (c) 2009-2022 Rhinostone <contact@gina.io>",
-  "dependencies": {
-    "tar": ""
-  },
   "engine": [
     "node >=0.10.25"
   ],
-  "preferGlobal": true,
+  "config": {
+    "optionalPrefix": "~/.npm-global"
+  },
   "bin": {
     "gina": "./bin/gina"
   },
-  "man": [
-    "./doc/man/gina.1",
-    "./doc/man/gina-framework.1",
-    "./doc/man/gina-project.1",
-    "./doc/man/gina-bundle.1",
-    "./doc/man/gina-model.1",
-    "./doc/man/gina-env.1"
-  ],
-  "main": "./framework/v0.1.1-alpha.70/core/gna",
+  "main": "./framework/v{version}/core/gna",
   "scripts": {
-    "prepare": "node ./script/prepare_version.js -g",
-    "preinstall": "node ./script/pre_install.js -g",
-    "postinstall": "node ./script/post_install.js -g"
+    "prepare": "node ./script/prepare_version.js",
+    "postpublish": "node ./script/post_publish.js",
+    "preinstall": "node ./script/pre_install.js",
+    "postinstall": "node ./script/post_install.js"
   },
   "license": "MIT",
   "readmeFilename": "README.md"

package/script/post_install.js

@@ -1,6 +1,6 @@
 /**
  * This file is part of the gina package.
- * Copyright (c) 2017 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -99,13 +99,17 @@ function PostInstall() {
         self.isGlobalInstall    = process.env.npm_config_global || false;
         self.isResetNeeded      = process.env.npm_config_reset || false;
         self.defaultPrefix      = execSync('npm config get prefix').toString().replace(/\n$/g, '');
-        var pkg = null;
-        try {
-            pkg = execSync('npm list -g gina --long --json').toString().replace(/\n$/g, '');
-        } catch(err) {
-            throw err
-        }
-        self.optionalPrefix     = JSON.parse(pkg).dependencies.gina.config.optionalPrefix.replace(/^\~/, getUserHome());
+        // var pkg = null;
+        // try {
+        //     if (self.isGlobalInstall) {
+        //         pkg = execSync('npm list -g gina --long --json').toString().replace(/\n$/g, '');
+        //     } else {
+        //         pkg = execSync('npm list gina --long --json').toString().replace(/\n$/g, '');
+        //     }
+        // } catch(err) {
+        //     throw err
+        // }
+        // self.optionalPrefix     = JSON.parse(pkg).dependencies.gina.config.optionalPrefix.replace(/^\~/, getUserHome());
 
         // `process.env.npm_config_prefix` is only retrieved on `npm install gina`
         // and it should always be equal to `self.defaultPrefix`
@@ -164,6 +168,22 @@ function PostInstall() {
             // process.env.npm_config_prefix = self.prefix = self.optionalPrefix;
         }
 
+        var pkg = null, pkgObj = null, cmd = null;
+        try {
+            cmd = 'npm list gina --long --json --prefix='+ self.prefix;
+            if (self.isGlobalInstall) {
+                cmd += ' -g';
+            }
+            pkg = execSync(cmd).toString().replace(/\n$/g, '');
+            self.optionalPrefix = JSON.parse(pkg).dependencies.gina.config.optionalPrefix.replace(/^\~/, getUserHome());
+
+        } catch(err) {
+            throw err
+        }
+        pkgObj = JSON.parse(pkg);
+        self.optionalPrefix     = pkgObj.dependencies.gina.config.optionalPrefix.replace(/^\~/, getUserHome());
+
+
         if ( self.prefix != self.defaultPrefix ) {
             self.isCustomPrefix = true;
         }
@@ -769,11 +789,20 @@ function PostInstall() {
         }
     }
 
+
     self.end = function(done) {
 
         restoreSymlinks();
-        // set settings prefix
+        // update package.json
+        var pkgObj = require(pack);
+        pkgObj.config.prefix = self.prefix;
+        pkgObj.config.globalMode = self.isGlobalInstall;
+        new _(pack, true).rmSync();
+        lib.generator.createFileFromDataSync(JSON.stringify(pkgObj, null, 2), pack);
+
+        // configuring Gina
         var ginaBinanry = _(self.gina + '/bin/gina', true);
+        execSync(ginaBinanry + ' framework:set --global-mode='+ self.isGlobalInstall);
         execSync(ginaBinanry + ' framework:set --prefix='+ self.prefix);
 
         // Update middleware file