add: mdtkconfig nest_max_depth, bugfix: stdin does not work

Author: m-YoC

Taskfile.md

@@ -32,15 +32,22 @@ git tag
 git push origin $t
 ~~~
 
+~~~bash task:git:rm-git-tag -- remove git tag & push to GitHub
+#args> t:tag
+git tag --delete $t
+git push origin :$t
+~~~
+
 ## Compress to .tar.gz and Decompress
 
 ~~~bash task:tar.gz:compress -- Compress binary files
 cd sources
 source ./mdtk/version.txt
-tar -zcvf ../mdtk_bin_v${VERSION}.tar.gz ./mdtk_bin 
+tar -zcvf ../mdtk_bin_v${VERSION}_amd64.tar.gz ./mdtk_bin/linux_amd64
+tar -zcvf ../mdtk_bin_v${VERSION}_arm64.tar.gz ./mdtk_bin/linux_arm64
 ~~~
 ~~~bash task:tar.gz:decompress -- Decompress binary files
-echo 'run command: tar -zxvf ./mdtk_bin_VERSION.tar.gz'
+echo 'run command: tar -zxvf ./mdtk_bin_VERSION_ARCH.tar.gz'
 ~~~
 
 ## Install Guide

memo/TODO.md renamed to memo_ja/TODO.md

@@ -64,4 +64,18 @@
 - v0.5.1以降
     - [x] execの出力がストリーム出力に対応していなかったので修正
         - 全部終わってから書き出していた
-        
+- v0.5.2以降
+    - [ ] 属性(`attribute`)をつけれるようにする
+        - `~~~sh task::t -- description`
+            - `description = [attribute] xxxxxxx`
+            - descriptionの一部として扱う
+            - descriptionの最初に記述する
+            - 当然無くてもいい
+            - タスクヘルプの解析時に属性があるかを解析する
+        - `hidden`属性をつけていたら公開タスクでもタスクヘルプで見えないようにする
+            - group名を非公開に変えてしまうと他のタスクからアクセスできなくなる可能性があるため
+            - ただの非公開扱いなので`-a`をつけたら見える
+    - [x] mdtkconfigにnestsizeを指定する項目を増やす
+    - [x] tar.gzの作成をamd64とarm64で別にする
+    - [x] 標準入力を受け付けなかったバグを修正
+- v0.5.3以降

memo/plan.md renamed to memo_ja/plan.md

@@ -1,10 +1,12 @@
 # shell to be used
-shell: bash
+shell: /bin/bash
 script_head_set: set -euo pipefail
 
 # List of languages that can be written at beginning of fenced code block
 acceptable_langs: sh shell bash zsh
 
+nest_max_depth: 30
+
 # Settings of pager
 pager: less -R
 pager_min_limit: 30

sources/.mdtkconfig

@@ -12,6 +12,7 @@ install: ## mdtk install (test)
 	cd mdtk && CGO_ENABLED=0 go install -ldflags '-s -w' -trimpath mdtk.go
 test:
 	@cd mdtk && go test ./...
+
 
 
 cross-compile: ## cross compile

sources/Makefile

@@ -6,11 +6,14 @@ embed: 1
 
 ## Base Test
 
-```bash task::hello_world
+```bash task::hello_world  -- aaa
 #desc> hello world
 #desc> test sample
 THIS=mdtk
 echo "Hello $THIS World!"
+read num
+echo $num
+echo ion
 ```
 
 ```bash task::test -- mdtk first test 日本語のテキストサンプルです

sources/Taskfile.md

@@ -5,6 +5,9 @@ script_head_set: set -euo pipefail
 # List of languages that can be written at beginning of fenced code block
 acceptable_langs: sh shell bash zsh
 
+# Maximum depth at which tasks can be deployed with embedded comment
+nest_max_depth: 20
+
 # Settings of pager
 pager: less -R
 pager_min_limit: 30

sources/mdtk/config/default_config.txt

@@ -21,6 +21,7 @@ type cfg struct {
 	Shell string
 	ScriptHeadSet string
 	LangAlias []string
+	NestMaxDepth uint
 	Pager []string
 	PagerMinLimit uint
 }
@@ -86,6 +87,12 @@ func setConfig(data []string) error {
 			} else {
 				Config.LangAlias = s
 			}
