Sirupsen to sirupsen

This patch handles the chaos caused when the Github user account
Sirupsen was renamed to sirupsen.

Gopkg.toml

@@ -13,32 +13,32 @@ required = [
 
 [[constraint]]
   name = "github.com/akutz/gofig"
-  version = "0.1.8"
+  version = "0.1.9"
 
 [[constraint]]
   name = "github.com/akutz/golf"
-  version = "0.1.2"
+  version = "0.1.3"
 
 [[constraint]]
   name = "github.com/akutz/goof"
-  version = "0.1.1"
+  version = "0.1.2"
 
 [[constraint]]
   name = "github.com/akutz/gotil"
   version = "0.1.0"
 
 [[constraint]]
   name = "github.com/codedellemc/gournal"
-  version = "0.3.0"
+  version = "0.3.1"
 
 [[constraint]]
   name = "github.com/SermoDigital/jose"
   version = "1.1.0"
 
-[[constraint]]
-  name = "github.com/Sirupsen/logrus"
+[[override]]
+  name = "github.com/sirupsen/logrus"
   source = "https://github.com/akutz/logrus"
-  revision = "5f376aa629ac60c3215cc368e674bd996093a01a"
+  revision = "d842de504ca841f97533764c59d3166afd70ddb9"
 
 [[constraint]]
   name = "github.com/spf13/cobra"
@@ -48,6 +48,15 @@ required = [
   branch = "master"
 
 
+################################################################################
+##                              Golang/X                                      ##
+################################################################################
+
+[[constraint]]
+  name = "golang.org/x/crypto/ssh/terminal"
+  branch = "master"
+
+
 ################################################################################
 ##                         Storage Driver Dependencies                        ##
 ################################################################################
@@ -90,12 +99,12 @@ required = [
 ### Isilon
 [[constraint]]
   name = "github.com/codedellemc/goisilon"
-  version = "1.5.0"
+  revision = "301d518bb39637b839382deb686811dcf257b8c8"
 
 ### ScaleIO
 [[constraint]]
   name = "github.com/codedellemc/goscaleio"
-  revision = "485da3636bfcc8e70f74fe7bdc7cb25e5a6e4c4a"
+  revision = "d9df9f1ff56d951b0d5dfc30c374533ac56a4068"
 
 ### VirtualBox
 [[constraint]]
@@ -104,23 +113,6 @@ required = [
   source = "https://github.com/clintonskitson/go-virtualboxclient"
 
 
-################################################################################
-##                                 Testing                                    ##
-################################################################################
-
-[[constraint]]
-  name = "github.com/onsi/ginkgo"
-  version = "1.4.0"
-
-[[constraint]]
-  name = "github.com/onsi/gomega"
-  version = "1.2.0"
-
-[[constraint]]
-  name = "github.com/stretchr/testify"
-  branch = "master"
-
-
 ################################################################################
 ##                                  Tools                                     ##
 ################################################################################
@@ -139,3 +131,20 @@ required = [
   name = "gopkg.in/yaml.v2"
   source = "https://github.com/akutz/yaml.git"
   revision = "bc35f417f8a7664a73d46c9def2933417c03019f"
+
+
+################################################################################
+##                                 Testing                                    ##
+################################################################################
+
+[[constraint]]
+  name = "github.com/onsi/ginkgo"
+  version = "1.4.0"
+
+[[constraint]]
+  name = "github.com/onsi/gomega"
+  version = "1.2.0"
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  branch = "master"

Makefile

@@ -363,9 +363,13 @@ ifneq (./dep,$(DEP))
 dep: $(DEP)
 endif
 
-dep-ensure: | $(DEP)
+dep-update: | $(DEP)
 	$(DEP) ensure -v
 
+dep-install: | $(DEP)
+	$(DEP) ensure -v -vendor-only
+
+.PHONY: dep-update dep-install
 
 ################################################################################
 ##                                   GIST                                     ##

agent/agent.go

@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	gofigCore "github.com/akutz/gofig"
 	gofig "github.com/akutz/gofig/types"
 	"github.com/akutz/goof"

cli/cli.go

@@ -6,17 +6,16 @@ import (
 	"os"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
 	gofig "github.com/akutz/gofig/types"
 	glog "github.com/akutz/golf/logrus"
+	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
 	"github.com/codedellemc/rexray/libstorage/api/context"
 	apitypes "github.com/codedellemc/rexray/libstorage/api/types"
 	apiutils "github.com/codedellemc/rexray/libstorage/api/utils"
 
-	"github.com/codedellemc/rexray/cli/term"
 	"github.com/codedellemc/rexray/util"
 )
 
@@ -352,7 +351,7 @@ func (c *CLI) preRun(cmd *cobra.Command, args []string) {
 	}
 
 	if permErr := c.checkCmdPermRequirements(cmd); permErr != nil {
-		if term.IsTerminal() {
+		if util.IsTerminal(os.Stderr) {
 			printColorizedError(permErr)
 		} else {
 			printNonColorizedError(permErr)
@@ -384,7 +383,7 @@ func (c *CLI) preRun(cmd *cobra.Command, args []string) {
 		}
 
 		if err != nil {
-			if term.IsTerminal() {
+			if util.IsTerminal(os.Stderr) {
 				printColorizedError(err)
 			} else {
 				printNonColorizedError(err)

cli/cli_formatter.go

@@ -11,7 +11,7 @@ import (
 	"text/tabwriter"
 	gtemplate "text/template"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 
 	"github.com/codedellemc/rexray/cli/template"
 	apitypes "github.com/codedellemc/rexray/libstorage/api/types"

cli/cli_formatter_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"text/template"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 
 	"github.com/codedellemc/rexray/libstorage/api/context"
 	apitypes "github.com/codedellemc/rexray/libstorage/api/types"

cli/cli_test.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"testing"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 )
 
 var defaultFlags = []string{

cli/cmds_02_device.go

@@ -4,7 +4,7 @@
 package cli
 
 import (
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	apitypes "github.com/codedellemc/rexray/libstorage/api/types"
 	"github.com/spf13/cobra"
 )

cli/cmds_05_module.go

@@ -11,7 +11,7 @@ import (
 	"net/http"
 	"net/url"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 

cli/cmds_10_volume.go

@@ -9,7 +9,7 @@ import (
 	"regexp"
 	"strings"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"github.com/akutz/goof"
 	"github.com/spf13/cobra"
 

cli/cmds_11_snapshot.go

@@ -5,7 +5,7 @@
 package cli
 
 import (
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 

cli/installer.go

@@ -12,7 +12,7 @@ import (
 	"strings"
 	"text/template"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"github.com/akutz/gotil"
 	apitypes "github.com/codedellemc/rexray/libstorage/api/types"
 	"github.com/codedellemc/rexray/util"