Revert "Miscellaneous cleanup (#740)"

This reverts commit 029bd2d.

Author: yottahmd

.golangci.yml

@@ -70,10 +70,22 @@ linters-settings:
   goheader:
     values:
       const:
-        AUTHOR: Yota Hamada
+        AUTHOR: The Dagu Authors
     template: |-
       Copyright (C) {{ YEAR }} {{ AUTHOR }}
-      SPDX-License-Identifier: GPL-3.0-or-later
+
+      This program is free software: you can redistribute it and/or modify
+      it under the terms of the GNU General Public License as published by
+      the Free Software Foundation, either version 3 of the License, or
+      (at your option) any later version.
+
+      This program is distributed in the hope that it will be useful,
+      but WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+      GNU General Public License for more details.
+
+      You should have received a copy of the GNU General Public License
+      along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 run:
   allow-parallel-runners: true

.goreleaser.yaml

@@ -6,7 +6,7 @@ before:
     # You may remove this if you don't use go modules.
     - go mod tidy
 builds:
-  - dir: ./cmd
+  - dir: .
     env:
       - CGO_ENABLED=0
     goos:
@@ -35,7 +35,7 @@ brews:
       name: homebrew-tap
     directory: Formula
     homepage: "https://github.com/dagu-org/dagu"
-    description: "A No-code workflow engine that runs DAGs defined in a simple YAML format"
+    description: "A No-code workflow executor that runs DAGs defined in a simple YAML format"
     license: "GNU General Public License v3.0"
     custom_block: |
       service do
@@ -50,7 +50,7 @@ brews:
       name: homebrew-brew
     directory: Formula
     homepage: "https://github.com/dagu-org/dagu"
-    description: "A No-code workflow engine that runs DAGs defined in a simple YAML format"
+    description: "A No-code workflow executor that runs DAGs defined in a simple YAML format"
     license: "GNU General Public License v3.0"
     custom_block: |
       service do

.vscode/settings.json

@@ -5,9 +5,6 @@
         "editor.formatOnSave": true,
         "editor.defaultFormatter": "golang.go"
     },
-    "[markdown]": {
-        "editor.formatOnSave": false
-    },
     "editor.rulers": [
         80
     ],

Dockerfile

@@ -23,7 +23,7 @@ COPY . .
 RUN go mod download && rm -rf frontend/assets
 COPY --from=ui-builder /app/dist/ ./internal/frontend/assets/
 
-RUN GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags="${LDFLAGS}" -o ./bin/dagu ./cmd
+RUN GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags="${LDFLAGS}" -o ./bin/dagu .
 
 # Stage 3: Final Image
 FROM --platform=$TARGETPLATFORM alpine:latest

LICENSE.md

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2024  Yota Hamada
+    Copyright (C) <year>  <name of author>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    <program>  Copyright (C) 2024 Yota Hamada
+    <program>  Copyright (C) <year>  <name of author>
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

Makefile

@@ -83,7 +83,7 @@ OPENSSL_CONF=${CONFIG_DIR}/openssl.local.conf
 # run starts the frontend server and the scheduler.
 run: ${FE_BUNDLE_JS}
 	@echo "${COLOR_GREEN}Starting the frontend server and the scheduler...${COLOR_RESET}"
-	@go run ./cmd start-all
+	@go run . start-all
 
 # server build the binary and start the server.
 run-server: golangci-lint build-bin
@@ -105,7 +105,7 @@ run-server-https: ${SERVER_CERT_FILE} ${SERVER_KEY_FILE}
 	@echo "${COLOR_GREEN}Starting the server with HTTPS...${COLOR_RESET}"
 	@DAGU_CERT_FILE=${SERVER_CERT_FILE} \
 		DAGU_KEY_FILE=${SERVER_KEY_FILE} \
-		go run ./cmd start-all
+		go run . start-all
 
 # test runs all tests.
 test: build-bin
@@ -189,7 +189,7 @@ addlicense:
 		-ignore "**/*.yaml" \
 		-ignore "**/filenotify/*" \
 		-ignore "**/testdata/**" \
-		-c "Yota Hamada" \
+		-c "The Dagu Authors" \
 		-f scripts/header.txt \
 		.
 
@@ -201,7 +201,7 @@ addlicense:
 build-bin:
 	@echo "${COLOR_GREEN}Building the binary...${COLOR_RESET}"
 	@mkdir -p ${BIN_DIR}
-	@go build -ldflags="$(LDFLAGS)" -o ${BIN_DIR}/${APP_NAME} ./cmd
+	@go build -ldflags="$(LDFLAGS)" -o ${BIN_DIR}/${APP_NAME} .
 
 # build-ui builds the frontend codes.
 build-ui:

cmd/common.go

@@ -1,21 +1,32 @@
-// Copyright (C) 2024 Yota Hamada
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-package main
+// Copyright (C) 2024 The Dagu Authors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+package cmd
 
 import (
-	"context"
 	"path/filepath"
 	"testing"
 	"time"
 
 	"github.com/dagu-org/dagu/internal/config"
-	"github.com/dagu-org/dagu/internal/digraph"
-	"github.com/dagu-org/dagu/internal/fileutil"
+	"github.com/dagu-org/dagu/internal/dag"
 	"github.com/dagu-org/dagu/internal/persistence"
 
 	"github.com/dagu-org/dagu/internal/client"
-	"github.com/dagu-org/dagu/internal/digraph/scheduler"
+	"github.com/dagu-org/dagu/internal/dag/scheduler"
+	"github.com/dagu-org/dagu/internal/util"
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/require"
 )
@@ -95,7 +106,7 @@ func withSpool(t *testing.T, testFunction func()) string {
 
 func testDAGFile(name string) string {
 	return filepath.Join(
-		filepath.Join(fileutil.MustGetwd(), "testdata"),
+		filepath.Join(util.MustGetwd(), "testdata"),
 		name,
 	)
 }
@@ -112,12 +123,11 @@ func testStatusEventual(t *testing.T, e client.Client, dagFile string, expected
 	cfg, err := config.Load()
 	require.NoError(t, err)
 
-	dag, err := digraph.Load(context.Background(), cfg.BaseConfig, dagFile, "")
+	workflow, err := dag.Load(cfg.BaseConfig, dagFile, "")
 	require.NoError(t, err)
 
-	ctx := context.Background()
 	require.Eventually(t, func() bool {
-		status, err := e.GetCurrentStatus(ctx, dag)
+		status, err := e.GetCurrentStatus(workflow)
 		require.NoError(t, err)
 		return expected == status.Status
 	}, waitForStatusTimeout, tick)
@@ -133,7 +143,7 @@ func testLastStatusEventual(
 	t.Helper()
 
 	require.Eventually(t, func() bool {
-		status := hs.ReadStatusRecent(context.Background(), dg, 1)
+		status := hs.ReadStatusRecent(dg, 1)
 		if len(status) < 1 {
 			return false
 		}