gina 0.1.1-alpha.201 → 0.1.1-alpha.202

package/framework/{v0.1.1-alpha.201 → v0.1.1-alpha.202}/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js.map

@@ -1,8 +1,8 @@
 {
 "version":3,
-"file":"/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.201/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
+"file":"/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.202/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
 "lineCount":5,
 "mappings":"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",
-"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.201/core/asset/plugin/src/vendor/gina/utils/loader.js"],
+"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.202/core/asset/plugin/src/vendor/gina/utils/loader.js"],
 "names":["window","gina","options","test","JSON","parse","decodeURIComponent","version","bundle","routes","routing","re","RegExp","String","fromCharCode","route","location","search","href","slice","match","Array","isArray","length","matched","split","err","link","links","document","head","getElementsByTagName","i","len","found","cssPath","createElement","media","rel","type","appendChild","Toolbar"]
 }

package/framework/{v0.1.1-alpha.201 → v0.1.1-alpha.202}/lib/cmd/framework/set.js

@@ -161,10 +161,8 @@ function Set(opt){
         lib.generator.createFileFromDataSync(mainSettingsConf, mainSettingsPath);
         // update package.json
         pack.config.globalMode = globalMode;
-        if ( new _(GINA_DIR +'/package.json', true ).existSync() ) {
-            lib.generator.createFileFromDataSync(pack, _(GINA_DIR +'/package.json', true ));
-        }
-        // lib.generator.createFileFromDataSync(pack, _(GINA_DIR +'/package.json', true ));
+
+        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.201",
+  "version": "0.1.1-alpha.202",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -51,10 +51,10 @@
   "bin": {
     "gina": "./bin/gina"
   },
-  "main": "./framework/v0.1.1-alpha.201/core/gna",
+  "main": "./framework/v0.1.1-alpha.202/core/gna",
   "scripts": {
-    "prepare": "./script/prepare_version.js",
-    "postpublish": "./script/post_publish.js",
+    "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/script/post_install.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-
+'use strict';
 /**
  * This file is part of the gina package.
  * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
@@ -221,9 +221,12 @@ function PostInstall() {
 
                 // OK ... found installed gina but on a different prefix
                 // In this case, let's assume that it is not really installed
+                console.info('A previous version of gina has been detected');
                 if ( !new RegExp('^'+ self.prefix).test(hasFoundGina.dependencies.gina.path) ) {
                     self.isGinaInstalled = false;
+                    console.info('Ignoring previous because of a mismatching install prefix');
                 }
+
             }
         } catch (err) {}
 
@@ -247,7 +250,6 @@ function PostInstall() {
      * Bebin - Will run checking tasks in order of declaration
      * */
      var begin = async function(i) {
-        //console.debug('i is ', i);
         var n = 0, funct = null, functName = null;
         for (let t in self) {
             if ( typeof(self[t]) == 'function') {
@@ -324,7 +326,7 @@ function PostInstall() {
 
     self.createVersionFile = function(done) {
         var version = self.version;
-        console.debug('writting version number: '+ version);
+        console.debug('Writting version number: '+ version);
 
         var target = _(self.versionPath + '/VERSION');
         try {
@@ -427,7 +429,7 @@ function PostInstall() {
         console.debug('Target: '+ target);
 
         if ( callback && typeof(callback) != 'undefined') {
-            console.info('linking to binaries dir: '+ source +' -> '+ target);
+            console.info('Linking to binaries dir: '+ source +' -> '+ target);
             try {
                 if ( fs.existsSync(target) ) {
                     fs.unlinkSync(target)
@@ -478,7 +480,7 @@ function PostInstall() {
                     return npmInstall(done)
                 } else {
                     var target = new _(self.versionPath + '/node_modules');
-                    console.debug('replacing: ', target.toString() );
+                    console.debug('Replacing: ', target.toString() );
                     return target
                         .rm( function onRemove(err) {
                             if (err) {
@@ -522,7 +524,7 @@ function PostInstall() {
 
     var npmInstall = function(done) {
 
-        console.info('Now installing modules: please, wait ...');
+        console.info('Now installing modules. Please, wait ...');
         console.info('Prefix ('+ self.isCustomPrefix +'): '+ self.prefix);
         console.info('Default prefix: '+ self.defaultPrefix);
         var initialDir = process.cwd();
@@ -532,11 +534,12 @@ function PostInstall() {
 
         process.chdir( self.versionPath );
 
-        console.info('running: `'+ cmd +'` from '+ process.cwd() );
-        console.info('running using TMPDIR: '+  _(getTmpDir(), true) );
+        console.info('Running: `'+ cmd +'` from '+ process.cwd() );
+        console.info('Running using TMPDIR: '+  _(getTmpDir(), true) );
         var oldConfigGlobal = process.env.npm_config_global;
         process.env.npm_config_global = false;
-        execSync(cmd);
+        console.info('Running using TMPDIR: '+ cmd);
+        console.info(execSync(cmd).toString());
         process.chdir(initialDir);
         process.env.npm_config_global = oldConfigGlobal;
 
@@ -576,6 +579,32 @@ function PostInstall() {
     }
 
     self.checkUserExtensions = async function(done) {
+        var err = null;
+        var versionDirObj = new _( getUserHome() +'/.gina/'+ self.shortVersion, true);
+        console.debug('versionDirObj: '+ versionDirObj.toString() );
+        if ( !versionDirObj.existsSync() ) {
+            versionDirObj.mkdirSync()
+        }
+        var defaultSettingsObj = new _(versionDirObj.toString() + '/settings.json', true);
+        if (!defaultSettingsObj.existsSync()) {
+            promisify(new _(self.gina +'/resources/home/main.json').cp)(defaultSettingsObj.toString())
+                .catch( function onCopyError(_err) {
+                    err = _err;
+                })
+        }
+        if (err) {
+            return done(err);
+        }
+        var defaultMainObj = new _(versionDirObj.toString() + '/main.json', true);
+        if (!defaultMainObj.existsSync()) {
+            promisify(new _(self.gina +'/resources/home/main.json').cp)(defaultMainObj.toString())
+                .catch( function onCopyError(_err) {
+                    err = _err;
+                })
+        }
+        if (err) {
+            return done(err);
+        }
 
         var userDir = _(getUserHome() + '/.gina/user', true);
         // var userDirObj = new _(userDir);
@@ -598,7 +627,7 @@ function PostInstall() {
         // }
         var folders = [];
         try {
-            console.debug('Reading : '+ ext + ' - isDirectory ? '+ fs.lstatSync( ext ).isDirectory() );
+            console.debug('Reading :'+ ext + ' - isDirectory ? '+ fs.lstatSync( ext ).isDirectory() );
             folders = fs.readdirSync(ext);
 
         } catch(readErr) {
@@ -647,7 +676,7 @@ function PostInstall() {
 
             for (let n = 0, nLen = files.length; n < nLen; n++) {
                 let file = files[n];
-                console.debug('file --> ', file);
+                console.debug('File --> ', file);
                 let extentionPath   = _(extDir +'/'+ file, true);
                 let extensionPathObj =  new _(extentionPath);
                 // redefined
@@ -662,7 +691,7 @@ function PostInstall() {
                             err = _err;
                         })
                         .then( function onCopy(_destination) {// jshint ignore:line
-                            console.info('Copy '+ extentionPath +' to '+ _destination +' done !');
+                            console.debug('Copy '+ extentionPath +' to '+ _destination +' done !');
                         });
 
                     if (err) {
@@ -697,7 +726,7 @@ function PostInstall() {
             await promisify(run)(cmd, { cwd: _(self.versionPath), tmp: _(getTmpDir(), true), outToProcessSTD: true, shell: "/bin/bash"})
                 .catch(function onError(err){
                     if (err) {
-                        console.warn('try to run: sudo ' + cmd);
+                        console.warn('Try to run: sudo ' + cmd);
                         return done(err);
                     }
                 });
@@ -742,9 +771,12 @@ function PostInstall() {
             return;
         }
         // get current framework version
-        var package = require(pack);
-        var currentVersion = 'v'+ package.version.replace(/^v/, '');
-
+        var ginaPackage = require(pack);
+        self.version = ginaPackage.version.replace(/^v/, '');
+        self.shortVersion = self.version.split('.');
+        self.shortVersion.splice(2);
+        self.shortVersion = self.shortVersion.join('.');
+        var currentVersion = 'v'+ self.version;
         // cleanup first
         var versionsFolders = fs.readdirSync(frameworkPath);
         for (let i = 0, len = versionsFolders.length; i < len; i++) {
@@ -811,9 +843,10 @@ function PostInstall() {
         }
 
         if ( !fs.existsSync(ginaBinanry) ) {
-            console.error('`'+ ginaBinanry +'` not found !');
+            console.error('Outch: `'+ ginaBinanry +'` not found !');
         }
 
+
         try {
             execSync(ginaBinanry + ' framework:set --global-mode='+ self.isGlobalInstall);
             execSync(ginaBinanry + ' framework:set --prefix='+ self.prefix);

package/script/post_publish.js

@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 //Imports.
 var fs          = require('fs');
 var util        = require('util');

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

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