1
=== modified file 'cmd/cmd.go'
2
--- cmd/cmd.go	2014-04-01 07:47:11 +0000
3
+++ cmd/cmd.go	2014-05-12 11:08:32 +0000
4
@@ -210,20 +210,23 @@
5
210
	return buf.Bytes()
210
	return buf.Bytes()
6
211
}
211
}
7
212
212
14
213
// Errors from commands can be either ErrHelp, which means "show the help" or
213
// Errors from commands can be ErrSilent (don't print an error message),
15
214
// some other error related to needed flags missing, or needed positional args
214
// ErrHelp (show the help) or some other error related to needed flags
16
215
// missing, in which case we should print the error and return a non-zero
215
// missing, or needed positional args missing, in which case we should
17
216
// return code.
216
// print the error and return a non-zero return code.
18
217
func handleCommandError(c Command, ctx *Context, err error, f *gnuflag.FlagSet) (int, bool) {
217
func handleCommandError(c Command, ctx *Context, err error, f *gnuflag.FlagSet) (rc int, done bool) {
19
218
	if err == gnuflag.ErrHelp {
218
	switch err {
20
219
	case nil:
21
220
		return 0, false
22
221
	case gnuflag.ErrHelp:
23
219
		ctx.Stdout.Write(c.Info().Help(f))
222
		ctx.Stdout.Write(c.Info().Help(f))
24
220
		return 0, true
223
		return 0, true
27
221
	}
224
	case ErrSilent:
28
222
	if err != nil {
225
		return 2, true
29
226
	default:
30
223
		fmt.Fprintf(ctx.Stderr, "error: %v\n", err)
227
		fmt.Fprintf(ctx.Stderr, "error: %v\n", err)
31
224
		return 2, true
228
		return 2, true
32
225
	}
229
	}
33
226
	return 0, false
34
227
}
230
}
35
228
231
36
229
// Main runs the given Command in the supplied Context with the given
232
// Main runs the given Command in the supplied Context with the given
37
230
233
38
=== modified file 'cmd/envcmd/environmentcommand.go'
39
--- cmd/envcmd/environmentcommand.go	2014-05-09 13:24:50 +0000
40
+++ cmd/envcmd/environmentcommand.go	2014-05-12 11:08:32 +0000
41
@@ -24,13 +24,6 @@
42
24
// has been explicitly specified, and there is no default environment.
24
// has been explicitly specified, and there is no default environment.
43
25
var ErrNoEnvironmentSpecified = fmt.Errorf("no environment specified")
25
var ErrNoEnvironmentSpecified = fmt.Errorf("no environment specified")
44
26
26
45
27
// The purpose of EnvCommandBase is to provide a default member and flag
46
28
// setting for commands that deal across different environments.
47
29
type EnvCommandBase struct {
48
30
	cmd.CommandBase
49
31
	EnvName string
50
32
}
51
33
52
34
func getCurrentEnvironmentFilePath() string {
27
func getCurrentEnvironmentFilePath() string {
53
35
	return filepath.Join(osenv.JujuHome(), CurrentEnvironmentFilename)
28
	return filepath.Join(osenv.JujuHome(), CurrentEnvironmentFilename)
54
36
}
29
}
55
@@ -60,39 +53,86 @@
56
60
53
57
61
// There is simple ordering for the default environment.  Firstly check the
54
// There is simple ordering for the default environment.  Firstly check the
58
62
// JUJU_ENV environment variable.  If that is set, it gets used.  If it isn't
55
// JUJU_ENV environment variable.  If that is set, it gets used.  If it isn't
82
63
// set, look in the $JUJU_HOME/current-environment file.
56
// set, look in the $JUJU_HOME/current-environment file.  If neither are
83
64
func getDefaultEnvironment() string {
57
// available, read environments.yaml and use the default environment therein.
84
65
	defaultEnv := os.Getenv(osenv.JujuEnvEnvKey)
58
func getDefaultEnvironment() (string, error) {
85
66
	if defaultEnv != "" {
59
	if defaultEnv := os.Getenv(osenv.JujuEnvEnvKey); defaultEnv != "" {
86
67
		return defaultEnv
60
		return defaultEnv, nil
87
68
	}
61
	}
88
69
	return ReadCurrentEnvironment()
62
	if currentEnv := ReadCurrentEnvironment(); currentEnv != "" {
89
70
}
63
		return currentEnv, nil
90
71
64
	}
91
72
// EnsureEnvName ensures that c.EnvName is non-empty, or sets it to the default
65
	envs, err := environs.ReadEnvirons("")
92
73
// environment name. If there is no default environment name, then
66
	if err != nil {
93
74
// EnsureEnvName returns ErrNoEnvironmentSpecified.
67
		return "", err
94
75
func (c *EnvCommandBase) EnsureEnvName() error {
68
	}
95
76
	if c.EnvName == "" {
69
	if envs.Default == "" {
96
77
		envs, err := environs.ReadEnvirons("")
70
		return "", ErrNoEnvironmentSpecified
97
78
		if err != nil {
71
	}
98
79
			return err
72
	return envs.Default, nil
99
80
		}
73
}
100
81
		if envs.Default == "" {
74
101
82
			return ErrNoEnvironmentSpecified
75
// EnvironCommand extends cmd.Command with a SetEnvName method.
102
83
		}
76
type EnvironCommand interface {
103
84
		c.EnvName = envs.Default
77
	cmd.Command
104
85
	}
78
105
79
	// SetEnvName is called prior to the wrapped command's Init method
106
80
	// with the active environment name. The environment name is guaranteed
107
81
	// to be non-empty at entry of Init.
108
82
	SetEnvName(envName string)
109
83
}
110
84
111
85
// EnvCommandBase is a convenience type for embedding in commands
112
86
// that wish to implement EnvironCommand.
113
87
type EnvCommandBase struct {
114
88
	cmd.CommandBase
115
89
	EnvName string
116
90
}
117
91
118
92
func (c *EnvCommandBase) SetEnvName(envName string) {
119
93
	c.EnvName = envName
120
94
}
121
95
122
96
// Wrap wraps the specified EnvironCommand, returning a Command
123
97
// that proxies to each of the EnvironCommand methods.
124
98
func Wrap(c EnvironCommand) cmd.Command {
125
99
	return &environCommandWrapper{EnvironCommand: c}
126
100
}
127
101
128
102
type environCommandWrapper struct {
129
103
	EnvironCommand
130
104
	envName string
131
105
}
132
106
133
107
func (w *environCommandWrapper) EnvironName() string {
134
108
	return w.envName
135
109
}
136
110
137
111
// ensureEnvName ensures that w.envName is non-empty, or sets it to
138
112
// the default environment name. If there is no default environment name,
139
113
// then ensureEnvName returns ErrNoEnvironmentSpecified.
140
114
func (w *environCommandWrapper) ensureEnvName() error {
141
115
	if w.envName != "" {
142
116
		return nil
143
117
	}
144
118
	defaultEnv, err := getDefaultEnvironment()
145
119
	if err != nil {
146
120
		return err
147
121
	}
148
122
	w.envName = defaultEnv
149
86
	return nil
123
	return nil
150
87
}
124
}
151
88
125
156
89
func (c *EnvCommandBase) SetFlags(f *gnuflag.FlagSet) {
126
func (w *environCommandWrapper) SetFlags(f *gnuflag.FlagSet) {
157
90
	defaultEnv := getDefaultEnvironment()
127
	f.StringVar(&w.envName, "e", "", "juju environment to operate in")
158
91
	f.StringVar(&c.EnvName, "e", defaultEnv, "juju environment to operate in")
128
	f.StringVar(&w.envName, "environment", "", "")
159
92
	f.StringVar(&c.EnvName, "environment", defaultEnv, "")
129
	w.EnvironCommand.SetFlags(f)
160
93
}
130
}
161
94
131
165
95
// EnvironName returns the name of the environment for this command
132
func (w *environCommandWrapper) Init(args []string) error {
166
96
func (c *EnvCommandBase) EnvironName() string {
133
	if err := w.ensureEnvName(); err != nil {
167
97
	return c.EnvName
134
		return err
168
135
	}
169
136
	w.SetEnvName(w.envName)
170
137
	return w.EnvironCommand.Init(args)
171
98
}
138
}
172
99
139
173
=== modified file 'cmd/envcmd/environmentcommand_test.go'
174
--- cmd/envcmd/environmentcommand_test.go	2014-05-09 13:24:50 +0000
175
+++ cmd/envcmd/environmentcommand_test.go	2014-05-12 11:08:32 +0000
176
@@ -12,6 +12,7 @@
177
12
	"launchpad.net/gnuflag"
12
	"launchpad.net/gnuflag"
178
13
	gc "launchpad.net/gocheck"
13
	gc "launchpad.net/gocheck"
179
14
14
180
15
	"launchpad.net/juju-core/cmd"
181
15
	"launchpad.net/juju-core/cmd/envcmd"
16
	"launchpad.net/juju-core/cmd/envcmd"
182
16
	"launchpad.net/juju-core/environs"
17
	"launchpad.net/juju-core/environs"
183
17
	"launchpad.net/juju-core/juju/osenv"
18
	"launchpad.net/juju-core/juju/osenv"
184
@@ -47,29 +48,33 @@
185
47
}
48
}
186
48
49
187
49
func (s *EnvironmentCommandSuite) TestGetDefaultEnvironmentNothingSet(c *gc.C) {
50
func (s *EnvironmentCommandSuite) TestGetDefaultEnvironmentNothingSet(c *gc.C) {
189
50
	env := envcmd.GetDefaultEnvironment()
51
	env, err := envcmd.GetDefaultEnvironment()
190
51
	c.Assert(env, gc.Equals, "")
52
	c.Assert(env, gc.Equals, "")
191
53
	c.Assert(err, jc.Satisfies, environs.IsNoEnv)
192
52
}
54
}
193
53
55
194
54
func (s *EnvironmentCommandSuite) TestGetDefaultEnvironmentCurrentEnvironmentSet(c *gc.C) {
56
func (s *EnvironmentCommandSuite) TestGetDefaultEnvironmentCurrentEnvironmentSet(c *gc.C) {
195
55
	err := envcmd.WriteCurrentEnvironment("fubar")
57
	err := envcmd.WriteCurrentEnvironment("fubar")
196
56
	c.Assert(err, gc.IsNil)
58
	c.Assert(err, gc.IsNil)
198
57
	env := envcmd.GetDefaultEnvironment()
59
	env, err := envcmd.GetDefaultEnvironment()
199
58
	c.Assert(env, gc.Equals, "fubar")
60
	c.Assert(env, gc.Equals, "fubar")
200
61
	c.Assert(err, gc.IsNil)
201
59
}
62
}
202
60
63
203
61
func (s *EnvironmentCommandSuite) TestGetDefaultEnvironmentJujuEnvSet(c *gc.C) {
64
func (s *EnvironmentCommandSuite) TestGetDefaultEnvironmentJujuEnvSet(c *gc.C) {
204
62
	os.Setenv(osenv.JujuEnvEnvKey, "magic")
65
	os.Setenv(osenv.JujuEnvEnvKey, "magic")
206
63
	env := envcmd.GetDefaultEnvironment()
66
	env, err := envcmd.GetDefaultEnvironment()
207
64
	c.Assert(env, gc.Equals, "magic")
67
	c.Assert(env, gc.Equals, "magic")
208
68
	c.Assert(err, gc.IsNil)
209
65
}
69
}
210
66
70
211
67
func (s *EnvironmentCommandSuite) TestGetDefaultEnvironmentBothSet(c *gc.C) {
71
func (s *EnvironmentCommandSuite) TestGetDefaultEnvironmentBothSet(c *gc.C) {
212
68
	os.Setenv(osenv.JujuEnvEnvKey, "magic")
72
	os.Setenv(osenv.JujuEnvEnvKey, "magic")
213
69
	err := envcmd.WriteCurrentEnvironment("fubar")
73
	err := envcmd.WriteCurrentEnvironment("fubar")
214
70
	c.Assert(err, gc.IsNil)
74
	c.Assert(err, gc.IsNil)
216
71
	env := envcmd.GetDefaultEnvironment()
75
	env, err := envcmd.GetDefaultEnvironment()
217
72
	c.Assert(env, gc.Equals, "magic")
76
	c.Assert(env, gc.Equals, "magic")
218
77
	c.Assert(err, gc.IsNil)
219
73
}
78
}
220
74
79
221
75
func (s *EnvironmentCommandSuite) TestWriteAddsNewline(c *gc.C) {
80
func (s *EnvironmentCommandSuite) TestWriteAddsNewline(c *gc.C) {
222
@@ -87,12 +92,12 @@
223
87
	c.Assert(err, gc.ErrorMatches, "unable to write to the environment file: .*")
92
	c.Assert(err, gc.ErrorMatches, "unable to write to the environment file: .*")
224
88
}
93
}
225
89
94
227
90
func (s *EnvironmentCommandSuite) TestEnsureEnvName(c *gc.C) {
95
func (s *EnvironmentCommandSuite) TestEnvironCommandInit(c *gc.C) {
228
91
	// Take environment name from command line arg.
96
	// Take environment name from command line arg.
231
92
	cmd := initEnvCommandBase(c, "explicit")
97
	cmd, envName := prepareEnvCommand(c, "explicit")
232
93
	err := cmd.EnsureEnvName()
98
	err := cmd.Init(nil)
233
94
	c.Assert(err, gc.IsNil)
99
	c.Assert(err, gc.IsNil)
235
95
	c.Assert(cmd.EnvName, gc.Equals, "explicit")
100
	c.Assert(*envName, gc.Equals, "explicit")
236
96
101
237
97
	// Take environment name from the default.
102
	// Take environment name from the default.
238
98
	defer coretesting.MakeFakeHome(c, coretesting.MultipleEnvConfig).Restore()
103
	defer coretesting.MakeFakeHome(c, coretesting.MultipleEnvConfig).Restore()
239
@@ -108,33 +113,52 @@
240
108
	testEnsureEnvName(c, "fubar")
113
	testEnsureEnvName(c, "fubar")
241
109
}
114
}
242
110
115
245
111
func (s *EnvironmentCommandSuite) TestEnsureEnvNameErrors(c *gc.C) {
116
func (s *EnvironmentCommandSuite) TestEnvironCommandInitErrors(c *gc.C) {
246
112
	err := initEnvCommandBase(c, "").EnsureEnvName()
117
	cmd, _ := prepareEnvCommand(c, "")
247
118
	err := cmd.Init(nil)
248
113
	c.Assert(err, jc.Satisfies, environs.IsNoEnv)
119
	c.Assert(err, jc.Satisfies, environs.IsNoEnv)
249
114
120
250
115
	// If there are multiple environments but no default,
121
	// If there are multiple environments but no default,
251
116
	// an error should be returned.
122
	// an error should be returned.
252
117
	defer coretesting.MakeFakeHome(c, coretesting.MultipleEnvConfigNoDefault).Restore()
123
	defer coretesting.MakeFakeHome(c, coretesting.MultipleEnvConfigNoDefault).Restore()
254
118
	err = initEnvCommandBase(c, "").EnsureEnvName()
124
	cmd, _ = prepareEnvCommand(c, "")
255
125
	err = cmd.Init(nil)
256
119
	c.Assert(err, gc.Equals, envcmd.ErrNoEnvironmentSpecified)
126
	c.Assert(err, gc.Equals, envcmd.ErrNoEnvironmentSpecified)
257
120
}
127
}
258
121
128
260
122
func initEnvCommandBase(c *gc.C, name string) *envcmd.EnvCommandBase {
129
type testCommand struct {
261
130
	envcmd.EnvCommandBase
262
131
}
263
132
264
133
func (c *testCommand) Info() *cmd.Info {
265
134
	panic("should not be called")
266
135
}
267
136
268
137
func (c *testCommand) Run(ctx *cmd.Context) error {
269
138
	panic("should not be called")
270
139
}
271
140
272
141
// prepareEnvCommand prepares a Command for a call to Init,
273
142
// returning the Command and a pointer to a string that will
274
143
// contain the environment name after the Command's Init method
275
144
// has been called.
276
145
func prepareEnvCommand(c *gc.C, name string) (cmd.Command, *string) {
277
123
	var flags gnuflag.FlagSet
146
	var flags gnuflag.FlagSet
280
124
	var cmd envcmd.EnvCommandBase
147
	var cmd testCommand
281
125
	cmd.SetFlags(&flags)
148
	wrapped := envcmd.Wrap(&cmd)
282
149
	wrapped.SetFlags(&flags)
283
126
	var args []string
150
	var args []string
284
127
	if name != "" {
151
	if name != "" {
285
128
		args = []string{"-e", name}
152
		args = []string{"-e", name}
286
129
	}
153
	}
287
130
	err := flags.Parse(false, args)
154
	err := flags.Parse(false, args)
288
131
	c.Assert(err, gc.IsNil)
155
	c.Assert(err, gc.IsNil)
290
132
	return &cmd
156
	return wrapped, &cmd.EnvName
291
133
}
157
}
292
134
158
293
135
func testEnsureEnvName(c *gc.C, expect string) {
159
func testEnsureEnvName(c *gc.C, expect string) {
296
136
	cmd := initEnvCommandBase(c, "")
160
	cmd, envName := prepareEnvCommand(c, "")
297
137
	err := cmd.EnsureEnvName()
161
	err := cmd.Init(nil)
298
138
	c.Assert(err, gc.IsNil)
162
	c.Assert(err, gc.IsNil)
300
139
	c.Assert(cmd.EnvName, gc.Equals, expect)
163
	c.Assert(*envName, gc.Equals, expect)
301
140
}
164
}
302
141
165
303
=== modified file 'cmd/juju/addmachine.go'
304
--- cmd/juju/addmachine.go	2014-05-09 13:24:50 +0000
305
+++ cmd/juju/addmachine.go	2014-05-12 11:08:32 +0000
306
@@ -74,15 +74,11 @@
307
74
}
74
}
308
75
75
309
76
func (c *AddMachineCommand) SetFlags(f *gnuflag.FlagSet) {
76
func (c *AddMachineCommand) SetFlags(f *gnuflag.FlagSet) {
310
77
	c.EnvCommandBase.SetFlags(f)
311
78
	f.StringVar(&c.Series, "series", "", "the charm series")
77
	f.StringVar(&c.Series, "series", "", "the charm series")
312
79
	f.Var(constraints.ConstraintsValue{Target: &c.Constraints}, "constraints", "additional machine constraints")
78
	f.Var(constraints.ConstraintsValue{Target: &c.Constraints}, "constraints", "additional machine constraints")
313
80
}
79
}
314
81
80
315
82
func (c *AddMachineCommand) Init(args []string) error {
81
func (c *AddMachineCommand) Init(args []string) error {
316
83
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
317
84
		return err
318
85
	}
319
86
	if c.Constraints.Container != nil {
82
	if c.Constraints.Container != nil {
320
87
		return fmt.Errorf("container constraint %q not allowed when adding a machine", *c.Constraints.Container)
83
		return fmt.Errorf("container constraint %q not allowed when adding a machine", *c.Constraints.Container)
321
88
	}
84
	}
322
@@ -92,7 +88,7 @@
323
92
	}
88
	}
324
93
	c.Placement, err = instance.ParsePlacement(placement)
89
	c.Placement, err = instance.ParsePlacement(placement)
325
94
	if err == instance.ErrPlacementScopeMissing {
90
	if err == instance.ErrPlacementScopeMissing {
327
95
		placement = c.EnvironName() + ":" + placement
91
		placement = c.EnvName + ":" + placement
328
96
		c.Placement, err = instance.ParsePlacement(placement)
92
		c.Placement, err = instance.ParsePlacement(placement)
329
97
	}
93
	}
330
98
	if err != nil {
94
	if err != nil {
331
99
95
332
=== modified file 'cmd/juju/addmachine_test.go'
333
--- cmd/juju/addmachine_test.go	2014-04-23 05:38:27 +0000
334
+++ cmd/juju/addmachine_test.go	2014-05-12 11:08:32 +0000
335
@@ -10,6 +10,7 @@
336
10
	jc "github.com/juju/testing/checkers"
10
	jc "github.com/juju/testing/checkers"
337
11
	gc "launchpad.net/gocheck"
11
	gc "launchpad.net/gocheck"
338
12
12
339
13
	"launchpad.net/juju-core/cmd/envcmd"
340
13
	"launchpad.net/juju-core/constraints"
14
	"launchpad.net/juju-core/constraints"
341
14
	"launchpad.net/juju-core/instance"
15
	"launchpad.net/juju-core/instance"
342
15
	jujutesting "launchpad.net/juju-core/juju/testing"
16
	jujutesting "launchpad.net/juju-core/juju/testing"
343
@@ -24,7 +25,7 @@
344
24
var _ = gc.Suite(&AddMachineSuite{})
25
var _ = gc.Suite(&AddMachineSuite{})
345
25
26
346
26
func runAddMachine(c *gc.C, args ...string) error {
27
func runAddMachine(c *gc.C, args ...string) error {
348
27
	_, err := testing.RunCommand(c, &AddMachineCommand{}, args)
28
	_, err := testing.RunCommand(c, envcmd.Wrap(&AddMachineCommand{}), args)
349
28
	return err
29
	return err
350
29
}
30
}
351
30
31
352
31
32
353
=== modified file 'cmd/juju/addrelation.go'
354
--- cmd/juju/addrelation.go	2014-05-09 13:24:50 +0000
355
+++ cmd/juju/addrelation.go	2014-05-12 11:08:32 +0000
356
@@ -26,9 +26,6 @@
357
26
}
26
}
358
27
27
359
28
func (c *AddRelationCommand) Init(args []string) error {
28
func (c *AddRelationCommand) Init(args []string) error {
360
29
	if err := c.EnsureEnvName(); err != nil {
361
30
		return err
362
31
	}
363
32
	if len(args) != 2 {
29
	if len(args) != 2 {
364
33
		return fmt.Errorf("a relation must involve two services")
30
		return fmt.Errorf("a relation must involve two services")
365
34
	}
31
	}
366
35
32
367
=== modified file 'cmd/juju/addrelation_test.go'
368
--- cmd/juju/addrelation_test.go	2013-09-13 14:48:13 +0000
369
+++ cmd/juju/addrelation_test.go	2014-05-12 11:08:32 +0000
370
@@ -6,6 +6,7 @@
371
6
import (
6
import (
372
7
	gc "launchpad.net/gocheck"
7
	gc "launchpad.net/gocheck"
373
8
8
374
9
	"launchpad.net/juju-core/cmd/envcmd"
375
9
	jujutesting "launchpad.net/juju-core/juju/testing"
10
	jujutesting "launchpad.net/juju-core/juju/testing"
376
10
	"launchpad.net/juju-core/testing"
11
	"launchpad.net/juju-core/testing"
377
11
)
12
)
378
@@ -17,7 +18,7 @@
379
17
var _ = gc.Suite(&AddRelationSuite{})
18
var _ = gc.Suite(&AddRelationSuite{})
380
18
19
381
19
func runAddRelation(c *gc.C, args ...string) error {
20
func runAddRelation(c *gc.C, args ...string) error {
383
20
	_, err := testing.RunCommand(c, &AddRelationCommand{}, args)
21
	_, err := testing.RunCommand(c, envcmd.Wrap(&AddRelationCommand{}), args)
384
21
	return err
22
	return err
385
22
}
23
}
386
23
24
387
24
25
388
=== modified file 'cmd/juju/addunit.go'
389
--- cmd/juju/addunit.go	2014-05-09 13:24:50 +0000
390
+++ cmd/juju/addunit.go	2014-05-12 11:08:32 +0000
391
@@ -74,15 +74,11 @@
392
74
}
74
}
393
75
75
394
76
func (c *AddUnitCommand) SetFlags(f *gnuflag.FlagSet) {
76
func (c *AddUnitCommand) SetFlags(f *gnuflag.FlagSet) {
395
77
	c.EnvCommandBase.SetFlags(f)
396
78
	c.UnitCommandBase.SetFlags(f)
77
	c.UnitCommandBase.SetFlags(f)
397
79
	f.IntVar(&c.NumUnits, "n", 1, "number of service units to add")
78
	f.IntVar(&c.NumUnits, "n", 1, "number of service units to add")
398
80
}
79
}
399
81
80
400
82
func (c *AddUnitCommand) Init(args []string) error {
81
func (c *AddUnitCommand) Init(args []string) error {
401
83
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
402
84
		return err
403
85
	}
404
86
	switch len(args) {
82
	switch len(args) {
405
87
	case 1:
83
	case 1:
406
88
		c.ServiceName = args[0]
84
		c.ServiceName = args[0]
407
89
85
408
=== modified file 'cmd/juju/addunit_test.go'
409
--- cmd/juju/addunit_test.go	2013-12-05 17:30:02 +0000
410
+++ cmd/juju/addunit_test.go	2014-05-12 11:08:32 +0000
411
@@ -7,6 +7,7 @@
412
7
	gc "launchpad.net/gocheck"
7
	gc "launchpad.net/gocheck"
413
8
8
414
9
	"launchpad.net/juju-core/charm"
9
	"launchpad.net/juju-core/charm"
415
10
	"launchpad.net/juju-core/cmd/envcmd"
416
10
	"launchpad.net/juju-core/instance"
11
	"launchpad.net/juju-core/instance"
417
11
	jujutesting "launchpad.net/juju-core/juju/testing"
12
	jujutesting "launchpad.net/juju-core/juju/testing"
418
12
	"launchpad.net/juju-core/state"
13
	"launchpad.net/juju-core/state"
419
@@ -38,13 +39,13 @@
420
38
func (s *AddUnitSuite) TestInitErrors(c *gc.C) {
39
func (s *AddUnitSuite) TestInitErrors(c *gc.C) {
421
39
	for i, t := range initAddUnitErrorTests {
40
	for i, t := range initAddUnitErrorTests {
422
40
		c.Logf("test %d", i)
41
		c.Logf("test %d", i)
424
41
		err := testing.InitCommand(&AddUnitCommand{}, t.args)
42
		err := testing.InitCommand(envcmd.Wrap(&AddUnitCommand{}), t.args)
425
42
		c.Check(err, gc.ErrorMatches, t.err)
43
		c.Check(err, gc.ErrorMatches, t.err)
426
43
	}
44
	}
427
44
}
45
}
428
45
46
429
46
func runAddUnit(c *gc.C, args ...string) error {
47
func runAddUnit(c *gc.C, args ...string) error {
431
47
	_, err := testing.RunCommand(c, &AddUnitCommand{}, args)
48
	_, err := testing.RunCommand(c, envcmd.Wrap(&AddUnitCommand{}), args)
432
48
	return err
49
	return err
433
49
}
50
}
434
50
51
435
51
52
436
=== modified file 'cmd/juju/adduser.go'
437
--- cmd/juju/adduser.go	2014-05-09 13:24:50 +0000
438
+++ cmd/juju/adduser.go	2014-05-12 11:08:32 +0000
439
@@ -51,9 +51,6 @@
440
51
	})
51
	})
441
52
}
52
}
442
53
func (c *AddUserCommand) Init(args []string) error {
53
func (c *AddUserCommand) Init(args []string) error {
443
54
	if err := c.EnsureEnvName(); err != nil {
444
55
		return err
445
56
	}
446
57
	switch len(args) {
54
	switch len(args) {
447
58
	case 0:
55
	case 0:
448
59
		return fmt.Errorf("no username supplied")
56
		return fmt.Errorf("no username supplied")
449
60
57
450
=== modified file 'cmd/juju/adduser_test.go'
451
--- cmd/juju/adduser_test.go	2014-03-28 10:55:18 +0000
452
+++ cmd/juju/adduser_test.go	2014-05-12 11:08:32 +0000
453
@@ -11,6 +11,8 @@
454
11
	"launchpad.net/goyaml"
11
	"launchpad.net/goyaml"
455
12
	jujutesting "launchpad.net/juju-core/juju/testing"
12
	jujutesting "launchpad.net/juju-core/juju/testing"
456
13
13
457
14
	"launchpad.net/juju-core/cmd"
458
15
	"launchpad.net/juju-core/cmd/envcmd"
459
14
	"launchpad.net/juju-core/testing"
16
	"launchpad.net/juju-core/testing"
460
15
)
17
)
461
16
18
462
@@ -22,22 +24,26 @@
463
22
24
464
23
var _ = gc.Suite(&AddUserSuite{})
25
var _ = gc.Suite(&AddUserSuite{})
465
24
26
466
27
func newAddUserCommand() cmd.Command {
467
28
	return envcmd.Wrap(&AddUserCommand{})
468
29
}
469
30
470
25
func (s *AddUserSuite) TestAddUser(c *gc.C) {
31
func (s *AddUserSuite) TestAddUser(c *gc.C) {
471
26
32
473
27
	_, err := testing.RunCommand(c, &AddUserCommand{}, []string{"foobar", "password"})
33
	_, err := testing.RunCommand(c, newAddUserCommand(), []string{"foobar", "password"})
474
28
	c.Assert(err, gc.IsNil)
34
	c.Assert(err, gc.IsNil)
475
29
35
477
30
	_, err = testing.RunCommand(c, &AddUserCommand{}, []string{"foobar", "newpassword"})
36
	_, err = testing.RunCommand(c, newAddUserCommand(), []string{"foobar", "newpassword"})
478
31
	c.Assert(err, gc.ErrorMatches, "Failed to create user: user already exists")
37
	c.Assert(err, gc.ErrorMatches, "Failed to create user: user already exists")
479
32
}
38
}
480
33
39
481
34
func (s *AddUserSuite) TestTooManyArgs(c *gc.C) {
40
func (s *AddUserSuite) TestTooManyArgs(c *gc.C) {
483
35
	_, err := testing.RunCommand(c, &AddUserCommand{}, []string{"foobar", "password", "whoops"})
41
	_, err := testing.RunCommand(c, newAddUserCommand(), []string{"foobar", "password", "whoops"})
484
36
	c.Assert(err, gc.ErrorMatches, `unrecognized args: \["whoops"\]`)
42
	c.Assert(err, gc.ErrorMatches, `unrecognized args: \["whoops"\]`)
485
37
}
43
}
486
38
44
487
39
func (s *AddUserSuite) TestNotEnoughArgs(c *gc.C) {
45
func (s *AddUserSuite) TestNotEnoughArgs(c *gc.C) {
489
40
	_, err := testing.RunCommand(c, &AddUserCommand{}, []string{})
46
	_, err := testing.RunCommand(c, newAddUserCommand(), []string{})
490
41
	c.Assert(err, gc.ErrorMatches, `no username supplied`)
47
	c.Assert(err, gc.ErrorMatches, `no username supplied`)
491
42
}
48
}
492
43
49
493
@@ -50,7 +56,7 @@
494
50
	tempFile, err := ioutil.TempFile("", "adduser-test")
56
	tempFile, err := ioutil.TempFile("", "adduser-test")
495
51
	tempFile.Close()
57
	tempFile.Close()
496
52
	c.Assert(err, gc.IsNil)
58
	c.Assert(err, gc.IsNil)
498
53
	_, err = testing.RunCommand(c, &AddUserCommand{}, []string{"foobar", "password", "-o", tempFile.Name()})
59
	_, err = testing.RunCommand(c, newAddUserCommand(), []string{"foobar", "password", "-o", tempFile.Name()})
499
54
	c.Assert(err, gc.IsNil)
60
	c.Assert(err, gc.IsNil)
500
55
	data, err := ioutil.ReadFile(tempFile.Name())
61
	data, err := ioutil.ReadFile(tempFile.Name())
501
56
	result := map[string]interface{}{}
62
	result := map[string]interface{}{}
502
@@ -65,7 +71,7 @@
503
65
		"password":      "password",
71
		"password":      "password",
504
66
		"state-servers": []interface{}{},
72
		"state-servers": []interface{}{},
505
67
		"ca-cert":       ""}
73
		"ca-cert":       ""}
