gina 0.1.1-alpha.93 → 0.1.1-alpha.94

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.1-alpha.93",
+  "version": "0.1.1-alpha.94",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -49,10 +49,7 @@
   "bin": {
     "gina": "./bin/gina"
   },
-  "main": "./framework/v0.1.1-alpha.93/core/gna",
-  "config": {
-    "prefix": "~/.npm-global"
-  },
+  "main": "./framework/v0.1.1-alpha.94/core/gna",
   "scripts": {
     "prepare": "node ./script/prepare_version.js",
     "preinstall": "node ./script/pre_install.js",

package/script/pre_install.js

@@ -250,16 +250,17 @@ function PreInstall() {
 
     var init = function() {
 
-        self.isGlobalInstall = false;
-        self.isResetNeeded = process.env.npm_config_reset || false;
+        self.isGlobalInstall = process.env.npm_config_global || false;
+        self.isResetNeeded = process.env.npm_config_reset || false;
         self.isGinaInstall = false;
         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.optionalPrefix = '~/.npm-global';
+        // `process.env.npm_config_prefix` is only retrieved on `npm install gina`
         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`
+        // Overriding thru passed arguments
         var args = process.argv, i = 0, len = args.length;
         for (; i < len; ++i) {
             if ( /^(\-g|\-\-global)$/.test(args[i]) ) {
@@ -280,27 +281,29 @@ function PreInstall() {
         }
 
         // 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
-            // console.error('local installation is not supported for this version at the moment.');
-            // 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);
+        if ( !self.isGlobalInstall ) {
+            console.warn('local installation is not fully supported for this at the moment.');
+            console.warn('please use `npm install -g gina`\nor\nif you are trying to link gina to your project, use `npm link gina` if Gina has already been installed\n');
+            // Just in case someone is trying to run pre_install from the `gina` module
+            if (!/node\_modules(\\\\|\/)gina$/.test(process.cwd())) {
+                self.prefix = process.cwd();
+            }
         }
         // process.env.npm_config_prefix = self.prefix;
 
+        if ( !isWritableSync(self.prefix) ) {
+            console.warn('Prefix `'+ self.prefix +'` does not have sufficient permissions. Switching to `--prefix='+ self.optionalPrefix +'`');
+            process.env.npm_config_prefix = self.prefix = self.optionalPrefix;
+        }
 
         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.optionalPrefix  => '+ self.optionalPrefix );
         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.93/VERSION

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