From f274d6f634d09953ffd61f08260a7b229b2893dc Mon Sep 17 00:00:00 2001
From: Jessica Yuen <im.jessicayuen@gmail.com>
Date: Mon, 4 Dec 2017 11:18:37 -0800
Subject: [PATCH] Reverse name, registry columns for pkg list
Currently the package name is listed before the registry name in `pkg
list`. This is inconsistent with the order of `pkg install` which is of
the format `<registry>/<package>`. This change will display the registry
name before the package name in `pkg list`.
Signed-off-by: Jessica Yuen <im.jessicayuen@gmail.com>
---
cmd/pkg.go | 13 +++++++++----
docs/cli-reference/ks_pkg_install.md | 5 +++++
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/cmd/pkg.go b/cmd/pkg.go
index ac47f048..3a7baca8 100644
--- a/cmd/pkg.go
+++ b/cmd/pkg.go
@@ -133,6 +133,11 @@ channels for official ksonnet libraries.
### Syntax
`,
Example: `
+# Install an nginx dependency, based on the latest branch.
+# In a ksonnet source file, this can be referenced as:
+# local nginx = import "incubator/nginx/nginx.libsonnet";
+ks pkg install incubator/nginx
+
# Install an nginx dependency, based on the 'master' branch.
# In a ksonnet source file, this can be referenced as:
# local nginx = import "incubator/nginx/nginx.libsonnet";
@@ -246,10 +251,10 @@ var pkgListCmd = &cobra.Command{
}
rows := [][]string{
- []string{nameHeader, registryHeader, installedHeader},
+ []string{registryHeader, nameHeader, installedHeader},
[]string{
- strings.Repeat("=", len(nameHeader)),
strings.Repeat("=", len(registryHeader)),
+ strings.Repeat("=", len(nameHeader)),
strings.Repeat("=", len(installedHeader))},
}
for name := range app.Registries {
@@ -261,9 +266,9 @@ var pkgListCmd = &cobra.Command{
for libName := range reg.Libraries {
_, isInstalled := app.Libraries[libName]
if isInstalled {
- rows = append(rows, []string{libName, name, installed})
+ rows = append(rows, []string{name, libName, installed})
} else {
- rows = append(rows, []string{libName, name})
+ rows = append(rows, []string{name, libName})
}
}
}
diff --git a/docs/cli-reference/ks_pkg_install.md b/docs/cli-reference/ks_pkg_install.md
index a674b4aa..e885c454 100644
--- a/docs/cli-reference/ks_pkg_install.md
+++ b/docs/cli-reference/ks_pkg_install.md
@@ -31,6 +31,11 @@ ks pkg install <registry>/<library>@<version>
```
+# Install an nginx dependency, based on the latest branch.
+# In a ksonnet source file, this can be referenced as:
+# local nginx = import "incubator/nginx/nginx.libsonnet";
+ks pkg install incubator/nginx
+
# Install an nginx dependency, based on the 'master' branch.
# In a ksonnet source file, this can be referenced as:
# local nginx = import "incubator/nginx/nginx.libsonnet";
--
GitLab