Change to skipPrompts and fix yaml parser

stateful · Oct 19, 2023 · 3ba24d4 · 3ba24d4
1 parent d84a4dd
commit 3ba24d4
Show file tree

Hide file tree

Showing 10 changed files with 83 additions and 60 deletions.
diff --git a/examples/frontmatter/skipenv/DISABLED.md → examples/frontmatter/skipPrompts/DISABLED.md b/examples/frontmatter/skipenv/DISABLED.md → examples/frontmatter/skipPrompts/DISABLED.md
@@ -1,5 +1,5 @@
 ---
-skipenv: false
+skipPrompts: false
 ---
 
 ```sh

diff --git a/examples/frontmatter/skipenv/ENABLED.md → examples/frontmatter/skipPrompts/ENABLED.md b/examples/frontmatter/skipenv/ENABLED.md → examples/frontmatter/skipPrompts/ENABLED.md
@@ -1,5 +1,5 @@
 ---
-skipenv: true
+skipPrompts: true
 ---
 
 ```sh

diff --git a/examples/frontmatter/skipenv/NONE.md → examples/frontmatter/skipPrompts/NONE.md b/examples/frontmatter/skipenv/NONE.md → examples/frontmatter/skipPrompts/NONE.md
diff --git a/internal/api/runme/parser/v1/parser.proto b/internal/api/runme/parser/v1/parser.proto
@@ -32,7 +32,7 @@ message Cell {
 message Frontmatter {
   string shell = 1;
   string cwd = 2;
-  bool skip_env = 3;
+  bool skip_prompts = 3;
 }
 
 message DeserializeRequest {

diff --git a/internal/document/frontmatter.go b/internal/document/frontmatter.go
@@ -11,9 +11,9 @@ import (
 )
 
 type Frontmatter struct {
-	Shell   string
-	Cwd     string
-	SkipEnv bool
+	Shell       string
+	Cwd         string
+	SkipPrompts bool `yaml:"skipPrompts,omitempty"`
 }
 
 type FrontmatterParseInfo struct {
@@ -69,8 +69,8 @@ func ParseFrontmatter(raw string) (f Frontmatter, info FrontmatterParseInfo) {
 
 func (fmtr Frontmatter) ToParser() *parserv1.Frontmatter {
 	return &parserv1.Frontmatter{
-		Shell:   fmtr.Shell,
-		Cwd:     fmtr.Cwd,
-		SkipEnv: fmtr.SkipEnv,
+		Shell:       fmtr.Shell,
+		Cwd:         fmtr.Cwd,
+		SkipPrompts: fmtr.SkipPrompts,
 	}
 }
diff --git a/internal/gen/proto/go/runme/parser/v1/parser.pb.go b/internal/gen/proto/go/runme/parser/v1/parser.pb.go
diff --git a/internal/gen/proto/ts/runme/parser/v1/parser_pb.d.ts b/internal/gen/proto/ts/runme/parser/v1/parser_pb.d.ts
@@ -76,9 +76,9 @@ export interface Frontmatter {
      */
     cwd: string;
     /**
-     * @generated from protobuf field: bool skip_env = 3;
+     * @generated from protobuf field: bool skip_prompts = 3;
      */
-    skipEnv: boolean;
+    skipPrompts: boolean;
 }
 /**
  * @generated from protobuf message runme.parser.v1.DeserializeRequest

diff --git a/internal/gen/proto/ts/runme/parser/v1/parser_pb.js b/internal/gen/proto/ts/runme/parser/v1/parser_pb.js
@@ -77,7 +77,7 @@ class Frontmatter$Type extends MessageType {
         super("runme.parser.v1.Frontmatter", [
             { no: 1, name: "shell", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
             { no: 2, name: "cwd", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 3, name: "skip_env", kind: "scalar", T: 8 /*ScalarType.BOOL*/ }
+            { no: 3, name: "skip_prompts", kind: "scalar", T: 8 /*ScalarType.BOOL*/ }
         ]);
     }
 }

diff --git a/internal/gen/proto/ts/runme/parser/v1/parser_pb.ts b/internal/gen/proto/ts/runme/parser/v1/parser_pb.ts
@@ -200,9 +200,9 @@ export class Frontmatter extends Message<Frontmatter> {
   cwd = "";
 
   /**
-   * @generated from field: bool skip_env = 3;
+   * @generated from field: bool skip_prompts = 3;
    */
-  skipEnv = false;
+  skipPrompts = false;
 
   constructor(data?: PartialMessage<Frontmatter>) {
     super();
@@ -214,7 +214,7 @@ export class Frontmatter extends Message<Frontmatter> {
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
     { no: 1, name: "shell", kind: "scalar", T: 9 /* ScalarType.STRING */ },
     { no: 2, name: "cwd", kind: "scalar", T: 9 /* ScalarType.STRING */ },
-    { no: 3, name: "skip_env", kind: "scalar", T: 8 /* ScalarType.BOOL */ },
+    { no: 3, name: "skip_prompts", kind: "scalar", T: 8 /* ScalarType.BOOL */ },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): Frontmatter {

diff --git a/pkg/project/project_test.go b/pkg/project/project_test.go
@@ -296,6 +296,29 @@ func Test_codeBlockFrontmatter(t *testing.T) {
 	assert.Equal(t, taskMemo["ZSH.md"].GetFrontmatter().Shell, "zsh")
 }
 
+func Test_codeBlockSkipPromptsFrontmatter(t *testing.T) {
+	cwd, err := os.Getwd()
+	require.NoError(t, err)
+
+	proj, err := NewDirectoryProject(filepath.Join(cwd, "../../", "examples", "frontmatter", "skipPrompts"), false, true, true, []string{})
+	require.NoError(t, err)
+
+	tasks, err := LoadProjectTasks(proj)
+	require.NoError(t, err)
+
+	t.Log(tasks)
+
+	taskMemo := make(map[string]FileCodeBlock)
+
+	for _, task := range tasks {
+		taskMemo[filepath.Base(task.GetFile())] = task
+	}
+
+	assert.Equal(t, taskMemo["DISABLED.md"].GetFrontmatter().SkipPrompts, false)
+	assert.Equal(t, taskMemo["ENABLED.md"].GetFrontmatter().SkipPrompts, true)
+	assert.Equal(t, taskMemo["NONE.md"].GetFrontmatter().SkipPrompts, false)
+}
+
 func projectDir() billy.Filesystem {
 	_, b, _, _ := runtime.Caller(0)
 	root := filepath.Join(