20191215 code improvements (#790)

* Upgrade godo to latest
* Fix a bunch of issues found by
* Running staticcheck on a codebase for the first time is a sobering experience
* go mod tidy
* More static improvements

Signed-off-by: Chris Cummer <chriscummer@me.com>

app/error_messages.go

@@ -1,19 +0,0 @@
-package app
-
-// This file contains the error messages that get written to the terminal when
-// something goes wrong with the configuration process.
-//
-// As a general rule, if one of these has to be shown the app should then die
-// via os.Exit(1)
-
-import (
-	"fmt"
-
-	"github.com/logrusorgru/aurora"
-)
-
-/* -------------------- Unexported Functions -------------------- */
-
-func displayError(err error) {
-	fmt.Printf("%s %s\n\n", aurora.Red("Error:"), err.Error())
-}

app/module_validator.go

@@ -52,7 +52,7 @@ func (val *ModuleValidator) Validate(widgets []wtf.Wtfable) {
 
 	if hasErrors {
 		fmt.Println()
-		fmt.Printf(errStr)
+		fmt.Println(errStr)
 
 		os.Exit(1)
 	}

app/scheduler.go

@@ -29,7 +29,7 @@ func Schedule(widget wtf.Wtfable) {
 				return
 			}
 		case quit := <-widget.QuitChan():
-			if quit == true {
+			if quit {
 				timer.Stop()
 				return
 			}

app/widget_maker.go

@@ -78,8 +78,14 @@ func MakeWidget(
 	var widget wtf.Wtfable
 
 	moduleConfig, _ := config.Get("wtf.mods." + moduleName)
+
+	// Don' try to initialize modules that don't exist
+	if moduleConfig == nil {
+		return nil
+	}
+
+	// Don't try to initialize modules that aren't enabled
 	if enabled := moduleConfig.UBool("enabled", false); !enabled {
-		// Don't initialize modules that aren't enabled
 		return nil
 	}
 

app/widget_maker_test.go

@@ -0,0 +1,77 @@
+package app
+
+import (
+	"testing"
+
+	"github.com/olebedev/config"
+	"github.com/stretchr/testify/assert"
+	"github.com/wtfutil/wtf/modules/clocks"
+	"github.com/wtfutil/wtf/wtf"
+)
+
+const (
+	disabled = `
+wtf:
+  mods:
+    clocks:
+      enabled: false
+      position:
+        top: 0
+        left: 0
+        height: 1
+        width: 1
+      refreshInterval: 30`
+
+	enabled = `
+wtf:
+  mods:
+    clocks:
+      enabled: true
+      position:
+        top: 0
+        left: 0
+        height: 1
+        width: 1
+      refreshInterval: 30`
+)
+
+func Test_MakeWidget(t *testing.T) {
+	tests := []struct {
+		name       string
+		moduleName string
+		config     *config.Config
+		expected   wtf.Wtfable
+	}{
+		{
+			name:       "invalid module",
+			moduleName: "",
+			config:     &config.Config{},
+			expected:   nil,
+		},
+		{
+			name:       "valid disabled module",
+			moduleName: "clocks",
+			config: func() *config.Config {
+				cfg, _ := config.ParseYaml(disabled)
+				return cfg
+			}(),
+			expected: nil,
+		},
+		{
+			name:       "valid enabled module",
+			moduleName: "clocks",
+			config: func() *config.Config {
+				cfg, _ := config.ParseYaml(enabled)
+				return cfg
+			}(),
+			expected: &clocks.Widget{},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			actual := MakeWidget(nil, nil, tt.moduleName, tt.config)
+			assert.IsType(t, tt.expected, actual)
+		})
+	}
+}

app/wtf_app.go

@@ -42,6 +42,7 @@ func NewWtfApp(app *tview.Application, config *config.Config, configFilePath str
 	})
 
 	wtfApp.app.SetInputCapture(wtfApp.keyboardIntercept)
+
 	wtfApp.widgets = MakeWidgets(wtfApp.app, wtfApp.pages, wtfApp.config)
 	wtfApp.display = NewDisplay(wtfApp.widgets, wtfApp.config)
 	wtfApp.focusTracker = NewFocusTracker(wtfApp.app, wtfApp.widgets, wtfApp.config)
@@ -64,11 +65,6 @@ func NewWtfApp(app *tview.Application, config *config.Config, configFilePath str
 
 /* -------------------- Exported Functions -------------------- */
 
-// App returns the *tview.Application instance
-func (wtfApp *WtfApp) App() *tview.Application {
-	return wtfApp.app
-}
-
 // Start initializes the app
 func (wtfApp *WtfApp) Start() {
 	wtfApp.scheduleWidgets()