gina 0.1.1-alpha.53 → 0.1.1-alpha.54

package/framework/v0.1.1-alpha.54/package.json

@@ -0,0 +1,14 @@
+{
+  "dependencies": {
+    "busboy": "^0.2.14",
+    "colors": "^1.4.0",
+    "engine.io": "^6.2.0",
+    "engine.io-client": "^6.2.2",
+    "requirejs": "^2.3.6",
+    "sanitize-html": "^2.7.0",
+    "ssl-checker": "^2.0.7",
+    "swig": "^1.4.2",
+    "uuid": "^7.0.3",
+    "zlib": "^1.0.5"
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.1-alpha.53",
+  "version": "0.1.1-alpha.54",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -42,7 +42,7 @@
     "./doc/man/gina-model.1",
     "./doc/man/gina-env.1"
   ],
-  "main": "./framework/v0.1.1-alpha.53/core/gna",
+  "main": "./framework/v0.1.1-alpha.54/core/gna",
   "scripts": {
     "prepare": "node ./script/prepare_version.js -g",
     "preinstall": "node ./script/pre_install.js -g",

package/script/post_install.js

@@ -13,6 +13,19 @@ var util        = require('util');
 var promisify   = util.promisify;
 const { execSync } = require('child_process');
 
+var isWin32 = function() {
+    return (process.platform === 'win32') ? true : false;
+};
+// just in case `post_install` is called by hand
+var initialDir = process.cwd();
+var frameworkPath   = __dirname +'/..';
+if ( !fs.existsSync(frameworkPath +'/node_modules/colors') ) {
+    process.chdir(frameworkPath);
+    var cmd = ( isWin32() ) ? 'npm.cmd install colors@1.4.0' : 'npm install colors@1.4.0';
+    execSync(cmd);
+    process.chdir(initialDir);
+}
+
 var lib         = require('./lib');
 var console     = lib.logger;
 
@@ -21,6 +34,7 @@ var ginaPath = (scriptPath.replace(/\\/g, '/')).replace('/script', '');
 var help        = require(ginaPath + '/utils/helper.js');
 var pack        = ginaPath + '/package.json';
 pack =  (isWin32()) ? pack.replace(/\//g, '\\') : pack;
+var helpers = null;
 
 
 /**
@@ -64,12 +78,17 @@ function PostInstall() {
         }
 
         // check for ~/.gina (first installation ?)
-        var ginaHomeDir = _(getUserHome() + '/.gina', true);
-        self.version = require( _(self.gina + '/package.json') ).version;
+        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()
@@ -360,21 +379,26 @@ function PostInstall() {
         console.info('Prefix ('+ self.isCustomPrefix +'): '+ self.prefix);
         var initialDir = process.cwd();
 
-        // var cmd = self.prefix +'/bin/';
-        // cmd += ( isWin32() ) ? 'npm.cmd install' : 'npm install';
+        var deps = require(_(self.path + '/package.json', true)).dependencies;
 
-        cmd = ( isWin32() ) ? 'npm.cmd install' : 'npm install';
+
+
+
+        var cmd = self.prefix +'/bin/';
+        cmd += ( isWin32() ) ? 'npm.cmd install' : 'npm install';
 
         console.info('running: `'+ cmd +'` from '+ _(self.path) );
         console.info('running using TMPDIR: '+  _(getTmpDir(), true) );
         process.chdir(self.path);
-        try {
-            execSync(cmd);
-            process.chdir(initialDir);
-        } catch (err) {
-            process.chdir(initialDir);
-            return done(err)
+
+        for (let d in deps) {
+            try {
+                execSync(cmd +' '+ d +'@"'+ deps[d] +'"');
+            } catch (err) {
+                return done(err)
+            }
         }
+        process.chdir(initialDir);
 
         done()
         // run(cmd, { cwd: _(self.path), tmp: _(getTmpDir(), true), outToProcessSTD: true })
@@ -627,6 +651,9 @@ function PostInstall() {
         }
     }
 
-    init()
+
+    setTimeout(() => {
+        init()
+    }, 1000);
 }
 new PostInstall()

package/script/pre_install.js

@@ -477,6 +477,7 @@ function PreInstall() {
             return done();
         }
 
+        var frameworkPath   = __dirname +'/..';
         helpers = require(frameworkPath+ '/utils/helpers');
         lib = require('./lib');
 

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

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

package/framework/v0.1.1-alpha.53/package.json

@@ -1,14 +0,0 @@
-{
-  "dependencies": {
-    "busboy": "^0.2.14",
-    "colors": "^1.4.0",
-    "engine.io": "^6",
-    "engine.io-client": "^6",
-    "requirejs": "^2.3.6",
-    "sanitize-html": "^2.5.0",
-    "swig": "^1.4.2",
-    "uuid": "^7",
-    "zlib": "^1.0.5",
-    "ssl-checker": "2.0.7"
-  }
-}