Table headers are now FirstLetter case #6423

Merged
merged 1 commit into from Oct 11, 2016

Conversation

Projects
None yet
3 participants
Owner

wallyworld commented Oct 11, 2016

All tables headers are now FirstLetter case. Except for things like "Model UUID" because UUID is generally capitalised.

QA - bootstrap and run various list related commands.

cmd/juju/machine/list_test.go
@@ -79,7 +79,7 @@ func (s *MachineListCommandSuite) TestMachine(c *gc.C) {
context, err := testing.RunCommand(c, newMachineListCommand())
c.Assert(err, jc.ErrorIsNil)
c.Assert(testing.Stdout(context), gc.Equals, ""+
- "MACHINE STATE DNS INS-ID SERIES AZ\n"+
+ "Machine State DNS Inst Id Series AZ\n"+
@anastasiamac

anastasiamac Oct 11, 2016

Member

This should be either "Inst ID" as with "Model UUID" columns or "Inst id" as with "Last connection"

@wallyworld

wallyworld Oct 11, 2016

Owner

Fair point, I thought Id looked better. I've changed to id. We can also tweak later.

cmd/juju/status/output_tabular.go
@@ -240,7 +240,7 @@ func getModelMessage(model modelStatus) string {
func printMachines(tw *ansiterm.TabWriter, machines map[string]machineStatus) {
w := output.Wrapper{tw}
- w.Println("MACHINE", "STATE", "DNS", "INS-ID", "SERIES", "AZ")
+ w.Println("Machine", "State", "DNS", "Inst Id", "Series", "AZ")
cmd/juju/storage/filesystemlist_test.go
@@ -88,7 +88,7 @@ func (s *ListSuite) TestFilesystemListWithErrorResults(c *gc.C) {
}
var expectedFilesystemListTabular = `
-MACHINE UNIT STORAGE ID VOLUME PROVIDER-ID MOUNTPOINT SIZE STATE MESSAGE
+Machine Unit Storage Id Volume Provider Id Mountpoint Size State Message
@@ -27,7 +27,7 @@ func formatMetadataTabular(writer io.Writer, metadata []MetadataInfo) {
print := func(values ...string) {
fmt.Fprintln(tw, strings.Join(values, "\t"))
}
- print("SOURCE", "SERIES", "ARCH", "REGION", "IMAGE-ID", "STREAM", "VIRT-TYPE", "STORAGE-TYPE")
+ print("Source", "Series", "Arch", "Region", "Image Id", "Stream", "Virt Type", "Storage Type")
resource/cmd/output_tabular_test.go
@@ -252,14 +252,14 @@ func (s *SvcTabularSuite) TestFormatSvcTabularMulti(c *gc.C) {
// Notes: sorted by name, then by revision, newest first.
c.Check(data, gc.Equals, `
[Service]
-RESOURCE SUPPLIED BY REVISION
+Resource Supplied By Revision
@anastasiamac

anastasiamac Oct 11, 2016

Member

Why is "by" capitalised but "connection" in "Last connection" isn't?

@wallyworld

wallyworld Oct 11, 2016

Owner

I missed that one, fixed

With one little change, LGTM \o/

Thank you for awesomeness

payload/status/output_tabular_test.go
@@ -75,7 +75,7 @@ func (s *outputTabularSuite) TestFormatTabularMulti(c *gc.C) {
c.Check(buff.String(), gc.Equals, `
[Unit Payloads]
-UNIT MACHINE PAYLOAD-CLASS STATUS TYPE ID TAGS
+Unit Machine Payload Class Status Type Id Tags
@anastasiamac

anastasiamac Oct 11, 2016

Member

Sorry, should this one be a "Payload class" too?

@wallyworld

wallyworld Oct 11, 2016

Owner

doh. fixed

Owner

wallyworld commented Oct 11, 2016

$$merge$$

Contributor

jujubot commented Oct 11, 2016

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

@jujubot jujubot merged commit 0e43361 into juju:master Oct 11, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment