Merge branch 'master' of github.com:grafana/grafana

pkg/cmd/grafana-cli/commands/commands.go

@@ -11,7 +11,7 @@ func runCommand(command func(commandLine CommandLine) error) func(context *cli.C
 
 
 		cmd := &contextCommandLine{context}
 		cmd := &contextCommandLine{context}
 		if err := command(cmd); err != nil {
 		if err := command(cmd); err != nil {
-			log.Errorf("%v\n\n", err)
+			log.Errorf("%s\n\n", err)
 
 
 			cmd.ShowHelp()
 			cmd.ShowHelp()
 			os.Exit(1)
 			os.Exit(1)

pkg/cmd/grafana-cli/commands/install_command.go

@@ -43,7 +43,11 @@ func installCommand(c CommandLine) error {
 	pluginToInstall := c.Args().First()
 	pluginToInstall := c.Args().First()
 	version := c.Args().Get(1)
 	version := c.Args().Get(1)
 
 
-	log.Infof("version: %v\n", version)
+	if version == "" {
+		log.Infof("version: latest\n")
+	} else {
+		log.Infof("version: %v\n", version)
+	}
 
 
 	return InstallPlugin(pluginToInstall, pluginFolder, version, c.GlobalString("repo"))
 	return InstallPlugin(pluginToInstall, pluginFolder, version, c.GlobalString("repo"))
 }
 }
@@ -62,6 +66,10 @@ func InstallPlugin(pluginName, pluginFolder, version, repoUrl string) error {
 	url := v.Url
 	url := v.Url
 	commit := v.Commit
 	commit := v.Commit
 
 
+	if version == "" {
+		version = v.Version
+	}
+
 	downloadURL := url + "/archive/" + commit + ".zip"
 	downloadURL := url + "/archive/" + commit + ".zip"
 
 
 	log.Infof("installing %v @ %v\n", plugin.Id, version)
 	log.Infof("installing %v @ %v\n", plugin.Id, version)
@@ -114,6 +122,12 @@ func downloadFile(pluginName, filepath, url string) (err error) {
 	if err != nil {
 	if err != nil {
 		return err
 		return err
 	}
 	}
+	log.Infof("Got statuscode %s from %s\n", resp.Status, url)
+
+	if resp.StatusCode == 302 || resp.StatusCode == 301 {
+		str, _ := ioutil.ReadAll(resp.Body)
+		log.Info("body %s\n\n", string(str))
+	}
 
 
 	r, err := zip.NewReader(bytes.NewReader(body), resp.ContentLength)
 	r, err := zip.NewReader(bytes.NewReader(body), resp.ContentLength)
 	if err != nil {
 	if err != nil {

pkg/cmd/grafana-cli/commands/ls_command.go

@@ -2,6 +2,7 @@ package commands
 
 
 import (
 import (
 	"errors"
 	"errors"
+	"fmt"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/log"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/log"
 	m "github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
 	m "github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
 	s "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
 	s "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
@@ -14,11 +15,11 @@ var validateLsCommmand = func(pluginDir string) error {
 		return errors.New("missing path flag")
 		return errors.New("missing path flag")
 	}
 	}
 
 
-	log.Info("plugindir: " + pluginDir + "\n")
+	log.Debug("plugindir: " + pluginDir + "\n")
 	pluginDirInfo, err := s.IoHelper.Stat(pluginDir)
 	pluginDirInfo, err := s.IoHelper.Stat(pluginDir)
 
 
 	if err != nil {
 	if err != nil {
-		return errors.New("missing path flag")
+		return fmt.Errorf("error: %s", err)
 	}
 	}
 
 
 	if pluginDirInfo.IsDir() == false {
 	if pluginDirInfo.IsDir() == false {
@@ -34,8 +35,14 @@ func lsCommand(c CommandLine) error {
 		return err
 		return err
 	}
 	}
 
 
-	for _, plugin := range ls_getPlugins(pluginDir) {
-		log.Infof("plugin: %s @ %s \n", plugin.Name, plugin.Info.Version)
+	plugins := ls_getPlugins(pluginDir)
+
+	if len(plugins) > 0 {
+		log.Info("installed plugins:\n")
+	}
+
+	for _, plugin := range plugins {
+		log.Infof("%s @ %s \n", plugin.Id, plugin.Info.Version)
 	}
 	}
 
 
 	return nil
 	return nil