feat: add new cli feature (update, exclude powerpacks) and persist co…

…nfig during init

.golangci.yaml

@@ -80,7 +80,7 @@ linters-settings:
   gocognit:
     # Minimal code complexity to report.
     # Default: 30 (but we recommend 10-20)
-    min-complexity: 30
+    min-complexity: 40
 
   gocritic:
     # Settings passed to gocritic.

.goreleaser.yaml

@@ -39,7 +39,7 @@ gomod:
 # https://goreleaser.com/customization/checksum
 
 checksum:
-  name_template: '{{ .ProjectName }}-{{ .Version }}-checksums.txt'
+  name_template: '{{ .ProjectName }}_{{ .Version }}-checksums.txt'
 
 # create a source tarball
 # https://goreleaser.com/customization/source/

.mockery.yaml

@@ -0,0 +1,10 @@
+filename: "mock_{{.InterfaceName}}.go"
+dir: "{{.InterfaceDir}}"
+mockname: "Mock{{.InterfaceName}}"
+outpkg: "{{.PackageName}}"
+inpackage: True
+all: True
+packages:
+  github.com/merlindorin/tk:
+    config:
+      recursive: True

.tk.yaml

@@ -0,0 +1,4 @@
+ignore_readme: false
+ignore_aqua: false
+ignore_taskfile: false
+excludes: []

.tk/default/Taskfile.yaml

@@ -17,8 +17,12 @@ tasks:
       Examples:
         - `task` will run all default tasks if you use default as prefix
         - `task {{.TASK}}` will explicitly run all default tasks
+      
+      Note:
+        You can add any extra to all default commands by using "--". For example `task -- -f` to force all update.
     vars:
       PATTERN: '{{.PATTERN | default .DEFAULT_DEFAULT_PATTERN}}'
 
     # this one-line is pretty scary
-    cmd: task -a --json | jq -c '[ (.tasks[] | select( .name | test({{.PATTERN | quote}})) | select( .name | index({{.TASK | quote}}) | not) ) | .name] | .[]' | xargs -n 1 -L1 -I'{}' sh -c 'task {} || exit 255'
+    cmds:
+      - cmd: task -a --json | jq -c '[ (.tasks[] | select( .name | test({{.PATTERN | quote}})) | select( .name | index({{.TASK | quote}}) | not) ) | .name] | .[]' | xargs -n 1 -L1 -I'{}' sh -c 'task {} {{.CLI_ARGS}} || exit 255'

.tk/git/Taskfile.yaml

@@ -28,9 +28,12 @@ tasks:
       Examples:
         - `task {{.TASK}}` generates the `.gitignore` file
     cmds:
-      - echo "${GITIGNORE_CONTENT}" > '{{.ROOT_DIR}}/.gitignore'
+      - echo "${GITIGNORE_CONTENT}" > '{{.GITIGNORE_FILE}}'
     vars:
       GITIGNORE_EXTRA: '{{.GITIGNORE_EXTRA | default .DEFAULT_GIT_GITIGNORE_EXTRA}}'
+      GITIGNORE_FILE: '{{.ROOT_DIR}}/.gitignore'
+    status:
+      - test -f '{{ .GITIGNORE_FILE }}'
     env:
       GITIGNORE_CONTENT: |
         # THIS FILE HAS BEEN GENERATED BY THE COMMAND `{{.TASK}}`; DO NOT EDIT;
@@ -399,7 +402,6 @@ tasks:
 
   install:
     desc: Install git pre-commit hook
-    run: once
     summary: |
       Install GIT pre-commit hook.
       This hook will stash everything that is untracked and execute all task
@@ -418,10 +420,12 @@ tasks:
     cmds:
       - if [ -f {{.PRE_COMMIT_FILE}} ]; then mv {{.PRE_COMMIT_FILE}} {{.PRE_COMMIT_FILE}}.old;fi;
       - echo "${PRE_COMMIT}" > {{.PRE_COMMIT_FILE}}
-      - chmod u+x {{.ROOT_DIR}}/.git/hooks/pre-commit
+      - chmod u+x {{.PRE_COMMIT_FILE}}
     vars:
       PATTERN: '{{.PATTERN | default .DEFAULT_GIT_PRE_COMMIT_PATTERN}}'
       PRE_COMMIT_FILE: '{{.ROOT_DIR}}/.git/hooks/pre-commit'
