gina 0.1.1-alpha.92 → 0.1.1-alpha.93

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.1-alpha.92",
+  "version": "0.1.1-alpha.93",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -24,11 +24,23 @@
     "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": {
+    "colors": "^1.4.0",
     "tar": ""
   },
   "engine": [
@@ -37,8 +49,7 @@
   "bin": {
     "gina": "./bin/gina"
   },
-  "main": "./framework/v0.1.1-alpha.92/core/gna",
-  "preferGlobal": true,
+  "main": "./framework/v0.1.1-alpha.93/core/gna",
   "config": {
     "prefix": "~/.npm-global"
   },

package/script/post_install.js

@@ -243,10 +243,11 @@ function PostInstall() {
 
 
             if ( !self.isGlobalInstall() ) {
-                new _(cli, true).symlinkSync(  _(self.prefix +'/', true) )
-            } else {
-                new _(cli, true).symlinkSync( _(self.prefix +'/bin/', true) )
+                new _(cli, true).symlinkSync(  _(self.prefix +'/gina', true) )
             }
+            // else {
+            //     new _(cli, true).symlinkSync( _(self.prefix +'/bin/', true) )
+            // }
 
 
             // var cmd = 'ln -s '+ self.gina +'/bin/gina '+ binPath;

package/script/pre_install.js

@@ -253,9 +253,13 @@ function PreInstall() {
         self.isGlobalInstall = false;
         self.isResetNeeded = process.env.npm_config_reset || false;
         self.isGinaInstall = false;
-        self.prefix = process.env.npm_config_prefix || execSync('npm config get prefix').toString().replace(/\n/g, '');
+        self.defaultPrefix = execSync('npm config get prefix').toString().replace(/\n/g, '');
+        // `process.env.npm_config_prefix` to retrieve arguments passed to `npm install gina --prefix=/path/to/prefix`
+        self.prefix = process.env.npm_config_prefix || self.defaultPrefix;
+        // self.prefix =
         self.isCustomPrefix = false;
 
+        // This part is mostly when running `node ./script/pre_install.js`
         var args = process.argv, i = 0, len = args.length;
         for (; i < len; ++i) {
             if ( /^(\-g|\-\-global)$/.test(args[i]) ) {
@@ -275,19 +279,8 @@ function PreInstall() {
             }
         }
 
-        // process.env.npm_config_prefix = self.prefix;
-
-        console.debug('process.env.npm_config_prefix => '+ process.env.npm_config_prefix);
-        if (
-            // process.env.npm_config_prefix
-            // &&
-            self.prefix != process.env.npm_config_prefix
-        ) {
-            // self.prefix = process.env.npm_config_prefix.toString();
-            self.isCustomPrefix = true;
-        }
-
-        if ( !self.isGlobalInstall ) { // none global install
+        // For local install
+        if ( !self.isGlobalInstall && !/node\_modules(\\\\|\/)gina$/.test(process.cwd()) ) {
             self.prefix = process.cwd();
             // self.root = process.cwd(); // project path
             // self.tmpDir = os.tmpdir(); // default tmp path
@@ -295,8 +288,19 @@ function PreInstall() {
             // console.info('please use `npm install -g gina`\n    or\nif you are trying to link gina to your project, use `npm link gina` if Gina has already been installed');
             // process.exit(1);
         }
-        console.debug('self.prefix => '+ self.prefix);
+        // process.env.npm_config_prefix = self.prefix;
+
+
+        if ( self.prefix != self.defaultPrefix ) {
+            // self.prefix = process.env.npm_config_prefix.toString();
+            self.isCustomPrefix = true;
+        }
 
+        console.debug('self.defaultPrefix => '+ self.defaultPrefix);
+        console.debug('self.prefix => '+ self.prefix);
+        console.debug('process.env.npm_config_prefix => '+ process.env.npm_config_prefix);
+        console.debug('process.env.npm_package_config_prefix => '+ process.env.npm_package_config_prefix);
+        process.exit(1);
 
         begin(0);
         // TODO check old framework version to be archived

package/framework/v0.1.1-alpha.92/VERSION

@@ -1 +0,0 @@
-0.1.1-alpha.92