507
68
	ctx, err := testing.RunCommand(c, &AddUserCommand{}, []string{"foobar", "password"})
74
	ctx, err := testing.RunCommand(c, newAddUserCommand(), []string{"foobar", "password"})
508
69
	c.Assert(err, gc.IsNil)
75
	c.Assert(err, gc.IsNil)
509
70
	stdout := ctx.Stdout.(*bytes.Buffer).Bytes()
76
	stdout := ctx.Stdout.(*bytes.Buffer).Bytes()
510
71
	result := map[string]interface{}{}
77
	result := map[string]interface{}{}
511
@@ -80,7 +86,7 @@
512
80
	tempFile, err := ioutil.TempFile("", "adduser-test")
86
	tempFile, err := ioutil.TempFile("", "adduser-test")
513
81
	tempFile.Close()
87
	tempFile.Close()
514
82
	c.Assert(err, gc.IsNil)
88
	c.Assert(err, gc.IsNil)
516
83
	_, err = testing.RunCommand(c, &AddUserCommand{}, []string{"foobar", "password", "-o", tempFile.Name(), "--format", "json"})
89
	_, err = testing.RunCommand(c, newAddUserCommand(), []string{"foobar", "password", "-o", tempFile.Name(), "--format", "json"})
517
84
	c.Assert(err, gc.IsNil)
90
	c.Assert(err, gc.IsNil)
518
85
	data, err := ioutil.ReadFile(tempFile.Name())
91
	data, err := ioutil.ReadFile(tempFile.Name())
519
86
	c.Assert(string(data), gc.DeepEquals, expected)
92
	c.Assert(string(data), gc.DeepEquals, expected)
520
@@ -89,14 +95,14 @@
521
89
func (s *AddUserSuite) TestJenvJsonFileOutput(c *gc.C) {
95
func (s *AddUserSuite) TestJenvJsonFileOutput(c *gc.C) {
522
90
	expected := `{"User":"foobar","Password":"password","state-servers":null,"ca-cert":""}
96
	expected := `{"User":"foobar","Password":"password","state-servers":null,"ca-cert":""}
523
91
`
97
`
525
92
	ctx, err := testing.RunCommand(c, &AddUserCommand{}, []string{"foobar", "password", "--format", "json"})
98
	ctx, err := testing.RunCommand(c, newAddUserCommand(), []string{"foobar", "password", "--format", "json"})
526
93
	c.Assert(err, gc.IsNil)
99
	c.Assert(err, gc.IsNil)
527
94
	stdout := ctx.Stdout.(*bytes.Buffer).String()
100
	stdout := ctx.Stdout.(*bytes.Buffer).String()
528
95
	c.Assert(stdout, gc.DeepEquals, expected)
101
	c.Assert(stdout, gc.DeepEquals, expected)
529
96
}
102
}
530
97
103
531
98
func (s *AddUserSuite) TestGeneratePassword(c *gc.C) {
104
func (s *AddUserSuite) TestGeneratePassword(c *gc.C) {
533
99
	ctx, err := testing.RunCommand(c, &AddUserCommand{}, []string{"foobar"})
105
	ctx, err := testing.RunCommand(c, newAddUserCommand(), []string{"foobar"})
534
100
	c.Assert(err, gc.IsNil)
106
	c.Assert(err, gc.IsNil)
535
101
	stdout := ctx.Stdout.(*bytes.Buffer).Bytes()
107
	stdout := ctx.Stdout.(*bytes.Buffer).Bytes()
536
102
	var d map[string]interface{}
108
	var d map[string]interface{}
537
103
109
538
=== modified file 'cmd/juju/authorizedkeys.go'
539
--- cmd/juju/authorizedkeys.go	2014-04-25 06:39:01 +0000
540
+++ cmd/juju/authorizedkeys.go	2014-05-12 11:08:32 +0000
541
@@ -7,6 +7,7 @@
542
7
	"launchpad.net/gnuflag"
7
	"launchpad.net/gnuflag"
543
8
8
544
9
	"launchpad.net/juju-core/cmd"
9
	"launchpad.net/juju-core/cmd"
545
10
	"launchpad.net/juju-core/cmd/envcmd"
546
10
)
11
)
547
11
12
548
12
var authKeysDoc = `
13
var authKeysDoc = `
549
@@ -29,10 +30,10 @@
550
29
			Aliases:     []string{"authorised-keys"},
30
			Aliases:     []string{"authorised-keys"},
551
30
		}),
31
		}),
552
31
	}
32
	}
557
32
	sshkeyscmd.Register(&AddKeysCommand{})
33
	sshkeyscmd.Register(envcmd.Wrap(&AddKeysCommand{}))
558
33
	sshkeyscmd.Register(&DeleteKeysCommand{})
34
	sshkeyscmd.Register(envcmd.Wrap(&DeleteKeysCommand{}))
559
34
	sshkeyscmd.Register(&ImportKeysCommand{})
35
	sshkeyscmd.Register(envcmd.Wrap(&ImportKeysCommand{}))
560
35
	sshkeyscmd.Register(&ListKeysCommand{})
36
	sshkeyscmd.Register(envcmd.Wrap(&ListKeysCommand{}))
561
36
	return sshkeyscmd
37
	return sshkeyscmd
562
37
}
38
}
563
38
39
564
39
40
565
=== modified file 'cmd/juju/authorizedkeys_add.go'
566
--- cmd/juju/authorizedkeys_add.go	2014-05-09 13:24:50 +0000
567
+++ cmd/juju/authorizedkeys_add.go	2014-05-12 11:08:32 +0000
568
@@ -35,9 +35,6 @@
569
35
}
35
}
570
36
36
571
37
func (c *AddKeysCommand) Init(args []string) error {
37
func (c *AddKeysCommand) Init(args []string) error {
572
38
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
573
39
		return err
574
40
	}
575
41
	switch len(args) {
38
	switch len(args) {
576
42
	case 0:
39
	case 0:
577
43
		return errors.New("no ssh key specified")
40
		return errors.New("no ssh key specified")
578
@@ -48,7 +45,6 @@
579
48
}
45
}
580
49
46
581
50
func (c *AddKeysCommand) SetFlags(f *gnuflag.FlagSet) {
47
func (c *AddKeysCommand) SetFlags(f *gnuflag.FlagSet) {
582
51
	c.EnvCommandBase.SetFlags(f)
583
52
	f.StringVar(&c.user, "user", "admin", "the user for which to add the keys")
48
	f.StringVar(&c.user, "user", "admin", "the user for which to add the keys")
584
53
}
49
}
585
54
50
586
55
51
587
=== modified file 'cmd/juju/authorizedkeys_delete.go'
588
--- cmd/juju/authorizedkeys_delete.go	2014-05-09 13:24:50 +0000
589
+++ cmd/juju/authorizedkeys_delete.go	2014-05-12 11:08:32 +0000
590
@@ -37,9 +37,6 @@
591
37
}
37
}
592
38
38
593
39
func (c *DeleteKeysCommand) Init(args []string) error {
39
func (c *DeleteKeysCommand) Init(args []string) error {
594
40
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
595
41
		return err
596
42
	}
597
43
	switch len(args) {
40
	switch len(args) {
598
44
	case 0:
41
	case 0:
599
45
		return errors.New("no ssh key id specified")
42
		return errors.New("no ssh key id specified")
600
@@ -50,7 +47,6 @@
601
50
}
47
}
602
51
48
603
52
func (c *DeleteKeysCommand) SetFlags(f *gnuflag.FlagSet) {
49
func (c *DeleteKeysCommand) SetFlags(f *gnuflag.FlagSet) {
604
53
	c.EnvCommandBase.SetFlags(f)
605
54
	f.StringVar(&c.user, "user", "admin", "the user for which to delete the keys")
50
	f.StringVar(&c.user, "user", "admin", "the user for which to delete the keys")
606
55
}
51
}
607
56
52
608
57
53
609
=== modified file 'cmd/juju/authorizedkeys_import.go'
610
--- cmd/juju/authorizedkeys_import.go	2014-05-09 13:24:50 +0000
611
+++ cmd/juju/authorizedkeys_import.go	2014-05-12 11:08:32 +0000
612
@@ -36,9 +36,6 @@
613
36
}
36
}
614
37
37
615
38
func (c *ImportKeysCommand) Init(args []string) error {
38
func (c *ImportKeysCommand) Init(args []string) error {
616
39
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
617
40
		return err
618
41
	}
619
42
	switch len(args) {
39
	switch len(args) {
620
43
	case 0:
40
	case 0:
621
44
		return errors.New("no ssh key id specified")
41
		return errors.New("no ssh key id specified")
622
@@ -49,7 +46,6 @@
623
49
}
46
}
624
50
47
625
51
func (c *ImportKeysCommand) SetFlags(f *gnuflag.FlagSet) {
48
func (c *ImportKeysCommand) SetFlags(f *gnuflag.FlagSet) {
626
52
	c.EnvCommandBase.SetFlags(f)
627
53
	f.StringVar(&c.user, "user", "admin", "the user for which to import the keys")
49
	f.StringVar(&c.user, "user", "admin", "the user for which to import the keys")
628
54
}
50
}
629
55
51
630
56
52
631
=== modified file 'cmd/juju/authorizedkeys_list.go'
632
--- cmd/juju/authorizedkeys_list.go	2014-05-09 13:24:50 +0000
633
+++ cmd/juju/authorizedkeys_list.go	2014-05-12 11:08:32 +0000
634
@@ -37,18 +37,10 @@
635
37
}
37
}
636
38
38
637
39
func (c *ListKeysCommand) SetFlags(f *gnuflag.FlagSet) {
39
func (c *ListKeysCommand) SetFlags(f *gnuflag.FlagSet) {
638
40
	c.EnvCommandBase.SetFlags(f)
639
41
	f.BoolVar(&c.showFullKey, "full", false, "show full key instead of just the key fingerprint")
40
	f.BoolVar(&c.showFullKey, "full", false, "show full key instead of just the key fingerprint")
640
42
	f.StringVar(&c.user, "user", "admin", "the user for which to list the keys")
41
	f.StringVar(&c.user, "user", "admin", "the user for which to list the keys")
641
43
}
42
}
642
44
43
643
45
func (c *ListKeysCommand) Init(args []string) error {
644
46
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
645
47
		return err
646
48
	}
647
49
	return cmd.CheckEmpty(args)
648
50
}
649
51
650
52
func (c *ListKeysCommand) Run(context *cmd.Context) error {
44
func (c *ListKeysCommand) Run(context *cmd.Context) error {
651
53
	client, err := juju.NewKeyManagerClient(c.EnvName)
45
	client, err := juju.NewKeyManagerClient(c.EnvName)
652
54
	if err != nil {
46
	if err != nil {
653
55
47
654
=== modified file 'cmd/juju/authorizedkeys_test.go'
655
--- cmd/juju/authorizedkeys_test.go	2014-04-25 06:39:01 +0000
656
+++ cmd/juju/authorizedkeys_test.go	2014-05-12 11:08:32 +0000
657
@@ -9,6 +9,7 @@
658
9
9
659
10
	gc "launchpad.net/gocheck"
10
	gc "launchpad.net/gocheck"
660
11
11
661
12
	"launchpad.net/juju-core/cmd/envcmd"
662
12
	"launchpad.net/juju-core/juju/osenv"
13
	"launchpad.net/juju-core/juju/osenv"
663
13
	jujutesting "launchpad.net/juju-core/juju/testing"
14
	jujutesting "launchpad.net/juju-core/juju/testing"
664
14
	keymanagerserver "launchpad.net/juju-core/state/apiserver/keymanager"
15
	keymanagerserver "launchpad.net/juju-core/state/apiserver/keymanager"
665
@@ -127,7 +128,7 @@
666
127
	key2 := sshtesting.ValidKeyTwo.Key + " another@host"
128
	key2 := sshtesting.ValidKeyTwo.Key + " another@host"
667
128
	s.setAuthorizedKeys(c, key1, key2)
129
	s.setAuthorizedKeys(c, key1, key2)
668
129
130
670
130
	context, err := coretesting.RunCommand(c, &ListKeysCommand{}, []string{})
131
	context, err := coretesting.RunCommand(c, envcmd.Wrap(&ListKeysCommand{}), []string{})
671
131
	c.Assert(err, gc.IsNil)
132
	c.Assert(err, gc.IsNil)
672
132
	output := strings.TrimSpace(coretesting.Stdout(context))
133
	output := strings.TrimSpace(coretesting.Stdout(context))
673
133
	c.Assert(err, gc.IsNil)
134
	c.Assert(err, gc.IsNil)
674
@@ -139,7 +140,7 @@
675
139
	key2 := sshtesting.ValidKeyTwo.Key + " another@host"
140
	key2 := sshtesting.ValidKeyTwo.Key + " another@host"
676
140
	s.setAuthorizedKeys(c, key1, key2)
141
	s.setAuthorizedKeys(c, key1, key2)
677
141
142
679
142
	context, err := coretesting.RunCommand(c, &ListKeysCommand{}, []string{"--full"})
143
	context, err := coretesting.RunCommand(c, envcmd.Wrap(&ListKeysCommand{}), []string{"--full"})
680
143
	c.Assert(err, gc.IsNil)
144
	c.Assert(err, gc.IsNil)
681
144
	output := strings.TrimSpace(coretesting.Stdout(context))
145
	output := strings.TrimSpace(coretesting.Stdout(context))
682
145
	c.Assert(err, gc.IsNil)
146
	c.Assert(err, gc.IsNil)
683
@@ -153,7 +154,7 @@
684
153
	_, err := s.State.AddUser("fred", "password")
154
	_, err := s.State.AddUser("fred", "password")
685
154
	c.Assert(err, gc.IsNil)
155
	c.Assert(err, gc.IsNil)
686
155
156
688
156
	context, err := coretesting.RunCommand(c, &ListKeysCommand{}, []string{"--user", "fred"})
157
	context, err := coretesting.RunCommand(c, envcmd.Wrap(&ListKeysCommand{}), []string{"--user", "fred"})
689
157
	c.Assert(err, gc.IsNil)
158
	c.Assert(err, gc.IsNil)
690
158
	output := strings.TrimSpace(coretesting.Stdout(context))
159
	output := strings.TrimSpace(coretesting.Stdout(context))
691
159
	c.Assert(err, gc.IsNil)
160
	c.Assert(err, gc.IsNil)
692
@@ -161,7 +162,7 @@
693
161
}
162
}
694
162
163
695
163
func (s *ListKeysSuite) TestTooManyArgs(c *gc.C) {
164
func (s *ListKeysSuite) TestTooManyArgs(c *gc.C) {
697
164
	_, err := coretesting.RunCommand(c, &ListKeysCommand{}, []string{"foo"})
165
	_, err := coretesting.RunCommand(c, envcmd.Wrap(&ListKeysCommand{}), []string{"foo"})
698
165
	c.Assert(err, gc.ErrorMatches, `unrecognized args: \["foo"\]`)
166
	c.Assert(err, gc.ErrorMatches, `unrecognized args: \["foo"\]`)
699
166
}
167
}
700
167
168
701
@@ -176,7 +177,7 @@
702
176
	s.setAuthorizedKeys(c, key1)
177
	s.setAuthorizedKeys(c, key1)
703
177
178
704
178
	key2 := sshtesting.ValidKeyTwo.Key + " another@host"
179
	key2 := sshtesting.ValidKeyTwo.Key + " another@host"
706
179
	context, err := coretesting.RunCommand(c, &AddKeysCommand{}, []string{key2, "invalid-key"})
180
	context, err := coretesting.RunCommand(c, envcmd.Wrap(&AddKeysCommand{}), []string{key2, "invalid-key"})
707
180
	c.Assert(err, gc.IsNil)
181
	c.Assert(err, gc.IsNil)
708
181
	c.Assert(coretesting.Stderr(context), gc.Matches, `cannot add key "invalid-key".*\n`)
182
	c.Assert(coretesting.Stderr(context), gc.Matches, `cannot add key "invalid-key".*\n`)
709
182
	s.assertEnvironKeys(c, key1, key2)
183
	s.assertEnvironKeys(c, key1, key2)
710
@@ -189,7 +190,7 @@
711
189
	c.Assert(err, gc.IsNil)
190
	c.Assert(err, gc.IsNil)
712
190
191
713
191
	key2 := sshtesting.ValidKeyTwo.Key + " another@host"
192
	key2 := sshtesting.ValidKeyTwo.Key + " another@host"
715
192
	context, err := coretesting.RunCommand(c, &AddKeysCommand{}, []string{"--user", "fred", key2})
193
	context, err := coretesting.RunCommand(c, envcmd.Wrap(&AddKeysCommand{}), []string{"--user", "fred", key2})
716
193
	c.Assert(err, gc.IsNil)
194
	c.Assert(err, gc.IsNil)
717
194
	c.Assert(coretesting.Stderr(context), gc.Equals, "")
195
	c.Assert(coretesting.Stderr(context), gc.Equals, "")
718
195
	s.assertEnvironKeys(c, key1, key2)
196
	s.assertEnvironKeys(c, key1, key2)
719
@@ -207,7 +208,7 @@
720
207
	s.setAuthorizedKeys(c, key1, key2)
208
	s.setAuthorizedKeys(c, key1, key2)
721
208
209
722
209
	context, err := coretesting.RunCommand(
210
	context, err := coretesting.RunCommand(
724
210
		c, &DeleteKeysCommand{}, []string{sshtesting.ValidKeyTwo.Fingerprint, "invalid-key"})
211
		c, envcmd.Wrap(&DeleteKeysCommand{}), []string{sshtesting.ValidKeyTwo.Fingerprint, "invalid-key"})
725
211
	c.Assert(err, gc.IsNil)
212
	c.Assert(err, gc.IsNil)
726
212
	c.Assert(coretesting.Stderr(context), gc.Matches, `cannot delete key id "invalid-key".*\n`)
213
	c.Assert(coretesting.Stderr(context), gc.Matches, `cannot delete key id "invalid-key".*\n`)
727
213
	s.assertEnvironKeys(c, key1)
214
	s.assertEnvironKeys(c, key1)
728
@@ -221,7 +222,7 @@
729
221
	c.Assert(err, gc.IsNil)
222
	c.Assert(err, gc.IsNil)
730
222
223
731
223
	context, err := coretesting.RunCommand(
224
	context, err := coretesting.RunCommand(
733
224
		c, &DeleteKeysCommand{}, []string{"--user", "fred", sshtesting.ValidKeyTwo.Fingerprint})
225
		c, envcmd.Wrap(&DeleteKeysCommand{}), []string{"--user", "fred", sshtesting.ValidKeyTwo.Fingerprint})
734
225
	c.Assert(err, gc.IsNil)
226
	c.Assert(err, gc.IsNil)
735
226
	c.Assert(coretesting.Stderr(context), gc.Equals, "")
227
	c.Assert(coretesting.Stderr(context), gc.Equals, "")
736
227
	s.assertEnvironKeys(c, key1)
228
	s.assertEnvironKeys(c, key1)
737
@@ -242,7 +243,7 @@
738
242
	key1 := sshtesting.ValidKeyOne.Key + " user@host"
243
	key1 := sshtesting.ValidKeyOne.Key + " user@host"
739
243
	s.setAuthorizedKeys(c, key1)
244
	s.setAuthorizedKeys(c, key1)
740
244
245
742
245
	context, err := coretesting.RunCommand(c, &ImportKeysCommand{}, []string{"lp:validuser", "invalid-key"})
246
	context, err := coretesting.RunCommand(c, envcmd.Wrap(&ImportKeysCommand{}), []string{"lp:validuser", "invalid-key"})
743
246
	c.Assert(err, gc.IsNil)
247
	c.Assert(err, gc.IsNil)
744
247
	c.Assert(coretesting.Stderr(context), gc.Matches, `cannot import key id "invalid-key".*\n`)
248
	c.Assert(coretesting.Stderr(context), gc.Matches, `cannot import key id "invalid-key".*\n`)
745
248
	s.assertEnvironKeys(c, key1, sshtesting.ValidKeyThree.Key)
249
	s.assertEnvironKeys(c, key1, sshtesting.ValidKeyThree.Key)
746
@@ -254,7 +255,7 @@
747
254
	_, err := s.State.AddUser("fred", "password")
255
	_, err := s.State.AddUser("fred", "password")
748
255
	c.Assert(err, gc.IsNil)
256
	c.Assert(err, gc.IsNil)
749
256
257
751
257
	context, err := coretesting.RunCommand(c, &ImportKeysCommand{}, []string{"--user", "fred", "lp:validuser"})
258
	context, err := coretesting.RunCommand(c, envcmd.Wrap(&ImportKeysCommand{}), []string{"--user", "fred", "lp:validuser"})
752
258
	c.Assert(err, gc.IsNil)
259
	c.Assert(err, gc.IsNil)
753
259
	c.Assert(coretesting.Stderr(context), gc.Equals, "")
260
	c.Assert(coretesting.Stderr(context), gc.Equals, "")
754
260
	s.assertEnvironKeys(c, key1, sshtesting.ValidKeyThree.Key)
261
	s.assertEnvironKeys(c, key1, sshtesting.ValidKeyThree.Key)
755
261
262
756
=== modified file 'cmd/juju/bootstrap.go'
757
--- cmd/juju/bootstrap.go	2014-05-09 13:24:50 +0000
758
+++ cmd/juju/bootstrap.go	2014-05-12 11:08:32 +0000
759
@@ -78,7 +78,6 @@
760
78
}
78
}
761
79
79
762
80
func (c *BootstrapCommand) SetFlags(f *gnuflag.FlagSet) {
80
func (c *BootstrapCommand) SetFlags(f *gnuflag.FlagSet) {
763
81
	c.EnvCommandBase.SetFlags(f)
764
82
	f.Var(constraints.ConstraintsValue{Target: &c.Constraints}, "constraints", "set environment constraints")
81
	f.Var(constraints.ConstraintsValue{Target: &c.Constraints}, "constraints", "set environment constraints")
765
83
	f.BoolVar(&c.UploadTools, "upload-tools", false, "upload local version of tools before bootstrapping")
82
	f.BoolVar(&c.UploadTools, "upload-tools", false, "upload local version of tools before bootstrapping")
766
84
	f.Var(newSeriesValue(nil, &c.Series), "upload-series", "upload tools for supplied comma-separated series list")
83
	f.Var(newSeriesValue(nil, &c.Series), "upload-series", "upload tools for supplied comma-separated series list")
767
@@ -88,9 +87,6 @@
768
88
}
87
}
769
89
88
770
90
func (c *BootstrapCommand) Init(args []string) (err error) {
89
func (c *BootstrapCommand) Init(args []string) (err error) {
771
91
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
772
92
		return err
773
93
	}
774
94
	if len(c.Series) > 0 && !c.UploadTools {
90
	if len(c.Series) > 0 && !c.UploadTools {
775
95
		return fmt.Errorf("--upload-series requires --upload-tools")
91
		return fmt.Errorf("--upload-series requires --upload-tools")
776
96
	}
92
	}
777
97
93
778
=== modified file 'cmd/juju/bootstrap_test.go'
779
--- cmd/juju/bootstrap_test.go	2014-05-12 00:24:54 +0000
780
+++ cmd/juju/bootstrap_test.go	2014-05-12 11:08:32 +0000
781
@@ -12,6 +12,7 @@
782
12
	gc "launchpad.net/gocheck"
12
	gc "launchpad.net/gocheck"
783
13
13
784
14
	"launchpad.net/juju-core/cmd"
14
	"launchpad.net/juju-core/cmd"
785
15
	"launchpad.net/juju-core/cmd/envcmd"
786
15
	"launchpad.net/juju-core/constraints"
16
	"launchpad.net/juju-core/constraints"
787
16
	"launchpad.net/juju-core/environs"
17
	"launchpad.net/juju-core/environs"
788
17
	"launchpad.net/juju-core/environs/config"
18
	"launchpad.net/juju-core/environs/config"
789
@@ -142,7 +143,7 @@
790
142
	restore := envtools.TestingPatchBootstrapFindTools(mockFindTools)
143
	restore := envtools.TestingPatchBootstrapFindTools(mockFindTools)
791
143
	defer restore()
144
	defer restore()
792
144
145
794
145
	_, errc := runCommand(nullContext(c), new(BootstrapCommand), test.args...)
146
	_, errc := runCommand(nullContext(c), envcmd.Wrap(new(BootstrapCommand)), test.args...)
795
146
	err := <-errc
147
	err := <-errc
796
147
	c.Check(findToolsRetryValues, gc.DeepEquals, test.expectedAllowRetry)
148
	c.Check(findToolsRetryValues, gc.DeepEquals, test.expectedAllowRetry)
797
148
	stripped := strings.Replace(err.Error(), "\n", "", -1)
149
	stripped := strings.Replace(err.Error(), "\n", "", -1)
798
@@ -225,7 +226,7 @@
799
225
	}
226
	}
800
226
227
801
227
	// Run command and check for uploads.
228
	// Run command and check for uploads.
803
228
	opc, errc := runCommand(nullContext(c), new(BootstrapCommand), test.args...)
229
	opc, errc := runCommand(nullContext(c), envcmd.Wrap(new(BootstrapCommand)), test.args...)
804
229
	// Check for remaining operations/errors.
230
	// Check for remaining operations/errors.
805
230
	if test.err != "" {
231
	if test.err != "" {
806
231
		err := <-errc
232
		err := <-errc
807
@@ -402,10 +403,10 @@
808
402
	defaultSeriesVersion.Minor = 11
403
	defaultSeriesVersion.Minor = 11
809
403
	s.PatchValue(&version.Current, defaultSeriesVersion)
404
	s.PatchValue(&version.Current, defaultSeriesVersion)
810
404
405
812
405
	_, err := coretesting.RunCommand(c, &BootstrapCommand{}, nil)
406
	_, err := coretesting.RunCommand(c, envcmd.Wrap(&BootstrapCommand{}), nil)
813
406
	c.Assert(err, gc.IsNil)
407
	c.Assert(err, gc.IsNil)
814
407
408
816
408
	_, err = coretesting.RunCommand(c, &BootstrapCommand{}, nil)
409
	_, err = coretesting.RunCommand(c, envcmd.Wrap(&BootstrapCommand{}), nil)
817
409
	c.Assert(err, gc.ErrorMatches, "environment is already bootstrapped")
410
	c.Assert(err, gc.ErrorMatches, "environment is already bootstrapped")
818
410
}
411
}
819
411
412
820
@@ -428,7 +429,7 @@
821
428
	_, fake := makeEmptyFakeHome(c)
429
	_, fake := makeEmptyFakeHome(c)
822
429
	defer fake.Restore()
430
	defer fake.Restore()
823
430
431
825
431
	ctx, err := coretesting.RunCommand(c, &BootstrapCommand{},
432
	ctx, err := coretesting.RunCommand(c, envcmd.Wrap(&BootstrapCommand{}),
826
432
		[]string{"--upload-tools", argVariant, "foo,bar"})
433
		[]string{"--upload-tools", argVariant, "foo,bar"})
827
433
434
828
434
	c.Assert(err, gc.IsNil)
435
	c.Assert(err, gc.IsNil)
829
@@ -457,7 +458,7 @@
830
457
	loggo.RegisterWriter(logger, testWriter, loggo.WARNING)
458
	loggo.RegisterWriter(logger, testWriter, loggo.WARNING)
831
458
	defer loggo.RemoveWriter(logger)
459
	defer loggo.RemoveWriter(logger)
832
459
460
834
460
	_, errc := runCommand(ctx, new(BootstrapCommand), "-e", "peckham")
461
	_, errc := runCommand(ctx, envcmd.Wrap(new(BootstrapCommand)), "-e", "peckham")
835
461
	c.Assert(<-errc, gc.IsNil)
462
	c.Assert(<-errc, gc.IsNil)
836
462
	c.Assert(testWriter.Log, jc.LogMatches, []string{"ignoring environments.yaml: using bootstrap config in .*"})
463
	c.Assert(testWriter.Log, jc.LogMatches, []string{"ignoring environments.yaml: using bootstrap config in .*"})
837
463
}
464
}
838
@@ -469,7 +470,7 @@
839
469
470
840
470
	// Bootstrap the environment with an invalid source.
471
	// Bootstrap the environment with an invalid source.
841
471
	// The command returns with an error.
472
	// The command returns with an error.
843
472
	_, err := coretesting.RunCommand(c, &BootstrapCommand{}, []string{"--metadata-source", c.MkDir()})
473
	_, err := coretesting.RunCommand(c, envcmd.Wrap(&BootstrapCommand{}), []string{"--metadata-source", c.MkDir()})
844
473
	c.Check(err, gc.ErrorMatches, "cannot upload bootstrap tools: Juju "+
474
	c.Check(err, gc.ErrorMatches, "cannot upload bootstrap tools: Juju "+
845
474
		"cannot bootstrap because no tools are available for your "+
475
		"cannot bootstrap because no tools are available for your "+
846
475
		"environment(.|\n)*")
476
		"environment(.|\n)*")
847
@@ -524,7 +525,7 @@
848
524
	devVersion.Minor = 11
525
	devVersion.Minor = 11
849
525
	s.PatchValue(&version.Current, devVersion)
526
	s.PatchValue(&version.Current, devVersion)
850
526
527
852
527
	_, err := coretesting.RunCommand(c, &BootstrapCommand{}, []string{"--metadata-source", sourceDir})
528
	_, err := coretesting.RunCommand(c, envcmd.Wrap(&BootstrapCommand{}), []string{"--metadata-source", sourceDir})
853
528
	c.Assert(err, gc.IsNil)
529
	c.Assert(err, gc.IsNil)
854
529
	c.Assert(imagemetadata.DefaultBaseURL, gc.Equals, imagemetadata.UbuntuCloudImagesURL)
530
	c.Assert(imagemetadata.DefaultBaseURL, gc.Equals, imagemetadata.UbuntuCloudImagesURL)
855
530
531
856
@@ -541,7 +542,7 @@
857
541
	// Bootstrap the environment with the valid source.
542
	// Bootstrap the environment with the valid source.
858
542
	// The bootstrapping has to show no error, because the tools
543
	// The bootstrapping has to show no error, because the tools
859
543
	// are automatically synchronized.
544
	// are automatically synchronized.
861
544
	_, err := coretesting.RunCommand(c, &BootstrapCommand{}, []string{"--metadata-source", sourceDir})
545
	_, err := coretesting.RunCommand(c, envcmd.Wrap(&BootstrapCommand{}), []string{"--metadata-source", sourceDir})
862
545
	c.Assert(err, gc.IsNil)
