Merge pull request #116 from essentialkaos/develop

Version 0.3.3

.github/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,64 @@
+name: ❗ Bug Report
+description: File a bug report
+title: "[Bug]: "
+labels: ["issue • bug"]
+assignees:
+  - andyone
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        > [!IMPORTANT]  
+        > Before you open an issue, search GitHub Issues for a similar bug reports. If so, please add a 👍 reaction to the existing issue.
+
+  - type: textarea
+    attributes:
+      label: Verbose application info
+      description: Output of `scratch -vv` command
+      render: shell
+    validations:
+      required: true
+
+  - type: dropdown
+    id: version
+    attributes:
+      label: Install tools
+      description: How did you install this application
+      options:
+        - From Sources
+        - RPM Package
+        - Prebuilt Binary
+      default: 0
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: Short guide on how to reproduce this problem on our site
+      placeholder: |
+        1. [First Step]
+        2. [Second Step]
+        3. [and so on...]
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      description: What you expected to happen
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Actual behavior
+      description: What actually happened
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Additional info
+      description: Include gist of relevant config, logs, etc.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,14 @@
+blank_issues_enabled: false
+
+contact_links:
+  - name: Security Policies and Procedures
+    url: https://github.com/essentialkaos/.github/blob/master/SECURITY.md
+    about: Security procedures and general policies for all ESSENTIAL KAOS projects.
+
+  - name: Contributing Guidelines
+    url: https://github.com/essentialkaos/contributing-guidelines/blob/master/CONTRIBUTING.md
+    about: Contributing Guidelines for all ESSENTIAL KAOS projects
+
+  - name: Go Version Support Policy
+    url: https://github.com/essentialkaos/.github/blob/master/GO-VERSION-SUPPORT.md
+    about: Information about supported Go versions

.github/ISSUE_TEMPLATE/question.yml

@@ -0,0 +1,26 @@
+name: ❓ Question
+description: Question about application, configuration or code
+title: "[Question]: "
+labels: ["issue • question"]
+assignees:
+  - andyone
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        > [!IMPORTANT]  
+        > Before you open an issue, search GitHub Issues for a similar question. If so, please add a 👍 reaction to the existing issue.
+
+  - type: textarea
+    attributes:
+      label: Question
+      description: Detailed question
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Related version application info
+      description: Output of `scratch -vv` command
+      render: shell

.github/ISSUE_TEMPLATE/suggestion.yml

@@ -0,0 +1,43 @@
+name: ➕ Suggestion
+description: Suggest new feature or improvement
+title: "[Suggestion]: "
+labels: ["issue • suggestion"]
+assignees:
+  - andyone
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        > [!IMPORTANT]  
+        > Before you open an issue, search GitHub Issues for a similar feature requests. If so, please add a 👍 reaction to the existing issue.
+        >
+        > Opening a feature request kicks off a discussion. Requests may be closed if we're not actively planning to work on them.
+
+  - type: textarea
+    attributes:
+      label: Proposal
+      description: Description of the feature
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Current behavior
+      description: What currently happens
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Desired behavior
+      description: What you would like to happen
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Use case
+      description: Why is this important (helps with prioritizing requests)
+    validations:
+      required: true

.github/dependabot.yml

@@ -6,7 +6,7 @@ updates:
     target-branch: "develop"
     schedule:
       interval: "daily"
-      timezone: "Europe/London"
+      timezone: "Etc/UTC"
       time: "03:00"
     labels:
       - "PR • MAINTENANCE"
@@ -26,8 +26,8 @@ updates:
     target-branch: "develop"
     schedule:
       interval: "daily"
-      timezone: "Europe/London"
-      time: "04:00"
+      timezone: "Etc/UTC"
+      time: "03:00"
     labels:
       - "PR • MAINTENANCE"
     assignees:

.github/workflows/ci.yml

@@ -29,7 +29,7 @@ jobs:
 
     strategy:
       matrix:
-        go: [ '1.21.x', '1.22.x' ]
+        go: [ '1.22.x', '1.23.x' ]
 
     steps:
       - name: Checkout

Makefile

@@ -1,7 +1,7 @@
 ################################################################################
 
-# This Makefile generated by GoMakeGen 3.0.2 using next command:
-# gomakegen --mod .
+# This Makefile generated by GoMakeGen 3.2.1 using next command:
+# gomakegen --mod --cgo .
 #
 # More info: https://kaos.sh/gomakegen
 
@@ -11,7 +11,12 @@ ifdef VERBOSE ## Print verbose information (Flag)
 VERBOSE_FLAG = -v
 endif
 
-COMPAT ?= 1.19
+ifdef PROXY ## Force proxy usage for downloading dependencies (Flag)
+export GOPROXY=https://proxy.golang.org/cached-only,direct
+endif
+
+export CGO_ENABLED=1
+
 MAKEDIR = $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 GITREV ?= $(shell test -s $(MAKEDIR)/.git && git rev-parse --short HEAD)
 
@@ -107,8 +112,9 @@ help: ## Show this info
 	@echo -e '\n\033[1mVariables:\033[0m\n'
 	@grep -E '^ifdef [A-Z_]+ .*?## .*$$' $(abspath $(lastword $(MAKEFILE_LIST))) \
 		| sed 's/ifdef //' \
+		| sort -h \
 		| awk 'BEGIN {FS = " .*?## "}; {printf "  \033[32m%-11s\033[0m  %s\n", $$1, $$2}'
 	@echo -e ''
-	@echo -e '\033[90mGenerated by GoMakeGen 3.0.2\033[0m\n'
+	@echo -e '\033[90mGenerated by GoMakeGen 3.2.1\033[0m\n'
 
 ################################################################################

README.md

