refactor: clean up code (#25)

* refactor: remove unnecessary packages

* fix: list sizing on toggle

* refactor: entry.Model to entry.Entry for Gorm

* refactor: remove unused vars

* feat: remove final render

* fix: fix render on quit

* chore: add goreleaser

* refactor: remove unused selectProjectCmd

* chore: update dependencies

Author: bashbunni

.gitignore

@@ -4,3 +4,5 @@ bin/
 *.md
 *.pdf
 debug.log
+
+dist/

.goreleaser.yaml

@@ -0,0 +1,37 @@
+# This is an example .goreleaser.yml file with some sensible defaults.
+# Make sure to check the documentation at https://goreleaser.com
+before:
+  hooks:
+    # You may remove this if you don't use go modules.
+    - go mod tidy
+    # you may remove this if you don't need go generate
+    - go generate ./...
+builds:
+  - env:
+      # go-sqlite3 requires cgo
+      - CGO_ENABLED=1
+    goos:
+      - linux
+      - windows
+      - darwin
+archives:
+  - replacements:
+      darwin: Darwin
+      linux: Linux
+      windows: Windows
+      386: i386
+      amd64: x86_64
+checksum:
+  name_template: 'checksums.txt'
+snapshot:
+  name_template: "{{ incpatch .Version }}-next"
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - '^docs:'
+      - '^test:'
+
+# modelines, feel free to remove those if you don't want/use them:
+# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
+# vim: set ts=2 sw=2 tw=0 fo=cnqoj

entry/entry.go

@@ -1,7 +1,6 @@
 package entry
 
 import (
-	"github.com/pkg/errors"
 	"gorm.io/gorm"
 )
 
@@ -28,29 +27,26 @@ type GormRepository struct {
 // DeleteEntryByID delete an entry by its ID
 func (g *GormRepository) DeleteEntryByID(entryID uint) error {
 	result := g.DB.Delete(&Entry{}, entryID)
-	resultErr := result.Error
-	if resultErr != nil {
-		return errors.Wrap(resultErr, cannotDeleteEntry)
-	}
-	return nil
+	return result.Error
 }
 
+// TODO: unused
 // DeleteEntries delete all entries for a given project
 func (g *GormRepository) DeleteEntries(projectID uint) error {
 	result := g.DB.Where("project_id = ?", projectID).Delete(&Entry{})
-	return errors.Wrap(result.Error, cannotDeleteEntry)
+	return result.Error
 }
 
 // GetEntriesByProjectID get all entries for a given project
 func (g *GormRepository) GetEntriesByProjectID(projectID uint) ([]Entry, error) {
 	var Entries []Entry
 	result := g.DB.Where("project_id = ?", projectID).Find(&Entries)
-	return Entries, errors.Wrap(result.Error, cannotFindProject)
+	return Entries, result.Error
 }
 
 // CreateEntry create a new entry in the database
 func (g *GormRepository) CreateEntry(message []byte, projectID uint) error {
 	entry := Entry{Message: string(message[:]), ProjectID: projectID}
 	result := g.DB.Create(&entry)
-	return errors.Wrap(result.Error, cannotCreateEntry)
+	return result.Error
 }

entry/entry_output.go

@@ -4,8 +4,6 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
-
-	"github.com/pkg/errors"
 )
 
 const divider = "---"
@@ -24,10 +22,11 @@ func FormatEntry(entry Entry) string {
 	return fmt.Sprintf("ID: %d\nCreated: %s\nMessage:\n\n %s\n %s\n", entry.ID, entry.CreatedAt.Format("2006-01-02"), entry.Message, divider)
 }
 
-func ReverseEntries(entries []Entry) []Entry {
+// ReverseList reverse the provided list
+func ReverseList(list []Entry) []Entry {
 	var output []Entry
-	for i := len(entries) - 1; i > 0; i-- {
-		output = append(output, entries[i])
+	for i := len(list) - 1; i >= 0; i-- {
+		output = append(output, list[i])
 	}
 	return output
 }
@@ -36,15 +35,15 @@ func ReverseEntries(entries []Entry) []Entry {
 func OutputEntriesToMarkdown(entries []Entry) error {
 	file, err := os.OpenFile("./output.md", os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0o644)
 	if err != nil {
-		return errors.Wrap(err, errCannotCreateFile)
+		return fmt.Errorf("Cannot create file: %v", err)
 	}
 	defer func() {
 		err = file.Close() // want defer as close to acquisition of resources as possible
 	}()
 	output := FormattedOutputFromEntries(entries)
 	_, err = file.Write(output)
 	if err != nil {
-		return errors.Wrap(err, errCannotSaveFile)
+		return fmt.Errorf("Cannot save file: %v", err)
 	}
 	return err
 }
@@ -55,7 +54,7 @@ func OutputEntriesToPDF(entries []Entry) error {
 	pandoc := exec.Command("pandoc", "-s", "-o", "output.pdf") // c is going to run pandoc, so I'm assigning the pipe to c
 	wc, wcerr := pandoc.StdinPipe()                            // io.WriteCloser, err
 	if wcerr != nil {
-		return errors.Wrap(wcerr, errPandoc)
+		return fmt.Errorf("Cannot stdin to pandoc: %v", wcerr)
 	}
 	goerr := make(chan error)
 	done := make(chan bool)
@@ -70,11 +69,11 @@ func OutputEntriesToPDF(entries []Entry) error {
 		close(done)
 	}()
 	if err := <-goerr; err != nil {
-		return errors.Wrap(err, errCannotWriteToFilePandoc)
+		return fmt.Errorf("Cannot write file to pandoc: %v", err)
 	}
 	err := pandoc.Run()
 	if err != nil {
-		return errors.Wrap(err, errCannotRunPandoc)
+		return fmt.Errorf("Cannot run pandoc: %v", err)
 	}
 	return nil
 }

entry/errors.go

@@ -3,41 +3,42 @@ module github.com/bashbunni/project-management
 go 1.17
 
 require (
-	github.com/charmbracelet/bubbles v0.13.0
+	github.com/charmbracelet/bubbles v0.14.0
 	github.com/charmbracelet/bubbletea v0.22.1
 	github.com/charmbracelet/glamour v0.5.0
-	github.com/charmbracelet/lipgloss v0.5.0
+	github.com/charmbracelet/lipgloss v0.6.0
 	github.com/pkg/errors v0.9.1
-	gorm.io/driver/sqlite v1.3.2
-	gorm.io/gorm v1.23.6
+	gorm.io/driver/sqlite v1.4.3
+	gorm.io/gorm v1.24.0
 )
 
 require (
 	github.com/alecthomas/chroma v0.10.0 // indirect
 	github.com/atotto/clipboard v0.1.4 // indirect
+	github.com/aymanbagabas/go-osc52 v1.2.1 // indirect
 	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/containerd/console v1.0.3 // indirect
-	github.com/dlclark/regexp2 v1.4.0 // indirect
+	github.com/dlclark/regexp2 v1.7.0 // indirect
 	github.com/gorilla/css v1.0.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/mattn/go-localereader v0.0.1 // indirect
-	github.com/mattn/go-runewidth v0.0.13 // indirect
-	github.com/mattn/go-sqlite3 v1.14.12 // indirect
-	github.com/microcosm-cc/bluemonday v1.0.18 // indirect
+	github.com/mattn/go-runewidth v0.0.14 // indirect
+	github.com/mattn/go-sqlite3 v1.14.16 // indirect
+	github.com/microcosm-cc/bluemonday v1.0.21 // indirect
 	github.com/muesli/ansi v0.0.0-20211031195517-c9f0611b6c70 // indirect
 	github.com/muesli/cancelreader v0.2.2 // indirect
 	github.com/muesli/reflow v0.3.0 // indirect
-	github.com/muesli/termenv v0.12.0 // indirect
+	github.com/muesli/termenv v0.13.0 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
-	github.com/rivo/uniseg v0.3.4 // indirect
+	github.com/rivo/uniseg v0.4.2 // indirect
 	github.com/sahilm/fuzzy v0.1.0 // indirect
-	github.com/yuin/goldmark v1.4.12 // indirect
+	github.com/yuin/goldmark v1.5.2 // indirect
 	github.com/yuin/goldmark-emoji v1.0.1 // indirect
-	golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 // indirect
-	golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect
-	golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/net v0.1.0 // indirect
+	golang.org/x/sys v0.1.0 // indirect
+	golang.org/x/term v0.1.0 // indirect
+	golang.org/x/text v0.4.0 // indirect
 )