Merge pull request #5 from oleg-balunenko/day02

Day02

Author: obalunenko

.golangci.yml

@@ -2,6 +2,7 @@ linters:
   enable-all: true
   disable:
     - gochecknoglobals
+    - gochecknoinits
 
 linters-settings:
   errcheck:

cmd/aoc-cli/main.go

@@ -3,11 +3,12 @@ package main
 import (
 	"flag"
 	"fmt"
-	"log"
 	"os"
 	"path/filepath"
 	"strings"
 
+	log "github.com/sirupsen/logrus"
+
 	"github.com/manifoldco/promptui"
 	"github.com/pkg/errors"
 
@@ -20,20 +21,51 @@ const (
 	exit = "exit"
 )
 
+var (
+	logLevel = flag.String("log_level", "INFO", "Set level of output logs")
+)
+
 func main() {
 	defer func() {
 		fmt.Println("Exiting...")
 	}()
 
+	flag.Parse()
+
 	printVersion()
 
-	flag.Parse()
+	setLogger()
 
 	if err := menu(); err != nil {
 		log.Fatal(err)
 	}
 }
 
+func setLogger() {
+	l, err := log.ParseLevel(*logLevel)
+	if err != nil {
+		l = log.InfoLevel
+	}
+
+	log.SetLevel(l)
+
+	formatter := &log.TextFormatter{
+		ForceColors:               true,
+		DisableColors:             false,
+		EnvironmentOverrideColors: false,
+		DisableTimestamp:          true,
+		FullTimestamp:             false,
+		TimestampFormat:           "",
+		DisableSorting:            false,
+		SortingFunc:               nil,
+		DisableLevelTruncation:    true,
+		QuoteEmptyFields:          true,
+		FieldMap:                  nil,
+		CallerPrettyfier:          nil,
+	}
+	log.SetFormatter(formatter)
+}
+
 func menu() error {
 	path, err := inputPath()
 	if err != nil {
@@ -49,7 +81,7 @@ func menu() error {
 	prompt := promptui.Select{
 		Label:             "Puzzles menu (input 'exit' for exit)",
 		Items:             append(solvers, exit),
-		Size:              0,
+		Size:              20,
 		IsVimMode:         false,
 		HideHelp:          false,
 		HideSelected:      false,
@@ -62,19 +94,31 @@ func menu() error {
 		Stdout:            nil,
 	}
 
+	return handleChoices(prompt, path)
+}
+
+func handleChoices(opt promptui.Select, inputDir string) error {
 	for {
-		_, result, err := prompt.Run()
+		_, choice, err := opt.Run()
 		if err != nil {
 			return errors.Wrap(err, "prompt failed")
 		}
 
-		if isExit(result) {
+		if isExit(choice) {
 			return nil
 		}
 
-		if err := run(result, path); err != nil {
-			return errors.Wrap(err, "failed run puzzle")
+		res, err := run(choice, inputDir)
+		if err != nil {
+			log.Error(err)
+			continue
 		}
+
+		log.WithFields(log.Fields{
+			"name":  res.Name,
+			"part1": res.Part1,
+			"part2": res.Part2,
+		}).Info("Puzzle answers")
 	}
 }
 
@@ -115,19 +159,20 @@ func inputPath() (string, error) {
 	return path, nil
 }
 
-func run(puzzle string, inputdir string) error {
+func run(puzzle string, inputdir string) (puzzles.Result, error) {
 	s, err := puzzles.GetSolver(puzzle)
 	if err != nil {
-		return errors.Wrap(err, "failed to get solver")
+		return puzzles.Result{}, errors.Wrap(err, "failed to get solver")
 	}
 
 	input := filepath.Clean(
-		filepath.Join(inputdir, fmt.Sprintf("%s.txt", puzzle)),
+		filepath.Join(inputdir, fmt.Sprintf("%s.txt", s.Name())),
 	)
 
-	if err := puzzles.Run(s, input); err != nil {
-		return errors.Wrap(err, "failed to run puzzle solver")
+	res, err := puzzles.Run(s, input)
+	if err != nil {
+		return puzzles.Result{}, errors.Wrapf(err, "failed to run [%s]", s.Name())
 	}
 
-	return nil
+	return res, nil
 }

go.mod

@@ -5,5 +5,6 @@ go 1.13
 require (
 	github.com/manifoldco/promptui v0.6.0
 	github.com/pkg/errors v0.8.1
+	github.com/sirupsen/logrus v1.4.2
 	github.com/stretchr/testify v1.4.0
 )

go.sum

@@ -21,6 +21,8 @@ github.com/gordonklaus/ineffassign v0.0.0-20180909121442-1003c8bd00dc h1:cJlkeAx
 github.com/gordonklaus/ineffassign v0.0.0-20180909121442-1003c8bd00dc/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU=
 github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a h1:FaWFmfWdAUKbSCtOU2QjDaorUexogfaMgbipgYATUMU=
 github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a/go.mod h1:UJSiEoRfvx3hP73CvoARgeLjaIOjybY9vj8PUPPFGeU=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -42,7 +44,11 @@ github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 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/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/tsenart/deadcode v0.0.0-20160724212837-210d2dc333e9 h1:vY5WqiEon0ZSTGM3ayVVi+twaHKHDFUVloaQ/wug9/c=
@@ -51,6 +57,8 @@ golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3 h1:x/bBzNauLQAlE3fLku/xy92Y
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b h1:MQE+LT/ABUuuvEZ+YQAMSXindAdUh7slEmAkup74op4=
 golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/tools v0.0.0-20181122213734-04b5d21e00f1 h1:bsEj/LXbv3BCtkp/rBj9Wi/0Nde4OMaraIZpndHAhdI=
 golang.org/x/tools v0.0.0-20181122213734-04b5d21e00f1/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 gopkg.in/alecthomas/kingpin.v3-unstable v3.0.0-20171010053543-63abe20a23e2 h1:5zOHKFi4LqGWG+3d+isqpbPrN/2yhDJnlO+BhRiuR6U=

puzzles/solutions/2019/day01/solution_test.go

@@ -182,79 +182,41 @@ func Test_calcPart2(t *testing.T) {
 	close(in)
 }
 
-func Test_solver_Part1(t *testing.T) {
-	type fields struct {
-		name string
-	}
+func readerFromFile(tb testing.TB, fpath string) io.Reader {
+	tb.Helper()
 
+	file, err := os.Open(fpath)
+	require.NoError(tb, err)
+
+	return file
+}
+
+func Test_calc(t *testing.T) {
 	type args struct {
 		inputPath string
+		calcFn    calcFunc
 	}
 
 	tests := []struct {
 		name    string
-		fields  fields
 		args    args
 		want    string
 		wantErr bool
 	}{
 		{
-			name: "",
-			fields: fields{
-				name: "day01",
-			},
+			name: "part 1",
 			args: args{
 				inputPath: filepath.Join("testdata", "input.txt"),
+				calcFn:    calcPart1,
 			},
 			want:    "34241",
 			wantErr: false,
 		},
-	}
-
-	for _, tt := range tests {
-		tt := tt
-
-		t.Run(tt.name, func(t *testing.T) {
-			s := solution{
-				name: tt.fields.name,
-			}
-			input := readerFromFile(t, tt.args.inputPath)
-
-			got, err := s.Part1(input)
-			if tt.wantErr {
-				assert.Error(t, err)
-				return
-			}
-
-			assert.NoError(t, err)
-			assert.Equal(t, tt.want, got)
-		})
-	}
-}
-
-func Test_solver_Part2(t *testing.T) {
-	type fields struct {
-		name string
-	}
-
-	type args struct {
-		inputPath string
-	}
-
-	tests := []struct {
-		name    string
-		fields  fields
-		args    args
-		want    string
-		wantErr bool
-	}{
 		{
-			name: "",
-			fields: fields{
-				name: "day01",
-			},
+			name: "part 2",
 			args: args{
 				inputPath: filepath.Join("testdata", "input.txt"),
+				calcFn:    calcPart2,
 			},
 			want:    "51316",
 			wantErr: false,
@@ -265,12 +227,9 @@ func Test_solver_Part2(t *testing.T) {
 		tt := tt
 
 		t.Run(tt.name, func(t *testing.T) {
-			s := solution{
-				name: tt.fields.name,
-			}
 			input := readerFromFile(t, tt.args.inputPath)
+			got, err := calc(input, tt.args.calcFn)
 
-			got, err := s.Part2(input)
 			if tt.wantErr {
 				assert.Error(t, err)
 				return
@@ -281,12 +240,3 @@ func Test_solver_Part2(t *testing.T) {
 		})
 	}
 }
-
-func readerFromFile(tb testing.TB, fpath string) io.Reader {
-	tb.Helper()
-
-	file, err := os.Open(fpath)
-	require.NoError(tb, err)
-
-	return file
-}