Tidy up

Author: deanishe

.golangci.toml

@@ -6,17 +6,17 @@ disable-all = true
 enable = [
   "deadcode",
   "goconst",
+  "gocritic",
   "gofmt",
   "goimports",
+  "gosimple",
   "ineffassign",
   "scopelint",
   "staticcheck",
   "stylecheck",
   "unconvert",
   "unused",
-  # "maligned",
-  # "lll",
-  # "prealloc",
+  "whitespace",
 ]
 
 [linter-settings]

alfred.go

@@ -52,7 +52,6 @@ type Alfred struct {
 // It accepts one optional Env argument. If an Env is passed, Alfred
 // is initialised from that instead of the system environment.
 func NewAlfred(env ...Env) *Alfred {
-
 	var e Env
 
 	if len(env) > 0 {
@@ -71,7 +70,6 @@ func (a *Alfred) Search(query string) error {
 
 // Browse tells Alfred to open path in navigation mode.
 func (a *Alfred) Browse(path string) error {
-
 	var err error
 
 	if path, err = filepath.Abs(path); err != nil {
@@ -88,15 +86,13 @@ func (a *Alfred) SetTheme(name string) error {
 
 // Action tells Alfred to show File Actions for path(s).
 func (a *Alfred) Action(path ...string) error {
-
 	if len(path) == 0 {
 		return nil
 	}
 
 	var paths []string
 
 	for _, p := range path {
-
 		p, err := filepath.Abs(p)
 		if err != nil {
 			return fmt.Errorf("[action] couldn't make path absolute (%s): %v", p, err)
@@ -114,7 +110,6 @@ func (a *Alfred) Action(path ...string) error {
 // workflow whose trigger should be run.
 // If not specified, it defaults to the current workflow's.
 func (a *Alfred) RunTrigger(name, query string, bundleID ...string) error {
-
 	var bid string
 	if len(bundleID) > 0 {
 		bid = bundleID[0]

azure-pipelines.yml

@@ -1,10 +1,19 @@
-# Go
-# Build your Go project.
-# Add steps that test, save build artifacts, deploy, and more:
 # https://docs.microsoft.com/azure/devops/pipelines/languages/go
 
 trigger:
-- master
+  batch: true
+  paths:
+    exclude:
+      - README.md
+      - LICENCE
+      - TODO
+      - icon.*
+      - env
+      - bench.py
+      - modd.conf
+      - .gitignore
+      - .travis.yml
+      - bin/*
 
 pool:
   vmImage: 'macOS-10.13'

background_test.go

@@ -21,7 +21,6 @@ func TestWorkflow_RunInBackground(t *testing.T) {
 	t.Parallel()
 
 	withTestWf(func(wf *Workflow) {
-
 		jobName := "sleep"
 
 		cmd := exec.Command("sleep", "5")

cache.go

@@ -185,9 +185,9 @@ func (c Cache) Age(name string) (time.Duration, error) {
 	p := c.path(name)
 	fi, err := os.Stat(p)
 	if err != nil {
-		return time.Duration(0), err
+		return 0, err
 	}
-	return time.Now().Sub(fi.ModTime()), nil
+	return time.Since(fi.ModTime()), nil
 }
 
 // path returns the path to a named file within cache directory.

cache_examples_test.go

@@ -11,7 +11,6 @@ import (
 )
 
 func ExampleCache() {
-
 	var (
 		// Cache "key" (filename) and the value to store
 		name  = "LastOpened"
@@ -62,7 +61,6 @@ func ExampleCache() {
 // LoadOrStore loads data from cache if they're fresh enough, otherwise it calls
 // the reload function for new data (which it caches).
 func ExampleCache_LoadOrStore() {
-
 	var (
 		name        = "Expiring"
 		data        = []byte("test")
@@ -83,7 +81,6 @@ func ExampleCache_LoadOrStore() {
 
 	// Called by LoadOrStore when cache is empty or has expired
 	reload := func() ([]byte, error) {
-
 		// Log call count
 		reloadCount++
 		fmt.Printf("reload #%d\n", reloadCount)
@@ -115,7 +112,7 @@ func ExampleCache_LoadOrStore() {
 	fmt.Println(string(out) == string(data)) // -> true
 
 	// Wait for cache to expire, then try again
-	time.Sleep(time.Millisecond + maxAge - time.Now().Sub(start))
+	time.Sleep(time.Millisecond + maxAge - time.Since(start))
 
 	// reload is called again
 	out, err = c.LoadOrStore(name, maxAge, reload)
@@ -138,7 +135,6 @@ func ExampleCache_LoadOrStore() {
 
 // LoadOrStoreJSON marshals JSON to/from the cache.
 func ExampleCache_LoadOrStoreJSON() {
-
 	var (
 		name   = "Host"
 		maxAge = time.Second * 5
@@ -161,7 +157,6 @@ func ExampleCache_LoadOrStoreJSON() {
 	// Normally, this function would do something that takes some time, like
 	// fetch data from the web or an application.
 	reload := func() (interface{}, error) {
-
 		fmt.Println("reload")
 
 		return &host{

config.go

@@ -84,7 +84,6 @@ type Config struct {
 // It accepts one optional Env argument. If an Env is passed, Config
 // is initialised from that instead of the system environment.
 func NewConfig(env ...Env) *Config {
-
 	var e Env
 	if len(env) > 0 {
 		e = env[0]
@@ -103,7 +102,6 @@ func NewConfig(env ...Env) *Config {
 //
 // If a variable is set, but empty, its value is used.
 func (cfg *Config) Get(key string, fallback ...string) string {
-
 	var fb string
 
 	if len(fallback) > 0 {
@@ -129,7 +127,6 @@ func (cfg *Config) GetString(key string, fallback ...string) string {
 // tries to parse the number with strconv.ParseFloat() and truncate it to an
 // int.
 func (cfg *Config) GetInt(key string, fallback ...int) int {
-
 	var fb int
 
 	if len(fallback) > 0 {
@@ -154,7 +151,6 @@ func (cfg *Config) GetInt(key string, fallback ...int) int {
 //
 // Values are parsed with strconv.ParseFloat().
 func (cfg *Config) GetFloat(key string, fallback ...float64) float64 {
-
 	var fb float64
 
 	if len(fallback) > 0 {
@@ -179,7 +175,6 @@ func (cfg *Config) GetFloat(key string, fallback ...float64) float64 {
 //
 // Values are parsed with time.ParseDuration().
 func (cfg *Config) GetDuration(key string, fallback ...time.Duration) time.Duration {
-
 	var fb time.Duration
 
 	if len(fallback) > 0 {
@@ -204,7 +199,6 @@ func (cfg *Config) GetDuration(key string, fallback ...time.Duration) time.Durat
 //
 // Values are parsed with strconv.ParseBool().
 func (cfg *Config) GetBool(key string, fallback ...bool) bool {
-
 	var fb bool
 
 	if len(fallback) > 0 {
@@ -229,7 +223,6 @@ func (cfg *Config) GetBool(key string, fallback ...bool) bool {
 // workflow whose configuration should be changed.
 // If not specified, it defaults to the current workflow's.
 func (cfg *Config) Set(key, value string, export bool, bundleID ...string) *Config {
-
 	bid := cfg.getBundleID(bundleID...)
 	opts := map[string]interface{}{
 		"toValue":    value,
@@ -246,7 +239,6 @@ func (cfg *Config) Set(key, value string, export bool, bundleID ...string) *Conf
 // workflow whose configuration should be changed.
 // If not specified, it defaults to the current workflow's.
 func (cfg *Config) Unset(key string, bundleID ...string) *Config {
-
 	bid := cfg.getBundleID(bundleID...)
 	opts := map[string]interface{}{
 		"inWorkflow": bid,
@@ -261,7 +253,6 @@ func (cfg *Config) Unset(key string, bundleID ...string) *Config {
 // Succeed or fail, any accumulated scripts and errors are cleared when Do()
 // is called.
 func (cfg *Config) Do() error {
-
 	if len(cfg.scripts) == 0 {
 		return errors.New("no commands to run")
 	}
@@ -275,7 +266,6 @@ func (cfg *Config) Do() error {
 
 // Extract bundle ID from argument or default.
 func (cfg *Config) getBundleID(bundleID ...string) string {
-
 	if len(bundleID) > 0 {
 		return bundleID[0]
 	}
@@ -286,7 +276,6 @@ func (cfg *Config) getBundleID(bundleID ...string) string {
 
 // Add a JavaScript that takes two arguments, a string and an object.
 func (cfg *Config) addScript(script, name string, opts map[string]interface{}) *Config {
-
 	script = fmt.Sprintf(script, util.QuoteJS(scriptAppName()), util.QuoteJS(name), util.QuoteJS(opts))
 	cfg.scripts = append(cfg.scripts, script)