546
	c.Assert(err, gc.IsNil)
863
546
547
864
547
	// Now check the available tools which are the 1.2.0 envtools.
548
	// Now check the available tools which are the 1.2.0 envtools.
865
@@ -575,7 +576,7 @@
866
575
576
867
576
	env := s.setupAutoUploadTest(c, "1.7.3", otherSeries)
577
	env := s.setupAutoUploadTest(c, "1.7.3", otherSeries)
868
577
	// Run command and check for that upload has been run for tools matching the current juju version.
578
	// Run command and check for that upload has been run for tools matching the current juju version.
870
578
	opc, errc := runCommand(nullContext(c), new(BootstrapCommand))
579
	opc, errc := runCommand(nullContext(c), envcmd.Wrap(new(BootstrapCommand)))
871
579
	c.Assert(<-errc, gc.IsNil)
580
	c.Assert(<-errc, gc.IsNil)
872
580
	c.Assert((<-opc).(dummy.OpPutFile).Env, gc.Equals, "peckham")
581
	c.Assert((<-opc).(dummy.OpPutFile).Env, gc.Equals, "peckham")
873
581
	list, err := envtools.FindTools(env, version.Current.Major, version.Current.Minor, coretools.Filter{}, false)
582
	list, err := envtools.FindTools(env, version.Current.Major, version.Current.Minor, coretools.Filter{}, false)
