validate yaml setup

ShMcK · ShMcK · commit c0e7cd0c6c63 · 2020-06-07T10:20:47.000-07:00
Signed-off-by: shmck &lt;shawn.j.mckay@gmail.com&gt;
diff --git a/src/build.ts b/src/build.ts
@@ -74,6 +74,10 @@ async function build(args: string[]) {
   let config;
   try {
     config = yamlParser.load(_yaml);
+    // TODO: validate yaml
+    if (!config || !config.length) {
+      throw new Error("Invalid yaml file contents");
+    }
   } catch (e) {
     console.error("Error parsing yaml");
     console.error(e.message);
diff --git a/src/utils/commits.ts b/src/utils/commits.ts
@@ -2,7 +2,7 @@ import * as fs from "fs";
 import util from "util";
 import * as path from "path";
 import gitP, { SimpleGit } from "simple-git/promise";
-import { addToCommitOrder, validateCommitOrder } from "./commitOrder";
+import { validateCommitOrder } from "./validateCommits";
 
 const mkdir = util.promisify(fs.mkdir);
 const exists = util.promisify(fs.exists);
diff --git a/src/utils/parse.ts b/src/utils/parse.ts
@@ -106,7 +106,6 @@ export function parse(params: ParseParams): any {
 
   // add init commits
   if (params.commits.INIT && params.commits.INIT.length) {
-    console.log(JSON.stringify(parsed.config?.testRunner));
     // @ts-ignore
     parsed.config.testRunner.setup = {
       ...(parsed.config?.testRunner?.setup || {}),
diff --git a/src/utils/validateCommits.ts b/src/utils/validateCommits.ts
@@ -1,9 +1,5 @@
 // should flag commits that are out of order based on the previous commit
 // position is a string like 'INIT', 'L1', 'L1S1'
-export function addToCommitOrder(position: string) {
-  // add position to list
-}
-
 export function validateCommitOrder(positions: string[]): boolean {
   // loop over positions
   const errors: number[] = [];
@@ -12,7 +8,6 @@ export function validateCommitOrder(positions: string[]): boolean {
   positions.forEach((position: string, index: number) => {
     if (position === "INIT") {
       if (previous.level !== 0 && previous.step !== 0) {
-        console.log("ERROR HERE");
         errors.push(index);
       }
       current = { level: 0, step: 0 };
@@ -46,7 +41,7 @@ export function validateCommitOrder(positions: string[]): boolean {
     previous = current;
   });
 
-  if (errors.length) {
+  if (errors.length && process.env.NODE_ENV !== "test") {
     console.warn("Found commit positions out of order");
     positions.forEach((position, index) => {
       if (errors.includes(index)) {
diff --git a/src/utils/validateYaml.ts b/src/utils/validateYaml.ts
@@ -0,0 +1,3 @@
+export function validateYaml(yaml: string) {
+  return true;
+}
diff --git a/src/validate.ts b/src/validate.ts
@@ -1,23 +1,46 @@
 import * as path from "path";
 import * as fs from "fs";
 import util from "util";
+import * as yamlParser from "js-yaml";
+import { getArg } from "./utils/args";
 import gitP, { SimpleGit } from "simple-git/promise";
 import { getCommits, CommitLogObject } from "./utils/commits";
 
 const mkdir = util.promisify(fs.mkdir);
 const exists = util.promisify(fs.exists);
 const rmdir = util.promisify(fs.rmdir);
+const read = util.promisify(fs.readFile);
 
 async function validate(args: string[]) {
   // dir - default .
   const dir = !args.length || args[0].match(/^-/) ? "." : args[0];
-  console.warn("Not yet implemented. Coming soon");
-
   const localDir = path.join(process.cwd(), dir);
-  const codeBranch = "";
 
-  const commits = getCommits({ localDir, codeBranch });
+  // -y --yaml - default coderoad-config.yml
+  const options = {
+    yaml: getArg(args, { name: "yaml", alias: "y" }) || "coderoad.yaml";
+  }
+
+  const _yaml = await read(path.join(localDir, options.yaml), "utf8");
+
+  // parse yaml config
+  let config;
+  try {
+    config = yamlParser.load(_yaml)
+    // TODO: validate yaml
+    if (!config || !config.length) {
+      throw new Error('Invalid yaml file contents')
+    }
+  } catch (e) {
+    console.error("Error parsing yaml");
+    console.error(e.message);
+  }
+
+  const codeBranch: string = config.config.repo.branch;
+
   // VALIDATE SKELETON WITH COMMITS
+  const commits = getCommits({ localDir, codeBranch });
+
   // parse tutorial skeleton for order and commands
 
   // on error, warn missing level/step
diff --git a/tests/commitOrder.test.ts b/tests/commitOrder.test.ts
@@ -1,4 +1,4 @@
-import { validateCommitOrder } from "../src/utils/commitOrder";
+import { validateCommitOrder } from "../src/utils/validateCommits";
 
 describe("commitOrder", () => {
   it("should return true if order is valid", () => {
diff --git a/tests/yaml.test.ts b/tests/yaml.test.ts
@@ -0,0 +1,3 @@
+describe("yaml", () => {
+  it.todo("should parse a valid yaml file");
+});

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export function validateYaml(yaml: string) {`
	`2`	`+ return true;`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { validateCommitOrder } from "../src/utils/commitOrder";`
	`1`	`+import { validateCommitOrder } from "../src/utils/validateCommits";`
`2`	`2`
`3`	`3`	`describe("commitOrder", () => {`
`4`	`4`	`it("should return true if order is valid", () => {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+describe("yaml", () => {`
	`2`	`+ it.todo("should parse a valid yaml file");`
	`3`	`+});`