Merge pull request #87 from StrongMonkey/master

add ability to remove vendor when running trash -k

Author: ibuildthecloud

conf/conf.go

@@ -29,6 +29,23 @@ type Import struct {
 	Options `yaml:",inline"`
 }
 
+type Imports []Import
+
+func (i Imports) Len() int {
+	return len(i)
+}
+
+func (i Imports) Less(k, j int) bool {
+	return strings.Compare(i[k].Package, i[j].Package) <= 0
+}
+
+func (i Imports) Swap(k, j int) {
+	tmp := i[j]
+	i[j] = i[k]
+	i[k] = tmp
+	return
+}
+
 type Options struct {
 	Transitive bool `yaml:"transitive,omitempty"`
 	Staging    bool `yaml:"staging,omitempty"`

trash.go

@@ -12,6 +12,7 @@ import (
 	"os/exec"
 	"path"
 	"path/filepath"
+	"sort"
 	"strings"
 
 	"github.com/Sirupsen/logrus"
@@ -73,6 +74,10 @@ func main() {
 			Hidden: true,
 			EnvVar: "GOPATH",
 		},
+		cli.BoolFlag{
+			Name:  "include-vendor",
+			Usage: "whether to include vendor when running trash -k",
+		},
 	}
 	app.Action = runWrapper
 
@@ -101,6 +106,7 @@ func run(c *cli.Context) error {
 	insecure := c.Bool("insecure")
 	trashDir := c.String("cache")
 	gopath = c.String("gopath")
+	includeVendor := c.Bool("include-vendor")
 
 	update := false
 	updateVendor := c.StringSlice("update")
@@ -218,6 +224,24 @@ func run(c *cli.Context) error {
 	}
 
 	if keep {
+		if !includeVendor {
+			wd, err := os.Getwd()
+			if err != nil {
+				return err
+			}
+			root := filepath.Join(wd, "vendor")
+			return filepath.Walk(root, func(path string, info os.FileInfo, err error) error {
+				if err != nil {
+					return filepath.SkipDir
+				}
+				if info.IsDir() && info.Name() == "vendor" && path != root {
+					logrus.Infof("Removing %s", path)
+					os.RemoveAll(path)
+					return filepath.SkipDir
+				}
+				return nil
+			})
+		}
 		return nil
 	}
 	return cleanup(update, dir, targetDir, trashConf)
@@ -1010,6 +1034,7 @@ func cleanup(update bool, dir, targetDir string, trashConf *conf.Conf) error {
 			writeConf.Imports = append(writeConf.Imports, i)
 		}
 	}
+	sort.Sort(conf.Imports(writeConf.Imports))
 	data, err := yaml.Marshal(writeConf)
 	if err != nil {
 		return err

trash.lock

@@ -0,0 +1,25 @@
+package: github.com/rancher/trash
+import:
+- package: github.com/Masterminds/glide
+  version: fb6c62596ce1b29128f1ef7e329c367a648ee9b1
+  repo: https://github.com/StrongMonkey/glide.git
+- package: github.com/Masterminds/vcs
+  version: v1.12.0
+- package: github.com/Sirupsen/logrus
+  version: v0.10.0
+- package: github.com/cloudfoundry-incubator/candiedyaml
+  version: 99c3df8
+- package: github.com/davecgh/go-spew
+  version: 5215b55
+- package: github.com/mitchellh/go-homedir
+  version: b8bc1bf767474819792c23f32d8286a45736f1c6
+- package: github.com/pmezard/go-difflib
+  version: 792786c
+- package: github.com/stretchr/testify
+  version: v1.1.3
+- package: github.com/urfave/cli
+  version: v1.18.0
+- package: golang.org/x/sys
+  version: a408501
+- package: gopkg.in/yaml.v2
+  version: eb3733d160e74a9c7e442f435eb3bea458e1d19f