Merge pull request #231 from Vanshika-Dhingra/bug-fix-branch

Made lab-display-name an optional parameter

lab_build/exp_utils.js

@@ -25,10 +25,11 @@ function exp_clone(e, exp_dir) {
   shell.mkdir("-p", path.resolve(exp_dir));
   shell.rm("-rf", path.resolve(exp_dir, e_short_name));
   shell.exec(
-    `git clone -b ${e.tag} --depth 1 ${e.repo} ${path.resolve(
+    `git clone -b ${e.tag} --depth 1 ${e.repo} "${path.resolve(
       exp_dir,
       e_short_name
-    )}`
+    )}"`,
+    {silent: false}
   );
 }
 

lab_build/lab_gen.js

@@ -64,6 +64,7 @@ function moveToDeployDir(labpath) {
   const elist = expList(require(path.resolve(labpath, "lab-descriptor.json")));
 
   elist.forEach((e) => {
+    if (e.deploy) {
     log.debug(`Deploying experiment ${e["short-name"]} to ${path.resolve(deployment_path, "exp", e["short-name"])}`);
     shell.mkdir("-p", path.resolve(deployment_path, "exp", e["short-name"]));
     //     shell.exec(`rsync -arv --exclude .git \
@@ -78,6 +79,7 @@ function moveToDeployDir(labpath) {
       `${deployment_path}/stage/exp/${e["short-name"]}/*`,
       `${deployment_path}/exp/${e["short-name"]}`
     );
+    }
   });
 
   // console.log(chalk`{bold DEPLOY LAB} to ${deployment_dest}/${lab_dir_name}`);

package.json

@@ -32,6 +32,7 @@
     "rsync": "^0.6.1",
     "shelljs": "^0.8.4",
     "simple-git": "^2.31.0",
+    "vlabs-buildexp": "^3.1.6",
     "winston": "^3.8.2",
     "yargs": "^17.0.1"
   },

validation/schemas/labDescSchema.json

@@ -1,12 +1,15 @@
 {
     "$schema": "http://json-schema.org/schema#",
     "type": "object",
-    "required": ["lab", "lab_display_name", "broadArea", "phase", "collegeName",
+    "required": ["lab", "broadArea", "phase", "collegeName",
 		 "baseUrl", "introduction", "objective",
 		 "targetAudience", "courseAlignment"],
     "properties": {
 	"lab": {"type": "string"},
-	"lab_display_name": {"type": "string"},
+	"lab_display_name": {
+        "type": "string",
+        "default": "Default Lab Display Name"
+    },
 	"broadArea": {
 	    "type": "object",
 	    "properties": {