Merge pull request #2790 from ipfs/feature/version-all

Add version --all option
ipfs · Jun 2, 2016 · 994109c · 994109c
2 parents 082393d + c8c329d
commit 994109c
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/core/commands/version.go b/core/commands/version.go
@@ -3,6 +3,7 @@ package commands
 import (
 	"fmt"
 	"io"
+	"runtime"
 	"strings"
 
 	cmds "github.com/ipfs/go-ipfs/commands"
@@ -14,6 +15,8 @@ type VersionOutput struct {
 	Version string
 	Commit  string
 	Repo    string
+	System  string
+	Golang  string
 }
 
 var VersionCmd = &cmds.Command{
@@ -26,12 +29,15 @@ var VersionCmd = &cmds.Command{
 		cmds.BoolOption("number", "n", "Only show the version number.").Default(false),
 		cmds.BoolOption("commit", "Show the commit hash.").Default(false),
 		cmds.BoolOption("repo", "Show repo version.").Default(false),
+		cmds.BoolOption("all", "Show all version information").Default(false),
 	},
 	Run: func(req cmds.Request, res cmds.Response) {
 		res.SetOutput(&VersionOutput{
 			Version: config.CurrentVersionNumber,
 			Commit:  config.CurrentCommit,
 			Repo:    fsrepo.RepoVersion,
+			System:  runtime.GOARCH + "/" + runtime.GOOS, //TODO: Precise version here
+			Golang:  runtime.Version(),
 		})
 	},
 	Marshalers: cmds.MarshalerMap{
@@ -64,6 +70,17 @@ var VersionCmd = &cmds.Command{
 				return strings.NewReader(fmt.Sprintln(v.Version + commitTxt)), nil
 			}
 
+			all, _, err := res.Request().Option("all").Bool()
+			if err != nil {
+				return nil, err
+			}
+			if all {
+				out := fmt.Sprintf("go-ipfs version: %s-%s\n"+
+					"Repo version: %s\nSystem version: %s\nGolang version: %s\n",
+					v.Version, v.Commit, v.Repo, v.System, v.Golang)
+				return strings.NewReader(out), nil
+			}
+
 			return strings.NewReader(fmt.Sprintf("ipfs version %s%s\n", v.Version, commitTxt)), nil
 		},
 	},

diff --git a/test/sharness/t0010-basic-commands.sh b/test/sharness/t0010-basic-commands.sh
@@ -21,6 +21,14 @@ test_expect_success "ipfs version output looks good" '
 	test_fsh cat version.txt
 '
 
+test_expect_success "ipfs version --all has all required fields" '
+	ipfs version --all > version_all.txt &&
+	grep "go-ipfs version" version_all.txt &&
+	grep "Repo version" version_all.txt &&
+	grep "System version" version_all.txt &&
+	grep "Golang version" version_all.txt
+'
+
 test_expect_success "ipfs help succeeds" '
 	ipfs help >help.txt
 '

diff --git a/test/sharness/t0500-issues-and-regressions-offline.sh b/test/sharness/t0500-issues-and-regressions-offline.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description="Tests for various fxed issues and regressions."
+test_description="Tests for various fixed issues and regressions."
 
 . lib/test-lib.sh
 

diff --git a/...ss/t0501-issues-and-regressions-online.sh → ...ss/t0600-issues-and-regressions-online.sh b/...ss/t0501-issues-and-regressions-online.sh → ...ss/t0600-issues-and-regressions-online.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description="Tests for various fxed issues and regressions."
+test_description="Tests for various fixed issues and regressions."
 
 . lib/test-lib.sh