@@ -2,7 +2,6 @@
 
 <p align="center">
   <a href="https://kaos.sh/w/scratch/ci"><img src="https://kaos.sh/w/scratch/ci.svg" alt="GitHub Actions CI Status" /></a>
-  <a href="https://kaos.sh/b/scratch"><img src="https://kaos.sh/b/3b2ed0f2-1e39-4366-93f6-d955ca22ce3a.svg" alt="Codebeat badge" /></a>
   <a href="https://kaos.sh/w/scratch/codeql"><img src="https://kaos.sh/w/scratch/codeql.svg" alt="GitHub Actions CodeQL Status" /></a>
   <a href="#license"><img src=".github/images/license.svg"/></a>
 </p>
@@ -16,11 +15,11 @@
 ### Installation
 
 > [!IMPORTANT]
-> Before the first run you have to create a directory for your tempaltes. By default, all templates must be stored in the `~/.config/scratch` directory.
+> Before the first run you have to create a directory for your templates. By default, all templates must be stored in the `~/.config/scratch` directory.
 
 #### From sources
 
-To install the `scratch` from sources, make sure you have a working Go 1.19+ workspace (_[instructions](https://go.dev/doc/install)_), then:
+To install the `scratch` from sources, make sure you have a working [Go 1.22+](https://github.com/essentialkaos/.github/blob/master/GO-VERSION-SUPPORT.md) workspace (_[instructions](https://go.dev/doc/install)_), then:
 
 ```
 go install github.com/essentialkaos/scratch@latest

app/app.go

@@ -12,34 +12,34 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/essentialkaos/ek/v12/fmtc"
-	"github.com/essentialkaos/ek/v12/fmtutil"
-	"github.com/essentialkaos/ek/v12/fsutil"
-	"github.com/essentialkaos/ek/v12/lscolors"
-	"github.com/essentialkaos/ek/v12/options"
-	"github.com/essentialkaos/ek/v12/path"
-	"github.com/essentialkaos/ek/v12/pluralize"
-	"github.com/essentialkaos/ek/v12/sortutil"
-	"github.com/essentialkaos/ek/v12/support"
-	"github.com/essentialkaos/ek/v12/support/apps"
-	"github.com/essentialkaos/ek/v12/support/deps"
-	"github.com/essentialkaos/ek/v12/system"
-	"github.com/essentialkaos/ek/v12/terminal"
-	"github.com/essentialkaos/ek/v12/terminal/input"
-	"github.com/essentialkaos/ek/v12/terminal/tty"
-	"github.com/essentialkaos/ek/v12/usage"
-	"github.com/essentialkaos/ek/v12/usage/completion/bash"
-	"github.com/essentialkaos/ek/v12/usage/completion/fish"
-	"github.com/essentialkaos/ek/v12/usage/completion/zsh"
-	"github.com/essentialkaos/ek/v12/usage/man"
-	"github.com/essentialkaos/ek/v12/usage/update"
+	"github.com/essentialkaos/ek/v13/fmtc"
+	"github.com/essentialkaos/ek/v13/fmtutil"
+	"github.com/essentialkaos/ek/v13/fsutil"
+	"github.com/essentialkaos/ek/v13/lscolors"
+	"github.com/essentialkaos/ek/v13/options"
+	"github.com/essentialkaos/ek/v13/path"
+	"github.com/essentialkaos/ek/v13/pluralize"
+	"github.com/essentialkaos/ek/v13/sortutil"
+	"github.com/essentialkaos/ek/v13/support"
+	"github.com/essentialkaos/ek/v13/support/apps"
+	"github.com/essentialkaos/ek/v13/support/deps"
+	"github.com/essentialkaos/ek/v13/system"
+	"github.com/essentialkaos/ek/v13/terminal"
+	"github.com/essentialkaos/ek/v13/terminal/input"
+	"github.com/essentialkaos/ek/v13/terminal/tty"
+	"github.com/essentialkaos/ek/v13/usage"
+	"github.com/essentialkaos/ek/v13/usage/completion/bash"
+	"github.com/essentialkaos/ek/v13/usage/completion/fish"
+	"github.com/essentialkaos/ek/v13/usage/completion/zsh"
+	"github.com/essentialkaos/ek/v13/usage/man"
+	"github.com/essentialkaos/ek/v13/usage/update"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 const (
 	APP  = "scratch"
-	VER  = "0.3.2"
+	VER  = "0.3.3"
 	DESC = "Utility for generating blank files for apps and services"
 )
 

app/templates.go

@@ -15,11 +15,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/essentialkaos/ek/v12/fsutil"
-	"github.com/essentialkaos/ek/v12/path"
-	"github.com/essentialkaos/ek/v12/sortutil"
-	"github.com/essentialkaos/ek/v12/system"
-	"github.com/essentialkaos/ek/v12/timeutil"
+	"github.com/essentialkaos/ek/v13/fsutil"
+	"github.com/essentialkaos/ek/v13/path"
+	"github.com/essentialkaos/ek/v13/sortutil"
+	"github.com/essentialkaos/ek/v13/system"
+	"github.com/essentialkaos/ek/v13/timeutil"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

go.mod

@@ -1,11 +1,11 @@
 module github.com/essentialkaos/scratch
 
-go 1.18
+go 1.22.7
 
-require github.com/essentialkaos/ek/v12 v12.127.0
+require github.com/essentialkaos/ek/v13 v13.5.1
 
 require (
-	github.com/essentialkaos/depsy v1.3.0 // indirect
-	github.com/essentialkaos/go-linenoise/v3 v3.6.0 // indirect
-	golang.org/x/sys v0.21.0 // indirect
+	github.com/essentialkaos/depsy v1.3.1 // indirect
+	github.com/essentialkaos/go-linenoise/v3 v3.6.1 // indirect
+	golang.org/x/sys v0.25.0 // indirect
 )