Merges PR #39

Author: nxtcoder17

Runfile.yml

@@ -10,7 +10,7 @@ tasks:
     cmd: 
       - |+
         echo "building ..."
-        go build -o bin/run -ldflags="-s -w" -tags urfave_cli_no_docs ./cmd/run
+        go build -o bin/run-nightly -ldflags="-s -w" -tags urfave_cli_no_docs ./cmd/run
         echo "DONE"
 
   example:
@@ -38,12 +38,12 @@ tasks:
     cmd:
       - |+
         pattern_args=""
-        [ -n "$pattern" ] && pattern_args="-run '$pattern'"
+        [ -n "$pattern" ] && pattern_args="-run $pattern"
 
         testfmt_args=""
         [ "$only_failing" = "true" ] && testfmt_args="--hide successful-tests"
 
-        go test -json ./parser/... $pattern_args | gotestfmt $testfmt_args
+        go test -json ./pkg/runfile/... $pattern_args | gotestfmt $testfmt_args
 
   test:only-failing:
     cmd:

cmd/run/completions.go

@@ -6,13 +6,12 @@ import (
 	"io"
 	"log/slog"
 
-	"github.com/nxtcoder17/go.pkgs/log"
-	"github.com/nxtcoder17/runfile/parser"
-	"github.com/nxtcoder17/runfile/types"
+	"github.com/nxtcoder17/fastlog"
+	"github.com/nxtcoder17/runfile/pkg/runfile"
 )
 
 func generateShellCompletion(ctx context.Context, writer io.Writer, rfpath string) error {
-	runfile, err := parser.ParseRunfile(types.NewContext(ctx, log.New()), rfpath)
+	runfile, err := runfile.ParseFromFile(runfile.NewContext(ctx, fastlog.New()), rfpath)
 	if err != nil {
 		slog.Error("parsing, got", "err", err)
 		panic(err)

cmd/run/main.go

@@ -12,22 +12,13 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/nxtcoder17/go.pkgs/log"
-	"github.com/nxtcoder17/runfile/errors"
-	"github.com/nxtcoder17/runfile/runner"
-	"github.com/nxtcoder17/runfile/types"
-
-	"github.com/nxtcoder17/runfile/parser"
+	"github.com/nxtcoder17/fastlog"
+	"github.com/nxtcoder17/runfile/pkg/errors"
+	"github.com/nxtcoder17/runfile/pkg/runfile"
 	"github.com/urfave/cli/v3"
 )
 
-var Version string = fmt.Sprintf("nightly | %s", time.Now().Format(time.RFC3339))
-
-var runfileNames []string = []string{
-	"Runfile",
-	"Runfile.yml",
-	"Runfile.yaml",
-}
+var Version string
 
 //go:embed completions/run.fish
 var shellCompletionFISH string
@@ -42,6 +33,10 @@ var shellCompletionZSH string
 var shellCompletionPS string
 
 func main() {
+	if Version == "" {
+		Version = fmt.Sprintf("nightly | %s", time.Now().Format(time.RFC3339))
+	}
+
 	cmd := cli.Command{
 		Name:        "run",
 		Version:     Version,
@@ -190,9 +185,11 @@ func main() {
 				return fmt.Errorf("parallel and watch can't be set together")
 			}
 
-			logger := log.New(log.Options{
-				ShowCaller:    true,
-				ShowLogLevel:  true,
+			logger := fastlog.New(fastlog.Options{
+				Format:        fastlog.ConsoleFormat,
+				EnableColors:  true,
+				ShowCaller:    debug,
+				ShowTimestamp: false,
 				ShowDebugLogs: debug,
 			})
 
@@ -202,32 +199,22 @@ func main() {
 				return err
 			}
 
-			runfileCtx := types.NewContext(ctx, logger)
+			rctx := runfile.NewContext(ctx, logger)
 
-			rf, err2 := parser.ParseRunfile(runfileCtx, runfilePath)
-			if err2 != nil {
-				slog.Error("parsing runfile, got", "err", err2)
-				panic(err2)
+			rf, err := runfile.ParseFromFile(rctx, runfilePath)
+			if err != nil {
+				slog.Error("parsing runfile, got", "err", err)
+				panic(err)
 			}
 
-			if err := runner.Run(runfileCtx, rf, runner.RunArgs{
-				Tasks:             args,
+			if err := rf.Run(rctx, args, runfile.RunOption{
 				ExecuteInParallel: parallel,
 				Watch:             watch,
 				Debug:             debug,
 				KVs:               kv,
 			}); err != nil {
-				errm, ok := err.(*errors.Error)
-				slog.Debug("got", "err", err)
-				if ok {
-					if errm != nil {
-						// errm.Error()
-						// TODO: change it to a better logging
-						// slog.Error("got", "err", errm)
-						errm.Log()
-					}
-				} else {
-					slog.Error("got", "err", err)
+				if err2, ok := err.(*errors.Error); ok {
+					logger.Error(err2.Error(), err2.SlogAttrs()...)
 				}
 			}
 
@@ -260,6 +247,12 @@ func locateRunfile(c *cli.Command) (string, error) {
 
 		oldDir := ""
 
+		runfileNames := []string{
+			"Runfile",
+			"Runfile.yml",
+			"Runfile.yaml",
+		}
+
 		for oldDir != dir {
 			for _, fn := range runfileNames {
 				if _, err := os.Stat(filepath.Join(dir, fn)); err != nil {

errors/errors.go

@@ -1,16 +1,18 @@
 {
   description = "RunFile dev workspace";
-
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
   };
 
-  outputs = { self, nixpkgs, flake-utils }:
-    flake-utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = import nixpkgs { inherit system; };
-      in
-      {
+  outputs = {
+    self,
+    nixpkgs,
+    flake-utils,
+  }:
+    flake-utils.lib.eachDefaultSystem (
+      system: let
+        pkgs = import nixpkgs {inherit system;};
+      in {
         devShells.default = pkgs.mkShell {
           # hardeningDisable = [ "all" ];
 
@@ -36,5 +38,3 @@
       }
     );
 }
-
-

flake.nix

@@ -9,6 +9,7 @@ require (
 	github.com/charmbracelet/lipgloss v1.0.0
 	github.com/joho/godotenv v1.5.1
 	github.com/muesli/termenv v0.15.2
+	github.com/nxtcoder17/fastlog v0.0.0-20250702035423-1739653a5c24
 	github.com/nxtcoder17/fwatcher v1.2.2-0.20250318121757-bfc2065fa9f5
 	github.com/nxtcoder17/go.pkgs v0.0.0-20250216034729-39e2d2cd48da
 	github.com/urfave/cli/v3 v3.0.0-beta1

go.mod

@@ -37,6 +37,8 @@ github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6T
 github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
 github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
+github.com/nxtcoder17/fastlog v0.0.0-20250702035423-1739653a5c24 h1:oLLpFv1p7jRRrrsZzyf77pECLAMKrTxzHRSoHNRoELw=
+github.com/nxtcoder17/fastlog v0.0.0-20250702035423-1739653a5c24/go.mod h1:x6o+8WEHRGaWu9XEhSdTrjmDjKhVnKNXd/XZ56bNN/o=
 github.com/nxtcoder17/fwatcher v1.2.2-0.20250318121757-bfc2065fa9f5 h1:6BulIAQBv2FZqUFZcKtFEhc1vMOeOdeMS+S5d874FMY=
 github.com/nxtcoder17/fwatcher v1.2.2-0.20250318121757-bfc2065fa9f5/go.mod h1:SMwIdCpyi5fBygrkCX8hIIUeILzgoxJFaDSlhFBOWWQ=
 github.com/nxtcoder17/go.pkgs v0.0.0-20250216034729-39e2d2cd48da h1:Y6GILHFlrihVfDqDPQ98y2kdUeI0SQc8tnoXh2NbEIA=