+    status:
+      - test -f '{{ .PRE_COMMIT_FILE }}'
     env:
       PRE_COMMIT: |
         #!/bin/bash

.tk/golangci/Taskfile.yaml

@@ -2,7 +2,7 @@ version: '3'
 
 vars:
   DEFAULT_GOLANGCI_BIN_NAME: '{{ .BIN_NAME | default "golangci-lint" }}'
-  DEFAULT_GOLANGCI_GITHUBACTION_FILENAME: '{{.ROOT_DIR}}/.github/workflows/golangci.yml'
+  DEFAULT_GOLANGCI_GITHUBACTION_FILENAME: 'golangci.yml'
   DEFAULT_GOLANGCI_CONFIG_FILENAME: '.golangci.yaml'
   DEFAULT_GOLANGCI_SOURCES: '{{ .DEFAULT_GO_SOURCES | default "./..." }}'
   DEFAULT_GOLANGCI_ARGS: ''
@@ -90,10 +90,12 @@ tasks:
       
       The generated file should be excluded from commits.
     vars:
-      GITHUBACTION_FILENAME: '{{.GITHUBACTION_FILENAME | default .DEFAULT_GOLANGCI_GITHUBACTION_FILENAME}}'
+      GITHUBACTION_FILENAME: '{{.ROOT_DIR}}/.github/workflows/{{.GITHUBACTION_FILENAME | default .DEFAULT_GOLANGCI_GITHUBACTION_FILENAME}}'
     cmds:
       - mkdir -p $(dirname "{{.GITHUBACTION_FILENAME}}")
       - echo "${GITHUBACTION_CONTENT}" > "{{.GITHUBACTION_FILENAME}}"
+    status:
+      - test -f '{{ .GITHUBACTION_FILENAME }}'
     env:
       GITHUBACTION_CONTENT: |
         # THIS FILE HAS BEEN GENERATED BY THE COMMAND `{{.TASK}}`; DO NOT EDIT;
@@ -157,9 +159,11 @@ tasks:
       
       The generated file should be excluded from commits.
     vars:
-      CONFIG_FILENAME: '{{.CONFIG_FILENAME | default .DEFAULT_GOLANGCI_CONFIG_FILENAME}}'
+      CONFIG_FILENAME: '{{.ROOT_DIR}}/{{.CONFIG_FILENAME | default .DEFAULT_GOLANGCI_CONFIG_FILENAME}}'
     cmds:
-      - echo "${CONFIG_CONTENT}" > "{{.ROOT_DIR}}/{{.CONFIG_FILENAME}}"
+      - echo "${CONFIG_CONTENT}" > "{{.CONFIG_FILENAME}}"
+    status:
+      - test -f '{{ .CONFIG_FILENAME }}'
     env:
       CONFIG_CONTENT: |
         # THIS FILE HAS BEEN GENERATED BY THE COMMAND `{{.TASK}}`; DO NOT EDIT;
@@ -244,7 +248,7 @@ tasks:
           gocognit:
             # Minimal code complexity to report.
             # Default: 30 (but we recommend 10-20)
-            min-complexity: 30
+            min-complexity: 40
 
           gocritic:
             # Settings passed to gocritic.

.tk/goreleaser/Taskfile.yaml

@@ -23,6 +23,7 @@ vars:
 tasks:
   default:
     cmds:
+      - task: docker
       - task: boilerplate
       - task: ci
       - task: install-script
@@ -36,6 +37,8 @@ tasks:
       BIN_NAME: '{{ .BIN_NAME | default .DEFAULT_GORELEASER_BIN_NAME }}'
     cmds:
       - echo "${INSTALL_SCRIPT_CONTENT}" > "{{.INSTALL_SCRIPT_FILENAME}}"
+    status:
+      - test -f '{{ .INSTALL_SCRIPT_FILENAME }}'
     env:
       INSTALL_SCRIPT_CONTENT: |
         #!/bin/sh
@@ -556,6 +559,28 @@ tasks:
                   args: release --clean
                 env:
                   GITHUB_TOKEN: ${{ "{{ secrets.GITHUB_TOKEN }}" }}
