Merge pull request #104 from Haeresis/develop

Fix serverPhysicalPath bad behavior.

Author: MachinisteWeb

CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.7.1 ##
+
+Bugfix:
+
+- Find the real place of `node-atlas` module used by CLI or by API.
+
+
+
 ## 1.7.0 ##
 
 Enhancement:

bin/node-atlas.js

@@ -137,6 +137,7 @@ NA = function () {
     this.config = init.config;
     this.afterGeneration = init.afterGeneration;
     this.afterGenerates = init.afterGenerates;
+    this.afterNewProject = init.afterNewProject;
     this.afterInitProject = init.afterInitProject;
     this.init = init.init;
     this.run = init.run;

index.js

@@ -6,7 +6,7 @@
 /**
  * @fileOverview NodeAtlas allows you to create and manage HTML assets or create multilingual websites/webapps easily with Node.js.
  * @author {@link https://www.lesieur.name/ Bruno Lesieur}
- * @version 1.7.0
+ * @version 1.7.1
  * @license {@link https://github.com/Haeresis/ResumeAtlas/blob/master/LICENSE/ GNU GENERAL PUBLIC LICENSE Version 2}
  * @module node-atlas
  * @requires {@link NA#modules.external:async}

lib/assets-generation.js

@@ -280,8 +280,8 @@ exports.generateStartingProject = function (fallback) {
             traverse.on('complete', function () {   
                 data.pathName = sourcePath;
                 NA.log(NA.appLabels.initCopy.replace(/%([\-a-zA-Z0-9_]+)%/g, function (regex, matches) { return data[matches]; }));
-                if (NA.afterInitProject) {
-                    NA.afterInitProject();
+                if (NA.afterNewProject) {
+                    NA.afterNewProject();
                 }
             });
 

lib/configuration.js

@@ -16,7 +16,7 @@ exports.lineCommandConfiguration = function () {
     commander
 
         /* Version of NodeAtlas currently in use with `--version` option. */
-        .version("1.7.0")
+        .version("1.7.1")
 
         /* Automaticly run default browser with `--browse` options. If a param is setted, the param is added to the and of url. */
         .option(NA.appLabels.commander.browse.command, NA.appLabels.commander.browse.description, String)
@@ -63,7 +63,8 @@ exports.lineCommandConfiguration = function () {
  * @memberOf NA#
  */
 exports.initGlobalVar = function () {
-    var NA = this;
+    var NA = this,
+        path = NA.modules.path;
 
     /**
      * Name of file which contains language error messages. The name of file is without extension.
@@ -81,9 +82,9 @@ exports.initGlobalVar = function () {
      * @alias serverPhysicalPath
      * @type {string}
      * @memberOf NA#
-     * @default « The path where `node-atlas.js` is. »
+     * @default « The path where `node-atlas` module is. »
      */
-    NA.serverPhysicalPath = process.argv[1];
+    NA.serverPhysicalPath = path.join(__dirname, "..");
 
     /**
      * All internationalize labels from `NA#appLanguage` file.

lib/init.js

@@ -57,7 +57,7 @@ exports.config = function (config) {
  *     // or
  *     // ...
  * }).run({
- *     generates: true
+ *     generate: true
  * });
  * @return {Object} The NA instance for chained functions.
  */
@@ -69,6 +69,31 @@ exports.afterGeneration = function (callback) {
     return NA;
 };
 
+/**
+ * Set private `NA#afterNewProject`.
+ * @public
+ * @function afterInitProject
+ * @memberOf module:node-atlas~NA#
+ * @param {function} Instruction to execute after initialization of template project.
+ * @example require('node-atlas')().afterInitProject(function () {
+ *     // Update all files on a server...
+ *     // or
+ *     // Generate a documentation...
+ *     // or
+ *     // ...
+ * }).run({
+ *     generate: true
+ * });
+ * @return {Object} The NA instance for chained functions.
+ */
+exports.afterInitProject = function (callback) {
+    var NA = this;
+
+    NA.afterNewProject = callback;
+
+    return NA;
+};
+
 /**
  * Initialize a NA instance.
  * @public

package.json

@@ -1,7 +1,7 @@
 {
   "name": "node-atlas",
   "preferGlobal": true,
-  "version": "1.7.0",
+  "version": "1.7.1",
   "author": {
     "name": "Bruno Lesieur",
     "email": "[email protected]"
@@ -79,7 +79,18 @@
     "lib/node-modules.js",
     "lib/web-server.js",
     "bin/node-atlas.js",
-    "templates/*",
+    "templates/hello-world/webconfig.json",
+    "templates/hello-world/variations/common.json",
+    "templates/hello-world/variations/index.json",
+    "templates/hello-world/variations/en-us/common.json",
+    "templates/hello-world/variations/en-us/index.json",
+    "templates/hello-world/templates/error.htm",
+    "templates/hello-world/templates/index.htm",
+    "templates/hello-world/controllers/common.js",
+    "templates/hello-world/controllers/index.js",
+    "templates/hello-world/components/head.htm",
+    "templates/hello-world/components/foot.htm",
+    "templates/hello-world/assets/stylesheets/common.css",
     "LICENSE",
     "README.md",
     "CHANGELOG.md",