Fix: behavior of magic command (#23)

Fix: behavior of magic command

Author: relastle

src/aop.go

@@ -11,7 +11,10 @@ import (
 // a started time.
 func MeasureElapsedTime(start time.Time, name string) {
 	logPath := os.ExpandEnv(defaultLogPath)
-	os.MkdirAll(path.Dir(logPath), os.ModePerm)
+	err := os.MkdirAll(path.Dir(logPath), os.ModePerm)
+	if err != nil {
+		panic(err)
+	}
 	f, err := os.OpenFile(logPath, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
 	if err != nil {
 		log.Fatalf("error opening file: %v", err)

src/out.go

@@ -132,15 +132,19 @@ func (out *Out) expandAllMagics() error {
 		if !strings.HasPrefix(cg.Stmt, "%") {
 			continue
 		}
-		snippetRelPath := strings.Replace(cg.Stmt, "%", "", -1)
+		startIndex := strings.Index(cg.Stmt, "%") + 1      // inclusive
+		length := strings.Index(cg.Stmt[startIndex:], "%") // exclusive
+		snippetRelPath := cg.Stmt[startIndex : startIndex+length]
 		snippetFileToApply, err := getToApply(snippetFiles, snippetRelPath)
 		if err != nil {
 			return err
 		}
 
-		cg.Stmt = fmt.Sprintf(
-			"cat %v | taggo -q '0:yellow' -d ' '",
-			snippetFileToApply.Path,
+		cg.Stmt = strings.Replace(
+			cg.Stmt,
+			"%"+snippetRelPath+"%",
+			fmt.Sprintf("cat %s", snippetFileToApply.Path),
+			-1,
 		)
 	}
 	return nil

src/rule.go

@@ -79,12 +79,14 @@ func GetAllRuleFiles() []*RuleFile {
 
 	res := []*RuleFile{}
 	for _, ruleRoot := range ruleRoots {
+		// expand environment variable
+		ruleRoot = os.ExpandEnv(ruleRoot)
 		if ruleRoot == "" {
 			continue
 		}
 		globPattern := fmt.Sprintf(
 			`%v/**/*%v`,
-			os.ExpandEnv(ruleRoot),
+			ruleRoot,
 			pmyRuleSuffixCommon,
 		)
 		matches, err := zglob.Glob(globPattern)

src/snippets.go

@@ -2,6 +2,7 @@ package pmy
 
 import (
 	"fmt"
+	"log"
 	"os"
 	"path"
 	"path/filepath"
@@ -36,12 +37,14 @@ func GetAllSnippetFiles() []*SnippetFile {
 
 	res := []*SnippetFile{}
 	for _, snippetRoot := range snippetRoots {
+		// expand environment variable
+		snippetRoot = os.ExpandEnv(snippetRoot)
 		if snippetRoot == "" {
 			continue
 		}
 		globPattern := fmt.Sprintf(
 			`%v/**/*%v`,
-			os.ExpandEnv(snippetRoot),
+			snippetRoot,
 			pmySnippetSuffix,
 		)
 		matches, err := zglob.Glob(globPattern)
@@ -51,6 +54,7 @@ func GetAllSnippetFiles() []*SnippetFile {
 		for _, snippetPath := range matches {
 			relpath, err := filepath.Rel(snippetRoot, snippetPath)
 			if err != nil {
+				log.Fatal(err)
 				relpath = ""
 			}
 			res = append(

test/rules/pmy_rules.json

@@ -28,7 +28,7 @@
     "cmdGroups": [
       {
         "tag": "",
-        "stmt":  "%magic",
+        "stmt":  "%magic%",
         "after": "awk '{print $1}'"
       }
     ],