+  docker:
+    desc: Generate dockerfile for GoReleaser
+    summary: |
+      Generate Docker for GoReleaser.
+    vars:
+      NAME: '{{ .NAME | default .DEFAULT_GORELEASER_NAME }}'
+      DOCKER_CMD: '{{ .DOCKER_CMD | default .DEFAULT_GORELEASER_DOCKER_CMD }}'
+    cmds:
+      - echo "${DOCKERFILE_CONTENT}" > "Dockerfile"
+
+    status:
+      - test -f 'Dockerfile'
+    env:
+      DOCKERFILE_CONTENT: |
+        FROM scratch
+
+        COPY {{ .NAME }} /usr/bin/{{ .NAME }}
+
+        ENTRYPOINT [ "/usr/bin/{{ .NAME }}" ]
+
+        CMD {{ .DOCKER_CMD }}
+
   boilerplate:
     desc: Generate goreleaser configuration
     summary: |
@@ -564,9 +589,6 @@ tasks:
       Any modification can be overwriting in the future.
       
       The generated file should be excluded from commits.
-
-    status:
-      - 'test -f "{{.CONFIG_FILENAME}}"'
     vars:
       NAME: '{{ .NAME | default .DEFAULT_GORELEASER_NAME }}'
       DESCRIPTION: '{{ .DESCRIPTION | default .DEFAULT_GORELEASER_DESCRIPTION }}'
@@ -578,16 +600,10 @@ tasks:
       SOURCE: '{{ .SOURCE | default .DEFAULT_GORELEASER_SOURCE }}'
     cmds:
       - echo "${CONFIG_CONTENT}" > "{{.CONFIG_FILENAME}}"
-      - echo "${DOCKERFILE_CONTENT}" > "Dockerfile"
-    env:
-      DOCKERFILE_CONTENT: |
-        FROM scratch
-
-        COPY {{ .NAME }} /usr/bin/{{ .NAME }}
-
-        ENTRYPOINT [ "/usr/bin/{{ .NAME }}" ]
 
-        CMD {{ .DOCKER_CMD }}
+    status:
+      - test -f '{{ .CONFIG_FILENAME }}'
+    env:
       CONFIG_CONTENT: |
         # THIS FILE HAS BEEN GENERATED BY THE COMMAND `{{.TASK}}`; DO NOT EDIT;
         # See also: .github/workflows/release.yml

.tk/license/Taskfile.yaml

@@ -45,5 +45,9 @@ tasks:
       FILENAME: '{{.LICENSE_FILENAME | default .DEFAULT_LICENSE_FILENAME}}'
       YEAR: '{{.LICENSE_YEAR | default .DEFAULT_LICENSE_YEAR}}'
       PROJECT: '{{.LICENSE_PROJECT | default .DEFAULT_LICENSE_PROJECT}}'
+
+    status:
+      - test -f '{{ .FILENAME }}'
+
     cmds:
       - aqua exec license -n "{{.NAME}}" -y "{{.YEAR}}" {{if .PROJECT }}-p "{{.PROJECT}}"{{end}} -o {{.FILENAME}} {{.TYPE}}

.tk/markdownlint/Taskfile.yaml

@@ -10,8 +10,6 @@ tasks:
     cmd:
       task: lint
 
-
-
   pre-commit:
     cmd:
       task: default
@@ -70,9 +68,11 @@ tasks:
       The generated file should be excluded from commits.
 
     status:
-      - 'test -f "{{.CONFIG_FILENAME}}"'
+      - test -f "{{.CONFIG_FILENAME}}"
+
     vars:
       CONFIG_FILENAME: '{{.CONFIG_FILENAME | default .DEFAULT_MARKDOWNLINT_CONFIG_FILENAME}}'
+
     cmds:
       - echo "${CONFIG_CONTENT}" > "{{.CONFIG_FILENAME}}"
     env:

.tk/trufflehog/Taskfile.yaml

@@ -30,6 +30,9 @@ tasks:
     cmds:
       - mkdir -p $(dirname "{{.GITHUBACTION_FILENAME}}")
       - echo "${GITHUBACTION_CONTENT}" > "{{.GITHUBACTION_FILENAME}}"
+
+    status:
+      - test -f "{{.GITHUBACTION_FILENAME}}"
     env:
       GITHUBACTION_CONTENT: |
         # THIS FILE HAS BEEN GENERATED BY THE COMMAND `{{.TASK}}`; DO NOT EDIT;

README.md