874
@@ -603,7 +604,7 @@
875
603
604
876
604
func (s *BootstrapSuite) TestAutoUploadOnlyForDev(c *gc.C) {
605
func (s *BootstrapSuite) TestAutoUploadOnlyForDev(c *gc.C) {
877
605
	s.setupAutoUploadTest(c, "1.8.3", "precise")
606
	s.setupAutoUploadTest(c, "1.8.3", "precise")
879
606
	_, errc := runCommand(nullContext(c), new(BootstrapCommand))
607
	_, errc := runCommand(nullContext(c), envcmd.Wrap(new(BootstrapCommand)))
880
607
	err := <-errc
608
	err := <-errc
881
608
	stripped := strings.Replace(err.Error(), "\n", "", -1)
609
	stripped := strings.Replace(err.Error(), "\n", "", -1)
882
609
	c.Assert(stripped, gc.Matches, noToolsAvailableMessage)
610
	c.Assert(stripped, gc.Matches, noToolsAvailableMessage)
883
@@ -612,7 +613,7 @@
884
612
func (s *BootstrapSuite) TestMissingToolsError(c *gc.C) {
613
func (s *BootstrapSuite) TestMissingToolsError(c *gc.C) {
885
613
	s.setupAutoUploadTest(c, "1.8.3", "precise")
614
	s.setupAutoUploadTest(c, "1.8.3", "precise")
886
614
615
888
615
	_, err := coretesting.RunCommand(c, &BootstrapCommand{}, nil)
616
	_, err := coretesting.RunCommand(c, envcmd.Wrap(&BootstrapCommand{}), nil)
889
616
	c.Assert(err, gc.ErrorMatches, "cannot upload bootstrap tools: Juju "+
617
	c.Assert(err, gc.ErrorMatches, "cannot upload bootstrap tools: Juju "+
890
617
		"cannot bootstrap because no tools are available for your "+
618
		"cannot bootstrap because no tools are available for your "+
891
618
		"environment(.|\n)*")
619
		"environment(.|\n)*")
892
@@ -626,7 +627,7 @@
893
626
	s.setupAutoUploadTest(c, "1.7.3", "precise")
627
	s.setupAutoUploadTest(c, "1.7.3", "precise")
894
627
	s.PatchValue(&sync.Upload, uploadToolsAlwaysFails)
628
	s.PatchValue(&sync.Upload, uploadToolsAlwaysFails)
895
628
629
897
629
	ctx, err := coretesting.RunCommand(c, &BootstrapCommand{}, nil)
630
	ctx, err := coretesting.RunCommand(c, envcmd.Wrap(&BootstrapCommand{}), nil)
898
630
631
899
631
	c.Check(coretesting.Stderr(ctx), gc.Matches,
632
	c.Check(coretesting.Stderr(ctx), gc.Matches,
900
632
		"uploading tools for series \\[precise .* raring\\]\n")
633
		"uploading tools for series \\[precise .* raring\\]\n")
901
@@ -642,7 +643,7 @@
902
642
	// upload is only enabled for dev versions.
643
	// upload is only enabled for dev versions.
903
643
	devVersion.Minor = 11
644
	devVersion.Minor = 11
904
644
	s.PatchValue(&version.Current, devVersion)
645
	s.PatchValue(&version.Current, devVersion)
906
645
	opc, errc := runCommand(nullContext(c), new(BootstrapCommand), "-e", "brokenenv")
646
	opc, errc := runCommand(nullContext(c), envcmd.Wrap(new(BootstrapCommand)), "-e", "brokenenv")
907
646
	err := <-errc
647
	err := <-errc
908
647
	c.Assert(err, gc.ErrorMatches, "dummy.Bootstrap is broken")
648
	c.Assert(err, gc.ErrorMatches, "dummy.Bootstrap is broken")
909
648
	var opDestroy *dummy.OpDestroy
649
	var opDestroy *dummy.OpDestroy
910
649
650
911
=== modified file 'cmd/juju/cmd_test.go'
912
--- cmd/juju/cmd_test.go	2014-05-11 22:52:40 +0000
913
+++ cmd/juju/cmd_test.go	2014-05-12 11:08:32 +0000
914
@@ -13,6 +13,7 @@
915
13
	gc "launchpad.net/gocheck"
13
	gc "launchpad.net/gocheck"
916
14
14
917
15
	"launchpad.net/juju-core/cmd"
15
	"launchpad.net/juju-core/cmd"
918
16
	"launchpad.net/juju-core/cmd/envcmd"
919
16
	"launchpad.net/juju-core/juju/osenv"
17
	"launchpad.net/juju-core/juju/osenv"
920
17
	"launchpad.net/juju-core/juju/testing"
18
	"launchpad.net/juju-core/juju/testing"
921
18
	"launchpad.net/juju-core/provider/dummy"
19
	"launchpad.net/juju-core/provider/dummy"
922
@@ -68,12 +69,12 @@
923
68
	}
69
	}
924
69
}
70
}
925
70
71
927
71
// assertConnName asserts that the Command is using
72
// assertEnvName asserts that the Command is using
928
72
// the given environment name.
73
// the given environment name.
929
73
// Since every command has a different type,
74
// Since every command has a different type,
930
74
// we use reflection to look at the value of the
75
// we use reflection to look at the value of the
931
75
// Conn field in the value.
76
// Conn field in the value.
933
76
func assertConnName(c *gc.C, com cmd.Command, name string) {
77
func assertEnvName(c *gc.C, com cmd.Command, name string) {
934
77
	v := reflect.ValueOf(com).Elem().FieldByName("EnvName")
78
	v := reflect.ValueOf(com).Elem().FieldByName("EnvName")
935
78
	c.Assert(v, jc.Satisfies, reflect.Value.IsValid)
79
	c.Assert(v, jc.Satisfies, reflect.Value.IsValid)
936
79
	c.Assert(v.Interface(), gc.Equals, name)
80
	c.Assert(v.Interface(), gc.Equals, name)
937
@@ -81,12 +82,12 @@
938
81
82
939
82
// All members of EnvironmentInitTests are tested for the -environment and -e
83
// All members of EnvironmentInitTests are tested for the -environment and -e
940
83
// flags, and that extra arguments will cause parsing to fail.
84
// flags, and that extra arguments will cause parsing to fail.
944
84
var EnvironmentInitTests = []func() (cmd.Command, []string){
85
var EnvironmentInitTests = []func() (envcmd.EnvironCommand, []string){
945
85
	func() (cmd.Command, []string) { return new(BootstrapCommand), nil },
86
	func() (envcmd.EnvironCommand, []string) { return new(BootstrapCommand), nil },
946
86
	func() (cmd.Command, []string) {
87
	func() (envcmd.EnvironCommand, []string) {
947
87
		return new(DeployCommand), []string{"charm-name", "service-name"}
88
		return new(DeployCommand), []string{"charm-name", "service-name"}
948
88
	},
89
	},
950
89
	func() (cmd.Command, []string) { return new(StatusCommand), nil },
90
	func() (envcmd.EnvironCommand, []string) { return new(StatusCommand), nil },
951
90
}
91
}
952
91
92
953
92
// TestEnvironmentInit tests that all commands which accept
93
// TestEnvironmentInit tests that all commands which accept
954
@@ -96,24 +97,24 @@
955
96
	for i, cmdFunc := range EnvironmentInitTests {
97
	for i, cmdFunc := range EnvironmentInitTests {
956
97
		c.Logf("test %d", i)
98
		c.Logf("test %d", i)
957
98
		com, args := cmdFunc()
99
		com, args := cmdFunc()
968
99
		testInit(c, com, args, "")
100
		testInit(c, envcmd.Wrap(com), args, "")
969
100
		assertConnName(c, com, "peckham")
101
		assertEnvName(c, com, "peckham")
970
101
102
971
102
		com, args = cmdFunc()
103
		com, args = cmdFunc()
972
103
		testInit(c, com, append(args, "-e", "walthamstow"), "")
104
		testInit(c, envcmd.Wrap(com), append(args, "-e", "walthamstow"), "")
973
104
		assertConnName(c, com, "walthamstow")
105
		assertEnvName(c, com, "walthamstow")
974
105
106
975
106
		com, args = cmdFunc()
107
		com, args = cmdFunc()
976
107
		testInit(c, com, append(args, "--environment", "walthamstow"), "")
108
		testInit(c, envcmd.Wrap(com), append(args, "--environment", "walthamstow"), "")
977
108
		assertConnName(c, com, "walthamstow")
109
		assertEnvName(c, com, "walthamstow")
978
109
110
979
110
		// JUJU_ENV is the final place the environment can be overriden
111
		// JUJU_ENV is the final place the environment can be overriden
980
111
		com, args = cmdFunc()
112
		com, args = cmdFunc()
981
112
		oldenv := os.Getenv(osenv.JujuEnvEnvKey)
113
		oldenv := os.Getenv(osenv.JujuEnvEnvKey)
982
113
		os.Setenv(osenv.JujuEnvEnvKey, "walthamstow")
114
		os.Setenv(osenv.JujuEnvEnvKey, "walthamstow")
984
114
		testInit(c, com, args, "")
115
		testInit(c, envcmd.Wrap(com), args, "")
985
115
		os.Setenv(osenv.JujuEnvEnvKey, oldenv)
116
		os.Setenv(osenv.JujuEnvEnvKey, oldenv)
987
116
		assertConnName(c, com, "walthamstow")
117
		assertEnvName(c, com, "walthamstow")
988
117
	}
118
	}
989
118
}
119
}
990
119
120
991
@@ -192,7 +193,7 @@
992
192
193
993
193
func initDeployCommand(args ...string) (*DeployCommand, error) {
194
func initDeployCommand(args ...string) (*DeployCommand, error) {
994
194
	com := &DeployCommand{}
195
	com := &DeployCommand{}
996
195
	return com, coretesting.InitCommand(com, args)
196
	return com, coretesting.InitCommand(envcmd.Wrap(com), args)
997
196
}
197
}
998
197
198
999
198
func (*CmdSuite) TestDeployCommandInit(c *gc.C) {
199
func (*CmdSuite) TestDeployCommandInit(c *gc.C) {
1000
199
200
1001
=== modified file 'cmd/juju/constraints.go'
1002
--- cmd/juju/constraints.go	2014-05-09 13:24:50 +0000
1003
+++ cmd/juju/constraints.go	2014-05-12 11:08:32 +0000
1004
@@ -70,7 +70,6 @@
1005
70
}
70
}
1006
71
71
1007
72
func (c *GetConstraintsCommand) SetFlags(f *gnuflag.FlagSet) {
72
func (c *GetConstraintsCommand) SetFlags(f *gnuflag.FlagSet) {
1008
73
	c.EnvCommandBase.SetFlags(f)
1009
74
	c.out.AddFlags(f, "constraints", map[string]cmd.Formatter{
73
	c.out.AddFlags(f, "constraints", map[string]cmd.Formatter{
1010
75
		"constraints": formatConstraints,
74
		"constraints": formatConstraints,
1011
76
		"yaml":        cmd.FormatYaml,
75
		"yaml":        cmd.FormatYaml,
1012
@@ -79,9 +78,6 @@
1013
79
}
78
}
1014
80
79
1015
81
func (c *GetConstraintsCommand) Init(args []string) error {
80
func (c *GetConstraintsCommand) Init(args []string) error {
1016
82
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
1017
83
		return err
1018
84
	}
1019
85
	if len(args) > 0 {
81
	if len(args) > 0 {
1020
86
		if !names.IsService(args[0]) {
82
		if !names.IsService(args[0]) {
1021
87
			return fmt.Errorf("invalid service name %q", args[0])
83
			return fmt.Errorf("invalid service name %q", args[0])
1022
@@ -127,15 +123,11 @@
1023
127
}
123
}
1024
128
124
1025
129
func (c *SetConstraintsCommand) SetFlags(f *gnuflag.FlagSet) {
125
func (c *SetConstraintsCommand) SetFlags(f *gnuflag.FlagSet) {
1026
130
	c.EnvCommandBase.SetFlags(f)
1027
131
	f.StringVar(&c.ServiceName, "s", "", "set service constraints")
126
	f.StringVar(&c.ServiceName, "s", "", "set service constraints")
1028
132
	f.StringVar(&c.ServiceName, "service", "", "")
127
	f.StringVar(&c.ServiceName, "service", "", "")
1029
133
}
128
}
1030
134
129
1031
135
func (c *SetConstraintsCommand) Init(args []string) (err error) {
130
func (c *SetConstraintsCommand) Init(args []string) (err error) {
1032
136
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
1033
137
		return err
1034
138
	}
1035
139
	if c.ServiceName != "" && !names.IsService(c.ServiceName) {
131
	if c.ServiceName != "" && !names.IsService(c.ServiceName) {
1036
140
		return fmt.Errorf("invalid service name %q", c.ServiceName)
132
		return fmt.Errorf("invalid service name %q", c.ServiceName)
1037
141
	}
133
	}
1038
142
134
1039
=== modified file 'cmd/juju/constraints_test.go'
1040
--- cmd/juju/constraints_test.go	2014-03-13 07:54:56 +0000
1041
+++ cmd/juju/constraints_test.go	2014-05-12 11:08:32 +0000
1042
@@ -10,6 +10,7 @@
1043
10
	gc "launchpad.net/gocheck"
10
	gc "launchpad.net/gocheck"
1044
11
11
1045
12
	"launchpad.net/juju-core/cmd"
12
	"launchpad.net/juju-core/cmd"
1046
13
	"launchpad.net/juju-core/cmd/envcmd"
1047
13
	"launchpad.net/juju-core/constraints"
14
	"launchpad.net/juju-core/constraints"
1048
14
	"launchpad.net/juju-core/juju/testing"
15
	"launchpad.net/juju-core/juju/testing"
1049
15
	coretesting "launchpad.net/juju-core/testing"
16
	coretesting "launchpad.net/juju-core/testing"
1050
@@ -35,7 +36,7 @@
1051
35
}
36
}
1052
36
37
1053
37
func assertSet(c *gc.C, args ...string) {
38
func assertSet(c *gc.C, args ...string) {
1055
38
	rcode, rstdout, rstderr := runCmdLine(c, &SetConstraintsCommand{}, args...)
39
	rcode, rstdout, rstderr := runCmdLine(c, envcmd.Wrap(&SetConstraintsCommand{}), args...)
1056
39
	c.Assert(rcode, gc.Equals, 0)
40
	c.Assert(rcode, gc.Equals, 0)
1057
40
	c.Assert(rstdout, gc.Equals, "")
41
	c.Assert(rstdout, gc.Equals, "")
1058
41
	c.Assert(rstderr, gc.Equals, "")
42
	c.Assert(rstderr, gc.Equals, "")
1059
@@ -78,7 +79,7 @@
1060
78
}
79
}
1061
79
80
1062
80
func assertSetError(c *gc.C, code int, stderr string, args ...string) {
81
func assertSetError(c *gc.C, code int, stderr string, args ...string) {
1064
81
	rcode, rstdout, rstderr := runCmdLine(c, &SetConstraintsCommand{}, args...)
82
	rcode, rstdout, rstderr := runCmdLine(c, envcmd.Wrap(&SetConstraintsCommand{}), args...)
1065
82
	c.Assert(rcode, gc.Equals, code)
83
	c.Assert(rcode, gc.Equals, code)
1066
83
	c.Assert(rstdout, gc.Equals, "")
84
	c.Assert(rstdout, gc.Equals, "")
1067
84
	c.Assert(rstderr, gc.Matches, "error: "+stderr+"\n")
85
	c.Assert(rstderr, gc.Matches, "error: "+stderr+"\n")
1068
85
86
1069
=== modified file 'cmd/juju/debuglog.go'
1070
--- cmd/juju/debuglog.go	2014-05-11 22:36:42 +0000
1071
+++ cmd/juju/debuglog.go	2014-05-12 11:08:32 +0000
1072
@@ -44,8 +44,6 @@
1073
44
}
44
}
1074
45
45
1075
46
func (c *DebugLogCommand) SetFlags(f *gnuflag.FlagSet) {
46
func (c *DebugLogCommand) SetFlags(f *gnuflag.FlagSet) {
1076
47
	c.EnvCommandBase.SetFlags(f)
1077
48
1078
49
	f.Var(cmd.NewAppendStringsValue(&c.params.IncludeEntity), "i", "only show log messages for these entities")
47
	f.Var(cmd.NewAppendStringsValue(&c.params.IncludeEntity), "i", "only show log messages for these entities")
1079
50
	f.Var(cmd.NewAppendStringsValue(&c.params.IncludeEntity), "include", "only show log messages for these entities")
48
	f.Var(cmd.NewAppendStringsValue(&c.params.IncludeEntity), "include", "only show log messages for these entities")
1080
51
	f.Var(cmd.NewAppendStringsValue(&c.params.ExcludeEntity), "x", "do not show log messages for these entities")
49
	f.Var(cmd.NewAppendStringsValue(&c.params.ExcludeEntity), "x", "do not show log messages for these entities")
1081
@@ -63,9 +61,6 @@
1082
63
}
61
}
1083
64
62
1084
65
func (c *DebugLogCommand) Init(args []string) error {
63
func (c *DebugLogCommand) Init(args []string) error {
1085
66
	if err := c.EnsureEnvName(); err != nil {
1086
67
		return err
1087
68
	}
1088
69
	if c.level != "" {
64
	if c.level != "" {
1089
70
		level, ok := loggo.ParseLevel(c.level)
65
		level, ok := loggo.ParseLevel(c.level)
1090
71
		if !ok || level < loggo.TRACE || level > loggo.ERROR {
66
		if !ok || level < loggo.TRACE || level > loggo.ERROR {
1091
72
67
1092
=== modified file 'cmd/juju/debuglog_test.go'
1093
--- cmd/juju/debuglog_test.go	2014-05-09 13:24:50 +0000
1094
+++ cmd/juju/debuglog_test.go	2014-05-12 11:08:32 +0000
1095
@@ -14,6 +14,7 @@
1096
14
	gc "launchpad.net/gocheck"
14
	gc "launchpad.net/gocheck"
1097
15
15
1098
16
	"launchpad.net/juju-core/cmd"
16
	"launchpad.net/juju-core/cmd"
1099
17
	"launchpad.net/juju-core/cmd/envcmd"
1100
17
	"launchpad.net/juju-core/errors"
18
	"launchpad.net/juju-core/errors"
1101
18
	"launchpad.net/juju-core/state/api"
19
	"launchpad.net/juju-core/state/api"
1102
19
	"launchpad.net/juju-core/testing"
20
	"launchpad.net/juju-core/testing"
1103
@@ -91,7 +92,7 @@
1104
91
	} {
92
	} {
1105
92
		c.Logf("test %v", i)
93
		c.Logf("test %v", i)
1106
93
		command := &DebugLogCommand{}
94
		command := &DebugLogCommand{}
1108
94
		err := testing.InitCommand(command, test.args)
95
		err := testing.InitCommand(envcmd.Wrap(command), test.args)
1109
95
		if test.errMatch == "" {
96
		if test.errMatch == "" {
1110
96
			c.Check(err, gc.IsNil)
97
			c.Check(err, gc.IsNil)
1111
97
			c.Check(command.params, jc.DeepEquals, test.expected)
98
			c.Check(command.params, jc.DeepEquals, test.expected)
1112
@@ -106,7 +107,7 @@
1113
106
	s.PatchValue(&getDebugLogAPI, func(envName string) (DebugLogAPI, error) {
107
	s.PatchValue(&getDebugLogAPI, func(envName string) (DebugLogAPI, error) {
1114
107
		return fake, nil
108
		return fake, nil
1115
108
	})
109
	})
1117
109
	_, err := testing.RunCommand(c, &DebugLogCommand{}, []string{
110
	_, err := testing.RunCommand(c, envcmd.Wrap(&DebugLogCommand{}), []string{
1118
110
		"-i", "machine-1*", "-x", "machine-1-lxc-1",
111
		"-i", "machine-1*", "-x", "machine-1-lxc-1",
1119
111
		"--include-module=juju.provisioner",
112
		"--include-module=juju.provisioner",
1120
112
		"--lines=500",
113
		"--lines=500",
1121
@@ -126,7 +127,7 @@
1122
126
	s.PatchValue(&getDebugLogAPI, func(envName string) (DebugLogAPI, error) {
127
	s.PatchValue(&getDebugLogAPI, func(envName string) (DebugLogAPI, error) {
1123
127
		return &fakeDebugLogAPI{log: "this is the log output"}, nil
128
		return &fakeDebugLogAPI{log: "this is the log output"}, nil
1124
128
	})
129
	})
1126
129
	ctx, err := testing.RunCommand(c, &DebugLogCommand{}, nil)
130
	ctx, err := testing.RunCommand(c, envcmd.Wrap(&DebugLogCommand{}), nil)
1127
130
	c.Assert(err, gc.IsNil)
131
	c.Assert(err, gc.IsNil)
1128
131
	c.Assert(testing.Stdout(ctx), gc.Equals, "this is the log output")
132
	c.Assert(testing.Stdout(ctx), gc.Equals, "this is the log output")
1129
132
}
133
}
1130
@@ -139,7 +140,7 @@
1131
139
	s.PatchValue(&getDebugLogAPI, func(envName string) (DebugLogAPI, error) {
140
	s.PatchValue(&getDebugLogAPI, func(envName string) (DebugLogAPI, error) {
1132
140
		return &fakeDebugLogAPI{err: errors.NotSupportedf("testing")}, nil
141
		return &fakeDebugLogAPI{err: errors.NotSupportedf("testing")}, nil
1133
141
	})
142
	})
1135
142
	ctx, err := testing.RunCommand(c, &DebugLogCommand{}, []string{"-n", "100"})
143
	ctx, err := testing.RunCommand(c, envcmd.Wrap(&DebugLogCommand{}), []string{"-n", "100"})
1136
143
	c.Assert(err, gc.IsNil)
144
	c.Assert(err, gc.IsNil)
1137
144
	c.Check(testing.Stderr(ctx), gc.Equals, "Server does not support new stream log, falling back to tail\n")
145
	c.Check(testing.Stderr(ctx), gc.Equals, "Server does not support new stream log, falling back to tail\n")
1138
145
	c.Check(testing.Stdout(ctx), gc.Equals, "[tail -n -100 -f /var/log/juju/all-machines.log]")
146
	c.Check(testing.Stdout(ctx), gc.Equals, "[tail -n -100 -f /var/log/juju/all-machines.log]")
1139
146
147
1140
=== modified file 'cmd/juju/deploy.go'
1141
--- cmd/juju/deploy.go	2014-05-09 13:24:50 +0000
1142
+++ cmd/juju/deploy.go	2014-05-12 11:08:32 +0000
1143
@@ -100,7 +100,6 @@
1144
100
}
100
}
1145
101
101
1146
102
func (c *DeployCommand) SetFlags(f *gnuflag.FlagSet) {
102
func (c *DeployCommand) SetFlags(f *gnuflag.FlagSet) {
1147
103
	c.EnvCommandBase.SetFlags(f)
1148
104
	c.UnitCommandBase.SetFlags(f)
103
	c.UnitCommandBase.SetFlags(f)
1149
105
	f.IntVar(&c.NumUnits, "n", 1, "number of service units to deploy for principal charms")
104
	f.IntVar(&c.NumUnits, "n", 1, "number of service units to deploy for principal charms")
1150
106
	f.BoolVar(&c.BumpRevision, "u", false, "increment local charm directory revision (DEPRECATED)")
105
	f.BoolVar(&c.BumpRevision, "u", false, "increment local charm directory revision (DEPRECATED)")
1151
@@ -113,9 +112,6 @@
1152
113
}
112
}
1153
114
113
1154
115
func (c *DeployCommand) Init(args []string) error {
114
func (c *DeployCommand) Init(args []string) error {
1155
116
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
1156
117
		return err
1157
118
	}
1158
119
	switch len(args) {
115
	switch len(args) {
1159
120
	case 2:
116
	case 2:
1160
121
		if !names.IsService(args[1]) {
117
		if !names.IsService(args[1]) {
1161
122
118
1162
=== modified file 'cmd/juju/deploy_test.go'
1163
--- cmd/juju/deploy_test.go	2014-05-02 22:26:15 +0000
1164
+++ cmd/juju/deploy_test.go	2014-05-12 11:08:32 +0000
1165
@@ -10,6 +10,7 @@
1166
10
	gc "launchpad.net/gocheck"
10
	gc "launchpad.net/gocheck"
1167
11
11
1168
12
	"launchpad.net/juju-core/charm"
12
	"launchpad.net/juju-core/charm"
1169
13
	"launchpad.net/juju-core/cmd/envcmd"
1170
13
	"launchpad.net/juju-core/constraints"
14
	"launchpad.net/juju-core/constraints"
1171
14
	"launchpad.net/juju-core/errors"
15
	"launchpad.net/juju-core/errors"
1172
15
	"launchpad.net/juju-core/instance"
16
	"launchpad.net/juju-core/instance"
1173
@@ -26,7 +27,7 @@
1174
26
var _ = gc.Suite(&DeploySuite{})
27
var _ = gc.Suite(&DeploySuite{})
1175
27
28
1176
28
func runDeploy(c *gc.C, args ...string) error {
29
func runDeploy(c *gc.C, args ...string) error {
1178
29
	_, err := coretesting.RunCommand(c, &DeployCommand{}, args)
30
	_, err := coretesting.RunCommand(c, envcmd.Wrap(&DeployCommand{}), args)
1179
30
	return err
31
	return err
1180
31
}
32
}
1181
32
33
1182
@@ -64,7 +65,7 @@
1183
64
func (s *DeploySuite) TestInitErrors(c *gc.C) {
65
func (s *DeploySuite) TestInitErrors(c *gc.C) {
1184
65
	for i, t := range initErrorTests {
66
	for i, t := range initErrorTests {
1185
66
		c.Logf("test %d", i)
67
		c.Logf("test %d", i)
1187
67
		err := coretesting.InitCommand(&DeployCommand{}, t.args)
68
		err := coretesting.InitCommand(envcmd.Wrap(&DeployCommand{}), t.args)
1188
68
		c.Assert(err, gc.ErrorMatches, t.err)
69
		c.Assert(err, gc.ErrorMatches, t.err)
1189
69
	}
70
	}
1190
70
}
71
}
1191
@@ -84,7 +85,7 @@
1192
84
85
1193
85
func (s *DeploySuite) TestUpgradeReportsDeprecated(c *gc.C) {
86
func (s *DeploySuite) TestUpgradeReportsDeprecated(c *gc.C) {
1194
86
	coretesting.Charms.ClonedDirPath(s.SeriesPath, "dummy")
87
	coretesting.Charms.ClonedDirPath(s.SeriesPath, "dummy")
1196
87
	ctx, err := coretesting.RunCommand(c, &DeployCommand{}, []string{"local:dummy", "-u"})
88
	ctx, err := coretesting.RunCommand(c, envcmd.Wrap(&DeployCommand{}), []string{"local:dummy", "-u"})
1197
88
	c.Assert(err, gc.IsNil)
89
	c.Assert(err, gc.IsNil)
1198
89
90
1199
90
	c.Assert(coretesting.Stdout(ctx), gc.Equals, "")
91
	c.Assert(coretesting.Stdout(ctx), gc.Equals, "")
1200
91
92
1201
=== modified file 'cmd/juju/endpoint.go'
1202
--- cmd/juju/endpoint.go	2014-05-09 13:24:50 +0000
1203
+++ cmd/juju/endpoint.go	2014-05-12 11:08:32 +0000
1204
@@ -37,15 +37,7 @@
1205
37
	}
37
	}
1206
38
}
38
}
1207
39
39
1208
40
func (c *EndpointCommand) Init(args []string) error {
1209
41
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
1210
42
		return err
1211
43
	}
1212
44
	return cmd.CheckEmpty(args)
1213
45
}
1214
46
1215
47
func (c *EndpointCommand) SetFlags(f *gnuflag.FlagSet) {
40
func (c *EndpointCommand) SetFlags(f *gnuflag.FlagSet) {
1216
48
	c.EnvCommandBase.SetFlags(f)
1217
49
	c.out.AddFlags(f, "smart", cmd.DefaultFormatters)
41
	c.out.AddFlags(f, "smart", cmd.DefaultFormatters)
1218
50
	f.BoolVar(&c.refresh, "refresh", false, "connect to the API to ensure up-to-date endpoint locations")
42
	f.BoolVar(&c.refresh, "refresh", false, "connect to the API to ensure up-to-date endpoint locations")
1219
51
}
43
}
1220
52
44
1221
=== modified file 'cmd/juju/endpoint_test.go'
1222
--- cmd/juju/endpoint_test.go	2013-08-15 15:00:54 +0000
1223
+++ cmd/juju/endpoint_test.go	2014-05-12 11:08:32 +0000
1224
@@ -10,6 +10,7 @@
1225
10
	gc "launchpad.net/gocheck"
10
	gc "launchpad.net/gocheck"
1226
11
11
1227
12
	"launchpad.net/juju-core/cmd"
12
	"launchpad.net/juju-core/cmd"
1228
13
	"launchpad.net/juju-core/cmd/envcmd"
1229
13
	"launchpad.net/juju-core/juju/testing"
14
	"launchpad.net/juju-core/juju/testing"
1230
14
	coretesting "launchpad.net/juju-core/testing"
15
	coretesting "launchpad.net/juju-core/testing"
1231
15
)
16
)
1232
@@ -22,7 +23,7 @@
1233
22
23
1234
23
func (s *EndpointSuite) TestEndpoint(c *gc.C) {
24
func (s *EndpointSuite) TestEndpoint(c *gc.C) {
1235
24
	ctx := coretesting.Context(c)
25
	ctx := coretesting.Context(c)
1237
25
	code := cmd.Main(&EndpointCommand{}, ctx, []string{})
26
	code := cmd.Main(envcmd.Wrap(&EndpointCommand{}), ctx, []string{})
1238
26
	c.Check(code, gc.Equals, 0)
27
	c.Check(code, gc.Equals, 0)
1239
27
	c.Assert(ctx.Stderr.(*bytes.Buffer).String(), gc.Equals, "")
28
	c.Assert(ctx.Stderr.(*bytes.Buffer).String(), gc.Equals, "")
1240
28
	output := string(ctx.Stdout.(*bytes.Buffer).Bytes())
29
	output := string(ctx.Stdout.(*bytes.Buffer).Bytes())
1241
29
30
1242
=== modified file 'cmd/juju/ensureavailability.go'
1243
--- cmd/juju/ensureavailability.go	2014-05-09 13:24:50 +0000
1244
+++ cmd/juju/ensureavailability.go	2014-05-12 11:08:32 +0000
1245
@@ -56,16 +56,12 @@
1246
56
}
56
}
1247
57
57
1248
58
func (c *EnsureAvailabilityCommand) SetFlags(f *gnuflag.FlagSet) {
58
func (c *EnsureAvailabilityCommand) SetFlags(f *gnuflag.FlagSet) {
1249
59
	c.EnvCommandBase.SetFlags(f)
1250
60
	f.IntVar(&c.NumStateServers, "n", 0, "number of state servers to make available")
59
	f.IntVar(&c.NumStateServers, "n", 0, "number of state servers to make available")
1251
61
	f.StringVar(&c.Series, "series", "", "the charm series")
60
	f.StringVar(&c.Series, "series", "", "the charm series")
1252
62
	f.Var(constraints.ConstraintsValue{&c.Constraints}, "constraints", "additional machine constraints")
61
	f.Var(constraints.ConstraintsValue{&c.Constraints}, "constraints", "additional machine constraints")
1253
63
}
62
}
1254
64
63
1255
65
func (c *EnsureAvailabilityCommand) Init(args []string) error {
64
func (c *EnsureAvailabilityCommand) Init(args []string) error {
1256
66
	if err := c.EnsureEnvName(); err != nil {
1257
67
		return err
1258
68
	}
1259
69
	if c.NumStateServers < 0 || (c.NumStateServers%2 != 1 && c.NumStateServers != 0) {
65
	if c.NumStateServers < 0 || (c.NumStateServers%2 != 1 && c.NumStateServers != 0) {
1260
70
		return fmt.Errorf("must specify a number of state servers odd and non-negative")
66
		return fmt.Errorf("must specify a number of state servers odd and non-negative")
1261
71
	}
67
	}
1262
72
68
1263
=== modified file 'cmd/juju/ensureavailability_test.go'
1264
--- cmd/juju/ensureavailability_test.go	2014-04-23 11:57:06 +0000
1265
+++ cmd/juju/ensureavailability_test.go	2014-05-12 11:08:32 +0000
1266
@@ -9,6 +9,7 @@
1267
9
	jc "github.com/juju/testing/checkers"
9
	jc "github.com/juju/testing/checkers"
1268
10
	gc "launchpad.net/gocheck"
10
	gc "launchpad.net/gocheck"
1269
11
11
1270
12
	"launchpad.net/juju-core/cmd/envcmd"
1271
12
	"launchpad.net/juju-core/constraints"
13
	"launchpad.net/juju-core/constraints"
1272
13
	jujutesting "launchpad.net/juju-core/juju/testing"
14
	jujutesting "launchpad.net/juju-core/juju/testing"
1273
14
	"launchpad.net/juju-core/state"
15
	"launchpad.net/juju-core/state"
1274
@@ -49,7 +50,7 @@
1275
49
}
50
}
1276
50
51
1277
51
func runEnsureAvailability(c *gc.C, args ...string) error {
52
func runEnsureAvailability(c *gc.C, args ...string) error {
1279
52
	_, err := coretesting.RunCommand(c, &EnsureAvailabilityCommand{}, args)
53
	_, err := coretesting.RunCommand(c, envcmd.Wrap(&EnsureAvailabilityCommand{}), args)
1280
53
	return err
54
	return err
1281
54
}
55
}
1282
55
56
1283
56
57
1284
=== modified file 'cmd/juju/environment.go'
1285
--- cmd/juju/environment.go	2014-05-09 13:24:50 +0000
1286
+++ cmd/juju/environment.go	2014-05-12 11:08:32 +0000
1287
@@ -45,14 +45,10 @@
1288
45
}
45
}
1289
46
46
1290
47
func (c *GetEnvironmentCommand) SetFlags(f *gnuflag.FlagSet) {
47
func (c *GetEnvironmentCommand) SetFlags(f *gnuflag.FlagSet) {
1291
48
	c.EnvCommandBase.SetFlags(f)
1292
49
	c.out.AddFlags(f, "smart", cmd.DefaultFormatters)
48
	c.out.AddFlags(f, "smart", cmd.DefaultFormatters)
1293
50
}
49
}
1294
51
50
1295
52
func (c *GetEnvironmentCommand) Init(args []string) (err error) {
51
func (c *GetEnvironmentCommand) Init(args []string) (err error) {
1296
53
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
1297
54
		return err
1298
55
	}
1299
56
	c.key, err = cmd.ZeroOrOneArgs(args)
52
	c.key, err = cmd.ZeroOrOneArgs(args)
1300
57
	return
53
	return
1301
58
}
54
}
1302
@@ -102,12 +98,7 @@
1303
102
	}
98
	}
1304
103
}
99
}
1305
104
100
1306
105
// SetFlags handled entirely by envcmd.EnvCommandBase
1307
106
1308
107
func (c *SetEnvironmentCommand) Init(args []string) (err error) {
101
func (c *SetEnvironmentCommand) Init(args []string) (err error) {
1309
108
	if err := c.EnsureEnvName(); err != nil {
1310
109
		return err
1311
110
	}
1312
111
	if len(args) == 0 {
102
	if len(args) == 0 {
1313
112
		return fmt.Errorf("No key, value pairs specified")
103
		return fmt.Errorf("No key, value pairs specified")
1314
113
	}
104
	}
1315
@@ -166,9 +157,6 @@
1316
166
}
157
}
1317
167
158
1318
168
func (c *UnsetEnvironmentCommand) Init(args []string) (err error) {
159
func (c *UnsetEnvironmentCommand) Init(args []string) (err error) {
1319
169
	if err := c.EnsureEnvName(); err != nil {
1320
170
		return err
1321
171
	}
1322
172
	if len(args) == 0 {
160
	if len(args) == 0 {
1323
173
		return fmt.Errorf("No keys specified")
161
		return fmt.Errorf("No keys specified")
1324
174
	}
162
	}
1325
175
163
1326
=== modified file 'cmd/juju/environment_test.go'
1327
--- cmd/juju/environment_test.go	2014-04-09 16:36:12 +0000
1328
+++ cmd/juju/environment_test.go	2014-05-12 11:08:32 +0000
1329
@@ -10,6 +10,7 @@
1330
10
	jc "github.com/juju/testing/checkers"
10
	jc "github.com/juju/testing/checkers"
1331
11
	gc "launchpad.net/gocheck"
11
	gc "launchpad.net/gocheck"
1332
12
12
1333
13
	"launchpad.net/juju-core/cmd/envcmd"
1334
13
	"launchpad.net/juju-core/environs/config"
14
	"launchpad.net/juju-core/environs/config"
1335
14
	jujutesting "launchpad.net/juju-core/juju/testing"
15
	jujutesting "launchpad.net/juju-core/juju/testing"
1336
15
	"launchpad.net/juju-core/provider/dummy"
16
	"launchpad.net/juju-core/provider/dummy"
1337
@@ -45,7 +46,7 @@
1338
45
46
1339
46
func (s *GetEnvironmentSuite) TestSingleValue(c *gc.C) {
47
func (s *GetEnvironmentSuite) TestSingleValue(c *gc.C) {
1340
47
	for _, t := range singleValueTests {
48
	for _, t := range singleValueTests {
1342
48
		context, err := testing.RunCommand(c, &GetEnvironmentCommand{}, []string{t.key})
49
		context, err := testing.RunCommand(c, envcmd.Wrap(&GetEnvironmentCommand{}), []string{t.key})
1343
49
		if t.err != "" {
50
		if t.err != "" {
1344
50
			c.Assert(err, gc.ErrorMatches, t.err)
51
			c.Assert(err, gc.ErrorMatches, t.err)
1345
51
		} else {
52
		} else {
1346
@@ -57,12 +58,12 @@
1347
57
}
58
}
1348
58
59
1349
59
func (s *GetEnvironmentSuite) TestTooManyArgs(c *gc.C) {
60
func (s *GetEnvironmentSuite) TestTooManyArgs(c *gc.C) {
1351
60
	_, err := testing.RunCommand(c, &GetEnvironmentCommand{}, []string{"name", "type"})
61
	_, err := testing.RunCommand(c, envcmd.Wrap(&GetEnvironmentCommand{}), []string{"name", "type"})
1352
61
	c.Assert(err, gc.ErrorMatches, `unrecognized args: \["type"\]`)
62
	c.Assert(err, gc.ErrorMatches, `unrecognized args: \["type"\]`)
1353
62
}
63
}
1354
63
64
1355
64
func (s *GetEnvironmentSuite) TestAllValues(c *gc.C) {
65
func (s *GetEnvironmentSuite) TestAllValues(c *gc.C) {
1357
65
	context, _ := testing.RunCommand(c, &GetEnvironmentCommand{}, []string{})
66
	context, _ := testing.RunCommand(c, envcmd.Wrap(&GetEnvironmentCommand{}), []string{})
1358
66
	output := strings.TrimSpace(testing.Stdout(context))
67
	output := strings.TrimSpace(testing.Stdout(context))
1359
67
68
1360
68
	// Make sure that all the environment keys are there. The admin
69
	// Make sure that all the environment keys are there. The admin
1361
@@ -116,7 +117,7 @@
1362
116
func (s *SetEnvironmentSuite) TestInit(c *gc.C) {
117
func (s *SetEnvironmentSuite) TestInit(c *gc.C) {
1363
117
	for _, t := range setEnvInitTests {
118
	for _, t := range setEnvInitTests {
1364
118
		command := &SetEnvironmentCommand{}
119
		command := &SetEnvironmentCommand{}
1366
119
		testing.TestInit(c, command, t.args, t.err)
120
		testing.TestInit(c, envcmd.Wrap(command), t.args, t.err)
1367
120
		if t.expected != nil {
121
		if t.expected != nil {
1368
121
			c.Assert(command.values, gc.DeepEquals, t.expected)
122
			c.Assert(command.values, gc.DeepEquals, t.expected)
1369
122
		}
123
		}
1370
@@ -131,7 +132,7 @@
1371
131
	c.Assert(ok, gc.Equals, true)
132
	c.Assert(ok, gc.Equals, true)
1372
132
	c.Assert(series, gc.Equals, "precise") // default-series set in RepoSuite.SetUpTest
133
	c.Assert(series, gc.Equals, "precise") // default-series set in RepoSuite.SetUpTest
1373
133
134
1375
134
	_, err = testing.RunCommand(c, &SetEnvironmentCommand{}, []string{"default-series=raring"})
135
	_, err = testing.RunCommand(c, envcmd.Wrap(&SetEnvironmentCommand{}), []string{"default-series=raring"})
1376
135
	c.Assert(err, gc.IsNil)
136
	c.Assert(err, gc.IsNil)
1377
136
137
1378
137
	stateConfig, err = s.State.EnvironConfig()
138
	stateConfig, err = s.State.EnvironConfig()
1379
@@ -143,7 +144,7 @@
1380
143
}
144
}
1381
144
145
1382
145
func (s *SetEnvironmentSuite) TestChangeBooleanAttribute(c *gc.C) {
146
func (s *SetEnvironmentSuite) TestChangeBooleanAttribute(c *gc.C) {
1384
146
	_, err := testing.RunCommand(c, &SetEnvironmentCommand{}, []string{"ssl-hostname-verification=false"})
147
	_, err := testing.RunCommand(c, envcmd.Wrap(&SetEnvironmentCommand{}), []string{"ssl-hostname-verification=false"})
1385
147
	c.Assert(err, gc.IsNil)
148
	c.Assert(err, gc.IsNil)
1386
148
149
1387
149
	stateConfig, err := s.State.EnvironConfig()
150
	stateConfig, err := s.State.EnvironConfig()
1388
@@ -152,7 +153,7 @@
1389
152
}
153
}
1390
153
154
1391
154
func (s *SetEnvironmentSuite) TestChangeMultipleValues(c *gc.C) {
155
func (s *SetEnvironmentSuite) TestChangeMultipleValues(c *gc.C) {
1393
155
	_, err := testing.RunCommand(c, &SetEnvironmentCommand{}, []string{"default-series=spartan", "broken=nope", "secret=sekrit"})
156
	_, err := testing.RunCommand(c, envcmd.Wrap(&SetEnvironmentCommand{}), []string{"default-series=spartan", "broken=nope", "secret=sekrit"})
1394
156
	c.Assert(err, gc.IsNil)
157
	c.Assert(err, gc.IsNil)
1395
157
158
1396
158
	stateConfig, err := s.State.EnvironConfig()
159
	stateConfig, err := s.State.EnvironConfig()
1397
@@ -164,10 +165,10 @@
1398
164
}
165
}
1399
165
166
1400
166
func (s *SetEnvironmentSuite) TestChangeAsCommandPair(c *gc.C) {
167
func (s *SetEnvironmentSuite) TestChangeAsCommandPair(c *gc.C) {
1402
167
	_, err := testing.RunCommand(c, &SetEnvironmentCommand{}, []string{"default-series=raring"})
168
	_, err := testing.RunCommand(c, envcmd.Wrap(&SetEnvironmentCommand{}), []string{"default-series=raring"})
1403
168
	c.Assert(err, gc.IsNil)
169
	c.Assert(err, gc.IsNil)
1404
169
170
1406
170
	context, err := testing.RunCommand(c, &GetEnvironmentCommand{}, []string{"default-series"})
171
	context, err := testing.RunCommand(c, envcmd.Wrap(&GetEnvironmentCommand{}), []string{"default-series"})
1407
171
	c.Assert(err, gc.IsNil)
172
	c.Assert(err, gc.IsNil)
1408
172
	output := strings.TrimSpace(testing.Stdout(context))
173
	output := strings.TrimSpace(testing.Stdout(context))
1409
173
174
1410
@@ -185,7 +186,7 @@
1411
185
func (s *SetEnvironmentSuite) TestImmutableConfigValues(c *gc.C) {
186
func (s *SetEnvironmentSuite) TestImmutableConfigValues(c *gc.C) {
1412
186
	for name, value := range immutableConfigTests {
187
	for name, value := range immutableConfigTests {
1413
187
		param := fmt.Sprintf("%s=%s", name, value)
188
		param := fmt.Sprintf("%s=%s", name, value)
1415
188
		_, err := testing.RunCommand(c, &SetEnvironmentCommand{}, []string{param})
189
		_, err := testing.RunCommand(c, envcmd.Wrap(&SetEnvironmentCommand{}), []string{param})
1416
189
		errorPattern := fmt.Sprintf("cannot change %s from .* to [\"]?%v[\"]?", name, value)
190
		errorPattern := fmt.Sprintf("cannot change %s from .* to [\"]?%v[\"]?", name, value)
1417
190
		c.Assert(err, gc.ErrorMatches, errorPattern)
191
		c.Assert(err, gc.ErrorMatches, errorPattern)
1418
191
	}
192
	}
1419
@@ -239,7 +240,7 @@
1420
239
	for _, t := range unsetEnvTests {
240
	for _, t := range unsetEnvTests {
1421
240
		c.Logf("testing unset-env %v", t.args)
241
		c.Logf("testing unset-env %v", t.args)
1422
241
		s.initConfig(c)
242
		s.initConfig(c)
1424
242
		_, err := testing.RunCommand(c, &UnsetEnvironmentCommand{}, t.args)
243
		_, err := testing.RunCommand(c, envcmd.Wrap(&UnsetEnvironmentCommand{}), t.args)
1425
243
		if t.err != "" {
244
		if t.err != "" {
1426
244
			c.Assert(err, gc.ErrorMatches, t.err)
245
			c.Assert(err, gc.ErrorMatches, t.err)
1427
245
		} else {
246
		} else {
1428
246
247
1429
=== modified file 'cmd/juju/expose.go'
1430
--- cmd/juju/expose.go	2014-05-09 13:24:50 +0000
1431
+++ cmd/juju/expose.go	2014-05-12 11:08:32 +0000
1432
@@ -33,9 +33,6 @@
1433
33
}
33
}
1434
34
34
1435
35
func (c *ExposeCommand) Init(args []string) error {
35
func (c *ExposeCommand) Init(args []string) error {
1436
36
	if err := c.EnsureEnvName(); err != nil {
1437
37
		return err
1438
38
	}
1439
39
	if len(args) == 0 {
36
	if len(args) == 0 {
1440
40
		return errors.New("no service name specified")
37
		return errors.New("no service name specified")
1441
41
	}
38
	}
1442
42
39
1443
=== modified file 'cmd/juju/expose_test.go'
1444
--- cmd/juju/expose_test.go	2013-09-13 14:48:13 +0000
1445
+++ cmd/juju/expose_test.go	2014-05-12 11:08:32 +0000
1446
@@ -7,6 +7,7 @@
1447
7
	gc "launchpad.net/gocheck"
7
	gc "launchpad.net/gocheck"
1448
8
8
1449
9
	"launchpad.net/juju-core/charm"
9
	"launchpad.net/juju-core/charm"
1450
10
	"launchpad.net/juju-core/cmd/envcmd"
1451
10
	jujutesting "launchpad.net/juju-core/juju/testing"
11
	jujutesting "launchpad.net/juju-core/juju/testing"
1452
11
	"launchpad.net/juju-core/testing"
12
	"launchpad.net/juju-core/testing"
1453
12
)
13
)
1454
@@ -18,7 +19,7 @@
1455
18
var _ = gc.Suite(&ExposeSuite{})
19
var _ = gc.Suite(&ExposeSuite{})
1456
19
20
1457
20
func runExpose(c *gc.C, args ...string) error {
21
func runExpose(c *gc.C, args ...string) error {
1459
21
	_, err := testing.RunCommand(c, &ExposeCommand{}, args)
22
	_, err := testing.RunCommand(c, envcmd.Wrap(&ExposeCommand{}), args)
1460
22
	return err
23
	return err
1461
23
}
24
}
1462
24
25
1463
25
26
1464
=== modified file 'cmd/juju/get.go'
1465
--- cmd/juju/get.go	2014-05-09 13:24:50 +0000
1466
+++ cmd/juju/get.go	2014-05-12 11:08:32 +0000
1467
@@ -29,7 +29,6 @@
1468
29
}
29
}
1469
30
30
1470
31
func (c *GetCommand) SetFlags(f *gnuflag.FlagSet) {
31
func (c *GetCommand) SetFlags(f *gnuflag.FlagSet) {
1471
32
	c.EnvCommandBase.SetFlags(f)
1472
33
	// TODO(dfc) add json formatting ?
32
	// TODO(dfc) add json formatting ?
1473
34
	c.out.AddFlags(f, "yaml", map[string]cmd.Formatter{
33
	c.out.AddFlags(f, "yaml", map[string]cmd.Formatter{
1474
35
		"yaml": cmd.FormatYaml,
34
		"yaml": cmd.FormatYaml,
1475
@@ -37,9 +36,6 @@
1476
37
}
36
}
1477
38
37
1478
39
func (c *GetCommand) Init(args []string) error {
38
func (c *GetCommand) Init(args []string) error {
1479
40
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
1480
41
		return err
1481
42
	}
1482
43
	// TODO(dfc) add --schema-only
39
	// TODO(dfc) add --schema-only
1483
44
	if len(args) == 0 {
40
	if len(args) == 0 {
1484
45
		return errors.New("no service name specified")
41
		return errors.New("no service name specified")
1485
46
42
1486
=== modified file 'cmd/juju/get_test.go'
1487
--- cmd/juju/get_test.go	2013-10-09 13:55:14 +0000
1488
+++ cmd/juju/get_test.go	2014-05-12 11:08:32 +0000
1489
@@ -11,6 +11,7 @@
1490
11
11
1491
12
	"launchpad.net/juju-core/charm"
12
	"launchpad.net/juju-core/charm"
1492
13
	"launchpad.net/juju-core/cmd"
13
	"launchpad.net/juju-core/cmd"
1493
14
	"launchpad.net/juju-core/cmd/envcmd"
1494
14
	"launchpad.net/juju-core/juju/testing"
15
	"launchpad.net/juju-core/juju/testing"
1495
15
	coretesting "launchpad.net/juju-core/testing"
16
	coretesting "launchpad.net/juju-core/testing"
1496
16
)
17
)
1497
@@ -67,7 +68,7 @@
1498
67
	c.Assert(err, gc.IsNil)
68
	c.Assert(err, gc.IsNil)
1499
68
	for _, t := range getTests {
69
	for _, t := range getTests {
1500
69
		ctx := coretesting.Context(c)
70
		ctx := coretesting.Context(c)
1502
70
		code := cmd.Main(&GetCommand{}, ctx, []string{t.service})
71
		code := cmd.Main(envcmd.Wrap(&GetCommand{}), ctx, []string{t.service})
1503
71
		c.Check(code, gc.Equals, 0)
72
		c.Check(code, gc.Equals, 0)
1504
72
		c.Assert(ctx.Stderr.(*bytes.Buffer).String(), gc.Equals, "")
73
		c.Assert(ctx.Stderr.(*bytes.Buffer).String(), gc.Equals, "")
1505
73
		// round trip via goyaml to avoid being sucked into a quagmire of
74
		// round trip via goyaml to avoid being sucked into a quagmire of
1506
74
75
1507
=== modified file 'cmd/juju/main.go'
1508
--- cmd/juju/main.go	2014-05-09 22:56:29 +0000
1509
+++ cmd/juju/main.go	2014-05-12 11:08:32 +0000
1510
@@ -10,6 +10,7 @@
1511
10
	"github.com/juju/loggo"
10
	"github.com/juju/loggo"
1512
11
11
1513
12
	"launchpad.net/juju-core/cmd"
12
	"launchpad.net/juju-core/cmd"
1514
13
	"launchpad.net/juju-core/cmd/envcmd"
1515
13
	"launchpad.net/juju-core/environs"
14
	"launchpad.net/juju-core/environs"
1516
14
	"launchpad.net/juju-core/juju"
15
	"launchpad.net/juju-core/juju"
1517
15
16
1518
@@ -72,104 +73,99 @@
1519
72
73
1520
73
	jujucmd.AddHelpTopicCallback("plugins", "Show Juju plugins", PluginHelpTopic)
74
	jujucmd.AddHelpTopicCallback("plugins", "Show Juju plugins", PluginHelpTopic)
1521
74
75
1522
76
	registerCommands(jujucmd, ctx)
1523
77
	os.Exit(cmd.Main(jujucmd, ctx, args[1:]))
1524
78
}
1525
79
1526
80
type commandRegistry interface {
1527
81
	Register(cmd.Command)
1528
82
}
1529
83
1530
84
// registerCommands registers commands in the specified registry.
1531
85
// EnvironCommands must be wrapped with an envCmdWrapper.
1532
86
func registerCommands(r commandRegistry, ctx *cmd.Context) {
1533
87
	wrapEnvCommand := func(c envcmd.EnvironCommand) cmd.Command {
1534
88
		return envCmdWrapper{envcmd.Wrap(c), ctx}
1535
89
	}
1536
90
1537
75
	// Creation commands.
91
	// Creation commands.
1543
76
	jujucmd.Register(wrap(&BootstrapCommand{}))
92
	r.Register(wrapEnvCommand(&BootstrapCommand{}))
1544
77
	jujucmd.Register(wrap(&AddMachineCommand{}))
93
	r.Register(wrapEnvCommand(&AddMachineCommand{}))
1545
78
	jujucmd.Register(wrap(&DeployCommand{}))
94
	r.Register(wrapEnvCommand(&DeployCommand{}))
1546
79
	jujucmd.Register(wrap(&AddRelationCommand{}))
95
	r.Register(wrapEnvCommand(&AddRelationCommand{}))
1547
80
	jujucmd.Register(wrap(&AddUnitCommand{}))
96
	r.Register(wrapEnvCommand(&AddUnitCommand{}))
1548
81
97
1549
82
	// Destruction commands.
98
	// Destruction commands.
1555
83
	jujucmd.Register(wrap(&RemoveMachineCommand{}))
99
	r.Register(wrapEnvCommand(&RemoveMachineCommand{}))
1556
84
	jujucmd.Register(wrap(&RemoveRelationCommand{}))
100
	r.Register(wrapEnvCommand(&RemoveRelationCommand{}))
1557
85
	jujucmd.Register(wrap(&RemoveServiceCommand{}))
101
	r.Register(wrapEnvCommand(&RemoveServiceCommand{}))
1558
86
	jujucmd.Register(wrap(&RemoveUnitCommand{}))
102
	r.Register(wrapEnvCommand(&RemoveUnitCommand{}))
1559
87
	jujucmd.Register(wrap(&DestroyEnvironmentCommand{}))
103
	r.Register(&DestroyEnvironmentCommand{})
1560
88
104
1561
89
	// Reporting commands.
105
	// Reporting commands.
1565
90
	jujucmd.Register(wrap(&StatusCommand{}))
106
	r.Register(wrapEnvCommand(&StatusCommand{}))
1566
91
	jujucmd.Register(wrap(&SwitchCommand{}))
107
	r.Register(&SwitchCommand{})
1567
92
	jujucmd.Register(wrap(&EndpointCommand{}))
108
	r.Register(wrapEnvCommand(&EndpointCommand{}))
1568
93
109
1569
94
	// Error resolution and debugging commands.
110
	// Error resolution and debugging commands.
1577
95
	jujucmd.Register(wrap(&RunCommand{}))
111
	r.Register(wrapEnvCommand(&RunCommand{}))
1578
96
	jujucmd.Register(wrap(&SCPCommand{}))
112
	r.Register(wrapEnvCommand(&SCPCommand{}))
1579
97
	jujucmd.Register(wrap(&SSHCommand{}))
113
	r.Register(wrapEnvCommand(&SSHCommand{}))
1580
98
	jujucmd.Register(wrap(&ResolvedCommand{}))
114
	r.Register(wrapEnvCommand(&ResolvedCommand{}))
1581
99
	jujucmd.Register(wrap(&DebugLogCommand{}))
115
	r.Register(wrapEnvCommand(&DebugLogCommand{}))
1582
100
	jujucmd.Register(wrap(&DebugHooksCommand{}))
116
	r.Register(wrapEnvCommand(&DebugHooksCommand{}))
1583
101
	jujucmd.Register(wrap(&RetryProvisioningCommand{}))
117
	r.Register(wrapEnvCommand(&RetryProvisioningCommand{}))
1584
102
118
1585
103
	// Configuration commands.
119
	// Configuration commands.
1600
104
	jujucmd.Register(wrap(&InitCommand{}))
120
	r.Register(&InitCommand{})
1601
105
	jujucmd.Register(wrap(&GetCommand{}))
121
	r.Register(wrapEnvCommand(&GetCommand{}))
1602
106
	jujucmd.Register(wrap(&SetCommand{}))
122
	r.Register(wrapEnvCommand(&SetCommand{}))
1603
107
	jujucmd.Register(wrap(&UnsetCommand{}))
123
	r.Register(wrapEnvCommand(&UnsetCommand{}))
1604
108
	jujucmd.Register(wrap(&GetConstraintsCommand{}))
124
	r.Register(wrapEnvCommand(&GetConstraintsCommand{}))
1605
109
	jujucmd.Register(wrap(&SetConstraintsCommand{}))
125
	r.Register(wrapEnvCommand(&SetConstraintsCommand{}))
1606
110
	jujucmd.Register(wrap(&GetEnvironmentCommand{}))
126
	r.Register(wrapEnvCommand(&GetEnvironmentCommand{}))
1607
111
	jujucmd.Register(wrap(&SetEnvironmentCommand{}))
127
	r.Register(wrapEnvCommand(&SetEnvironmentCommand{}))
1608
112
	jujucmd.Register(wrap(&UnsetEnvironmentCommand{}))
128
	r.Register(wrapEnvCommand(&UnsetEnvironmentCommand{}))
1609
113
	jujucmd.Register(wrap(&ExposeCommand{}))
129
	r.Register(wrapEnvCommand(&ExposeCommand{}))
1610
114
	jujucmd.Register(wrap(&SyncToolsCommand{}))
130
	r.Register(wrapEnvCommand(&SyncToolsCommand{}))
1611
115
	jujucmd.Register(wrap(&UnexposeCommand{}))
131
	r.Register(wrapEnvCommand(&UnexposeCommand{}))
1612
116
	jujucmd.Register(wrap(&UpgradeJujuCommand{}))
132
	r.Register(wrapEnvCommand(&UpgradeJujuCommand{}))
1613
117
	jujucmd.Register(wrap(&UpgradeCharmCommand{}))
133
	r.Register(wrapEnvCommand(&UpgradeCharmCommand{}))
1614
118
134
1615
119
	// Charm publishing commands.
135
	// Charm publishing commands.
1617
120
	jujucmd.Register(wrap(&PublishCommand{}))
136
	r.Register(wrapEnvCommand(&PublishCommand{}))
1618
121
137
1619
122
	// Charm tool commands.
138
	// Charm tool commands.
1621
123
	jujucmd.Register(wrap(&HelpToolCommand{}))
139
	r.Register(&HelpToolCommand{})
1622
124
140
1623
125
	// Manage authorized ssh keys.
141
	// Manage authorized ssh keys.
1625
126
	jujucmd.Register(wrap(NewAuthorizedKeysCommand()))
142
	r.Register(NewAuthorizedKeysCommand())
1626
127
143
1627
128
	// Manage state server availability.
144
	// Manage state server availability.
1630
129
	// TODO: enable once the backend is ready for it.
145
	r.Register(wrapEnvCommand(&EnsureAvailabilityCommand{}))
1629
130
	jujucmd.Register(wrap(&EnsureAvailabilityCommand{}))
1631
131
146
1632
132
	// Common commands.
147
	// Common commands.
1651
133
	jujucmd.Register(wrap(&cmd.VersionCommand{}))
148
	r.Register(&cmd.VersionCommand{})
1634
134
1635
135
	os.Exit(cmd.Main(jujucmd, ctx, args[1:]))
1636
136
}
1637
137
1638
138
// wrap encapsulates code that wraps some of the commands in a helper class
1639
139
// that handles some common errors
1640
140
func wrap(c cmd.Command) cmd.Command {
1641
141
	if ec, ok := c.(envCmd); ok {
1642
142
		return envCmdWrapper{ec}
1643
143
	}
1644
144
	return c
1645
145
}
1646
146
1647
147
// envCmd is a Command that interacts with the juju client environment
1648
148
type envCmd interface {
1649
149
	cmd.Command
1650
150
	EnvironName() string
1652
151
}
149
}
1653
152
150
1654
153
// envCmdWrapper is a struct that wraps an environment command and lets us handle
151
// envCmdWrapper is a struct that wraps an environment command and lets us handle
1656
154
// errors returned from Run before they're returned to the main function
152
// errors returned from Init before they're returned to the main function.
1657
155
type envCmdWrapper struct {
153
type envCmdWrapper struct {
1659
156
	envCmd
154
	cmd.Command
1660
155
	ctx *cmd.Context
1661
157
}
156
}
1662
158
157
1674
159
// Run in envCmdWrapper gives us an opportunity to handle errors after the command is
158
func (w envCmdWrapper) Init(args []string) error {
1675
160
// run. This is used to give informative messages to the user.
159
	err := w.Command.Init(args)
1676
161
func (c envCmdWrapper) Run(ctx *cmd.Context) error {
160
	if environs.IsNoEnv(err) {
1677
162
	err := c.envCmd.Run(ctx)
161
		fmt.Fprintln(w.ctx.Stderr, "No juju environment configuration file exists.")
1678
163
	if environs.IsNoEnv(err) && c.EnvironName() == "" {
162
		fmt.Fprintln(w.ctx.Stderr, err)
1679
164
		fmt.Fprintln(ctx.Stderr, "No juju environment configuration file exists.")
163
		fmt.Fprintln(w.ctx.Stderr, "Please create a configuration by running:")
1680
165
		fmt.Fprintln(ctx.Stderr, err)
164
		fmt.Fprintln(w.ctx.Stderr, "    juju init")
1681
166
		fmt.Fprintln(ctx.Stderr, "Please create a configuration by running:")
165
		fmt.Fprintln(w.ctx.Stderr, "then edit the file to configure your juju environment.")
1682
167
		fmt.Fprintln(ctx.Stderr, "    juju init")
166
		fmt.Fprintln(w.ctx.Stderr, "You can then re-run the command.")
1672
168
		fmt.Fprintln(ctx.Stderr, "then edit the file to configure your juju environment.")
1673
169
		fmt.Fprintln(ctx.Stderr, "You can then re-run the command.")
1683
170
		return cmd.ErrSilent
167
		return cmd.ErrSilent
1684
171
	}
168
	}
1685
172
1686
173
	return err
169
	return err
1687
174
}
170
}
1688
175
171
1689
176
172
1690
=== modified file 'cmd/juju/main_test.go'
1691
--- cmd/juju/main_test.go	2014-04-25 13:57:06 +0000
1692
+++ cmd/juju/main_test.go	2014-05-12 11:08:32 +0000
1693
@@ -19,6 +19,7 @@
1694
19
	gc "launchpad.net/gocheck"
19
	gc "launchpad.net/gocheck"
1695
20
20
1696
21
	"launchpad.net/juju-core/cmd"
21
	"launchpad.net/juju-core/cmd"
1697
22
	"launchpad.net/juju-core/cmd/envcmd"
1698
22
	"launchpad.net/juju-core/juju/osenv"
23
	"launchpad.net/juju-core/juju/osenv"
1699
23
	_ "launchpad.net/juju-core/provider/dummy"
24
	_ "launchpad.net/juju-core/provider/dummy"
1700
24
	"launchpad.net/juju-core/testing"
25
	"launchpad.net/juju-core/testing"
1701
@@ -70,11 +71,11 @@
1702
70
}
71
}
1703
71
72
1704
72
func deployHelpText() string {
73
func deployHelpText() string {
1706
73
	return helpText(&DeployCommand{}, "juju deploy")
74
	return helpText(envcmd.Wrap(&DeployCommand{}), "juju deploy")
1707
74
}
75
}
1708
75
76
1709
76
func syncToolsHelpText() string {
77
func syncToolsHelpText() string {
1711
77
	return helpText(&SyncToolsCommand{}, "juju sync-tools")
78
	return helpText(envcmd.Wrap(&SyncToolsCommand{}), "juju sync-tools")
1712
78
}
79
}
1713
79
80
1714
80
func (s *MainSuite) TestRunMain(c *gc.C) {
81
func (s *MainSuite) TestRunMain(c *gc.C) {
1715
@@ -350,3 +351,20 @@
1716
350
		c.Assert(line, gc.Matches, globalFlags[i])
351
		c.Assert(line, gc.Matches, globalFlags[i])
1717
351
	}
352
	}
1718
352
}
353
}
1719
354
1720
355
type commands []cmd.Command
1721
356
1722
357
func (r *commands) Register(c cmd.Command) {
1723
358
	*r = append(*r, c)
1724
359
}
1725
360
1726
361
func (s *MainSuite) TestEnvironCommands(c *gc.C) {
1727
362
	var commands commands
1728
363
	registerCommands(&commands, testing.Context(c))
1729
364
	// There should not be any EnvironCommands registered.
1730
365
	// EnvironCommands must be wrapped using envcmd.Wrap.
1731
366
	for _, cmd := range commands {
1732
367
		c.Logf("%v", cmd.Info().Name)
1733
368
		c.Check(cmd, gc.Not(gc.FitsTypeOf), envcmd.EnvironCommand(&BootstrapCommand{}))
1734
369
	}
1735
370
}
1736
353
371
1737
=== modified file 'cmd/juju/plugin.go'
1738
--- cmd/juju/plugin.go	2014-05-09 13:24:50 +0000
1739
+++ cmd/juju/plugin.go	2014-05-12 11:08:32 +0000
1740
@@ -46,7 +46,7 @@
1741
46
46
1742
47
func RunPlugin(ctx *cmd.Context, subcommand string, args []string) error {
47
func RunPlugin(ctx *cmd.Context, subcommand string, args []string) error {
1743
48
	cmdName := JujuPluginPrefix + subcommand
48
	cmdName := JujuPluginPrefix + subcommand
1745
49
	plugin := &PluginCommand{name: cmdName}
49
	plugin := envcmd.Wrap(&PluginCommand{name: cmdName})
1746
50
50
1747
51
	// We process common flags supported by Juju commands.
51
	// We process common flags supported by Juju commands.
1748
52
	// To do this, we extract only those supported flags from the
52
	// To do this, we extract only those supported flags from the
1749
@@ -84,22 +84,15 @@
1750
84
}
84
}
1751
85
85
1752
86
func (c *PluginCommand) Init(args []string) error {
86
func (c *PluginCommand) Init(args []string) error {
1753
87
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
1754
88
		return err
1755
89
	}
1756
90
	c.args = args
87
	c.args = args
1757
91
	return nil
88
	return nil
1758
92
}
89
}
1759
93
90
1760
94
func (c *PluginCommand) SetFlags(f *gnuflag.FlagSet) {
1761
95
	c.EnvCommandBase.SetFlags(f)
1762
96
}
1763
97
1764
98
func (c *PluginCommand) Run(ctx *cmd.Context) error {
91
func (c *PluginCommand) Run(ctx *cmd.Context) error {
1765
99
	command := exec.Command(c.name, c.args...)
92
	command := exec.Command(c.name, c.args...)
1766
100
	command.Env = append(os.Environ(), []string{
93
	command.Env = append(os.Environ(), []string{
1767
101
		osenv.JujuHomeEnvKey + "=" + osenv.JujuHome(),
94
		osenv.JujuHomeEnvKey + "=" + osenv.JujuHome(),
1769
102
		osenv.JujuEnvEnvKey + "=" + c.EnvironName()}...,
95
		osenv.JujuEnvEnvKey + "=" + c.EnvName}...,
1770
103
	)
96
	)
1771
104
97
1772
105
	// Now hook up stdin, stdout, stderr
98
	// Now hook up stdin, stdout, stderr
1773
106
99
1774
=== modified file 'cmd/juju/publish.go'
1775
--- cmd/juju/publish.go	2014-05-09 13:24:50 +0000
1776
+++ cmd/juju/publish.go	2014-05-12 11:08:32 +0000
1777
@@ -55,14 +55,10 @@
1778
55
}
55
}
1779
56
56
1780
57
func (c *PublishCommand) SetFlags(f *gnuflag.FlagSet) {
57
func (c *PublishCommand) SetFlags(f *gnuflag.FlagSet) {
1781
58
	c.EnvCommandBase.SetFlags(f)
1782
59
	f.StringVar(&c.CharmPath, "from", ".", "path for charm to be published")
58
	f.StringVar(&c.CharmPath, "from", ".", "path for charm to be published")
1783
60
}
59
}
1784
61
60
1785
62
func (c *PublishCommand) Init(args []string) error {
61
func (c *PublishCommand) Init(args []string) error {
1786
63
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
1787
64
		return err
1788
65
	}
1789
66
	if len(args) == 0 {
62
	if len(args) == 0 {
1790
67
		return nil
63
		return nil
1791
68
	}
64
	}
1792
69
65
1793
=== modified file 'cmd/juju/publish_test.go'
1794
--- cmd/juju/publish_test.go	2014-05-09 13:24:50 +0000
1795
+++ cmd/juju/publish_test.go	2014-05-12 11:08:32 +0000
1796
@@ -12,6 +12,7 @@
1797
12
	"launchpad.net/juju-core/bzr"
12
	"launchpad.net/juju-core/bzr"
1798
13
	"launchpad.net/juju-core/charm"
13
	"launchpad.net/juju-core/charm"
1799
14
	"launchpad.net/juju-core/cmd"
14
	"launchpad.net/juju-core/cmd"
1800
15
	"launchpad.net/juju-core/cmd/envcmd"
1801
15
	"launchpad.net/juju-core/testing"
16
	"launchpad.net/juju-core/testing"
1802
16
	"launchpad.net/juju-core/testing/testbase"
17
	"launchpad.net/juju-core/testing/testbase"
1803
17
)
18
)
1804
@@ -52,7 +53,7 @@
1805
52
}
53
}
1806
53
54
1807
54
func (s *PublishSuite) runPublish(c *gc.C, args ...string) (*cmd.Context, error) {
55
func (s *PublishSuite) runPublish(c *gc.C, args ...string) (*cmd.Context, error) {
1809
55
	return testing.RunCommandInDir(c, &PublishCommand{}, args, s.dir)
56
	return testing.RunCommandInDir(c, envcmd.Wrap(&PublishCommand{}), args, s.dir)
1810
56
}
57
}
1811
57
58
1812
58
const pollDelay = testing.ShortWait
59
const pollDelay = testing.ShortWait
1813
@@ -94,7 +95,7 @@
1814
94
95
1815
95
func (s *PublishSuite) TestNoBranch(c *gc.C) {
96
func (s *PublishSuite) TestNoBranch(c *gc.C) {
1816
96
	dir := c.MkDir()
97
	dir := c.MkDir()
1818
97
	_, err := testing.RunCommandInDir(c, &PublishCommand{}, []string{"cs:precise/wordpress"}, dir)
98
	_, err := testing.RunCommandInDir(c, envcmd.Wrap(&PublishCommand{}), []string{"cs:precise/wordpress"}, dir)
1819
98
	c.Assert(err, gc.ErrorMatches, fmt.Sprintf("not a charm branch: %s", dir))
99
	c.Assert(err, gc.ErrorMatches, fmt.Sprintf("not a charm branch: %s", dir))
1820
99
}
100
}
1821
100
101
1822
@@ -104,7 +105,7 @@
1823
104
}
105
}
1824
105
106
1825
106
func (s *PublishSuite) TestFrom(c *gc.C) {
107
func (s *PublishSuite) TestFrom(c *gc.C) {
1827
107
	_, err := testing.RunCommandInDir(c, &PublishCommand{}, []string{"--from", s.dir, "cs:precise/wordpress"}, c.MkDir())
108
	_, err := testing.RunCommandInDir(c, envcmd.Wrap(&PublishCommand{}), []string{"--from", s.dir, "cs:precise/wordpress"}, c.MkDir())
1828
108
	c.Assert(err, gc.ErrorMatches, `cannot obtain local digest: branch has no content`)
109
	c.Assert(err, gc.ErrorMatches, `cannot obtain local digest: branch has no content`)
1829
109
}
110
}
1830
110
111
1831
@@ -149,7 +150,7 @@
1832
149
		panic("unreachable")
150
		panic("unreachable")
1833
150
	})
151
	})
1834
151
152
1836
152
	_, err := testing.RunCommandInDir(c, cmd, []string{"precise/wordpress"}, s.dir)
153
	_, err := testing.RunCommandInDir(c, envcmd.Wrap(cmd), []string{"precise/wordpress"}, s.dir)
1837
153
	c.Assert(err, gc.IsNil)
154
	c.Assert(err, gc.IsNil)
1838
154
	c.Fatal("shouldn't get here; location closure didn't run?")
155
	c.Fatal("shouldn't get here; location closure didn't run?")
1839
155
}
156
}
1840
@@ -264,7 +265,7 @@
1841
264
	body = `{"cs:~user/precise/wordpress": {"kind": "published", "digest": %q, "revision": 42}}`
265
	body = `{"cs:~user/precise/wordpress": {"kind": "published", "digest": %q, "revision": 42}}`
1842
265
	testing.Server.Response(200, nil, []byte(fmt.Sprintf(body, digest)))
266
	testing.Server.Response(200, nil, []byte(fmt.Sprintf(body, digest)))
1843
266
267
1845
267
	ctx, err := testing.RunCommandInDir(c, cmd, []string{"cs:~user/precise/wordpress"}, s.dir)
268
	ctx, err := testing.RunCommandInDir(c, envcmd.Wrap(cmd), []string{"cs:~user/precise/wordpress"}, s.dir)
1846
268
	c.Assert(err, gc.IsNil)
269
	c.Assert(err, gc.IsNil)
1847
269
	c.Assert(testing.Stdout(ctx), gc.Equals, "cs:~user/precise/wordpress-42\n")
270
	c.Assert(testing.Stdout(ctx), gc.Equals, "cs:~user/precise/wordpress-42\n")
1848
270
271
1849
@@ -320,7 +321,7 @@
1850
320
	body = `{"cs:~user/precise/wordpress": {"kind": "published", "digest": %q, "revision": 42}}`
321
	body = `{"cs:~user/precise/wordpress": {"kind": "published", "digest": %q, "revision": 42}}`
1851
321
	testing.Server.Response(200, nil, []byte(fmt.Sprintf(body, digest)))
322
	testing.Server.Response(200, nil, []byte(fmt.Sprintf(body, digest)))
1852
322
323
1854
323
	ctx, err := testing.RunCommandInDir(c, cmd, []string{"cs:~user/precise/wordpress"}, s.dir)
324
	ctx, err := testing.RunCommandInDir(c, envcmd.Wrap(cmd), []string{"cs:~user/precise/wordpress"}, s.dir)
1855
324
	c.Assert(err, gc.IsNil)
325
	c.Assert(err, gc.IsNil)
1856
325
	c.Assert(testing.Stdout(ctx), gc.Equals, "cs:~user/precise/wordpress-42\n")
326
	c.Assert(testing.Stdout(ctx), gc.Equals, "cs:~user/precise/wordpress-42\n")
1857
326
327
1858
@@ -376,7 +377,7 @@
1859
376
	body = `{"cs:~user/precise/wordpress": {"kind": "published", "digest": "surprising-digest", "revision": 42}}`
377
	body = `{"cs:~user/precise/wordpress": {"kind": "published", "digest": "surprising-digest", "revision": 42}}`
1860
377
	testing.Server.Response(200, nil, []byte(body))
378
	testing.Server.Response(200, nil, []byte(body))
1861
378
379
1863
379
	_, err = testing.RunCommandInDir(c, cmd, []string{"cs:~user/precise/wordpress"}, s.dir)
380
	_, err = testing.RunCommandInDir(c, envcmd.Wrap(cmd), []string{"cs:~user/precise/wordpress"}, s.dir)
1864
380
	c.Assert(err, gc.ErrorMatches, `charm changed but not to local charm digest; publishing race\?`)
381
	c.Assert(err, gc.ErrorMatches, `charm changed but not to local charm digest; publishing race\?`)
1865
381
382
1866
382
	// Ensure the branch was actually pushed.
383
	// Ensure the branch was actually pushed.
1867
383
384
1868
=== modified file 'cmd/juju/removemachine.go'
1869
--- cmd/juju/removemachine.go	2014-05-11 22:52:40 +0000
1870
+++ cmd/juju/removemachine.go	2014-05-12 11:08:32 +0000
1871
@@ -46,14 +46,10 @@
1872
46
}
46
}
1873
47
47
1874
48
func (c *RemoveMachineCommand) SetFlags(f *gnuflag.FlagSet) {
48
func (c *RemoveMachineCommand) SetFlags(f *gnuflag.FlagSet) {
1875
49
	c.EnvCommandBase.SetFlags(f)
1876
50
	f.BoolVar(&c.Force, "force", false, "completely remove machine and all dependencies")
49
	f.BoolVar(&c.Force, "force", false, "completely remove machine and all dependencies")
1877
51
}
50
}
1878
52
51
1879
53
func (c *RemoveMachineCommand) Init(args []string) error {
52
func (c *RemoveMachineCommand) Init(args []string) error {
1880
54
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
1881
55
		return err
1882
56
	}
1883
57
	if len(args) == 0 {
53
	if len(args) == 0 {
1884
58
		return fmt.Errorf("no machines specified")
54
		return fmt.Errorf("no machines specified")
1885
59
	}
55
	}
1886
60
56
1887
=== modified file 'cmd/juju/removemachine_test.go'
1888
--- cmd/juju/removemachine_test.go	2014-05-09 22:56:29 +0000
1889
+++ cmd/juju/removemachine_test.go	2014-05-12 11:08:32 +0000
1890
@@ -7,6 +7,7 @@
1891
7
	jc "github.com/juju/testing/checkers"
7
	jc "github.com/juju/testing/checkers"
1892
8
	gc "launchpad.net/gocheck"
8
	gc "launchpad.net/gocheck"
1893
9
9
1894
10
	"launchpad.net/juju-core/cmd/envcmd"
1895
10
	"launchpad.net/juju-core/errors"
11
	"launchpad.net/juju-core/errors"
1896
11
	jujutesting "launchpad.net/juju-core/juju/testing"
12
	jujutesting "launchpad.net/juju-core/juju/testing"
1897
12
	"launchpad.net/juju-core/state"
13
	"launchpad.net/juju-core/state"
1898
@@ -20,7 +21,7 @@
1899
20
var _ = gc.Suite(&RemoveMachineSuite{})
21
var _ = gc.Suite(&RemoveMachineSuite{})
1900
21
22
1901
22
func runRemoveMachine(c *gc.C, args ...string) error {
23
func runRemoveMachine(c *gc.C, args ...string) error {
1903
23
	_, err := testing.RunCommand(c, &RemoveMachineCommand{}, args)
24
	_, err := testing.RunCommand(c, envcmd.Wrap(&RemoveMachineCommand{}), args)
1904
24
	return err
25
	return err
1905
25
}
26
}
1906
26
27
1907
27
28
1908
=== modified file 'cmd/juju/removerelation.go'
1909
--- cmd/juju/removerelation.go	2014-05-11 22:52:40 +0000
1910
+++ cmd/juju/removerelation.go	2014-05-12 11:08:32 +0000
1911
@@ -27,9 +27,6 @@
1912
27
}
27
}
1913
28
28
1914
29
func (c *RemoveRelationCommand) Init(args []string) error {
29
func (c *RemoveRelationCommand) Init(args []string) error {
1915
30
	if err := c.EnsureEnvName(); err != nil {
1916
31
		return err
1917
32
	}
1918
33
	if len(args) != 2 {
30
	if len(args) != 2 {
1919
34
		return fmt.Errorf("a relation must involve two services")
31
		return fmt.Errorf("a relation must involve two services")
1920
35
	}
32
	}
1921
36
33
1922
=== modified file 'cmd/juju/removerelation_test.go'
1923
--- cmd/juju/removerelation_test.go	2014-05-08 21:27:00 +0000
1924
+++ cmd/juju/removerelation_test.go	2014-05-12 11:08:32 +0000
1925
@@ -6,6 +6,7 @@
1926
6
import (
6
import (
1927
7
	gc "launchpad.net/gocheck"
7
	gc "launchpad.net/gocheck"
1928
8
8
1929
9
	"launchpad.net/juju-core/cmd/envcmd"
1930
9
	jujutesting "launchpad.net/juju-core/juju/testing"
10
	jujutesting "launchpad.net/juju-core/juju/testing"
1931
10
	"launchpad.net/juju-core/testing"
11
	"launchpad.net/juju-core/testing"
1932
11
)
12
)
1933
@@ -17,7 +18,7 @@
1934
17
var _ = gc.Suite(&RemoveRelationSuite{})
18
var _ = gc.Suite(&RemoveRelationSuite{})
1935
18
19
1936
19
func runRemoveRelation(c *gc.C, args ...string) error {
20
func runRemoveRelation(c *gc.C, args ...string) error {
1938
20
	_, err := testing.RunCommand(c, &RemoveRelationCommand{}, args)
21
	_, err := testing.RunCommand(c, envcmd.Wrap(&RemoveRelationCommand{}), args)
1939
21
	return err
22
	return err
1940
22
}
23
}
1941
23
24
1942
24
25
1943
=== modified file 'cmd/juju/removeservice.go'
1944
--- cmd/juju/removeservice.go	2014-05-11 22:52:40 +0000
1945
+++ cmd/juju/removeservice.go	2014-05-12 11:08:32 +0000
1946
@@ -29,9 +29,6 @@
1947
29
}
29
}
1948
30
30
1949
31
func (c *RemoveServiceCommand) Init(args []string) error {
31
func (c *RemoveServiceCommand) Init(args []string) error {
1950
32
	if err := c.EnsureEnvName(); err != nil {
1951
33
		return err
1952
34
	}
1953
35
	if len(args) == 0 {
32
	if len(args) == 0 {
1954
36
		return fmt.Errorf("no service specified")
33
		return fmt.Errorf("no service specified")
1955
37
	}
34
	}
1956
38
35
1957
=== modified file 'cmd/juju/removeservice_test.go'
1958
--- cmd/juju/removeservice_test.go	2014-05-08 21:27:00 +0000
1959
+++ cmd/juju/removeservice_test.go	2014-05-12 11:08:32 +0000
1960
@@ -6,6 +6,7 @@
1961
6
import (
6
import (
1962
7
	gc "launchpad.net/gocheck"
7
	gc "launchpad.net/gocheck"
1963
8
8
1964
9
	"launchpad.net/juju-core/cmd/envcmd"
1965
9
	jujutesting "launchpad.net/juju-core/juju/testing"
10
	jujutesting "launchpad.net/juju-core/juju/testing"
1966
10
	"launchpad.net/juju-core/state"
11
	"launchpad.net/juju-core/state"
1967
11
	"launchpad.net/juju-core/testing"
12
	"launchpad.net/juju-core/testing"
1968
@@ -18,7 +19,7 @@
1969
18
var _ = gc.Suite(&RemoveServiceSuite{})
19
var _ = gc.Suite(&RemoveServiceSuite{})
1970
19
20
1971
20
func runRemoveService(c *gc.C, args ...string) error {
21
func runRemoveService(c *gc.C, args ...string) error {
1973
21
	_, err := testing.RunCommand(c, &RemoveServiceCommand{}, args)
22
	_, err := testing.RunCommand(c, envcmd.Wrap(&RemoveServiceCommand{}), args)
1974
22
	return err
23
	return err
1975
23
}
24
}
1976
24
25
1977
25
26
1978
=== modified file 'cmd/juju/removeunit.go'
1979
--- cmd/juju/removeunit.go	2014-05-11 22:52:40 +0000
1980
+++ cmd/juju/removeunit.go	2014-05-12 11:08:32 +0000
1981
@@ -29,9 +29,6 @@
1982
29
}
29
}
1983
30
30
1984
31
func (c *RemoveUnitCommand) Init(args []string) error {
31
func (c *RemoveUnitCommand) Init(args []string) error {
1985
32
	if err := c.EnsureEnvName(); err != nil {
1986
33
		return err
1987
34
	}
1988
35
	c.UnitNames = args
32
	c.UnitNames = args
1989
36
	if len(c.UnitNames) == 0 {
33
	if len(c.UnitNames) == 0 {
1990
37
		return errors.New("no units specified")
34
		return errors.New("no units specified")
1991
38
35
1992
=== modified file 'cmd/juju/removeunit_test.go'
1993
--- cmd/juju/removeunit_test.go	2014-05-08 21:27:00 +0000
1994
+++ cmd/juju/removeunit_test.go	2014-05-12 11:08:32 +0000
1995
@@ -7,6 +7,7 @@
1996
7
	gc "launchpad.net/gocheck"
7
	gc "launchpad.net/gocheck"
1997
8
8
1998
9
	"launchpad.net/juju-core/charm"
9
	"launchpad.net/juju-core/charm"
1999
10
	"launchpad.net/juju-core/cmd/envcmd"
2000
10
	jujutesting "launchpad.net/juju-core/juju/testing"
11
	jujutesting "launchpad.net/juju-core/juju/testing"
2001
11
	"launchpad.net/juju-core/state"
12
	"launchpad.net/juju-core/state"
2002
12
	"launchpad.net/juju-core/testing"
13
	"launchpad.net/juju-core/testing"
2003
@@ -19,7 +20,7 @@
2004
19
var _ = gc.Suite(&RemoveUnitSuite{})
20
var _ = gc.Suite(&RemoveUnitSuite{})
2005
20
21
2006
21
func runRemoveUnit(c *gc.C, args ...string) error {
22
func runRemoveUnit(c *gc.C, args ...string) error {
2008
22
	_, err := testing.RunCommand(c, &RemoveUnitCommand{}, args)
23
	_, err := testing.RunCommand(c, envcmd.Wrap(&RemoveUnitCommand{}), args)
2009
23
	return err
24
	return err
2010
24
}
25
}
2011
25
26
2012
26
27
2013
=== modified file 'cmd/juju/removeuser.go'
2014
--- cmd/juju/removeuser.go	2014-05-09 13:24:50 +0000
2015
+++ cmd/juju/removeuser.go	2014-05-12 11:08:32 +0000
2016
@@ -33,9 +33,6 @@
2017
33
}
33
}
2018
34
34
2019
35
func (c *RemoveUserCommand) Init(args []string) error {
35
func (c *RemoveUserCommand) Init(args []string) error {
2020
36
	if err := c.EnsureEnvName(); err != nil {
2021
37
		return err
2022
38
	}
2023
39
	if len(args) == 0 {
36
	if len(args) == 0 {
2024
40
		return errors.New("no username supplied")
37
		return errors.New("no username supplied")
2025
41
	}
38
	}
2026
42
39
2027
=== modified file 'cmd/juju/removeuser_test.go'
2028
--- cmd/juju/removeuser_test.go	2014-03-27 04:28:45 +0000
2029
+++ cmd/juju/removeuser_test.go	2014-05-12 11:08:32 +0000
2030
@@ -6,6 +6,7 @@
2031
6
import (
6
import (
2032
7
	gc "launchpad.net/gocheck"
7
	gc "launchpad.net/gocheck"
2033
8
8
2034
9
	"launchpad.net/juju-core/cmd/envcmd"
2035
9
	jujutesting "launchpad.net/juju-core/juju/testing"
10
	jujutesting "launchpad.net/juju-core/juju/testing"
2036
10
	"launchpad.net/juju-core/testing"
11
	"launchpad.net/juju-core/testing"
2037
11
)
12
)
2038
@@ -17,19 +18,19 @@
2039
17
var _ = gc.Suite(&RemoveUserSuite{})
18
var _ = gc.Suite(&RemoveUserSuite{})
2040
18
19
2041
19
func (s *RemoveUserSuite) TestRemoveUser(c *gc.C) {
20
func (s *RemoveUserSuite) TestRemoveUser(c *gc.C) {
2043
20
	_, err := testing.RunCommand(c, &AddUserCommand{}, []string{"foobar", "password"})
21
	_, err := testing.RunCommand(c, envcmd.Wrap(&AddUserCommand{}), []string{"foobar", "password"})
2044
21
	c.Assert(err, gc.IsNil)
22
	c.Assert(err, gc.IsNil)
2045
22
23
2047
23
	_, err = testing.RunCommand(c, &RemoveUserCommand{}, []string{"foobar"})
24
	_, err = testing.RunCommand(c, envcmd.Wrap(&RemoveUserCommand{}), []string{"foobar"})
2048
24
	c.Assert(err, gc.IsNil)
25
	c.Assert(err, gc.IsNil)
2049
25
}
26
}
2050
26
27
2051
27
func (s *RemoveUserSuite) TestTooManyArgs(c *gc.C) {
28
func (s *RemoveUserSuite) TestTooManyArgs(c *gc.C) {
2053
28
	_, err := testing.RunCommand(c, &RemoveUserCommand{}, []string{"foobar", "password"})
29
	_, err := testing.RunCommand(c, envcmd.Wrap(&RemoveUserCommand{}), []string{"foobar", "password"})
2054
29
	c.Assert(err, gc.ErrorMatches, `unrecognized args: \["password"\]`)
30
	c.Assert(err, gc.ErrorMatches, `unrecognized args: \["password"\]`)
2055
30
}
31
}
2056
31
32
2057
32
func (s *RemoveUserSuite) TestNotEnoughArgs(c *gc.C) {
33
func (s *RemoveUserSuite) TestNotEnoughArgs(c *gc.C) {
2059
33
	_, err := testing.RunCommand(c, &RemoveUserCommand{}, []string{})
34
	_, err := testing.RunCommand(c, envcmd.Wrap(&RemoveUserCommand{}), []string{})
2060
34
	c.Assert(err, gc.ErrorMatches, `no username supplied`)
35
	c.Assert(err, gc.ErrorMatches, `no username supplied`)
2061
35
}
36
}
2062
36
37
2063
=== modified file 'cmd/juju/resolved.go'
2064
--- cmd/juju/resolved.go	2014-05-09 13:24:50 +0000
2065
+++ cmd/juju/resolved.go	2014-05-12 11:08:32 +0000
2066
@@ -30,15 +30,11 @@
2067
30
}
30
}
2068
31
31
2069
32
func (c *ResolvedCommand) SetFlags(f *gnuflag.FlagSet) {
32
func (c *ResolvedCommand) SetFlags(f *gnuflag.FlagSet) {
2070
33
	c.EnvCommandBase.SetFlags(f)
2071
34
	f.BoolVar(&c.Retry, "r", false, "re-execute failed hooks")
33
	f.BoolVar(&c.Retry, "r", false, "re-execute failed hooks")
2072
35
	f.BoolVar(&c.Retry, "retry", false, "")
34
	f.BoolVar(&c.Retry, "retry", false, "")
2073
36
}
35
}
2074
37
36
2075
38
func (c *ResolvedCommand) Init(args []string) error {
37
func (c *ResolvedCommand) Init(args []string) error {
2076
39
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
2077
40
		return err
2078
41
	}
2079
42
	if len(args) > 0 {
38
	if len(args) > 0 {
2080
43
		c.UnitName = args[0]
39
		c.UnitName = args[0]
2081
44
		if !names.IsUnit(c.UnitName) {
40
		if !names.IsUnit(c.UnitName) {
2082
45
41
2083
=== modified file 'cmd/juju/resolved_test.go'
2084
--- cmd/juju/resolved_test.go	2013-09-18 15:57:30 +0000
2085
+++ cmd/juju/resolved_test.go	2014-05-12 11:08:32 +0000
2086
@@ -6,6 +6,7 @@
2087
6
import (
6
import (
2088
7
	gc "launchpad.net/gocheck"
7
	gc "launchpad.net/gocheck"
2089
8
8
2090
9
	"launchpad.net/juju-core/cmd/envcmd"
2091
9
	jujutesting "launchpad.net/juju-core/juju/testing"
10
	jujutesting "launchpad.net/juju-core/juju/testing"
2092
10
	"launchpad.net/juju-core/state"
11
	"launchpad.net/juju-core/state"
2093
11
	"launchpad.net/juju-core/state/api/params"
12
	"launchpad.net/juju-core/state/api/params"
2094
@@ -19,7 +20,7 @@
2095
19
var _ = gc.Suite(&ResolvedSuite{})
20
var _ = gc.Suite(&ResolvedSuite{})
2096
20
21
2097
21
func runResolved(c *gc.C, args []string) error {
22
func runResolved(c *gc.C, args []string) error {
2099
22
	_, err := testing.RunCommand(c, &ResolvedCommand{}, args)
23
	_, err := testing.RunCommand(c, envcmd.Wrap(&ResolvedCommand{}), args)
2100
23
	return err
24
	return err
2101
24
}
25
}
2102
25
26
2103
26
27
2104
=== modified file 'cmd/juju/retryprovisioning.go'
2105
--- cmd/juju/retryprovisioning.go	2014-05-09 13:24:50 +0000
2106
+++ cmd/juju/retryprovisioning.go	2014-05-12 11:08:32 +0000
2107
@@ -28,9 +28,6 @@
2108
28
}
28
}
2109
29
29
2110
30
func (c *RetryProvisioningCommand) Init(args []string) error {
30
func (c *RetryProvisioningCommand) Init(args []string) error {
2111
31
	if err := c.EnsureEnvName(); err != nil {
2112
32
		return err
2113
33
	}
2114
34
	if len(args) == 0 {
31
	if len(args) == 0 {
2115
35
		return fmt.Errorf("no machine specified")
32
		return fmt.Errorf("no machine specified")
2116
36
	}
33
	}
2117
37
34
2118
=== modified file 'cmd/juju/retryprovisioning_test.go'
2119
--- cmd/juju/retryprovisioning_test.go	2014-03-26 12:42:30 +0000
2120
+++ cmd/juju/retryprovisioning_test.go	2014-05-12 11:08:32 +0000
2121
@@ -9,6 +9,7 @@
2122
9
	jc "github.com/juju/testing/checkers"
9
	jc "github.com/juju/testing/checkers"
2123
10
	gc "launchpad.net/gocheck"
10
	gc "launchpad.net/gocheck"
2124
11
11
2125
12
	"launchpad.net/juju-core/cmd/envcmd"
2126
12
	jujutesting "launchpad.net/juju-core/juju/testing"
13
	jujutesting "launchpad.net/juju-core/juju/testing"
2127
13
	"launchpad.net/juju-core/state"
14
	"launchpad.net/juju-core/state"
2128
14
	"launchpad.net/juju-core/state/api/params"
15
	"launchpad.net/juju-core/state/api/params"
2129
@@ -61,7 +62,7 @@
2130
61
62
2131
62
	for i, t := range resolvedMachineTests {
63
	for i, t := range resolvedMachineTests {
2132
63
		c.Logf("test %d: %v", i, t.args)
64
		c.Logf("test %d: %v", i, t.args)
2134
64
		context, err := testing.RunCommand(c, &RetryProvisioningCommand{}, t.args)
65
		context, err := testing.RunCommand(c, envcmd.Wrap(&RetryProvisioningCommand{}), t.args)
2135
65
		if t.err != "" {
66
		if t.err != "" {
2136
66
			c.Check(err, gc.ErrorMatches, t.err)
67
			c.Check(err, gc.ErrorMatches, t.err)
2137
67
			continue
68
			continue
2138
68
69
2139
=== modified file 'cmd/juju/run.go'
2140
--- cmd/juju/run.go	2014-05-09 13:24:50 +0000
2141
+++ cmd/juju/run.go	2014-05-12 11:08:32 +0000
2142
@@ -70,7 +70,6 @@
2143
70
}
70
}
2144
71
71
2145
72
func (c *RunCommand) SetFlags(f *gnuflag.FlagSet) {
72
func (c *RunCommand) SetFlags(f *gnuflag.FlagSet) {
2146
73
	c.EnvCommandBase.SetFlags(f)
2147
74
	c.out.AddFlags(f, "smart", cmd.DefaultFormatters)
73
	c.out.AddFlags(f, "smart", cmd.DefaultFormatters)
2148
75
	f.BoolVar(&c.all, "all", false, "run the commands on all the machines")
74
	f.BoolVar(&c.all, "all", false, "run the commands on all the machines")
2149
76
	f.DurationVar(&c.timeout, "timeout", 5*time.Minute, "how long to wait before the remote command is considered to have failed")
75
	f.DurationVar(&c.timeout, "timeout", 5*time.Minute, "how long to wait before the remote command is considered to have failed")
2150
@@ -80,9 +79,6 @@
2151
80
}
79
}
2152
81
80
2153
82
func (c *RunCommand) Init(args []string) error {
81
func (c *RunCommand) Init(args []string) error {
2154
83
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
2155
84
		return err
2156
85
	}
2157
86
	if len(args) == 0 {
82
	if len(args) == 0 {
2158
87
		return errors.New("no commands specified")
83
		return errors.New("no commands specified")
2159
88
	}
84
	}
2160
89
85
2161
=== modified file 'cmd/juju/run_test.go'
2162
--- cmd/juju/run_test.go	2014-03-27 04:10:28 +0000
2163
+++ cmd/juju/run_test.go	2014-05-12 11:08:32 +0000
2164
@@ -11,6 +11,7 @@
2165
11
	gc "launchpad.net/gocheck"
11
	gc "launchpad.net/gocheck"
2166
12
12
2167
13
	"launchpad.net/juju-core/cmd"
13
	"launchpad.net/juju-core/cmd"
2168
14
	"launchpad.net/juju-core/cmd/envcmd"
2169
14
	"launchpad.net/juju-core/state/api/params"
15
	"launchpad.net/juju-core/state/api/params"
2170
15
	"launchpad.net/juju-core/testing"
16
	"launchpad.net/juju-core/testing"
2171
16
	"launchpad.net/juju-core/utils/exec"
17
	"launchpad.net/juju-core/utils/exec"
2172
@@ -106,7 +107,7 @@
2173
106
	}} {
107
	}} {
2174
107
		c.Log(fmt.Sprintf("%v: %s", i, test.message))
108
		c.Log(fmt.Sprintf("%v: %s", i, test.message))
2175
108
		runCmd := &RunCommand{}
109
		runCmd := &RunCommand{}
2177
109
		testing.TestInit(c, runCmd, test.args, test.errMatch)
110
		testing.TestInit(c, envcmd.Wrap(runCmd), test.args, test.errMatch)
2178
110
		if test.errMatch == "" {
111
		if test.errMatch == "" {
2179
111
			c.Check(runCmd.all, gc.Equals, test.all)
112
			c.Check(runCmd.all, gc.Equals, test.all)
2180
112
			c.Check(runCmd.machines, gc.DeepEquals, test.machines)
113
			c.Check(runCmd.machines, gc.DeepEquals, test.machines)
2181
@@ -142,7 +143,7 @@
2182
142
	}} {
143
	}} {
2183
143
		c.Log(fmt.Sprintf("%v: %s", i, test.message))
144
		c.Log(fmt.Sprintf("%v: %s", i, test.message))
2184
144
		runCmd := &RunCommand{}
145
		runCmd := &RunCommand{}
2186
145
		testing.TestInit(c, runCmd, test.args, test.errMatch)
146
		testing.TestInit(c, envcmd.Wrap(runCmd), test.args, test.errMatch)
2187
146
		if test.errMatch == "" {
147
		if test.errMatch == "" {
2188
147
			c.Check(runCmd.timeout, gc.Equals, test.timeout)
148
			c.Check(runCmd.timeout, gc.Equals, test.timeout)
2189
148
		}
149
		}
2190
@@ -257,7 +258,7 @@
2191
257
	jsonFormatted, err := cmd.FormatJson(unformatted)
258
	jsonFormatted, err := cmd.FormatJson(unformatted)
2192
258
	c.Assert(err, gc.IsNil)
259
	c.Assert(err, gc.IsNil)
2193
259
260
2195
260
	context, err := testing.RunCommand(c, &RunCommand{}, []string{
261
	context, err := testing.RunCommand(c, envcmd.Wrap(&RunCommand{}), []string{
2196
261
		"--format=json", "--machine=0", "--unit=unit/0", "hostname",
262
		"--format=json", "--machine=0", "--unit=unit/0", "hostname",
2197
262
	})
263
	})
2198
263
	c.Assert(err, gc.IsNil)
264
	c.Assert(err, gc.IsNil)
2199
@@ -337,7 +338,7 @@
2200
337
			args = append(args, "--format", test.format)
338
			args = append(args, "--format", test.format)
2201
338
		}
339
		}
2202
339
		args = append(args, "--all", "ignored")
340
		args = append(args, "--all", "ignored")
2204
340
		context, err := testing.RunCommand(c, &RunCommand{}, args)
341
		context, err := testing.RunCommand(c, envcmd.Wrap(&RunCommand{}), args)
2205
341
		if test.errorMatch != "" {
342
		if test.errorMatch != "" {
2206
342
			c.Check(err, gc.ErrorMatches, test.errorMatch)
343
			c.Check(err, gc.ErrorMatches, test.errorMatch)
2207
343
		} else {
344
		} else {
2208
344
345
2209
=== modified file 'cmd/juju/set.go'
2210
--- cmd/juju/set.go	2014-05-09 13:24:50 +0000
2211
+++ cmd/juju/set.go	2014-05-12 11:08:32 +0000
2212
@@ -39,14 +39,10 @@
2213
39
}
39
}
2214
40
40
2215
41
func (c *SetCommand) SetFlags(f *gnuflag.FlagSet) {
41
func (c *SetCommand) SetFlags(f *gnuflag.FlagSet) {
2216
42
	c.EnvCommandBase.SetFlags(f)
2217
43
	f.Var(&c.SettingsYAML, "config", "path to yaml-formatted service config")
42
	f.Var(&c.SettingsYAML, "config", "path to yaml-formatted service config")
2218
44
}
43
}
2219
45
44
2220
46
func (c *SetCommand) Init(args []string) error {
45
func (c *SetCommand) Init(args []string) error {
2221
47
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
2222
48
		return err
2223
49
	}
2224
50
	if len(args) == 0 || len(strings.Split(args[0], "=")) > 1 {
46
	if len(args) == 0 || len(strings.Split(args[0], "=")) > 1 {
2225
51
		return errors.New("no service name specified")
47
		return errors.New("no service name specified")
2226
52
	}
48
	}
2227
53
49
2228
=== modified file 'cmd/juju/set_test.go'
2229
--- cmd/juju/set_test.go	2013-10-09 13:55:14 +0000
2230
+++ cmd/juju/set_test.go	2014-05-12 11:08:32 +0000
2231
@@ -11,6 +11,7 @@
2232
11
11
2233
12
	"launchpad.net/juju-core/charm"
12
	"launchpad.net/juju-core/charm"
2234
13
	"launchpad.net/juju-core/cmd"
13
	"launchpad.net/juju-core/cmd"
2235
14
	"launchpad.net/juju-core/cmd/envcmd"
2236
14
	"launchpad.net/juju-core/juju/testing"
15
	"launchpad.net/juju-core/juju/testing"
2237
15
	"launchpad.net/juju-core/state"
16
	"launchpad.net/juju-core/state"
2238
16
	coretesting "launchpad.net/juju-core/testing"
17
	coretesting "launchpad.net/juju-core/testing"
2239
@@ -73,7 +74,7 @@
2240
73
// assertSetSuccess sets configuration options and checks the expected settings.
74
// assertSetSuccess sets configuration options and checks the expected settings.
2241
74
func assertSetSuccess(c *gc.C, dir string, svc *state.Service, args []string, expect charm.Settings) {
75
func assertSetSuccess(c *gc.C, dir string, svc *state.Service, args []string, expect charm.Settings) {
2242
75
	ctx := coretesting.ContextForDir(c, dir)
76
	ctx := coretesting.ContextForDir(c, dir)
2244
76
	code := cmd.Main(&SetCommand{}, ctx, append([]string{"dummy-service"}, args...))
77
	code := cmd.Main(envcmd.Wrap(&SetCommand{}), ctx, append([]string{"dummy-service"}, args...))
2245
77
	c.Check(code, gc.Equals, 0)
78
	c.Check(code, gc.Equals, 0)
2246
78
	settings, err := svc.ConfigSettings()
79
	settings, err := svc.ConfigSettings()
2247
79
	c.Assert(err, gc.IsNil)
80
	c.Assert(err, gc.IsNil)
2248
@@ -83,7 +84,7 @@
2249
83
// assertSetFail sets configuration options and checks the expected error.
84
// assertSetFail sets configuration options and checks the expected error.
2250
84
func assertSetFail(c *gc.C, dir string, args []string, err string) {
85
func assertSetFail(c *gc.C, dir string, args []string, err string) {
2251
85
	ctx := coretesting.ContextForDir(c, dir)
86
	ctx := coretesting.ContextForDir(c, dir)
2253
86
	code := cmd.Main(&SetCommand{}, ctx, append([]string{"dummy-service"}, args...))
87
	code := cmd.Main(envcmd.Wrap(&SetCommand{}), ctx, append([]string{"dummy-service"}, args...))
2254
87
	c.Check(code, gc.Not(gc.Equals), 0)
88
	c.Check(code, gc.Not(gc.Equals), 0)
2255
88
	c.Assert(ctx.Stderr.(*bytes.Buffer).String(), gc.Matches, err)
89
	c.Assert(ctx.Stderr.(*bytes.Buffer).String(), gc.Matches, err)
2256
89
}
90
}
2257
90
91
2258
=== modified file 'cmd/juju/ssh.go'
2259
--- cmd/juju/ssh.go	2014-05-09 13:24:50 +0000
2260
+++ cmd/juju/ssh.go	2014-05-12 11:08:32 +0000
2261
@@ -40,7 +40,6 @@
2262
40
}
40
}
2263
41
41
2264
42
func (c *SSHCommon) SetFlags(f *gnuflag.FlagSet) {
42
func (c *SSHCommon) SetFlags(f *gnuflag.FlagSet) {
2265
43
	c.EnvCommandBase.SetFlags(f)
2266
44
	f.BoolVar(&c.proxy, "proxy", true, "proxy through the API server")
43
	f.BoolVar(&c.proxy, "proxy", true, "proxy through the API server")
2267
45
	f.BoolVar(&c.pty, "pty", true, "enable pseudo-tty allocation")
44
	f.BoolVar(&c.pty, "pty", true, "enable pseudo-tty allocation")
2268
46
}
45
}
2269
@@ -94,9 +93,6 @@
2270
94
}
93
}
2271
95
94
2272
96
func (c *SSHCommand) Init(args []string) error {
95
func (c *SSHCommand) Init(args []string) error {
2273
97
	if err := c.EnsureEnvName(); err != nil {
2274
98
		return err
2275
99
	}
2276
100
	if len(args) == 0 {
96
	if len(args) == 0 {
2277
101
		return errors.New("no target name specified")
97
		return errors.New("no target name specified")
2278
102
	}
98
	}
2279
103
99
2280
=== modified file 'cmd/juju/ssh_test.go'
2281
--- cmd/juju/ssh_test.go	2014-05-09 07:41:52 +0000
2282
+++ cmd/juju/ssh_test.go	2014-05-12 11:08:32 +0000
2283
@@ -14,6 +14,7 @@
2284
14
14
2285
15
	"launchpad.net/juju-core/charm"
15
	"launchpad.net/juju-core/charm"
2286
16
	"launchpad.net/juju-core/cmd"
16
	"launchpad.net/juju-core/cmd"
2287
17
	"launchpad.net/juju-core/cmd/envcmd"
2288
17
	"launchpad.net/juju-core/instance"
18
	"launchpad.net/juju-core/instance"
2289
18
	"launchpad.net/juju-core/juju/testing"
19
	"launchpad.net/juju-core/juju/testing"
2290
19
	"launchpad.net/juju-core/state"
20
	"launchpad.net/juju-core/state"
2291
@@ -113,7 +114,7 @@
2292
113
		c.Logf("test %d: %s -> %s\n", i, t.about, t.args)
114
		c.Logf("test %d: %s -> %s\n", i, t.about, t.args)
2293
114
		ctx := coretesting.Context(c)
115
		ctx := coretesting.Context(c)
2294
115
		jujucmd := cmd.NewSuperCommand(cmd.SuperCommandParams{})
116
		jujucmd := cmd.NewSuperCommand(cmd.SuperCommandParams{})
2296
116
		jujucmd.Register(&SSHCommand{})
117
		jujucmd.Register(envcmd.Wrap(&SSHCommand{}))
2297
117
118
2298
118
		code := cmd.Main(jujucmd, ctx, t.args)
119
		code := cmd.Main(jujucmd, ctx, t.args)
2299
119
		c.Check(code, gc.Equals, 0)
120
		c.Check(code, gc.Equals, 0)
2300
120
121
2301
=== modified file 'cmd/juju/status.go'
2302
--- cmd/juju/status.go	2014-05-09 13:24:50 +0000
2303
+++ cmd/juju/status.go	2014-05-12 11:08:32 +0000
2304
@@ -50,7 +50,6 @@
2305
50
}
50
}
2306
51
51
2307
52
func (c *StatusCommand) SetFlags(f *gnuflag.FlagSet) {
52
func (c *StatusCommand) SetFlags(f *gnuflag.FlagSet) {
2308
53
	c.EnvCommandBase.SetFlags(f)
2309
54
	c.out.AddFlags(f, "yaml", map[string]cmd.Formatter{
53
	c.out.AddFlags(f, "yaml", map[string]cmd.Formatter{
2310
55
		"yaml": cmd.FormatYaml,
54
		"yaml": cmd.FormatYaml,
2311
56
		"json": cmd.FormatJson,
55
		"json": cmd.FormatJson,
2312
@@ -58,9 +57,6 @@
2313
58
}
57
}
2314
59
58
2315
60
func (c *StatusCommand) Init(args []string) error {
59
func (c *StatusCommand) Init(args []string) error {
2316
61
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
2317
62
		return err
2318
63
	}
2319
64
	c.patterns = args
60
	c.patterns = args
2320
65
	return nil
61
	return nil
2321
66
}
62
}
2322
67
63
2323
=== modified file 'cmd/juju/status_test.go'
2324
--- cmd/juju/status_test.go	2014-05-01 17:56:04 +0000
2325
+++ cmd/juju/status_test.go	2014-05-12 11:08:32 +0000
2326
@@ -17,6 +17,7 @@
2327
17
17
2328
18
	"launchpad.net/juju-core/charm"
18
	"launchpad.net/juju-core/charm"
2329
19
	"launchpad.net/juju-core/cmd"
19
	"launchpad.net/juju-core/cmd"
2330
20
	"launchpad.net/juju-core/cmd/envcmd"
2331
20
	"launchpad.net/juju-core/constraints"
21
	"launchpad.net/juju-core/constraints"
2332
21
	"launchpad.net/juju-core/environs/network"
22
	"launchpad.net/juju-core/environs/network"
2333
22
	"launchpad.net/juju-core/instance"
23
	"launchpad.net/juju-core/instance"
2334
@@ -31,7 +32,7 @@
2335
31
32
2336
32
func runStatus(c *gc.C, args ...string) (code int, stdout, stderr []byte) {
33
func runStatus(c *gc.C, args ...string) (code int, stdout, stderr []byte) {
2337
33
	ctx := coretesting.Context(c)
34
	ctx := coretesting.Context(c)
2339
34
	code = cmd.Main(&StatusCommand{}, ctx, args)
35
	code = cmd.Main(envcmd.Wrap(&StatusCommand{}), ctx, args)
2340
35
	stdout = ctx.Stdout.(*bytes.Buffer).Bytes()
36
	stdout = ctx.Stdout.(*bytes.Buffer).Bytes()
2341
36
	stderr = ctx.Stderr.(*bytes.Buffer).Bytes()
37
	stderr = ctx.Stderr.(*bytes.Buffer).Bytes()
2342
37
	return
38
	return
2343
38
39
2344
=== modified file 'cmd/juju/synctools.go'
2345
--- cmd/juju/synctools.go	2014-05-09 13:24:50 +0000
2346
+++ cmd/juju/synctools.go	2014-05-12 11:08:32 +0000
2347
@@ -52,7 +52,6 @@
2348
52
}
52
}
2349
53
53
2350
54
func (c *SyncToolsCommand) SetFlags(f *gnuflag.FlagSet) {
54
func (c *SyncToolsCommand) SetFlags(f *gnuflag.FlagSet) {
2351
55
	c.EnvCommandBase.SetFlags(f)
2352
56
	f.BoolVar(&c.allVersions, "all", false, "copy all versions, not just the latest")
55
	f.BoolVar(&c.allVersions, "all", false, "copy all versions, not just the latest")
2353
57
	f.StringVar(&c.versionStr, "version", "", "copy a specific major[.minor] version")
56
	f.StringVar(&c.versionStr, "version", "", "copy a specific major[.minor] version")
2354
58
	f.BoolVar(&c.dryRun, "dry-run", false, "don't copy, just print what would be copied")
57
	f.BoolVar(&c.dryRun, "dry-run", false, "don't copy, just print what would be copied")
2355
@@ -64,9 +63,6 @@
2356
64
}
63
}
2357
65
64
2358
66
func (c *SyncToolsCommand) Init(args []string) error {
65
func (c *SyncToolsCommand) Init(args []string) error {
2359
67
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
2360
68
		return err
2361
69
	}
2362
70
	if c.destination != "" {
66
	if c.destination != "" {
2363
71
		// Override localDir with destination as localDir now replaces destination
67
		// Override localDir with destination as localDir now replaces destination
2364
72
		c.localDir = c.destination
68
		c.localDir = c.destination
2365
73
69
2366
=== modified file 'cmd/juju/synctools_test.go'
2367
--- cmd/juju/synctools_test.go	2014-03-24 10:42:51 +0000
2368
+++ cmd/juju/synctools_test.go	2014-05-12 11:08:32 +0000
2369
@@ -12,6 +12,7 @@
2370
12
	gc "launchpad.net/gocheck"
12
	gc "launchpad.net/gocheck"
2371
13
13
2372
14
	"launchpad.net/juju-core/cmd"
14
	"launchpad.net/juju-core/cmd"
2373
15
	"launchpad.net/juju-core/cmd/envcmd"
2374
15
	"launchpad.net/juju-core/environs"
16
	"launchpad.net/juju-core/environs"
2375
16
	"launchpad.net/juju-core/environs/configstore"
17
	"launchpad.net/juju-core/environs/configstore"
2376
17
	"launchpad.net/juju-core/environs/sync"
18
	"launchpad.net/juju-core/environs/sync"
2377
@@ -61,7 +62,7 @@
2378
61
}
62
}
2379
62
63
2380
63
func runSyncToolsCommand(c *gc.C, args ...string) (*cmd.Context, error) {
64
func runSyncToolsCommand(c *gc.C, args ...string) (*cmd.Context, error) {
2382
64
	return coretesting.RunCommand(c, &SyncToolsCommand{}, args)
65
	return coretesting.RunCommand(c, envcmd.Wrap(&SyncToolsCommand{}), args)
2383
65
}
66
}
2384
66
67
2385
67
func wait(signal chan struct{}) error {
68
func wait(signal chan struct{}) error {
2386
68
69
2387
=== modified file 'cmd/juju/unexpose.go'
2388
--- cmd/juju/unexpose.go	2014-05-09 13:24:50 +0000
2389
+++ cmd/juju/unexpose.go	2014-05-12 11:08:32 +0000
2390
@@ -26,9 +26,6 @@
2391
26
}
26
}
2392
27
27
2393
28
func (c *UnexposeCommand) Init(args []string) error {
28
func (c *UnexposeCommand) Init(args []string) error {
2394
29
	if err := c.EnsureEnvName(); err != nil {
2395
30
		return err
2396
31
	}
2397
32
	if len(args) == 0 {
29
	if len(args) == 0 {
2398
33
		return errors.New("no service name specified")
30
		return errors.New("no service name specified")
2399
34
	}
31
	}
2400
35
32
2401
=== modified file 'cmd/juju/unexpose_test.go'
2402
--- cmd/juju/unexpose_test.go	2013-09-13 14:48:13 +0000
2403
+++ cmd/juju/unexpose_test.go	2014-05-12 11:08:32 +0000
2404
@@ -7,6 +7,7 @@
2405
7
	gc "launchpad.net/gocheck"
7
	gc "launchpad.net/gocheck"
2406
8
8
2407
9
	"launchpad.net/juju-core/charm"
9
	"launchpad.net/juju-core/charm"
2408
10
	"launchpad.net/juju-core/cmd/envcmd"
2409
10
	jujutesting "launchpad.net/juju-core/juju/testing"
11
	jujutesting "launchpad.net/juju-core/juju/testing"
2410
11
	"launchpad.net/juju-core/testing"
12
	"launchpad.net/juju-core/testing"
2411
12
)
13
)
2412
@@ -18,7 +19,7 @@
2413
18
var _ = gc.Suite(&UnexposeSuite{})
19
var _ = gc.Suite(&UnexposeSuite{})
2414
19
20
2415
20
func runUnexpose(c *gc.C, args ...string) error {
21
func runUnexpose(c *gc.C, args ...string) error {
2417
21
	_, err := testing.RunCommand(c, &UnexposeCommand{}, args)
22
	_, err := testing.RunCommand(c, envcmd.Wrap(&UnexposeCommand{}), args)
2418
22
	return err
23
	return err
2419
23
}
24
}
2420
24
25
2421
25
26
2422
=== modified file 'cmd/juju/unset.go'
2423
--- cmd/juju/unset.go	2014-05-09 13:24:50 +0000
2424
+++ cmd/juju/unset.go	2014-05-12 11:08:32 +0000
2425
@@ -6,8 +6,6 @@
2426
6
import (
6
import (
2427
7
	"errors"
7
	"errors"
2428
8
8
2429
9
	"launchpad.net/gnuflag"
2430
10
2431
11
	"launchpad.net/juju-core/cmd"
9
	"launchpad.net/juju-core/cmd"
2432
12
	"launchpad.net/juju-core/cmd/envcmd"
10
	"launchpad.net/juju-core/cmd/envcmd"
2433
13
	"launchpad.net/juju-core/juju"
11
	"launchpad.net/juju-core/juju"
2434
@@ -36,14 +34,7 @@
2435
36
	}
34
	}
2436
37
}
35
}
2437
38
36
2438
39
func (c *UnsetCommand) SetFlags(f *gnuflag.FlagSet) {
2439
40
	c.EnvCommandBase.SetFlags(f)
2440
41
}
2441
42
2442
43
func (c *UnsetCommand) Init(args []string) error {
37
func (c *UnsetCommand) Init(args []string) error {
2443
44
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
2444
45
		return err
2445
46
	}
2446
47
	if len(args) == 0 {
38
	if len(args) == 0 {
2447
48
		return errors.New("no service name specified")
39
		return errors.New("no service name specified")
2448
49
	}
40
	}
2449
50
41
2450
=== modified file 'cmd/juju/unset_test.go'
2451
--- cmd/juju/unset_test.go	2013-11-28 15:53:00 +0000
2452
+++ cmd/juju/unset_test.go	2014-05-12 11:08:32 +0000
2453
@@ -10,6 +10,7 @@
2454
10
10
2455
11
	"launchpad.net/juju-core/charm"
11
	"launchpad.net/juju-core/charm"
2456
12
	"launchpad.net/juju-core/cmd"
12
	"launchpad.net/juju-core/cmd"
2457
13
	"launchpad.net/juju-core/cmd/envcmd"
2458
13
	"launchpad.net/juju-core/juju/testing"
14
	"launchpad.net/juju-core/juju/testing"
2459
14
	"launchpad.net/juju-core/state"
15
	"launchpad.net/juju-core/state"
2460
15
	coretesting "launchpad.net/juju-core/testing"
16
	coretesting "launchpad.net/juju-core/testing"
2461
@@ -77,7 +78,7 @@
2462
77
// assertUnsetSuccess unsets configuration options and checks the expected settings.
78
// assertUnsetSuccess unsets configuration options and checks the expected settings.
2463
78
func assertUnsetSuccess(c *gc.C, dir string, svc *state.Service, args []string, expect charm.Settings) {
79
func assertUnsetSuccess(c *gc.C, dir string, svc *state.Service, args []string, expect charm.Settings) {
2464
79
	ctx := coretesting.ContextForDir(c, dir)
80
	ctx := coretesting.ContextForDir(c, dir)
2466
80
	code := cmd.Main(&UnsetCommand{}, ctx, append([]string{"dummy-service"}, args...))
81
	code := cmd.Main(envcmd.Wrap(&UnsetCommand{}), ctx, append([]string{"dummy-service"}, args...))
2467
81
	c.Check(code, gc.Equals, 0)
82
	c.Check(code, gc.Equals, 0)
2468
82
	settings, err := svc.ConfigSettings()
83
	settings, err := svc.ConfigSettings()
2469
83
	c.Assert(err, gc.IsNil)
84
	c.Assert(err, gc.IsNil)
2470
@@ -87,7 +88,7 @@
2471
87
// assertUnsetFail unsets configuration options and checks the expected error.
88
// assertUnsetFail unsets configuration options and checks the expected error.
2472
88
func assertUnsetFail(c *gc.C, dir string, args []string, err string) {
89
func assertUnsetFail(c *gc.C, dir string, args []string, err string) {
2473
89
	ctx := coretesting.ContextForDir(c, dir)
90
	ctx := coretesting.ContextForDir(c, dir)
2475
90
	code := cmd.Main(&UnsetCommand{}, ctx, append([]string{"dummy-service"}, args...))
91
	code := cmd.Main(envcmd.Wrap(&UnsetCommand{}), ctx, append([]string{"dummy-service"}, args...))
2476
91
	c.Check(code, gc.Not(gc.Equals), 0)
92
	c.Check(code, gc.Not(gc.Equals), 0)
2477
92
	c.Assert(ctx.Stderr.(*bytes.Buffer).String(), gc.Matches, err)
93
	c.Assert(ctx.Stderr.(*bytes.Buffer).String(), gc.Matches, err)
2478
93
}
94
}
2479
94
95
2480
=== modified file 'cmd/juju/upgradecharm.go'
2481
--- cmd/juju/upgradecharm.go	2014-05-09 13:24:50 +0000
2482
+++ cmd/juju/upgradecharm.go	2014-05-12 11:08:32 +0000
2483
@@ -76,7 +76,6 @@
2484
76
}
76
}
2485
77
77
2486
78
func (c *UpgradeCharmCommand) SetFlags(f *gnuflag.FlagSet) {
78
func (c *UpgradeCharmCommand) SetFlags(f *gnuflag.FlagSet) {
2487
79
	c.EnvCommandBase.SetFlags(f)
2488
80
	f.BoolVar(&c.Force, "force", false, "upgrade all units immediately, even if in error state")
79
	f.BoolVar(&c.Force, "force", false, "upgrade all units immediately, even if in error state")
2489
81
	f.StringVar(&c.RepoPath, "repository", os.Getenv("JUJU_REPOSITORY"), "local charm repository path")
80
	f.StringVar(&c.RepoPath, "repository", os.Getenv("JUJU_REPOSITORY"), "local charm repository path")
2490
82
	f.StringVar(&c.SwitchURL, "switch", "", "crossgrade to a different charm")
81
	f.StringVar(&c.SwitchURL, "switch", "", "crossgrade to a different charm")
2491
@@ -84,9 +83,6 @@
2492
84
}
83
}
2493
85
84
2494
86
func (c *UpgradeCharmCommand) Init(args []string) error {
85
func (c *UpgradeCharmCommand) Init(args []string) error {
2495
87
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
2496
88
		return err
2497
89
	}
2498
90
	switch len(args) {
86
	switch len(args) {
2499
91
	case 1:
87
	case 1:
2500
92
		if !names.IsService(args[0]) {
88
		if !names.IsService(args[0]) {
2501
93
89
2502
=== modified file 'cmd/juju/upgradecharm_test.go'
2503
--- cmd/juju/upgradecharm_test.go	2014-03-18 05:08:25 +0000
2504
+++ cmd/juju/upgradecharm_test.go	2014-05-12 11:08:32 +0000
2505
@@ -13,6 +13,7 @@
2506
13
13
2507
14
	"launchpad.net/juju-core/charm"
14
	"launchpad.net/juju-core/charm"
2508
15
	charmtesting "launchpad.net/juju-core/charm/testing"
15
	charmtesting "launchpad.net/juju-core/charm/testing"
2509
16
	"launchpad.net/juju-core/cmd/envcmd"
2510
16
	jujutesting "launchpad.net/juju-core/juju/testing"
17
	jujutesting "launchpad.net/juju-core/juju/testing"
2511
17
	"launchpad.net/juju-core/state"
18
	"launchpad.net/juju-core/state"
2512
18
	"launchpad.net/juju-core/testing"
19
	"launchpad.net/juju-core/testing"
2513
@@ -34,7 +35,7 @@
2514
34
var _ = gc.Suite(&UpgradeCharmErrorsSuite{})
35
var _ = gc.Suite(&UpgradeCharmErrorsSuite{})
2515
35
36
2516
36
func runUpgradeCharm(c *gc.C, args ...string) error {
37
func runUpgradeCharm(c *gc.C, args ...string) error {
2518
37
	_, err := testing.RunCommand(c, &UpgradeCharmCommand{}, args)
38
	_, err := testing.RunCommand(c, envcmd.Wrap(&UpgradeCharmCommand{}), args)
2519
38
	return err
39
	return err
2520
39
}
40
}
2521
40
41
2522
41
42
2523
=== modified file 'cmd/juju/upgradejuju.go'
2524
--- cmd/juju/upgradejuju.go	2014-05-09 13:24:50 +0000
2525
+++ cmd/juju/upgradejuju.go	2014-05-12 11:08:32 +0000
2526
@@ -76,16 +76,12 @@
2527
76
}
76
}
2528
77
77
2529
78
func (c *UpgradeJujuCommand) SetFlags(f *gnuflag.FlagSet) {
78
func (c *UpgradeJujuCommand) SetFlags(f *gnuflag.FlagSet) {
2530
79
	c.EnvCommandBase.SetFlags(f)
2531
80
	f.StringVar(&c.vers, "version", "", "upgrade to specific version")
79
	f.StringVar(&c.vers, "version", "", "upgrade to specific version")
2532
81
	f.BoolVar(&c.UploadTools, "upload-tools", false, "upload local version of tools")
80
	f.BoolVar(&c.UploadTools, "upload-tools", false, "upload local version of tools")
2533
82
	f.Var(newSeriesValue(nil, &c.Series), "series", "upload tools for supplied comma-separated series list")
81
	f.Var(newSeriesValue(nil, &c.Series), "series", "upload tools for supplied comma-separated series list")
2534
83
}
82
}
2535
84
83
2536
85
func (c *UpgradeJujuCommand) Init(args []string) error {
84
func (c *UpgradeJujuCommand) Init(args []string) error {
2537
86
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
2538
87
		return err
2539
88
	}
2540
89
	if c.vers != "" {
85
	if c.vers != "" {
2541
90
		vers, err := version.Parse(c.vers)
86
		vers, err := version.Parse(c.vers)
2542
91
		if err != nil {
87
		if err != nil {
2543
92
88
2544
=== modified file 'cmd/juju/upgradejuju_test.go'
2545
--- cmd/juju/upgradejuju_test.go	2014-04-09 16:36:12 +0000
2546
+++ cmd/juju/upgradejuju_test.go	2014-05-12 11:08:32 +0000
2547
@@ -14,6 +14,7 @@
2548
14
	jc "github.com/juju/testing/checkers"
14
	jc "github.com/juju/testing/checkers"
2549
15
	gc "launchpad.net/gocheck"
15
	gc "launchpad.net/gocheck"
2550
16
16
2551
17
	"launchpad.net/juju-core/cmd/envcmd"
2552
17
	"launchpad.net/juju-core/environs/config"
18
	"launchpad.net/juju-core/environs/config"
2553
18
	"launchpad.net/juju-core/environs/filestorage"
19
	"launchpad.net/juju-core/environs/filestorage"
2554
19
	"launchpad.net/juju-core/environs/storage"
20
	"launchpad.net/juju-core/environs/storage"
2555
@@ -313,7 +314,7 @@
2556
313
		// Set up apparent CLI version and initialize the command.
314
		// Set up apparent CLI version and initialize the command.
2557
314
		version.Current = version.MustParseBinary(test.currentVersion)
315
		version.Current = version.MustParseBinary(test.currentVersion)
2558
315
		com := &UpgradeJujuCommand{}
316
		com := &UpgradeJujuCommand{}
2560
316
		if err := coretesting.InitCommand(com, test.args); err != nil {
317
		if err := coretesting.InitCommand(envcmd.Wrap(com), test.args); err != nil {
2561
317
			if test.expectInitErr != "" {
318
			if test.expectInitErr != "" {
2562
318
				c.Check(err, gc.ErrorMatches, test.expectInitErr)
319
				c.Check(err, gc.ErrorMatches, test.expectInitErr)
2563
319
			} else {
320
			} else {
2564
320
321
2565
=== modified file 'cmd/plugins/juju-metadata/imagemetadata.go'
2566
--- cmd/plugins/juju-metadata/imagemetadata.go	2014-05-09 13:24:50 +0000
2567
+++ cmd/plugins/juju-metadata/imagemetadata.go	2014-05-12 11:08:32 +0000
2568
@@ -53,7 +53,6 @@
2569
53
}
53
}
2570
54
54
2571
55
func (c *ImageMetadataCommand) SetFlags(f *gnuflag.FlagSet) {
55
func (c *ImageMetadataCommand) SetFlags(f *gnuflag.FlagSet) {
2572
56
	c.EnvCommandBase.SetFlags(f)
2573
57
	f.StringVar(&c.Series, "s", "", "the charm series")
56
	f.StringVar(&c.Series, "s", "", "the charm series")
2574
58
	f.StringVar(&c.Arch, "a", arch.AMD64, "the image achitecture")
57
	f.StringVar(&c.Arch, "a", arch.AMD64, "the image achitecture")
2575
59
	f.StringVar(&c.Dir, "d", "", "the destination directory in which to place the metadata files")
58
	f.StringVar(&c.Dir, "d", "", "the destination directory in which to place the metadata files")
2576
@@ -62,13 +61,6 @@
2577
62
	f.StringVar(&c.Endpoint, "u", "", "the cloud endpoint (for Openstack, this is the Identity Service endpoint)")
61
	f.StringVar(&c.Endpoint, "u", "", "the cloud endpoint (for Openstack, this is the Identity Service endpoint)")
2578
63
}
62
}
2579
64
63
2580
65
func (c *ImageMetadataCommand) Init(args []string) error {
2581
66
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
2582
67
		return err
2583
68
	}
2584
69
	return cmd.CheckEmpty(args)
2585
70
}
2586
71
2587
72
// setParams sets parameters based on the environment configuration
64
// setParams sets parameters based on the environment configuration
2588
73
// for those which have not been explicitly specified.
65
// for those which have not been explicitly specified.
2589
74
func (c *ImageMetadataCommand) setParams(context *cmd.Context) error {
66
func (c *ImageMetadataCommand) setParams(context *cmd.Context) error {
2590
75
67
2591
=== modified file 'cmd/plugins/juju-metadata/imagemetadata_test.go'
2592
--- cmd/plugins/juju-metadata/imagemetadata_test.go	2014-05-09 21:54:06 +0000
2593
+++ cmd/plugins/juju-metadata/imagemetadata_test.go	2014-05-12 11:08:32 +0000
2594
@@ -15,6 +15,7 @@
2595
15
	gc "launchpad.net/gocheck"
15
	gc "launchpad.net/gocheck"
2596
16
16
2597
17
	"launchpad.net/juju-core/cmd"
17
	"launchpad.net/juju-core/cmd"
2598
18
	"launchpad.net/juju-core/cmd/envcmd"
2599
18
	"launchpad.net/juju-core/environs/config"
19
	"launchpad.net/juju-core/environs/config"
2600
19
	"launchpad.net/juju-core/provider/dummy"
20
	"launchpad.net/juju-core/provider/dummy"
2601
20
	"launchpad.net/juju-core/testing"
21
	"launchpad.net/juju-core/testing"
2602
@@ -116,7 +117,7 @@
2603
116
func (s *ImageMetadataSuite) TestImageMetadataFilesNoEnv(c *gc.C) {
117
func (s *ImageMetadataSuite) TestImageMetadataFilesNoEnv(c *gc.C) {
2604
117
	ctx := testing.Context(c)
118
	ctx := testing.Context(c)
2605
118
	code := cmd.Main(
119
	code := cmd.Main(
2607
119
		&ImageMetadataCommand{}, ctx, []string{
120
		envcmd.Wrap(&ImageMetadataCommand{}), ctx, []string{
2608
120
			"-d", s.dir, "-i", "1234", "-r", "region", "-a", "arch", "-u", "endpoint", "-s", "raring"})
121
			"-d", s.dir, "-i", "1234", "-r", "region", "-a", "arch", "-u", "endpoint", "-s", "raring"})
2609
121
	c.Assert(code, gc.Equals, 0)
122
	c.Assert(code, gc.Equals, 0)
2610
122
	out := testing.Stdout(ctx)
123
	out := testing.Stdout(ctx)
2611
@@ -130,7 +131,7 @@
2612
130
func (s *ImageMetadataSuite) TestImageMetadataFilesDefaultArch(c *gc.C) {
131
func (s *ImageMetadataSuite) TestImageMetadataFilesDefaultArch(c *gc.C) {
2613
131
	ctx := testing.Context(c)
132
	ctx := testing.Context(c)
2614
132
	code := cmd.Main(
133
	code := cmd.Main(
2616
133
		&ImageMetadataCommand{}, ctx, []string{
134
		envcmd.Wrap(&ImageMetadataCommand{}), ctx, []string{
2617
134
			"-d", s.dir, "-i", "1234", "-r", "region", "-u", "endpoint", "-s", "raring"})
135
			"-d", s.dir, "-i", "1234", "-r", "region", "-u", "endpoint", "-s", "raring"})
2618
135
	c.Assert(code, gc.Equals, 0)
136
	c.Assert(code, gc.Equals, 0)
2619
136
	out := testing.Stdout(ctx)
137
	out := testing.Stdout(ctx)
2620
@@ -144,7 +145,7 @@
2621
144
func (s *ImageMetadataSuite) TestImageMetadataFilesLatestLts(c *gc.C) {
145
func (s *ImageMetadataSuite) TestImageMetadataFilesLatestLts(c *gc.C) {
2622
145
	ctx := testing.Context(c)
146
	ctx := testing.Context(c)
2623
146
	code := cmd.Main(
147
	code := cmd.Main(
2625
147
		&ImageMetadataCommand{}, ctx, []string{
148
		envcmd.Wrap(&ImageMetadataCommand{}), ctx, []string{
2626
148
			"-d", s.dir, "-i", "1234", "-r", "region", "-a", "arch", "-u", "endpoint"})
149
			"-d", s.dir, "-i", "1234", "-r", "region", "-a", "arch", "-u", "endpoint"})
2627
149
	c.Assert(code, gc.Equals, 0)
150
	c.Assert(code, gc.Equals, 0)
2628
150
	out := testing.Stdout(ctx)
151
	out := testing.Stdout(ctx)
2629
@@ -158,7 +159,7 @@
2630
158
func (s *ImageMetadataSuite) TestImageMetadataFilesUsingEnv(c *gc.C) {
159
func (s *ImageMetadataSuite) TestImageMetadataFilesUsingEnv(c *gc.C) {
2631
159
	ctx := testing.Context(c)
160
	ctx := testing.Context(c)
2632
160
	code := cmd.Main(
161
	code := cmd.Main(
2634
161
		&ImageMetadataCommand{}, ctx, []string{"-d", s.dir, "-e", "ec2", "-i", "1234"})
162
		envcmd.Wrap(&ImageMetadataCommand{}), ctx, []string{"-d", s.dir, "-e", "ec2", "-i", "1234"})
2635
162
	c.Assert(code, gc.Equals, 0)
163
	c.Assert(code, gc.Equals, 0)
2636
163
	out := testing.Stdout(ctx)
164
	out := testing.Stdout(ctx)
2637
164
	expected := expectedMetadata{
165
	expected := expectedMetadata{
2638
@@ -173,7 +174,7 @@
2639
173
func (s *ImageMetadataSuite) TestImageMetadataFilesUsingEnvWithRegionOverride(c *gc.C) {
174
func (s *ImageMetadataSuite) TestImageMetadataFilesUsingEnvWithRegionOverride(c *gc.C) {
2640
174
	ctx := testing.Context(c)
175
	ctx := testing.Context(c)
2641
175
	code := cmd.Main(
176
	code := cmd.Main(
2643
176
		&ImageMetadataCommand{}, ctx, []string{
177
		envcmd.Wrap(&ImageMetadataCommand{}), ctx, []string{
2644
177
			"-d", s.dir, "-e", "ec2", "-r", "us-west-1", "-u", "https://ec2.us-west-1.amazonaws.com", "-i", "1234"})
178
			"-d", s.dir, "-e", "ec2", "-r", "us-west-1", "-u", "https://ec2.us-west-1.amazonaws.com", "-i", "1234"})
2645
178
	c.Assert(code, gc.Equals, 0)
179
	c.Assert(code, gc.Equals, 0)
2646
179
	out := testing.Stdout(ctx)
180
	out := testing.Stdout(ctx)
2647
@@ -189,7 +190,7 @@
2648
189
func (s *ImageMetadataSuite) TestImageMetadataFilesUsingEnvWithNoHasRegion(c *gc.C) {
190
func (s *ImageMetadataSuite) TestImageMetadataFilesUsingEnvWithNoHasRegion(c *gc.C) {
2649
190
	ctx := testing.Context(c)
191
	ctx := testing.Context(c)
2650
191
	code := cmd.Main(
192
	code := cmd.Main(
2652
192
		&ImageMetadataCommand{}, ctx, []string{
193
		envcmd.Wrap(&ImageMetadataCommand{}), ctx, []string{
2653
193
			"-d", s.dir, "-e", "azure", "-r", "region", "-u", "endpoint", "-i", "1234"})
194
			"-d", s.dir, "-e", "azure", "-r", "region", "-u", "endpoint", "-i", "1234"})
2654
194
	c.Assert(code, gc.Equals, 0)
195
	c.Assert(code, gc.Equals, 0)
2655
195
	out := testing.Stdout(ctx)
196
	out := testing.Stdout(ctx)
2656
@@ -234,7 +235,7 @@
2657
234
	for i, t := range errTests {
235
	for i, t := range errTests {
2658
235
		c.Logf("test: %d", i)
236
		c.Logf("test: %d", i)
2659
236
		ctx := testing.Context(c)
237
		ctx := testing.Context(c)
2661
237
		code := cmd.Main(&ImageMetadataCommand{}, ctx, t.args)
238
		code := cmd.Main(envcmd.Wrap(&ImageMetadataCommand{}), ctx, t.args)
2662
238
		c.Check(code, gc.Equals, 1)
239
		c.Check(code, gc.Equals, 1)
2663
239
	}
240
	}
2664
240
}
241
}
2665
241
242
2666
=== modified file 'cmd/plugins/juju-metadata/metadata.go'
2667
--- cmd/plugins/juju-metadata/metadata.go	2014-03-21 14:28:36 +0000
2668
+++ cmd/plugins/juju-metadata/metadata.go	2014-05-12 11:08:32 +0000
2669
@@ -10,6 +10,7 @@
2670
10
	"github.com/juju/loggo"
10
	"github.com/juju/loggo"
2671
11
11
2672
12
	"launchpad.net/juju-core/cmd"
12
	"launchpad.net/juju-core/cmd"
2673
13
	"launchpad.net/juju-core/cmd/envcmd"
2674
13
	"launchpad.net/juju-core/juju"
14
	"launchpad.net/juju-core/juju"
2675
14
	_ "launchpad.net/juju-core/provider/all"
15
	_ "launchpad.net/juju-core/provider/all"
2676
15
)
16
)
2677
@@ -41,10 +42,10 @@
2678
41
		Purpose:     "tools for generating and validating image and tools metadata",
42
		Purpose:     "tools for generating and validating image and tools metadata",
2679
42
		Log:         &cmd.Log{}})
43
		Log:         &cmd.Log{}})
2680
43
44
2685
44
	metadatacmd.Register(&ValidateImageMetadataCommand{})
45
	metadatacmd.Register(envcmd.Wrap(&ValidateImageMetadataCommand{}))
2686
45
	metadatacmd.Register(&ImageMetadataCommand{})
46
	metadatacmd.Register(envcmd.Wrap(&ImageMetadataCommand{}))
2687
46
	metadatacmd.Register(&ToolsMetadataCommand{})
47
	metadatacmd.Register(envcmd.Wrap(&ToolsMetadataCommand{}))
2688
47
	metadatacmd.Register(&ValidateToolsMetadataCommand{})
48
	metadatacmd.Register(envcmd.Wrap(&ValidateToolsMetadataCommand{}))
2689
48
	metadatacmd.Register(&SignMetadataCommand{})
49
	metadatacmd.Register(&SignMetadataCommand{})
2690
49
50
2691
50
	os.Exit(cmd.Main(metadatacmd, ctx, args[1:]))
51
	os.Exit(cmd.Main(metadatacmd, ctx, args[1:]))
2692
51
52
2693
=== modified file 'cmd/plugins/juju-metadata/toolsmetadata.go'
2694
--- cmd/plugins/juju-metadata/toolsmetadata.go	2014-05-09 13:24:50 +0000
2695
+++ cmd/plugins/juju-metadata/toolsmetadata.go	2014-05-12 11:08:32 +0000
2696
@@ -37,18 +37,10 @@
2697
37
}
37
}
2698
38
38
2699
39
func (c *ToolsMetadataCommand) SetFlags(f *gnuflag.FlagSet) {
39
func (c *ToolsMetadataCommand) SetFlags(f *gnuflag.FlagSet) {
2700
40
	c.EnvCommandBase.SetFlags(f)
2701
41
	f.StringVar(&c.metadataDir, "d", "", "local directory in which to store metadata")
40
	f.StringVar(&c.metadataDir, "d", "", "local directory in which to store metadata")
2702
42
	f.BoolVar(&c.public, "public", false, "tools are for a public cloud, so generate mirrors information")
41
	f.BoolVar(&c.public, "public", false, "tools are for a public cloud, so generate mirrors information")
2703
43
}
42
}
2704
44
43
2705
45
func (c *ToolsMetadataCommand) Init(args []string) error {
2706
46
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
2707
47
		return err
2708
48
	}
2709
49
	return cmd.CheckEmpty(args)
2710
50
}
2711
51
2712
52
func (c *ToolsMetadataCommand) Run(context *cmd.Context) error {
44
func (c *ToolsMetadataCommand) Run(context *cmd.Context) error {
2713
53
	loggo.RegisterWriter("toolsmetadata", cmd.NewCommandLogWriter("juju.environs.tools", context.Stdout, context.Stderr), loggo.INFO)
45
	loggo.RegisterWriter("toolsmetadata", cmd.NewCommandLogWriter("juju.environs.tools", context.Stdout, context.Stderr), loggo.INFO)
2714
54
	defer loggo.RemoveWriter("toolsmetadata")
46
	defer loggo.RemoveWriter("toolsmetadata")
2715
55
47
2716
=== modified file 'cmd/plugins/juju-metadata/toolsmetadata_test.go'
2717
--- cmd/plugins/juju-metadata/toolsmetadata_test.go	2014-04-09 16:36:12 +0000
2718
+++ cmd/plugins/juju-metadata/toolsmetadata_test.go	2014-05-12 11:08:32 +0000
2719
@@ -14,6 +14,7 @@
2720
14
	gc "launchpad.net/gocheck"
14
	gc "launchpad.net/gocheck"
2721
15
15
2722
16
	"launchpad.net/juju-core/cmd"
16
	"launchpad.net/juju-core/cmd"
2723
17
	"launchpad.net/juju-core/cmd/envcmd"
2724
17
	"launchpad.net/juju-core/environs"
18
	"launchpad.net/juju-core/environs"
2725
18
	"launchpad.net/juju-core/environs/configstore"
19
	"launchpad.net/juju-core/environs/configstore"
2726
19
	envtesting "launchpad.net/juju-core/environs/testing"
20
	envtesting "launchpad.net/juju-core/environs/testing"
2727
@@ -100,7 +101,7 @@
2728
100
	metadataDir := osenv.JujuHome() // default metadata dir
101
	metadataDir := osenv.JujuHome() // default metadata dir
2729
101
	ttesting.MakeTools(c, metadataDir, "releases", versionStrings)
102
	ttesting.MakeTools(c, metadataDir, "releases", versionStrings)
2730
102
	ctx := coretesting.Context(c)
103
	ctx := coretesting.Context(c)
2732
103
	code := cmd.Main(&ToolsMetadataCommand{}, ctx, nil)
104
	code := cmd.Main(envcmd.Wrap(&ToolsMetadataCommand{}), ctx, nil)
2733
104
	c.Assert(code, gc.Equals, 0)
105
	c.Assert(code, gc.Equals, 0)
2734
105
	output := ctx.Stdout.(*bytes.Buffer).String()
106
	output := ctx.Stdout.(*bytes.Buffer).String()
2735
106
	c.Assert(output, gc.Matches, expectedOutputDirectory)
107
	c.Assert(output, gc.Matches, expectedOutputDirectory)
2736
@@ -118,7 +119,7 @@
2737
118
	metadataDir := c.MkDir()
119
	metadataDir := c.MkDir()
2738
119
	ttesting.MakeTools(c, metadataDir, "releases", versionStrings)
120
	ttesting.MakeTools(c, metadataDir, "releases", versionStrings)
2739
120
	ctx := coretesting.Context(c)
121
	ctx := coretesting.Context(c)
2741
121
	code := cmd.Main(&ToolsMetadataCommand{}, ctx, []string{"-d", metadataDir})
122
	code := cmd.Main(envcmd.Wrap(&ToolsMetadataCommand{}), ctx, []string{"-d", metadataDir})
2742
122
	c.Assert(code, gc.Equals, 0)
123
	c.Assert(code, gc.Equals, 0)
2743
123
	output := ctx.Stdout.(*bytes.Buffer).String()
124
	output := ctx.Stdout.(*bytes.Buffer).String()
2744
124
	c.Assert(output, gc.Matches, expectedOutputDirectory)
125
	c.Assert(output, gc.Matches, expectedOutputDirectory)
2745
@@ -139,7 +140,7 @@
2746
139
	// Run the command with no local metadata.
140
	// Run the command with no local metadata.
2747
140
	ctx := coretesting.Context(c)
141
	ctx := coretesting.Context(c)
2748
141
	metadataDir := c.MkDir()
142
	metadataDir := c.MkDir()
2750
142
	code := cmd.Main(&ToolsMetadataCommand{}, ctx, []string{"-d", metadataDir})
143
	code := cmd.Main(envcmd.Wrap(&ToolsMetadataCommand{}), ctx, []string{"-d", metadataDir})
2751
143
	c.Assert(code, gc.Equals, 0)
144
	c.Assert(code, gc.Equals, 0)
2752
144
	metadata := ttesting.ParseMetadataFromDir(c, metadataDir, false)
145
	metadata := ttesting.ParseMetadataFromDir(c, metadataDir, false)
2753
145
	c.Assert(metadata, gc.HasLen, len(versionStrings))
146
	c.Assert(metadata, gc.HasLen, len(versionStrings))
2754
@@ -155,7 +156,7 @@
2755
155
	metadataDir := c.MkDir()
156
	metadataDir := c.MkDir()
2756
156
	ttesting.MakeTools(c, metadataDir, "releases", versionStrings)
157
	ttesting.MakeTools(c, metadataDir, "releases", versionStrings)
2757
157
	ctx := coretesting.Context(c)
158
	ctx := coretesting.Context(c)
2759
158
	code := cmd.Main(&ToolsMetadataCommand{}, ctx, []string{"--public", "-d", metadataDir})
159
	code := cmd.Main(envcmd.Wrap(&ToolsMetadataCommand{}), ctx, []string{"--public", "-d", metadataDir})
2760
159
	c.Assert(code, gc.Equals, 0)
160
	c.Assert(code, gc.Equals, 0)
2761
160
	output := ctx.Stdout.(*bytes.Buffer).String()
161
	output := ctx.Stdout.(*bytes.Buffer).String()
2762
161
	c.Assert(output, gc.Matches, expectedOutputMirrors)
162
	c.Assert(output, gc.Matches, expectedOutputMirrors)
2763
@@ -171,7 +172,7 @@
2764
171
172
2765
172
func (s *ToolsMetadataSuite) TestNoTools(c *gc.C) {
173
func (s *ToolsMetadataSuite) TestNoTools(c *gc.C) {
2766
173
	ctx := coretesting.Context(c)
174
	ctx := coretesting.Context(c)
2768
174
	code := cmd.Main(&ToolsMetadataCommand{}, ctx, nil)
175
	code := cmd.Main(envcmd.Wrap(&ToolsMetadataCommand{}), ctx, nil)
2769
175
	c.Assert(code, gc.Equals, 1)
176
	c.Assert(code, gc.Equals, 1)
2770
176
	stdout := ctx.Stdout.(*bytes.Buffer).String()
177
	stdout := ctx.Stdout.(*bytes.Buffer).String()
2771
177
	c.Assert(stdout, gc.Matches, "Finding tools in .*\n")
178
	c.Assert(stdout, gc.Matches, "Finding tools in .*\n")
2772
@@ -189,7 +190,7 @@
2773
189
	metadataDir := osenv.JujuHome() // default metadata dir
190
	metadataDir := osenv.JujuHome() // default metadata dir
2774
190
	ttesting.MakeTools(c, metadataDir, "releases", versionStrings)
191
	ttesting.MakeTools(c, metadataDir, "releases", versionStrings)
2775
191
	ctx := coretesting.Context(c)
192
	ctx := coretesting.Context(c)
2777
192
	code := cmd.Main(&ToolsMetadataCommand{}, ctx, nil)
193
	code := cmd.Main(envcmd.Wrap(&ToolsMetadataCommand{}), ctx, nil)
2778
193
	c.Assert(code, gc.Equals, 0)
194
	c.Assert(code, gc.Equals, 0)
2779
194
	output := ctx.Stdout.(*bytes.Buffer).String()
195
	output := ctx.Stdout.(*bytes.Buffer).String()
2780
195
	expectedOutput := fmt.Sprintf(`
196
	expectedOutput := fmt.Sprintf(`
2781
196
197
2782
=== modified file 'cmd/plugins/juju-metadata/validateimagemetadata.go'
2783
--- cmd/plugins/juju-metadata/validateimagemetadata.go	2014-05-09 13:24:50 +0000
2784
+++ cmd/plugins/juju-metadata/validateimagemetadata.go	2014-05-12 11:08:32 +0000
2785
@@ -81,7 +81,6 @@
2786
81
}
81
}
2787
82
82
2788
83
func (c *ValidateImageMetadataCommand) SetFlags(f *gnuflag.FlagSet) {
83
func (c *ValidateImageMetadataCommand) SetFlags(f *gnuflag.FlagSet) {
2789
84
	c.EnvCommandBase.SetFlags(f)
2790
85
	c.out.AddFlags(f, "smart", cmd.DefaultFormatters)
84
	c.out.AddFlags(f, "smart", cmd.DefaultFormatters)
2791
86
	f.StringVar(&c.providerType, "p", "", "the provider type eg ec2, openstack")
85
	f.StringVar(&c.providerType, "p", "", "the provider type eg ec2, openstack")
2792
87
	f.StringVar(&c.metadataDir, "d", "", "directory where metadata files are found")
86
	f.StringVar(&c.metadataDir, "d", "", "directory where metadata files are found")
2793
@@ -92,9 +91,6 @@
2794
92
}
91
}
2795
93
92
2796
94
func (c *ValidateImageMetadataCommand) Init(args []string) error {
93
func (c *ValidateImageMetadataCommand) Init(args []string) error {
2797
95
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
2798
96
		return err
2799
97
	}
2800
98
	if c.providerType != "" {
94
	if c.providerType != "" {
2801
99
		if c.series == "" {
95
		if c.series == "" {
2802
100
			return fmt.Errorf("series required if provider type is specified")
96
			return fmt.Errorf("series required if provider type is specified")
2803
101
97
2804
=== modified file 'cmd/plugins/juju-metadata/validateimagemetadata_test.go'
2805
--- cmd/plugins/juju-metadata/validateimagemetadata_test.go	2014-05-08 09:27:50 +0000
2806
+++ cmd/plugins/juju-metadata/validateimagemetadata_test.go	2014-05-12 11:08:32 +0000
2807
@@ -11,6 +11,7 @@
2808
11
	gc "launchpad.net/gocheck"
11
	gc "launchpad.net/gocheck"
2809
12
12
2810
13
	"launchpad.net/juju-core/cmd"
13
	"launchpad.net/juju-core/cmd"
2811
14
	"launchpad.net/juju-core/cmd/envcmd"
2812
14
	"launchpad.net/juju-core/environs/filestorage"
15
	"launchpad.net/juju-core/environs/filestorage"
2813
15
	"launchpad.net/juju-core/environs/imagemetadata"
16
	"launchpad.net/juju-core/environs/imagemetadata"
2814
16
	"launchpad.net/juju-core/environs/simplestreams"
17
	"launchpad.net/juju-core/environs/simplestreams"
2815
@@ -27,7 +28,7 @@
2816
27
var _ = gc.Suite(&ValidateImageMetadataSuite{})
28
var _ = gc.Suite(&ValidateImageMetadataSuite{})
2817
28
29
2818
29
func runValidateImageMetadata(c *gc.C, args ...string) error {
30
func runValidateImageMetadata(c *gc.C, args ...string) error {
2820
30
	_, err := coretesting.RunCommand(c, &ValidateImageMetadataCommand{}, args)
31
	_, err := coretesting.RunCommand(c, envcmd.Wrap(&ValidateImageMetadataCommand{}), args)
2821
31
	return err
32
	return err
2822
32
}
33
}
2823
33
34
2824
@@ -50,7 +51,7 @@
2825
50
func (s *ValidateImageMetadataSuite) TestInitErrors(c *gc.C) {
51
func (s *ValidateImageMetadataSuite) TestInitErrors(c *gc.C) {
2826
51
	for i, t := range validateInitImageErrorTests {
52
	for i, t := range validateInitImageErrorTests {
2827
52
		c.Logf("test %d", i)
53
		c.Logf("test %d", i)
2829
53
		err := coretesting.InitCommand(&ValidateImageMetadataCommand{}, t.args)
54
		err := coretesting.InitCommand(envcmd.Wrap(&ValidateImageMetadataCommand{}), t.args)
2830
54
		c.Check(err, gc.ErrorMatches, t.err)
55
		c.Check(err, gc.ErrorMatches, t.err)
2831
55
	}
56
	}
2832
56
}
57
}
2833
@@ -130,7 +131,7 @@
2834
130
	s.setupEc2LocalMetadata(c, "us-east-1", stream)
131
	s.setupEc2LocalMetadata(c, "us-east-1", stream)
2835
131
	ctx := coretesting.Context(c)
132
	ctx := coretesting.Context(c)
2836
132
	code := cmd.Main(
133
	code := cmd.Main(
2838
133
		&ValidateImageMetadataCommand{}, ctx, []string{"-e", "ec2", "-d", s.metadataDir, "-m", stream},
134
		envcmd.Wrap(&ValidateImageMetadataCommand{}), ctx, []string{"-e", "ec2", "-d", s.metadataDir, "-m", stream},
2839
134
	)
135
	)
2840
135
	c.Assert(code, gc.Equals, 0)
136
	c.Assert(code, gc.Equals, 0)
2841
136
	errOut := ctx.Stdout.(*bytes.Buffer).String()
137
	errOut := ctx.Stdout.(*bytes.Buffer).String()
2842
@@ -154,7 +155,7 @@
2843
154
	s.setupEc2LocalMetadata(c, "us-east-1", "")
155
	s.setupEc2LocalMetadata(c, "us-east-1", "")
2844
155
	ctx := coretesting.Context(c)
156
	ctx := coretesting.Context(c)
2845
156
	code := cmd.Main(
157
	code := cmd.Main(
2847
157
		&ValidateImageMetadataCommand{}, ctx, []string{"-e", "ec2", "-d", s.metadataDir},
158
		envcmd.Wrap(&ValidateImageMetadataCommand{}), ctx, []string{"-e", "ec2", "-d", s.metadataDir},
2848
158
	)
159
	)
2849
159
	c.Assert(code, gc.Equals, 1)
160
	c.Assert(code, gc.Equals, 1)
2850
160
	errOut := ctx.Stderr.(*bytes.Buffer).String()
161
	errOut := ctx.Stderr.(*bytes.Buffer).String()
2851
@@ -166,7 +167,7 @@
2852
166
	s.setupEc2LocalMetadata(c, "us-west-1", "")
167
	s.setupEc2LocalMetadata(c, "us-west-1", "")
2853
167
	ctx := coretesting.Context(c)
168
	ctx := coretesting.Context(c)
2854
168
	code := cmd.Main(
169
	code := cmd.Main(
2856
169
		&ValidateImageMetadataCommand{}, ctx, []string{
170
		envcmd.Wrap(&ValidateImageMetadataCommand{}), ctx, []string{
2857
170
			"-p", "ec2", "-s", "precise", "-r", "us-west-1",
171
			"-p", "ec2", "-s", "precise", "-r", "us-west-1",
2858
171
			"-u", "https://ec2.us-west-1.amazonaws.com", "-d", s.metadataDir},
172
			"-u", "https://ec2.us-west-1.amazonaws.com", "-d", s.metadataDir},
2859
172
	)
173
	)
2860
@@ -182,13 +183,13 @@
2861
182
	s.setupEc2LocalMetadata(c, "us-east-1", "")
183
	s.setupEc2LocalMetadata(c, "us-east-1", "")
2862
183
	ctx := coretesting.Context(c)
184
	ctx := coretesting.Context(c)
2863
184
	code := cmd.Main(
185
	code := cmd.Main(
2865
185
		&ValidateImageMetadataCommand{}, ctx, []string{
186
		envcmd.Wrap(&ValidateImageMetadataCommand{}), ctx, []string{
2866
186
			"-p", "ec2", "-s", "raring", "-r", "us-west-1",
187
			"-p", "ec2", "-s", "raring", "-r", "us-west-1",
2867
187
			"-u", "https://ec2.us-west-1.amazonaws.com", "-d", s.metadataDir},
188
			"-u", "https://ec2.us-west-1.amazonaws.com", "-d", s.metadataDir},
2868
188
	)
189
	)
2869
189
	c.Assert(code, gc.Equals, 1)
190
	c.Assert(code, gc.Equals, 1)
2870
190
	code = cmd.Main(
191
	code = cmd.Main(
2872
191
		&ValidateImageMetadataCommand{}, ctx, []string{
192
		envcmd.Wrap(&ValidateImageMetadataCommand{}), ctx, []string{
2873
192
			"-p", "ec2", "-s", "precise", "-r", "region",
193
			"-p", "ec2", "-s", "precise", "-r", "region",
2874
193
			"-u", "https://ec2.region.amazonaws.com", "-d", s.metadataDir},
194
			"-u", "https://ec2.region.amazonaws.com", "-d", s.metadataDir},
2875
194
	)
195
	)
2876
@@ -202,7 +203,7 @@
2877
202
	s.makeLocalMetadata(c, "1234", "region-2", "raring", "some-auth-url", "")
203
	s.makeLocalMetadata(c, "1234", "region-2", "raring", "some-auth-url", "")
2878
203
	ctx := coretesting.Context(c)
204
	ctx := coretesting.Context(c)
2879
204
	code := cmd.Main(
205
	code := cmd.Main(
2881
205
		&ValidateImageMetadataCommand{}, ctx, []string{
206
		envcmd.Wrap(&ValidateImageMetadataCommand{}), ctx, []string{
2882
206
			"-p", "openstack", "-s", "raring", "-r", "region-2",
207
			"-p", "openstack", "-s", "raring", "-r", "region-2",
2883
207
			"-u", "some-auth-url", "-d", s.metadataDir},
208
			"-u", "some-auth-url", "-d", s.metadataDir},
2884
208
	)
209
	)
2885
@@ -218,7 +219,7 @@
2886
218
	s.makeLocalMetadata(c, "1234", "region-2", "raring", "some-auth-url", "")
219
	s.makeLocalMetadata(c, "1234", "region-2", "raring", "some-auth-url", "")
2887
219
	ctx := coretesting.Context(c)
220
	ctx := coretesting.Context(c)
2888
220
	code := cmd.Main(
221
	code := cmd.Main(
2890
221
		&ValidateImageMetadataCommand{}, ctx, []string{
222
		envcmd.Wrap(&ValidateImageMetadataCommand{}), ctx, []string{
2891
222
			"-p", "openstack", "-s", "precise", "-r", "region-2",
223
			"-p", "openstack", "-s", "precise", "-r", "region-2",
2892
223
			"-u", "some-auth-url", "-d", s.metadataDir},
224
			"-u", "some-auth-url", "-d", s.metadataDir},
2893
224
	)
225
	)
2894
@@ -227,7 +228,7 @@
2895
227
	strippedOut := strings.Replace(errOut, "\n", "", -1)
228
	strippedOut := strings.Replace(errOut, "\n", "", -1)
2896
228
	c.Check(strippedOut, gc.Matches, `.*Resolve Metadata:.*`)
229
	c.Check(strippedOut, gc.Matches, `.*Resolve Metadata:.*`)
2897
229
	code = cmd.Main(
230
	code = cmd.Main(
2899
230
		&ValidateImageMetadataCommand{}, ctx, []string{
231
		envcmd.Wrap(&ValidateImageMetadataCommand{}), ctx, []string{
2900
231
			"-p", "openstack", "-s", "raring", "-r", "region-3",
232
			"-p", "openstack", "-s", "raring", "-r", "region-3",
2901
232
			"-u", "some-auth-url", "-d", s.metadataDir},
233
			"-u", "some-auth-url", "-d", s.metadataDir},
2902
233
	)
234
	)
2903
234
235
2904
=== modified file 'cmd/plugins/juju-metadata/validatetoolsmetadata.go'
2905
--- cmd/plugins/juju-metadata/validatetoolsmetadata.go	2014-05-09 13:24:50 +0000
2906
+++ cmd/plugins/juju-metadata/validatetoolsmetadata.go	2014-05-12 11:08:32 +0000
2907
@@ -103,7 +103,6 @@
2908
103
}
103
}
2909
104
104
2910
105
func (c *ValidateToolsMetadataCommand) SetFlags(f *gnuflag.FlagSet) {
105
func (c *ValidateToolsMetadataCommand) SetFlags(f *gnuflag.FlagSet) {
2911
106
	c.EnvCommandBase.SetFlags(f)
2912
107
	c.out.AddFlags(f, "smart", cmd.DefaultFormatters)
106
	c.out.AddFlags(f, "smart", cmd.DefaultFormatters)
2913
108
	f.StringVar(&c.providerType, "p", "", "the provider type eg ec2, openstack")
107
	f.StringVar(&c.providerType, "p", "", "the provider type eg ec2, openstack")
2914
109
	f.StringVar(&c.metadataDir, "d", "", "directory where metadata files are found")
108
	f.StringVar(&c.metadataDir, "d", "", "directory where metadata files are found")
2915
@@ -118,9 +117,6 @@
2916
118
}
117
}
2917
119
118
2918
120
func (c *ValidateToolsMetadataCommand) Init(args []string) error {
119
func (c *ValidateToolsMetadataCommand) Init(args []string) error {
2919
121
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
2920
122
		return err
2921
123
	}
2922
124
	if c.providerType != "" {
120
	if c.providerType != "" {
2923
125
		if c.region == "" {
121
		if c.region == "" {
2924
126
			return fmt.Errorf("region required if provider type is specified")
122
			return fmt.Errorf("region required if provider type is specified")
2925
127
123
2926
=== modified file 'cmd/plugins/juju-metadata/validatetoolsmetadata_test.go'
2927
--- cmd/plugins/juju-metadata/validatetoolsmetadata_test.go	2014-03-18 15:43:41 +0000
2928
+++ cmd/plugins/juju-metadata/validatetoolsmetadata_test.go	2014-05-12 11:08:32 +0000
2929
@@ -11,6 +11,7 @@
2930
11
	gc "launchpad.net/gocheck"
11
	gc "launchpad.net/gocheck"
2931
12
12
2932
13
	"launchpad.net/juju-core/cmd"
13
	"launchpad.net/juju-core/cmd"
2933
14
	"launchpad.net/juju-core/cmd/envcmd"
2934
14
	"launchpad.net/juju-core/environs/filestorage"
15
	"launchpad.net/juju-core/environs/filestorage"
2935
15
	"launchpad.net/juju-core/environs/tools"
16
	"launchpad.net/juju-core/environs/tools"
2936
16
	coretesting "launchpad.net/juju-core/testing"
17
	coretesting "launchpad.net/juju-core/testing"
2937
@@ -27,7 +28,7 @@
2938
27
var _ = gc.Suite(&ValidateToolsMetadataSuite{})
28
var _ = gc.Suite(&ValidateToolsMetadataSuite{})
2939
28
29
2940
29
func runValidateToolsMetadata(c *gc.C, args ...string) error {
30
func runValidateToolsMetadata(c *gc.C, args ...string) error {
2942
30
	_, err := coretesting.RunCommand(c, &ValidateToolsMetadataCommand{}, args)
31
	_, err := coretesting.RunCommand(c, envcmd.Wrap(&ValidateToolsMetadataCommand{}), args)
2943
31
	return err
32
	return err
2944
32
}
33
}
2945
33
34
2946
@@ -56,7 +57,7 @@
2947
56
func (s *ValidateToolsMetadataSuite) TestInitErrors(c *gc.C) {
57
func (s *ValidateToolsMetadataSuite) TestInitErrors(c *gc.C) {
2948
57
	for i, t := range validateInitToolsErrorTests {
58
	for i, t := range validateInitToolsErrorTests {
2949
58
		c.Logf("test %d", i)
59
		c.Logf("test %d", i)
2951
59
		err := coretesting.InitCommand(&ValidateToolsMetadataCommand{}, t.args)
60
		err := coretesting.InitCommand(envcmd.Wrap(&ValidateToolsMetadataCommand{}), t.args)
2952
60
		c.Check(err, gc.ErrorMatches, t.err)
61
		c.Check(err, gc.ErrorMatches, t.err)
2953
61
	}
62
	}
2954
62
}
63
}
2955
@@ -112,7 +113,7 @@
2956
112
	s.setupEc2LocalMetadata(c, "us-east-1")
113
	s.setupEc2LocalMetadata(c, "us-east-1")
2957
113
	ctx := coretesting.Context(c)
114
	ctx := coretesting.Context(c)
2958
114
	code := cmd.Main(
115
	code := cmd.Main(
2960
115
		&ValidateToolsMetadataCommand{}, ctx, []string{"-e", "ec2", "-j", "1.11.4", "-d", s.metadataDir},
116
		envcmd.Wrap(&ValidateToolsMetadataCommand{}), ctx, []string{"-e", "ec2", "-j", "1.11.4", "-d", s.metadataDir},
2961
116
	)
117
	)
2962
117
	c.Assert(code, gc.Equals, 0)
118
	c.Assert(code, gc.Equals, 0)
2963
118
	errOut := ctx.Stdout.(*bytes.Buffer).String()
119
	errOut := ctx.Stdout.(*bytes.Buffer).String()
2964
@@ -126,7 +127,7 @@
2965
126
	s.setupEc2LocalMetadata(c, "us-east-1")
127
	s.setupEc2LocalMetadata(c, "us-east-1")
2966
127
	ctx := coretesting.Context(c)
128
	ctx := coretesting.Context(c)
2967
128
	code := cmd.Main(
129
	code := cmd.Main(
2969
129
		&ValidateToolsMetadataCommand{}, ctx, []string{"-e", "ec2", "-j", "1.11.4"},
130
		envcmd.Wrap(&ValidateToolsMetadataCommand{}), ctx, []string{"-e", "ec2", "-j", "1.11.4"},
2970
130
	)
131
	)
2971
131
	c.Assert(code, gc.Equals, 1)
132
	c.Assert(code, gc.Equals, 1)
2972
132
	errOut := ctx.Stderr.(*bytes.Buffer).String()
133
	errOut := ctx.Stderr.(*bytes.Buffer).String()
2973
@@ -138,7 +139,7 @@
2974
138
	s.setupEc2LocalMetadata(c, "us-west-1")
139
	s.setupEc2LocalMetadata(c, "us-west-1")
2975
139
	ctx := coretesting.Context(c)
140
	ctx := coretesting.Context(c)
2976
140
	code := cmd.Main(
141
	code := cmd.Main(
2978
141
		&ValidateToolsMetadataCommand{}, ctx, []string{
142
		envcmd.Wrap(&ValidateToolsMetadataCommand{}), ctx, []string{
2979
142
			"-p", "ec2", "-s", "precise", "-r", "us-west-1", "-j", "1.11.4",
143
			"-p", "ec2", "-s", "precise", "-r", "us-west-1", "-j", "1.11.4",
2980
143
			"-u", "https://ec2.us-west-1.amazonaws.com", "-d", s.metadataDir},
144
			"-u", "https://ec2.us-west-1.amazonaws.com", "-d", s.metadataDir},
2981
144
	)
145
	)
2982
@@ -152,13 +153,13 @@
2983
152
	s.setupEc2LocalMetadata(c, "us-east-1")
153
	s.setupEc2LocalMetadata(c, "us-east-1")
2984
153
	ctx := coretesting.Context(c)
154
	ctx := coretesting.Context(c)
2985
154
	code := cmd.Main(
155
	code := cmd.Main(
2987
155
		&ValidateToolsMetadataCommand{}, ctx, []string{
156
		envcmd.Wrap(&ValidateToolsMetadataCommand{}), ctx, []string{
2988
156
			"-p", "ec2", "-s", "raring", "-r", "us-west-1",
157
			"-p", "ec2", "-s", "raring", "-r", "us-west-1",
2989
157
			"-u", "https://ec2.us-west-1.amazonaws.com", "-d", s.metadataDir},
158
			"-u", "https://ec2.us-west-1.amazonaws.com", "-d", s.metadataDir},
2990
158
	)
159
	)
2991
159
	c.Assert(code, gc.Equals, 1)
160
	c.Assert(code, gc.Equals, 1)
2992
160
	code = cmd.Main(
161
	code = cmd.Main(
2994
161
		&ValidateToolsMetadataCommand{}, ctx, []string{
162
		envcmd.Wrap(&ValidateToolsMetadataCommand{}), ctx, []string{
2995
162
			"-p", "ec2", "-s", "precise", "-r", "region",
163
			"-p", "ec2", "-s", "precise", "-r", "region",
2996
163
			"-u", "https://ec2.region.amazonaws.com", "-d", s.metadataDir},
164
			"-u", "https://ec2.region.amazonaws.com", "-d", s.metadataDir},
2997
164
	)
165
	)
2998
@@ -172,7 +173,7 @@
2999
172
	s.makeLocalMetadata(c, "1.11.4", "region-2", "raring", "some-auth-url")
173
	s.makeLocalMetadata(c, "1.11.4", "region-2", "raring", "some-auth-url")
3000
173
	ctx := coretesting.Context(c)
174
	ctx := coretesting.Context(c)
3001
174
	code := cmd.Main(
175
	code := cmd.Main(
3003
175
		&ValidateToolsMetadataCommand{}, ctx, []string{
176
		envcmd.Wrap(&ValidateToolsMetadataCommand{}), ctx, []string{
3004
176
			"-p", "openstack", "-s", "raring", "-r", "region-2", "-j", "1.11.4",
177
			"-p", "openstack", "-s", "raring", "-r", "region-2", "-j", "1.11.4",
3005
177
			"-u", "some-auth-url", "-d", s.metadataDir},
178
			"-u", "some-auth-url", "-d", s.metadataDir},
3006
178
	)
179
	)
3007
@@ -186,13 +187,13 @@
3008
186
	s.makeLocalMetadata(c, "1.11.4", "region-2", "raring", "some-auth-url")
187
	s.makeLocalMetadata(c, "1.11.4", "region-2", "raring", "some-auth-url")
3009
187
	ctx := coretesting.Context(c)
188
	ctx := coretesting.Context(c)
3010
188
	code := cmd.Main(
189
	code := cmd.Main(
3012
189
		&ValidateToolsMetadataCommand{}, ctx, []string{
190
		envcmd.Wrap(&ValidateToolsMetadataCommand{}), ctx, []string{
3013
190
			"-p", "openstack", "-s", "precise", "-r", "region-2",
191
			"-p", "openstack", "-s", "precise", "-r", "region-2",
3014
191
			"-u", "some-auth-url", "-d", s.metadataDir},
192
			"-u", "some-auth-url", "-d", s.metadataDir},
3015
192
	)
193
	)
3016
193
	c.Assert(code, gc.Equals, 1)
194
	c.Assert(code, gc.Equals, 1)
3017
194
	code = cmd.Main(
195
	code = cmd.Main(
3019
195
		&ValidateToolsMetadataCommand{}, ctx, []string{
196
		envcmd.Wrap(&ValidateToolsMetadataCommand{}), ctx, []string{
3020
196
			"-p", "openstack", "-s", "raring", "-r", "region-3",
197
			"-p", "openstack", "-s", "raring", "-r", "region-3",
3021
197
			"-u", "some-auth-url", "-d", s.metadataDir},
198
			"-u", "some-auth-url", "-d", s.metadataDir},
3022
198
	)
199
	)
3023
@@ -206,7 +207,7 @@
3024
206
	s.makeLocalMetadata(c, version.Current.Number.String(), "region-2", "raring", "some-auth-url")
207
	s.makeLocalMetadata(c, version.Current.Number.String(), "region-2", "raring", "some-auth-url")
3025
207
	ctx := coretesting.Context(c)
208
	ctx := coretesting.Context(c)
3026
208
	code := cmd.Main(
209
	code := cmd.Main(
3028
209
		&ValidateToolsMetadataCommand{}, ctx, []string{
210
		envcmd.Wrap(&ValidateToolsMetadataCommand{}), ctx, []string{
3029
210
			"-p", "openstack", "-s", "raring", "-r", "region-2",
211
			"-p", "openstack", "-s", "raring", "-r", "region-2",
3030
211
			"-u", "some-auth-url", "-d", s.metadataDir},
212
			"-u", "some-auth-url", "-d", s.metadataDir},
3031
212
	)
213
	)
3032
@@ -220,7 +221,7 @@
3033
220
	s.makeLocalMetadata(c, "1.11.4", "region-2", "raring", "some-auth-url")
221
	s.makeLocalMetadata(c, "1.11.4", "region-2", "raring", "some-auth-url")
3034
221
	ctx := coretesting.Context(c)
222
	ctx := coretesting.Context(c)
3035
222
	code := cmd.Main(
223
	code := cmd.Main(
3037
223
		&ValidateToolsMetadataCommand{}, ctx, []string{
224
		envcmd.Wrap(&ValidateToolsMetadataCommand{}), ctx, []string{
3038
224
			"-p", "openstack", "-s", "raring", "-r", "region-2",
225
			"-p", "openstack", "-s", "raring", "-r", "region-2",
3039
225
			"-u", "some-auth-url", "-d", s.metadataDir, "-m", "1"},
226
			"-u", "some-auth-url", "-d", s.metadataDir, "-m", "1"},
3040
226
	)
227
	)
3041
@@ -234,7 +235,7 @@
3042
234
	s.makeLocalMetadata(c, "1.12.1", "region-2", "raring", "some-auth-url")
235
	s.makeLocalMetadata(c, "1.12.1", "region-2", "raring", "some-auth-url")
3043
235
	ctx := coretesting.Context(c)
236
	ctx := coretesting.Context(c)
3044
236
	code := cmd.Main(
237
	code := cmd.Main(
3046
237
		&ValidateToolsMetadataCommand{}, ctx, []string{
238
		envcmd.Wrap(&ValidateToolsMetadataCommand{}), ctx, []string{
3047
238
			"-p", "openstack", "-s", "raring", "-r", "region-2",
239
			"-p", "openstack", "-s", "raring", "-r", "region-2",
3048
239
			"-u", "some-auth-url", "-d", s.metadataDir, "-m", "1.12"},
240
			"-u", "some-auth-url", "-d", s.metadataDir, "-m", "1.12"},
3049
240
	)
241
	)
3050
@@ -248,7 +249,7 @@
3051
248
	s.makeLocalMetadata(c, version.Current.Number.String(), "region-2", "raring", "some-auth-url")
249
	s.makeLocalMetadata(c, version.Current.Number.String(), "region-2", "raring", "some-auth-url")
3052
249
	ctx := coretesting.Context(c)
250
	ctx := coretesting.Context(c)
3053
250
	code := cmd.Main(
251
	code := cmd.Main(
3055
251
		&ValidateToolsMetadataCommand{}, ctx, []string{"-s", "raring", "-d", s.metadataDir},
252
		envcmd.Wrap(&ValidateToolsMetadataCommand{}), ctx, []string{"-s", "raring", "-d", s.metadataDir},
3056
252
	)
253
	)
3057
253
	c.Assert(code, gc.Equals, 0)
254
	c.Assert(code, gc.Equals, 0)
3058
254
	errOut := ctx.Stdout.(*bytes.Buffer).String()
255
	errOut := ctx.Stdout.(*bytes.Buffer).String()
3059
255
256
3060
=== modified file 'cmd/plugins/juju-restore/restore.go'
3061
--- cmd/plugins/juju-restore/restore.go	2014-05-09 13:24:50 +0000
3062
+++ cmd/plugins/juju-restore/restore.go	2014-05-12 11:08:32 +0000
3063
@@ -48,7 +48,7 @@
3064
48
		fmt.Fprintf(os.Stderr, "error: %s\n", err)
48
		fmt.Fprintf(os.Stderr, "error: %s\n", err)
3065
49
		os.Exit(2)
49
		os.Exit(2)
3066
50
	}
50
	}
3068
51
	os.Exit(cmd.Main(&restoreCommand{}, ctx, args[1:]))
51
	os.Exit(cmd.Main(envcmd.Wrap(&restoreCommand{}), ctx, args[1:]))
3069
52
}
52
}
3070
53
53
3071
54
var logger = loggo.GetLogger("juju.plugins.restore")
54
var logger = loggo.GetLogger("juju.plugins.restore")
3072
@@ -82,16 +82,12 @@
3073
82
}
82
}
3074
83
83
3075
84
func (c *restoreCommand) SetFlags(f *gnuflag.FlagSet) {
84
func (c *restoreCommand) SetFlags(f *gnuflag.FlagSet) {
3076
85
	c.EnvCommandBase.SetFlags(f)
3077
86
	f.Var(constraints.ConstraintsValue{Target: &c.Constraints}, "constraints", "set environment constraints")
85
	f.Var(constraints.ConstraintsValue{Target: &c.Constraints}, "constraints", "set environment constraints")
3078
87
	f.BoolVar(&c.showDescription, "description", false, "show the purpose of this plugin")
86
	f.BoolVar(&c.showDescription, "description", false, "show the purpose of this plugin")
3079
88
	c.Log.AddFlags(f)
87
	c.Log.AddFlags(f)
3080
89
}
88
}
3081
90
89
3082
91
func (c *restoreCommand) Init(args []string) error {
90
func (c *restoreCommand) Init(args []string) error {
3083
92
	if err := c.EnvCommandBase.EnsureEnvName(); err != nil {
3084
93
		return err
3085
94
	}
3086
95
	if c.showDescription {
91
	if c.showDescription {
3087
96
		return cmd.CheckEmpty(args)
92
		return cmd.CheckEmpty(args)
3088
97
	}
93
	}
Status:	Merged
Approved by:	Andrew Wilkins on 2014-05-13
Approved revision:	no longer in the source branch.
Merged at revision:	2721
Proposed branch:	lp:~axwalk/juju-core/envcmd-inversion
Merge into:	lp:~go-bot/juju-core/trunk
Diff against target:	3088 lines (+421/-485) 83 files modified cmd/cmd.go (+12/-9) cmd/envcmd/environmentcommand.go (+77/-37) cmd/envcmd/environmentcommand_test.go (+42/-18) cmd/juju/addmachine.go (+1/-5) cmd/juju/addmachine_test.go (+2/-1) cmd/juju/addrelation.go (+0/-3) cmd/juju/addrelation_test.go (+2/-1) cmd/juju/addunit.go (+0/-4) cmd/juju/addunit_test.go (+3/-2) cmd/juju/adduser.go (+0/-3) cmd/juju/adduser_test.go (+15/-9) cmd/juju/authorizedkeys.go (+5/-4) cmd/juju/authorizedkeys_add.go (+0/-4) cmd/juju/authorizedkeys_delete.go (+0/-4) cmd/juju/authorizedkeys_import.go (+0/-4) cmd/juju/authorizedkeys_list.go (+0/-8) cmd/juju/authorizedkeys_test.go (+11/-10) cmd/juju/bootstrap.go (+0/-4) cmd/juju/bootstrap_test.go (+15/-14) cmd/juju/cmd_test.go (+20/-19) cmd/juju/constraints.go (+0/-8) cmd/juju/constraints_test.go (+3/-2) cmd/juju/debuglog.go (+0/-5) cmd/juju/debuglog_test.go (+5/-4) cmd/juju/deploy.go (+0/-4) cmd/juju/deploy_test.go (+4/-3) cmd/juju/endpoint.go (+0/-8) cmd/juju/endpoint_test.go (+2/-1) cmd/juju/ensureavailability.go (+0/-4) cmd/juju/ensureavailability_test.go (+2/-1) cmd/juju/environment.go (+0/-12) cmd/juju/environment_test.go (+12/-11) cmd/juju/expose.go (+0/-3) cmd/juju/expose_test.go (+2/-1) cmd/juju/get.go (+0/-4) cmd/juju/get_test.go (+2/-1) cmd/juju/main.go (+67/-71) cmd/juju/main_test.go (+20/-2) cmd/juju/plugin.go (+2/-9) cmd/juju/publish.go (+0/-4) cmd/juju/publish_test.go (+8/-7) cmd/juju/removemachine.go (+0/-4) cmd/juju/removemachine_test.go (+2/-1) cmd/juju/removerelation.go (+0/-3) cmd/juju/removerelation_test.go (+2/-1) cmd/juju/removeservice.go (+0/-3) cmd/juju/removeservice_test.go (+2/-1) cmd/juju/removeunit.go (+0/-3) cmd/juju/removeunit_test.go (+2/-1) cmd/juju/removeuser.go (+0/-3) cmd/juju/removeuser_test.go (+5/-4) cmd/juju/resolved.go (+0/-4) cmd/juju/resolved_test.go (+2/-1) cmd/juju/retryprovisioning.go (+0/-3) cmd/juju/retryprovisioning_test.go (+2/-1) cmd/juju/run.go (+0/-4) cmd/juju/run_test.go (+5/-4) cmd/juju/set.go (+0/-4) cmd/juju/set_test.go (+3/-2) cmd/juju/ssh.go (+0/-4) cmd/juju/ssh_test.go (+2/-1) cmd/juju/status.go (+0/-4) cmd/juju/status_test.go (+2/-1) cmd/juju/synctools.go (+0/-4) cmd/juju/synctools_test.go (+2/-1) cmd/juju/unexpose.go (+0/-3) cmd/juju/unexpose_test.go (+2/-1) cmd/juju/unset.go (+0/-9) cmd/juju/unset_test.go (+3/-2) cmd/juju/upgradecharm.go (+0/-4) cmd/juju/upgradecharm_test.go (+2/-1) cmd/juju/upgradejuju.go (+0/-4) cmd/juju/upgradejuju_test.go (+2/-1) cmd/plugins/juju-metadata/imagemetadata.go (+0/-8) cmd/plugins/juju-metadata/imagemetadata_test.go (+8/-7) cmd/plugins/juju-metadata/metadata.go (+5/-4) cmd/plugins/juju-metadata/toolsmetadata.go (+0/-8) cmd/plugins/juju-metadata/toolsmetadata_test.go (+7/-6) cmd/plugins/juju-metadata/validateimagemetadata.go (+0/-4) cmd/plugins/juju-metadata/validateimagemetadata_test.go (+11/-10) cmd/plugins/juju-metadata/validatetoolsmetadata.go (+0/-4) cmd/plugins/juju-metadata/validatetoolsmetadata_test.go (+15/-14) cmd/plugins/juju-restore/restore.go (+1/-5)
To merge this branch:	bzr merge lp:~axwalk/juju-core/envcmd-inversion
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Juju Engineering		2014-05-12	Pending
Review via email: mp+219135@code.launchpad.net