From d1d95395bd6cea4eaa58b4e98e3d41ae5d2cd3df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20Rockst=C3=A4dt?= Date: Thu, 29 Dec 2022 18:10:54 +0100 Subject: [PATCH] Use txtreader package Closes #11 --- go.mod | 5 ++++- go.sum | 2 ++ main.go | 4 ++-- src/utils/filereader.go | 25 ------------------------- src/utils/filereader_test.go | 21 --------------------- src/utils/test.txt | 2 -- 6 files changed, 8 insertions(+), 51 deletions(-) delete mode 100644 src/utils/filereader.go delete mode 100644 src/utils/filereader_test.go delete mode 100644 src/utils/test.txt diff --git a/go.mod b/go.mod index a5288bf..3077e45 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,10 @@ module rockstaedt/commit-message-check go 1.19 -require github.com/stretchr/testify v1.8.1 +require ( + github.com/rockstaedt/txtreader v1.0.1 + github.com/stretchr/testify v1.8.1 +) require ( github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/go.sum b/go.sum index 2ec90f7..f59502a 100644 --- a/go.sum +++ b/go.sum @@ -3,6 +3,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rockstaedt/txtreader v1.0.1 h1:2FlMPrFEOGdw8CizWnuPe+1be3i7o+ErNhZzwekwEYg= +github.com/rockstaedt/txtreader v1.0.1/go.mod h1:5U0AithdsiR/v3kSTg1z0AbTUZaTy/AhdiDN8wJl9F4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= diff --git a/main.go b/main.go index 07bfa58..8d4e5a0 100644 --- a/main.go +++ b/main.go @@ -1,10 +1,10 @@ package main import ( + "github.com/rockstaedt/txtreader" "log" "os" "rockstaedt/commit-message-check/src" - "rockstaedt/commit-message-check/src/utils" ) const ( @@ -14,7 +14,7 @@ const ( func main() { log.Println("[INFO]\t Validating commit message...") - commitLines, err := utils.GetLinesFromTextFile(os.Args[1]) + commitLines, err := txtreader.GetLinesFromTextFile(os.Args[1]) if err != nil { log.Printf("[ERROR]\t Could not read commit message lines: %q", err.Error()) os.Exit(1) diff --git a/src/utils/filereader.go b/src/utils/filereader.go deleted file mode 100644 index 37c60e8..0000000 --- a/src/utils/filereader.go +++ /dev/null @@ -1,25 +0,0 @@ -package utils - -import ( - "bufio" - "errors" - "os" -) - -func GetLinesFromTextFile(input string) ([]string, error) { - file, err := os.Open(input) - defer file.Close() - - if err != nil { - return nil, errors.New("file not found") - } - fileScanner := bufio.NewScanner(file) - fileScanner.Split(bufio.ScanLines) - var fileLines []string - - for fileScanner.Scan() { - fileLines = append(fileLines, fileScanner.Text()) - } - - return fileLines, nil -} diff --git a/src/utils/filereader_test.go b/src/utils/filereader_test.go deleted file mode 100644 index fa4fde6..0000000 --- a/src/utils/filereader_test.go +++ /dev/null @@ -1,21 +0,0 @@ -package utils - -import ( - "github.com/stretchr/testify/assert" - "testing" -) - -func TestGetLinesFromTextFile(t *testing.T) { - t.Run("returns lines slice from text file", func(t *testing.T) { - lines, _ := GetLinesFromTextFile("test.txt") - - assert.Len(t, lines, 2) - assert.Equal(t, "Hello", lines[0]) - }) - - t.Run("returns err if file was not found", func(t *testing.T) { - _, err := GetLinesFromTextFile("not_existing_file") - - assert.Error(t, err) - }) -} diff --git a/src/utils/test.txt b/src/utils/test.txt deleted file mode 100644 index ed81d07..0000000 --- a/src/utils/test.txt +++ /dev/null @@ -1,2 +0,0 @@ -Hello -World \ No newline at end of file