Merge pull request #201 from muesli/format-fixes

Fixed import order using goimports

cmd/analyze.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+
 	"github.com/spf13/cobra"
 	"github.com/wagoodman/dive/runtime"
 	"github.com/wagoodman/dive/utils"

filetree/efficiency.go

@@ -2,8 +2,9 @@ package filetree
 
 import (
 	"fmt"
-	"github.com/sirupsen/logrus"
 	"sort"
+
+	"github.com/sirupsen/logrus"
 )
 
 // Len is required for sorting.

filetree/node.go

@@ -3,10 +3,11 @@ package filetree
 import (
 	"archive/tar"
 	"fmt"
-	"github.com/sirupsen/logrus"
 	"sort"
 	"strings"
 
+	"github.com/sirupsen/logrus"
+
 	"github.com/dustin/go-humanize"
 	"github.com/fatih/color"
 	"github.com/phayes/permbits"

filetree/tree.go

@@ -2,10 +2,11 @@ package filetree
 
 import (
 	"fmt"
-	"github.com/google/uuid"
-	"github.com/sirupsen/logrus"
 	"sort"
 	"strings"
+
+	"github.com/google/uuid"
+	"github.com/sirupsen/logrus"
 )
 
 const (

filetree/types.go

@@ -1,8 +1,9 @@
 package filetree
 
 import (
-	"github.com/google/uuid"
 	"os"
+
+	"github.com/google/uuid"
 )
 
 // FileTree represents a set of files, directories, and their relations.

image/docker_layer.go

@@ -2,9 +2,10 @@ package image
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/dustin/go-humanize"
 	"github.com/wagoodman/dive/filetree"
-	"strings"
 )
 
 const (

image/types.go

@@ -1,9 +1,10 @@
 package image
 
 import (
+	"io"
+
 	"github.com/docker/docker/client"
 	"github.com/wagoodman/dive/filetree"
-	"io"
 )
 
 type Parser interface {

runtime/ci/evaluator.go

@@ -3,12 +3,13 @@ package ci
 import (
 	"bytes"
 	"fmt"
-	"github.com/logrusorgru/aurora"
-	"github.com/spf13/viper"
-	"github.com/wagoodman/dive/image"
 	"io/ioutil"
 	"sort"
 	"strings"
+
+	"github.com/logrusorgru/aurora"
+	"github.com/spf13/viper"
+	"github.com/wagoodman/dive/image"
 )
 
 func NewEvaluator() *Evaluator {

runtime/ci/evaluator_test.go

@@ -1,10 +1,11 @@
 package ci
 
 import (
-	"github.com/spf13/viper"
-	"github.com/wagoodman/dive/image"
 	"strings"
 	"testing"
+
+	"github.com/spf13/viper"
+	"github.com/wagoodman/dive/image"
 )
 
 func Test_Evaluator(t *testing.T) {

runtime/ci/rules.go

@@ -2,10 +2,11 @@ package ci
 
 import (
 	"fmt"
+	"strconv"
+
 	"github.com/dustin/go-humanize"
 	"github.com/logrusorgru/aurora"
 	"github.com/wagoodman/dive/image"
-	"strconv"
 )
 
 func newGenericCiRule(key string, evaluator func(*image.AnalysisResult, string) (RuleStatus, string)) *GenericCiRule {

runtime/export.go

@@ -2,8 +2,9 @@ package runtime
 
 import (
 	"encoding/json"
-	"github.com/wagoodman/dive/image"
 	"io/ioutil"
+
+	"github.com/wagoodman/dive/image"
 )
 
 func newExport(analysis *image.AnalysisResult) *export {

runtime/export_test.go

@@ -1,8 +1,9 @@
 package runtime
 
 import (
-	"github.com/wagoodman/dive/image"
 	"testing"
+
+	"github.com/wagoodman/dive/image"
 )
 
 func Test_Export(t *testing.T) {

runtime/run.go

@@ -2,6 +2,11 @@ package runtime
 
 import (
 	"fmt"
+	"io/ioutil"
+	"log"
+	"os"
+	"strconv"
+
 	"github.com/dustin/go-humanize"
 	"github.com/logrusorgru/aurora"
 	"github.com/wagoodman/dive/filetree"
@@ -9,10 +14,6 @@ import (
 	"github.com/wagoodman/dive/runtime/ci"
 	"github.com/wagoodman/dive/ui"
 	"github.com/wagoodman/dive/utils"
-	"io/ioutil"
-	"log"
-	"os"
-	"strconv"
 )
 
 func title(s string) string {

ui/details_controller.go

@@ -2,12 +2,13 @@ package ui
 
 import (
 	"fmt"
+	"strconv"
+	"strings"
+
 	"github.com/dustin/go-humanize"
 	"github.com/jroimartin/gocui"
 	"github.com/lunixbochs/vtclean"
 	"github.com/wagoodman/dive/filetree"
-	"strconv"
-	"strings"
 )
 
 // DetailsController holds the UI objects and data models for populating the lower-left pane. Specifically the pane that

ui/filetree_controller.go

@@ -2,12 +2,13 @@ package ui
 
 import (
 	"fmt"
+	"regexp"
+	"strings"
+
 	"github.com/lunixbochs/vtclean"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 	"github.com/wagoodman/keybinding"
-	"regexp"
-	"strings"
 
 	"github.com/jroimartin/gocui"
 	"github.com/wagoodman/dive/filetree"

ui/filetree_viewmodel.go

@@ -3,11 +3,12 @@ package ui
 import (
 	"bytes"
 	"fmt"
+	"regexp"
+	"strings"
+
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 	"github.com/wagoodman/dive/utils"
-	"regexp"
-	"strings"
 
 	"github.com/lunixbochs/vtclean"
 	"github.com/wagoodman/dive/filetree"

ui/filetree_viewmodel_test.go

@@ -2,15 +2,16 @@ package ui
 
 import (
 	"bytes"
-	"github.com/fatih/color"
-	"github.com/sergi/go-diff/diffmatchpatch"
-	"github.com/wagoodman/dive/filetree"
-	"github.com/wagoodman/dive/image"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"regexp"
 	"testing"
+
+	"github.com/fatih/color"
+	"github.com/sergi/go-diff/diffmatchpatch"
+	"github.com/wagoodman/dive/filetree"
+	"github.com/wagoodman/dive/image"
 )
 
 const allowTestDataCapture = false

ui/layer_controller.go

@@ -2,6 +2,8 @@ package ui
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/jroimartin/gocui"
 	"github.com/lunixbochs/vtclean"
 	"github.com/sirupsen/logrus"
@@ -9,7 +11,6 @@ import (
 	"github.com/wagoodman/dive/image"
 	"github.com/wagoodman/dive/utils"
 	"github.com/wagoodman/keybinding"
-	"strings"
 )
 
 // LayerController holds the UI objects and data models for populating the lower-left pane. Specifically the pane that

ui/status_controller.go

@@ -3,8 +3,9 @@ package ui
 import (
 	"fmt"
 
-	"github.com/jroimartin/gocui"
 	"strings"
+
+	"github.com/jroimartin/gocui"
 )
 
 // StatusController holds the UI objects and data models for populating the bottom-most pane. Specifically the panel

ui/ui.go

@@ -2,6 +2,7 @@ package ui
 
 import (
 	"errors"
+
 	"github.com/fatih/color"
 	"github.com/jroimartin/gocui"
 	"github.com/sirupsen/logrus"

utils/exit.go

@@ -2,9 +2,10 @@ package utils
 
 import (
 	"fmt"
+	"os"
+
 	"github.com/jroimartin/gocui"
 	"github.com/sirupsen/logrus"
-	"os"
 )
 
 var ui *gocui.Gui