Merge pull request #1378 from nanliu/patch

Fix snaptel environment variable.

cmd/snaptel/commands.go

@@ -24,7 +24,7 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 var (

cmd/snaptel/config.go

@@ -28,8 +28,8 @@ import (
 	"strconv"
 	"text/tabwriter"
 
-	"github.com/codegangsta/cli"
 	"github.com/intelsdi-x/snap/core/ctypes"
+	"github.com/urfave/cli"
 )
 
 type config struct {

cmd/snaptel/flags.go

@@ -19,7 +19,7 @@ limitations under the License.
 
 package main
 
-import "github.com/codegangsta/cli"
+import "github.com/urfave/cli"
 
 var (
 
@@ -49,7 +49,7 @@ var (
 	}
 	flConfig = cli.StringFlag{
 		Name:   "config, c",
-		EnvVar: "SNAPCTL_CONFIG_PATH",
+		EnvVar: "SNAPTEL_CONFIG_PATH,SNAPCTL_CONFIG_PATH",
 		Usage:  "Path to a config file",
 		Value:  "",
 	}

cmd/snaptel/main.go

@@ -28,8 +28,8 @@ import (
 
 	"golang.org/x/crypto/ssh/terminal"
 
-	"github.com/codegangsta/cli"
 	"github.com/intelsdi-x/snap/mgmt/rest/client"
+	"github.com/urfave/cli"
 )
 
 var (

cmd/snaptel/metric.go

@@ -28,9 +28,9 @@ import (
 	"text/tabwriter"
 	"time"
 
-	"github.com/codegangsta/cli"
 	"github.com/intelsdi-x/snap/mgmt/rest/client"
 	"github.com/intelsdi-x/snap/mgmt/rest/rbody"
+	"github.com/urfave/cli"
 
 	"github.com/intelsdi-x/snap/pkg/stringutils"
 )

cmd/snaptel/plugin.go

@@ -28,7 +28,7 @@ import (
 	"text/tabwriter"
 	"time"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 func loadPlugin(ctx *cli.Context) error {

cmd/snaptel/task.go

@@ -33,10 +33,10 @@ import (
 	"text/tabwriter"
 	"time"
 
-	"github.com/codegangsta/cli"
 	"github.com/intelsdi-x/snap/mgmt/rest/client"
 	"github.com/intelsdi-x/snap/scheduler/wmap"
 	"github.com/robfig/cron"
+	"github.com/urfave/cli"
 	"golang.org/x/crypto/ssh/terminal"
 
 	"github.com/ghodss/yaml"

cmd/snaptel/tribe.go

@@ -27,8 +27,8 @@ import (
 	"sort"
 	"text/tabwriter"
 
-	"github.com/codegangsta/cli"
 	"github.com/intelsdi-x/snap/mgmt/tribe/agreement"
+	"github.com/urfave/cli"
 )
 
 func listMembers(ctx *cli.Context) error {

control/flags.go

@@ -22,7 +22,7 @@ package control
 import (
 	"fmt"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 var (

glide.yaml

@@ -9,9 +9,9 @@ import:
   - schema
 - package: github.com/asaskevich/govalidator
   version: 9699ab6b38bee2e02cd3fe8b99ecf67665395c96
-- package: github.com/codegangsta/cli
-  version: 01857ac33766ce0c93856370626f9799281c14f4
-- package: github.com/codegangsta/negroni
+- package: github.com/urfave/cli
+  version: ^1.19.0
+- package: github.com/urfave/negroni
   version: c7477ad8e330bef55bf1ebe300cf8aa67c492d1b
 - package: github.com/ghodss/yaml
   version: c3eb24aeea63668ebdac08d2e252f20df8b6b1ae

mgmt/rest/flags.go

@@ -22,7 +22,7 @@ package rest
 import (
 	"fmt"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 var (

mgmt/rest/log_handler.go

@@ -23,7 +23,7 @@ import (
 	"net/http"
 
 	log "github.com/Sirupsen/logrus"
-	"github.com/codegangsta/negroni"
+	"github.com/urfave/negroni"
 )
 
 // Logger is a snap middleware that logs to a logrus facility

mgmt/rest/server.go

@@ -33,8 +33,8 @@ import (
 	"time"
 
 	log "github.com/Sirupsen/logrus"
-	"github.com/codegangsta/negroni"
 	"github.com/julienschmidt/httprouter"
+	"github.com/urfave/negroni"
 
 	"github.com/intelsdi-x/snap/core"
 	"github.com/intelsdi-x/snap/core/cdata"

mgmt/tribe/flags.go

@@ -22,7 +22,7 @@ package tribe
 import (
 	"fmt"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 var (

scheduler/flags.go

@@ -22,7 +22,7 @@ package scheduler
 import (
 	"fmt"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 var (

snapteld.go

@@ -37,7 +37,7 @@ import (
 	"golang.org/x/crypto/ssh/terminal"
 
 	log "github.com/Sirupsen/logrus"
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 	"github.com/vrischmann/jsonutil"
 
 	"github.com/intelsdi-x/snap/control"