+		case "nest_max_depth":
+			if vv, err := strconv.ParseUint(strings.TrimSpace(v), 10, 64); err != nil {
+				return err
+			} else {
+				Config.NestMaxDepth = uint(vv)
+			}
 		case "pager":
 			if s, err := parse.LexArgString(v); err != nil {
 				return err

sources/mdtk/config/readwrite.go

@@ -15,29 +15,19 @@ func GetShHead() string {
 	return config.Config.ScriptHeadSet
 }
 
-func ToExecCode(code string, eos string) string {
-	return "cat - << '" + eos + "' | " + GetShell() + "\n" + GetShHead() + "\n" + code + "\n" + eos
-}
-
 func Run(code string, quiet_mode bool) {
-	execcode := ToExecCode(code, "EOS")
-	// fmt.Println(execcode)
+	cmd := exec.Command(GetShell(), "-c", GetShHead() + "\n" + code)
 
-	cmd := exec.Command(GetShell(), "-c", execcode)
 	if !quiet_mode {
 		cmd.Stdout = os.Stdout
 	}
+	cmd.Stdin = os.Stdin
 	cmd.Stderr = os.Stderr
 
-	err := cmd.Run()
-
-	if err != nil {	
+	if err := cmd.Run(); err != nil {	
 		errtext := "mdtk: Command exec error."
 		fmt.Println(errtext, "Error command was run in", os.Args)
 		os.Exit(1)
 	}
-
-	// 実行したコマンドの結果を出力
-	// fmt.Print(string(out))
 }
 

sources/mdtk/exec/exec.go

@@ -14,13 +14,16 @@ import (
 	"mdtk/cache"
 	"mdtk/config"
 	"os"
+	"strconv"
 	_ "embed"
 )
 
 func GetFlag () parse.Flag {
+	nestsizestr := strconv.FormatUint(uint64(config.Config.NestMaxDepth), 10)
+
 	flags := parse.Flag{}
 	flags.Set("--file", []string{"-f"}).SetHasValue("").SetDescription("Select a task file.")
-	flags.Set("--nest", []string{"-n"}).SetHasValue("20").SetDescription("Set the nest maximum times of embedded comment (embed/task).\nDefault is 20.")
+	flags.Set("--nest", []string{"-n"}).SetHasValue(nestsizestr).SetDescription("Set the nest maximum depth of embedded comment (embed/task).\nDefault is " + nestsizestr + ".")
 	flags.Set("--quiet", []string{"-q"}).SetDescription("Task output is not sent to standard output.")
 	flags.Set("--all-task", []string{"-a"}).SetDescription("Can select private groups at the command.\nOr show all tasks that include private groups at task help.")
 	flags.Set("--script", []string{"-s"}).SetDescription("Display run-script.\n(= shebang + '" + exec.GetShHead() + "' + expanded-script)\nIf --debug option is not set, do not run.")
@@ -55,9 +58,20 @@ func main() {
 	task_args := args.ToArgs(task_args_strarr...)
 
 	if fd := flags.GetData("--file"); fd.Exist {
-		config.ReadConfig(string(path.Path(fd.Value).Dir()))
+		if err := config.ReadConfig(string(path.Path(fd.Value).Dir())); err != nil {
+			fmt.Print(err)
+			os.Exit(1)
+		}
 	} else {
-		config.ReadConfig("")
+		if err := config.ReadConfig(""); err != nil {
+			fmt.Print(err)
+			os.Exit(1)
+		}
+	}
+
+	nestsize := config.Config.NestMaxDepth
+	if fd := flags.GetData("--nest"); fd.Exist {
+		nestsize = uint(fd.ValueUint())
 	}
 
 	// show command/md help
@@ -88,7 +102,7 @@ func main() {
 
 	// make lib
 	if fd := flags.GetData("--make-library"); fd.Exist {
-		cache.WriteLib(tds, filename.Dir(), fd.Value, int(flags.GetData("--nest").ValueUint()))		
+		cache.WriteLib(tds, filename.Dir(), fd.Value, int(nestsize))		
 		return
 	}
 
@@ -110,7 +124,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	code := tds.GetTaskStart(gtname, task_args, int(flags.GetData("--nest").ValueUint()))
+	code := tds.GetTaskStart(gtname, task_args, int(nestsize))
 
 	if checkOptionsAndWriteScriptToStdout(code, flags) {
 		return