1
=== added file 'cmd/juju/helptool.go'
2
--- cmd/juju/helptool.go	1970-01-01 00:00:00 +0000
3
+++ cmd/juju/helptool.go	2013-07-30 07:40:47 +0000
4
@@ -0,0 +1,104 @@
5
1
// Copyright 2013 Canonical Ltd.
6
2
// Licensed under the AGPLv3, see LICENCE file for details.
7
3
8
4
package main
9
5
10
6
import (
11
7
	"fmt"
12
8
13
9
	"launchpad.net/gnuflag"
14
10
15
11
	"launchpad.net/juju-core/charm"
16
12
	"launchpad.net/juju-core/cmd"
17
13
	"launchpad.net/juju-core/worker/uniter/jujuc"
18
14
)
19
15
20
16
// dummyHookContext implements jujuc.Context,
21
17
// as expected by jujuc.NewCommand.
22
18
type dummyHookContext struct{}
23
19
24
20
func (dummyHookContext) UnitName() string {
25
21
	return ""
26
22
}
27
23
func (dummyHookContext) PublicAddress() (string, bool) {
28
24
	return "", false
29
25
}
30
26
func (dummyHookContext) PrivateAddress() (string, bool) {
31
27
	return "", false
32
28
}
33
29
func (dummyHookContext) OpenPort(protocol string, port int) error {
34
30
	return nil
35
31
}
36
32
func (dummyHookContext) ClosePort(protocol string, port int) error {
37
33
	return nil
38
34
}
39
35
func (dummyHookContext) ConfigSettings() (charm.Settings, error) {
40
36
	return charm.NewConfig().DefaultSettings(), nil
41
37
}
42
38
func (dummyHookContext) HookRelation() (jujuc.ContextRelation, bool) {
43
39
	return nil, false
44
40
}
45
41
func (dummyHookContext) RemoteUnitName() (string, bool) {
46
42
	return "", false
47
43
}
48
44
func (dummyHookContext) Relation(id int) (jujuc.ContextRelation, bool) {
49
45
	return nil, false
50
46
}
51
47
func (dummyHookContext) RelationIds() []int {
52
48
	return []int{}
53
49
}
54
50
55
51
type HelpToolCommand struct {
56
52
	cmd.CommandBase
57
53
	tool string
58
54
}
59
55
60
56
func (t *HelpToolCommand) Info() *cmd.Info {
61
57
	return &cmd.Info{
62
58
		Name:    "help-tool",
63
59
		Args:    "[tool]",
64
60
		Purpose: "show help on a juju charm tool",
65
61
	}
66
62
}
67
63
68
64
func (t *HelpToolCommand) Init(args []string) error {
69
65
	tool, err := cmd.ZeroOrOneArgs(args)
70
66
	if err == nil {
71
67
		t.tool = tool
72
68
	}
73
69
	return err
74
70
}
75
71
76
72
func (c *HelpToolCommand) Run(ctx *cmd.Context) error {
77
73
	var hookctx dummyHookContext
78
74
	if c.tool == "" {
79
75
		// Ripped from SuperCommand. We could Run() a SuperCommand
80
76
		// with "help commands", but then the implicit "help" command
81
77
		// shows up.
82
78
		names := jujuc.CommandNames()
83
79
		cmds := make([]cmd.Command, 0, len(names))
84
80
		longest := 0
85
81
		for _, name := range names {
86
82
			if c, err := jujuc.NewCommand(hookctx, name); err == nil {
87
83
				if len(name) > longest {
88
84
					longest = len(name)
89
85
				}
90
86
				cmds = append(cmds, c)
91
87
			}
92
88
		}
93
89
		for _, c := range cmds {
94
90
			info := c.Info()
95
91
			fmt.Fprintf(ctx.Stdout, "%-*s  %s\n", longest, info.Name, info.Purpose)
96
92
		}
97
93
	} else {
98
94
		c, err := jujuc.NewCommand(hookctx, c.tool)
99
95
		if err != nil {
100
96
			return err
101
97
		}
102
98
		info := c.Info()
103
99
		f := gnuflag.NewFlagSet(info.Name, gnuflag.ContinueOnError)
104
100
		c.SetFlags(f)
105
101
		ctx.Stdout.Write(info.Help(f))
106
102
	}
107
103
	return nil
108
104
}
109
0
105
110
=== added file 'cmd/juju/helptool_test.go'
111
--- cmd/juju/helptool_test.go	1970-01-01 00:00:00 +0000
112
+++ cmd/juju/helptool_test.go	2013-07-30 07:40:47 +0000
113
@@ -0,0 +1,63 @@
114
1
// Copyright 2013 Canonical Ltd.
115
2
// Licensed under the AGPLv3, see LICENCE file for details.
116
3
117
4
package main
118
5
119
6
import (
120
7
	"strings"
121
8
122
9
	. "launchpad.net/gocheck"
123
10
	"launchpad.net/juju-core/testing"
124
11
)
125
12
126
13
type HelpToolSuite struct {
127
14
	home *testing.FakeHome
128
15
}
129
16
130
17
var _ = Suite(&HelpToolSuite{})
131
18
132
19
func (suite *HelpToolSuite) SetUpTest(c *C) {
133
20
	suite.home = testing.MakeSampleHome(c)
134
21
}
135
22
136
23
func (suite *HelpToolSuite) TearDownTest(c *C) {
137
24
	suite.home.Restore()
138
25
}
139
26
140
27
func (suite *HelpToolSuite) TestHelpToolHelp(c *C) {
141
28
	output := badrun(c, 0, "help", "help-tool")
142
29
	c.Assert(output, Equals, `usage: juju help-tool [tool]
143
30
purpose: show help on a juju charm tool
144
31
`)
145
32
}
146
33
147
34
func (suite *HelpToolSuite) TestHelpTool(c *C) {
148
35
	expectedNames := []string{
149
36
		"close-port",
150
37
		"config-get",
151
38
		"juju-log",
152
39
		"open-port",
153
40
		"relation-get",
154
41
		"relation-ids",
155
42
		"relation-list",
156
43
		"relation-set",
157
44
		"unit-get",
158
45
	}
159
46
	output := badrun(c, 0, "help-tool")
160
47
	lines := strings.Split(strings.TrimSpace(output), "\n")
161
48
	for i, line := range lines {
162
49
		lines[i] = strings.Fields(line)[0]
163
50
	}
164
51
	c.Assert(lines, DeepEquals, expectedNames)
165
52
}
166
53
167
54
func (suite *HelpToolSuite) TestHelpToolName(c *C) {
168
55
	output := badrun(c, 0, "help-tool", "relation-get")
169
56
	expectedHelp := `usage: relation-get \[options\] <key> <unit id>
170
57
purpose: get relation settings
171
58
172
59
options:
173
60
(.|\n)*
174
61
relation-get prints the value(.|\n)*`
175
62
	c.Assert(output, Matches, expectedHelp)
176
63
}
177
0
64
178
=== modified file 'cmd/juju/main.go'
179
--- cmd/juju/main.go	2013-05-28 02:05:06 +0000
180
+++ cmd/juju/main.go	2013-07-30 07:40:47 +0000
181
@@ -90,6 +90,9 @@
182
90
	// Charm publishing commands.
90
	// Charm publishing commands.
183
91
	juju.Register(&PublishCommand{})
91
	juju.Register(&PublishCommand{})
184
92
92
185
93
	// Charm tool commands.
186
94
	juju.Register(&HelpToolCommand{})
187
95
188
93
	// Common commands.
96
	// Common commands.
189
94
	juju.Register(&cmd.VersionCommand{})
97
	juju.Register(&cmd.VersionCommand{})
190
95
98
191
96
99
192
=== modified file 'cmd/juju/main_test.go'
193
--- cmd/juju/main_test.go	2013-07-10 18:25:42 +0000
194
+++ cmd/juju/main_test.go	2013-07-30 07:40:47 +0000
195
@@ -230,6 +230,7 @@
196
230
	"get-env", // alias for get-environment
230
	"get-env", // alias for get-environment
197
231
	"get-environment",
231
	"get-environment",
198
232
	"help",
232
	"help",
199
233
	"help-tool",
200
233
	"image-metadata",
234
	"image-metadata",
201
234
	"init",
235
	"init",
202
235
	"publish",
236
	"publish",
Reviewer	Review Type	Date Requested	Status
Juju Engineering		2013-07-24	Pending
Review via email: mp+176611@code.launchpad.net