iSharkFly-Docs/packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

packer: TargettedUi properly targets machine-readable data

Browse Source
This commit is contained in:
Mitchell Hashimoto 2013-08-11 19:08:08 -07:00
parent b54a5c0074
commit ca54df1a76
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packer/ui.go
View File

@ -140,8 +140,8 @@ func (u *TargettedUi) Error(message string) {
}
func (u *TargettedUi) Machine(t string, args ...string) {
// Just pass it through for now.
u.Ui.Machine(t, args...)
// Prefix in the target, then pass through
u.Ui.Machine(fmt.Sprintf("%s,%s", u.Target, t), args...)
}
func (u *TargettedUi) prefixLines(arrow bool, message string) string {

10
packer/ui_test.go
View File

@ -41,21 +41,21 @@ func TestTargettedUi(t *testing.T) {
assert := asserts.NewTestingAsserts(t, true)
bufferUi := testUi()
TargettedUi := &TargettedUi{
targettedUi := &TargettedUi{
Target: "foo",
Ui: bufferUi,
}
TargettedUi.Say("foo")
targettedUi.Say("foo")
assert.Equal(readWriter(bufferUi), "==> foo: foo\n", "should have prefix")
TargettedUi.Message("foo")
targettedUi.Message("foo")
assert.Equal(readWriter(bufferUi), " foo: foo\n", "should have prefix")
TargettedUi.Error("bar")
targettedUi.Error("bar")
assert.Equal(readWriter(bufferUi), "==> foo: bar\n", "should have prefix")
TargettedUi.Say("foo\nbar")
targettedUi.Say("foo\nbar")
assert.Equal(readWriter(bufferUi), "==> foo: foo\n==> foo: bar\n", "should multiline")
}