@@ -4,7 +4,7 @@
 [![Test Status](https://github.com/merlindorin/tk/actions/workflows/goreleaser.yml/badge.svg)](https://github.com/merlindorin/tk/actions/workflows/goreleaser.yml)
 [![Test Status](https://github.com/merlindorin/tk/actions/workflows/trufflehog.yml/badge.svg)](https://github.com/merlindorin/tk/actions/workflows/trufflehog.yml)
 
-Welcome to `tk`, a command-line interface (CLI) designed to streamline the installation of tools for your projects.
+> Welcome to `tk`, a command-line interface (CLI) designed to streamline the installation of tools for your projects.
 Managed by [merlindorin](https://github.com/merlindorin), this project offers simplicity and efficiency by using
 powerpacks that bundle necessary configurations for Taskfile and Aquafiles.
 

cmd/tk/commands/init.go

@@ -2,31 +2,25 @@ package commands
 
 import (
 	"fmt"
-	"time"
 
+	"github.com/merlindorin/go-shared/pkg/cmd"
 	ps "github.com/merlindorin/tk/pkg/powerpacks"
-
 	"github.com/merlindorin/tk/powerpacks"
-
-	"github.com/vanyda-official/go-shared/pkg/cmd"
 )
 
 type InitCmd struct {
-	Name        string `arg:"" optional:"" help:"project name"`
-	Description string `help:"project description"`
+	Target string `help:"target where to init tk" default:"."`
+
+	Exclude []string `help:"exclude powerpacks" optional:""`
 
 	DisableEnvrc     bool `default:"false" help:"disable envrc"`
 	DisableTaskfiles bool `default:"false" help:"disable taskfiles"`
 	DisableAqua      bool `default:"false" help:"disable aqua"`
 	DisableReadme    bool
-
-	Force bool `default:"false" help:"overwrite existing files if already exist"`
-
-	Timeout time.Duration `default:"5s" help:"timeout for discovering (ns, ms, s & m)"`
 }
 
 func (i *InitCmd) Run(_ *cmd.Commons) error {
-	p, err := powerpacks.BuildPowerpackManager()
+	manager, err := powerpacks.BuildPowerpackManager()
 	if err != nil {
 		return fmt.Errorf("failed to create powerpacks: %w", err)
 	}
@@ -35,9 +29,10 @@ func (i *InitCmd) Run(_ *cmd.Commons) error {
 		IgnoreAqua:     i.DisableAqua,
 		IgnoreTaskfile: i.DisableTaskfiles,
 		IgnoreReadme:   i.DisableReadme,
+		Excludes:       i.Exclude,
 	}
 
-	if er := p.Write(".", opts); er != nil {
+	if er := manager.Write(".", opts); er != nil {
 		return fmt.Errorf("failed to write powerpacks: %w", er)
 	}
 

cmd/tk/commands/templates/Taskfile.yaml.gotmpl

@@ -7,5 +7,4 @@ includes:
 
 dotenv:
   - .env
-  - PROJECT
   - .env.default

cmd/tk/commands/update.go

@@ -0,0 +1,43 @@
+package commands
+
+import (
+	"bytes"
+	"fmt"
+	"os"
+	"path/filepath"
+
+	ps "github.com/merlindorin/tk/pkg/powerpacks"
+	"github.com/merlindorin/tk/powerpacks"
+	"gopkg.in/yaml.v3"
+
+	"github.com/merlindorin/go-shared/pkg/cmd"
+)
+
+type UpdateCmd struct {
+	Target string `help:"target where to init tk" default:"."`
+}
+
+func (i *UpdateCmd) Run(_ *cmd.Commons) error {
+	manager, err := powerpacks.BuildPowerpackManager()
+	if err != nil {
+		return fmt.Errorf("failed to create powerpacks: %w", err)
+	}
+
+	f, err := os.ReadFile(filepath.Join(i.Target, ".tk.yaml"))
+	if err != nil {
+		return fmt.Errorf("failed to read .tk.yaml: %w", err)
+	}
+
+	opts := ps.WriteOption{}
+
+	err = yaml.NewDecoder(bytes.NewBuffer(f)).Decode(&opts)
+	if err != nil {
+		return fmt.Errorf("failed to parse .tk.yaml: %w", err)
+	}
+
+	if er := manager.Write(".", opts); er != nil {
+		return fmt.Errorf("failed to updates powerpacks: %w", er)
+	}
+
+	return nil
+}

cmd/tk/global/tk.go

@@ -1,4 +1,4 @@
 package global
 
-type Taskfiles struct {
+type TK struct {
 }