gina 0.1.1-alpha.95 → 0.1.1-alpha.96

package/script/post_install.js

@@ -17,25 +17,25 @@ var isWin32 = function() {
     return (process.platform === 'win32') ? true : false;
 };
 var isWritableSync = function(path) {
-        var canWrite = false;
-        if ( fs.accessSync && typeof(fs.accessSync) != 'undefined' ) {
-            try {
-                fs.accessSync(path, fs.constants.W_OK);
-                canWrite = true;
-            } catch (err) {
-                canWrite = false;
-            }
-        } else { // support for old version of nodejs
+    var canWrite = false;
+    if ( fs.accessSync && typeof(fs.accessSync) != 'undefined' ) {
+        try {
+            fs.accessSync(path, fs.constants.W_OK);
+            canWrite = true;
+        } catch (err) {
+            canWrite = false;
+        }
+    } else { // support for old version of nodejs
 
-            try {
-                canWrite = (fs.statSync(path).mode & (fs.constants.S_IRUSR | fs.constants.S_IRGRP | fs.constants.S_IROTH));
-            } catch (err) {
-                canWrite = false
-            }
+        try {
+            canWrite = (fs.statSync(path).mode & (fs.constants.S_IRUSR | fs.constants.S_IRGRP | fs.constants.S_IROTH));
+        } catch (err) {
+            canWrite = false
         }
+    }
 
-        return canWrite
-    };
+    return canWrite
+};
 var getUserHome = function() {
     var home = os.homedir ? os.homedir : function() {
         var homeDir = process.env[(isWin32()) ? 'USERPROFILE' : 'HOME'];
@@ -160,8 +160,8 @@ function PostInstall() {
                 console.warn('Path not accessible or missing: '+ self.prefix + ( isWin32() ? '\\' : '/' ) + 'var')
             }
 
-            console.warn('You do not have sufficient permissions. Switching to `--prefix='+ self.optionalPrefix +'`');
-            process.env.npm_config_prefix = self.prefix = self.optionalPrefix;
+            // console.warn('You do not have sufficient permissions. Switching to `--prefix='+ self.optionalPrefix +'`');
+            // process.env.npm_config_prefix = self.prefix = self.optionalPrefix;
         }
 
         if ( self.prefix != self.defaultPrefix ) {
@@ -204,76 +204,6 @@ function PostInstall() {
 
     //Initialize post installation scripts.
     var init = function() {
-        // self.isWin32 = isWin32();//getEnvVar('GINA_IS_WIN32');
-        // self.versionPath = getEnvVar('GINA_FRAMEWORK');
-        // self.gina = getEnvVar('GINA_DIR');
-        // self.root = self.gina; // by default
-        // self.isGlobalInstall = false;
-        // self.prefix = process.env.npm_config_prefix || execSync('npm config get prefix').toString().replace(/\n$/g, '');
-        // self.isCustomPrefix = false;
-
-        // var args = process.argv, i = 0, len = args.length;
-        // for (; i < len; ++i) {
-        //     if ( /^(\-g|\-\-global)$/.test(args[i]) ) {
-        //         self.isGlobalInstall = true;
-        //         continue;
-        //     }
-        //     if ( /^\-\-prefix\=/.test(args[i] ) ) {
-        //         self.isCustomPrefix = true;
-        //         self.prefix = args[i].split(/\=/)[1];
-        //         continue;
-        //     }
-        // }
-
-        // if (
-        //     // process.env.npm_config_prefix
-        //     // &&
-        //     self.prefix != process.env.npm_config_prefix
-        // ) {
-        //     // self.prefix = process.env.npm_config_prefix;
-        //     self.isCustomPrefix = true;
-        // }
-
-        // if ( !self.isGlobalInstall ) { // none global install
-        //     // process.env.npm_config_prefix = process.cwd();
-        //     self.prefix = process.cwd();
-        //     // self.root = process.cwd(); // project path
-        //     // console.error('local installation is not supported for this version at the moment.');
-        //     // console.info('please use `npm install -g gina`');
-        //     // process.exit(1);
-        // }
-        // // setEnvVar('GINA_PREFIX', self.prefix); // for the `helper.js`
-
-        // // check for ~/.gina (first installation ?)
-        // var ginaHomeDir = getUserHome() + ( isWin32() ? '\\.gina' : '/.gina' );
-        // self.version = require( self.gina + ( isWin32() ? '\\' : '/' ) +'package.json' ).version;
-        // self.shortVersion = self.version.split('.');
-        // self.shortVersion.splice(2);
-        // self.shortVersion = self.shortVersion.join('.');
-
-
-
-        // var frameworkVersionPath   = __dirname +'/../framework/v'+ self.version;
-        // helpers = require(frameworkVersionPath+ '/helpers');
-
-        // // if not found -> skip because it means that gina might not be installed or configured yet
-        // if ( !new _(ginaHomeDir).existsSync() ) {
-        //     new _(ginaHomeDir).mkdirSync()
-        // }
-        // if ( !new _(ginaHomeDir +'/'+ self.shortVersion ).existsSync() ) {
-        //     new _(ginaHomeDir +'/'+ self.shortVersion).mkdirSync()
-        // }
-
-        // console.debug('Is this for Windows ? ' +  self.isWin32);
-
-
-
-        // console.debug('prefix path: ' + self.prefix);
-        // console.debug('framework path: ' + self.gina);
-        // console.debug('framework version path: ' + self.versionPath);
-        // console.debug('cwd path: ' + self.root );
-        // console.debug('this is a global install ...');
-
         configure();
         helpers = require(self.versionPath+ '/helpers');
 
@@ -376,6 +306,7 @@ function PostInstall() {
         done();
     }
 
+    // TODO - Remove this part
     var configureGina = function() {
         // link to ./bin/cli to binaries dir
         if (!self.isWin32) {
@@ -472,10 +403,8 @@ function PostInstall() {
             if ( !self.isGlobalInstall ) { // local install only
                 lib.generator.createFileFromTemplate(source, target, function onGinaFileCreated(err) {
                     return callback(err)
-
                 })
             } else {
-
                 // configureGina();
                 return callback(false)
             }
@@ -483,9 +412,6 @@ function PostInstall() {
             if ( !self.isGlobalInstall ) {
                 lib.generator.createFileFromTemplate(source, target)
             }
-            // else {
-            //     configureGina();
-            // }
         }
     }
 
@@ -584,34 +510,10 @@ function PostInstall() {
         var oldConfigGlobal = process.env.npm_config_global;
         process.env.npm_config_global = false;
         execSync(cmd);
-
-        // var deps = require(_(self.versionPath + '/package.json', true)).dependencies;
-        // for (let d in deps) {
-        //     try {
-        //         console.info('running: `'+ cmd +' '+ d +'@"'+ deps[d] +'"` from '+ self.versionPath );
-        //         execSync(cmd +' '+ d +'@"'+ deps[d] +'"');
-        //     } catch (err) {
-        //         return done(err)
-        //     }
-        // }
         process.chdir(initialDir);
         process.env.npm_config_global = oldConfigGlobal;
 
         done()
-
-
-        // run(cmd, { cwd: _(self.versionPath), tmp: _(getTmpDir(), true), outToProcessSTD: true })
-        //     .onData(function onData(data){
-        //         console.info(data)
-        //     })
-        //     .onComplete( function onDone(err, data){
-        //         if (!err || /^false$/i.test(err) ) {
-        //             console.info('completed: '+ cmd);
-        //             return done()
-        //         }
-        //         console.debug('error found: '+ err + '\n=> '+ data);
-        //         done(err)
-        //     })
     }
 
     self.cleanupIfNeeded = function(done) {
@@ -698,7 +600,6 @@ function PostInstall() {
 
             let files = []
                 , extDir = _(ext +'/'+ dir, true)
-                , extDirObj = new _(extDir)
             ;
             try {
 
@@ -735,7 +636,7 @@ function PostInstall() {
                         });
 
                     if (err) {
-                        throw err;
+                        return done(err);
                     }
                 }
             }
@@ -746,76 +647,62 @@ function PostInstall() {
     }
 
     /**
-     * Link binary to profile
-     * Will edit ~/.profile, check and add if needed path to ~/.npm-global
+     * Updated user's profile
+     * Will edit ~/.profile, check and add if needed path to Gina binary
      *
      */
-    // self.linkBinaryToProfile = async function(done) {
-
-    //     // create a directory for global installations
-    //     var npmGlobalPath = _(getUserHome() + '/.npm-global', true);
+    self.updateUserProfile = async function(done) {
 
-    //     if (self.prefix != npmGlobalPath ) {
-    //         done()
-    //     }
+        if ( !self.isGlobalInstall || isWin32() ) {
+            return done()
+        }
+        if (!self.isCustomPrefix || self.prefix == self.defaultPrefix) {
+            return done()
+        }
 
-    //     console.info('Setting npm global path: '+ npmGlobalPath +' '+ new _(npmGlobalPath).existsSync() );
-    //     var npmGlobalPathObj = new _(npmGlobalPath);
-    //     if ( !npmGlobalPathObj.existsSync() ) {
-    //         npmGlobalPathObj.mkdirSync()
-    //     }
-    //     // from `/usr/local` -> `~/.npm-global`
-    //     var cmd = 'npm config set prefix '+ getUserHome() +'/.npm-global';
-    //     await promisify(run)(cmd, { cwd: _(self.versionPath), tmp: _(self.root +'/tmp'), outToProcessSTD: true })
-    //         .catch(function onError(err){
-    //             if (err) {
-    //                 console.warn('try to run: sudo ' + cmd);
-    //                 return done(err);
-    //             }
-    //         });
-
-    //     var profilePath = getUserHome() + '/.profile';
-    //     var profilePathObj = new _(profilePath);
-    //     if ( !profilePathObj.existsSync() ) {
-    //         cmd = 'touch '+ profilePath;
-    //         await promisify(run)(cmd, { cwd: _(self.versionPath), tmp: _(self.root +'/tmp'), outToProcessSTD: true })
-    //             .catch(function onError(err){
-    //                 if (err) {
-    //                     console.warn('try to run: sudo ' + cmd);
-    //                     return done(err);
-    //                 }
-    //             });
-    //     }
+        var profilePath = getUserHome() + '/.profile';
+        var profilePathObj = new _(profilePath);
+        if ( !profilePathObj.existsSync() ) {
+            cmd = 'touch '+ profilePath;
+            await promisify(run)(cmd, { cwd: _(self.versionPath), tmp: _(getTmpDir(), true), outToProcessSTD: true })
+                .catch(function onError(err){
+                    if (err) {
+                        console.warn('try to run: sudo ' + cmd);
+                        return done(err);
+                    }
+                });
+        }
 
-    //     var inFile = null;
-    //     try {
-    //         inFile = execSync("cat ~/.profile | grep .npm-global/bin").toString();
-    //     } catch (err) {
-    //         // nothing to do
-    //     }
+        var inFile = null;
+        var patt = _(self.prefix.replace( new RegExp( '^' +getUserHome() ), '(.*)[$]HOME') + '/bin', true);
+        try {
+            inFile = execSync("cat ~/.profile | grep -Eo '" + patt +"'").toString();
+        } catch (err) {
+            // nothing to do
+        }
 
-    //     if (!inFile) {
-    //         inFile = "\n# set PATH so it includes user‘s private npm bin if exists"
-    //         inFile += '\nif [ -d "$HOME/.npm-global/bin" ]; then';
-    //         inFile += '\n    PATH="$HOME/.npm-global/bin:$PATH"';
-    //         inFile += '\nfi\n';
-    //         try {
-    //             fs.appendFileSync( getUserHome()+'/.profile', inFile );
-    //         } catch (err) {
-    //             return done(err);
-    //         }
-    //         inFile = null;
+        if (!inFile) {
+            patt = patt.replace('(.*)[$]', '$');
+            inFile = '\nif [ -d "'+ patt +'" ]; then';
+            inFile += '\n    PATH="'+ patt +':$PATH"';
+            inFile += '\nfi\n';
+            try {
+                fs.appendFileSync( getUserHome()+'/.profile', inFile );
+            } catch (err) {
+                return done(err);
+            }
+            inFile = null;
 
-    //         // we need to source/update ~/.profile
-    //         try {
-    //             execSync("source "+ profilePath);
-    //         } catch (err) {
-    //             return done(err)
-    //         }
-    //     }
+            // we need to source/update ~/.profile
+            try {
+                execSync("source "+ profilePath);
+            } catch (err) {
+                return done(err)
+            }
+        }
 
-    //     done()
-    // }
+        done()
+    }
 
     var restoreSymlinks = function() {
         var archivesPath = _(getUserHome() + '/.gina/archives/framework', true);
@@ -885,7 +772,9 @@ function PostInstall() {
     self.end = function(done) {
 
         restoreSymlinks();
-
+        // set settings prefix
+        var ginaBinanry = _(self.gina + '/bin/gina', true);
+        execSync(ginaBinanry + ' framework:set --prefix='+ self.prefix);
 
         // Update middleware file
         var filename = _(self.versionPath) + '/MIDDLEWARE';
@@ -919,7 +808,7 @@ function PostInstall() {
                     if (err) {
                         return done(err)
                     }
-                    console.debug('def !== middleware case');
+                    console.debug('Updated: def !== middleware case');
                     // execSync(self.prefix +'/bin/gina framework:set --prefix='+ self.prefix);
                     console.info(msg);
                     done()
@@ -932,11 +821,6 @@ function PostInstall() {
                 }
                 console.info('File created case');
 
-                // var cmd = self.prefix;
-                // cmd += '/gina framework:set --prefix=';
-                // cmd += self.prefix;
-                // execSync(cmd);
-
                 console.info(msg);
                 done()
             })
@@ -944,8 +828,6 @@ function PostInstall() {
     }
 
 
-    // setTimeout(() => {
-        init()
-    // }, 1000);
+    init()
 }
 new PostInstall()

package/script/pre_install.js

@@ -104,8 +104,8 @@ function PreInstall() {
                 console.warn('Path not accessible or missing: '+ self.prefix + ( isWin32() ? '\\' : '/' ) + 'var')
             }
 
-            console.warn('You do not have sufficient permissions. Switching to `--prefix='+ self.optionalPrefix +'`');
-            process.env.npm_config_prefix = self.prefix = self.optionalPrefix;
+            // console.warn('You do not have sufficient permissions. Switching to `--prefix='+ self.optionalPrefix +'`');
+            // process.env.npm_config_prefix = self.prefix = self.optionalPrefix;
         }
 
         if ( self.prefix != self.defaultPrefix ) {
@@ -341,7 +341,7 @@ function PreInstall() {
             lib     = require('./lib');
             console = lib.logger;
         } catch (err) {
-            throw err
+            return done(err)
         }
 
 
@@ -410,7 +410,7 @@ function PreInstall() {
                 });
 
             if (err) {
-                throw err;
+                return done(err);
             }
         }
         // It is not required to update `~/.gina/main.json` &&  `~/.gina/{shortVersion}/settings.json`
@@ -516,7 +516,7 @@ function PreInstall() {
 
     var getTmpDir = function(prefix) {
         if ( !prefix || typeof(prefix) == 'undefined' || prefix == '' ) {
-            prefix = '/usr/local'
+            prefix = self.defaultPrefix;
         }
         // support for node 0.10.x & 0.11.x
         var tmp = (os.tmpdir) ? os.tmpdir : function() {
@@ -562,7 +562,7 @@ function PreInstall() {
      * */
     var getLogDir = function(prefix) {
         if ( !prefix || typeof(prefix) == 'undefined' || prefix == '' ) {
-            prefix = '/usr/local'
+            prefix = self.defaultPrefix;
         }
         // Trying to retrieve original value if already defined
         var logDir = null;