Fix formatting and add missing error wrapping

Author: chapterjason

env/load_file.go

@@ -1,10 +1,11 @@
 package env
 
 import (
-	"github.com/joho/godotenv"
-	"github.com/pkg/errors"
 	"os"
 	"path/filepath"
+
+	"github.com/joho/godotenv"
+	"github.com/pkg/errors"
 )
 
 func loadFile(envMap map[string]string, directory string, filename string) error {

env/load_php_file.go

@@ -2,12 +2,13 @@ package env
 
 import (
 	"fmt"
-	"github.com/joho/godotenv"
-	"github.com/pkg/errors"
 	"io"
 	"os"
 	"os/exec"
 	"path/filepath"
+
+	"github.com/joho/godotenv"
+	"github.com/pkg/errors"
 )
 
 func loadPHPFile(envMap map[string]string, directory string, filename string) error {

git/root_directory.go

@@ -3,6 +3,8 @@ package git
 import (
 	"os/exec"
 	"path/filepath"
+
+	"github.com/pkg/errors"
 )
 
 // RootDirectory tries to find the git root directory from the given path.
@@ -12,7 +14,7 @@ func RootDirectory(startDir string) (string, error) {
 	out, err := cmd.Output()
 
 	if err != nil {
-		return "", err
+		return "", errors.Wrapf(err, "failed to read git root directory")
 	}
 
 	return string(filepath.Clean(string(out[:len(out)-1]))), nil

macro/check_requirements.go

@@ -1,10 +1,11 @@
 package macro
 
 import (
+	"path/filepath"
+
 	"github.com/SoureCode/kyx/project"
 	"github.com/SoureCode/kyx/shell"
 	"github.com/pkg/errors"
-	"path/filepath"
 )
 
 func CheckRequirements() {

macro/composer_dump_env.go

@@ -1,11 +1,12 @@
 package macro
 
 import (
+	"os"
+	"path/filepath"
+
 	"github.com/SoureCode/kyx/project"
 	"github.com/SoureCode/kyx/shell"
 	"github.com/pkg/errors"
-	"os"
-	"path/filepath"
 )
 
 func ComposerDumpEnv() {

macro/docker_compose_down.go

@@ -1,10 +1,11 @@
 package macro
 
 import (
+	"path/filepath"
+
 	"github.com/SoureCode/kyx/project"
 	"github.com/SoureCode/kyx/shell"
 	"github.com/pkg/errors"
-	"path/filepath"
 )
 
 func DockerComposeDown() {

macro/docker_compose_up.go

@@ -1,11 +1,12 @@
 package macro
 
 import (
+	"os"
+	"path/filepath"
+
 	"github.com/SoureCode/kyx/project"
 	"github.com/SoureCode/kyx/shell"
 	"github.com/pkg/errors"
-	"os"
-	"path/filepath"
 )
 
 func anyFileExists(filenames ...string) bool {

macro/wait_for_database.go

@@ -1,10 +1,11 @@
 package macro
 
 import (
+	"time"
+
 	"github.com/SoureCode/kyx/project"
 	"github.com/SoureCode/kyx/shell"
 	"github.com/pkg/errors"
-	"time"
 )
 
 func WaitForDatabase() {

main.go

@@ -2,14 +2,15 @@ package main
 
 import (
 	"fmt"
+	"os"
+	"slices"
+	"time"
+
 	"github.com/SoureCode/kyx/commands"
 	"github.com/SoureCode/kyx/tools"
 	"github.com/pkg/errors"
 	"github.com/symfony-cli/console"
 	"github.com/symfony-cli/dumper"
-	"os"
-	"slices"
-	"time"
 )
 
 var (

project/composer_json.go

@@ -3,6 +3,8 @@ package project
 import (
 	"encoding/json"
 	"os"
+
+	"github.com/pkg/errors"
 )
 
 type composerJson struct {
@@ -38,12 +40,12 @@ func loadComposerJson(path string) (*composerJson, error) {
 	file, err := os.ReadFile(path)
 
 	if err != nil {
-		return nil, err
+		return nil, errors.Wrap(err, "failed to read file")
 	}
 
 	var composerData composerJson
 	if err := json.Unmarshal(file, &composerData); err != nil {
-		return nil, err
+		return nil, errors.Wrap(err, "failed to unmarshal composer.json")
 	}
 
 	return &composerData, nil