Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add newline to end of ipfs object put text output. #2000

Merged
merged 1 commit into from
Dec 2, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/commands/ipns.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ Resolve the value of another name:
if !ok {
return nil, u.ErrCast()
}
return strings.NewReader(output.Path.String()), nil
return strings.NewReader(output.Path.String() + "\n"), nil
},
},
Type: ResolvedPath{},
Expand Down
2 changes: 1 addition & 1 deletion core/commands/object.go
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ and then run
Marshalers: cmds.MarshalerMap{
cmds.Text: func(res cmds.Response) (io.Reader, error) {
object := res.Output().(*Object)
return strings.NewReader("added " + object.Hash), nil
return strings.NewReader("added " + object.Hash + "\n"), nil
},
},
Type: Object{},
Expand Down
2 changes: 1 addition & 1 deletion core/commands/resolve.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ Resolve the value of an IPFS DAG path:
if !ok {
return nil, u.ErrCast()
}
return strings.NewReader(output.Path.String()), nil
return strings.NewReader(output.Path.String() + "\n"), nil
},
},
Type: ResolvedPath{},
Expand Down
2 changes: 1 addition & 1 deletion core/commands/tar.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ var tarAddCmd = &cmds.Command{
Marshalers: cmds.MarshalerMap{
cmds.Text: func(res cmds.Response) (io.Reader, error) {
o := res.Output().(*AddedObject)
return strings.NewReader(o.Hash), nil
return strings.NewReader(o.Hash + "\n"), nil
},
},
}
Expand Down
12 changes: 6 additions & 6 deletions test/sharness/t0051-object.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ test_object_cmd() {

test_expect_success "'ipfs object put file.json' output looks good" '
HASH="QmUTSAdDi2xsNkDtLqjFgQDMEn5di3Ab9eqbrt4gaiNbUD" &&
printf "added $HASH" > expected_putOut &&
printf "added $HASH\n" > expected_putOut &&
test_cmp expected_putOut actual_putOut
'

Expand All @@ -76,7 +76,7 @@ test_object_cmd() {

test_expect_success "'ipfs object put file.xml' output looks good" '
HASH="QmQzNKUHy4HyEUGkqKe3q3t796ffPLQXYCkHCcXUNT5JNK" &&
printf "added $HASH" > expected_putOut &&
printf "added $HASH\n" > expected_putOut &&
test_cmp expected_putOut actual_putOut
'

Expand All @@ -103,7 +103,7 @@ test_object_cmd() {
'

test_expect_failure "'ipfs object put --inputenc=xml' output looks good" '
echo "added $HASH" >expected &&
echo "added $HASH\n" >expected &&
test_cmp expected actual
'

Expand All @@ -113,7 +113,7 @@ test_object_cmd() {

test_expect_success "'ipfs object put file.pb' output looks good" '
HASH="QmUTSAdDi2xsNkDtLqjFgQDMEn5di3Ab9eqbrt4gaiNbUD" &&
printf "added $HASH" > expected_putOut &&
printf "added $HASH\n" > expected_putOut &&
test_cmp expected_putOut actual_putOut
'

Expand All @@ -123,7 +123,7 @@ test_object_cmd() {

test_expect_success "'ipfs object put' from stdin output looks good" '
HASH="QmUTSAdDi2xsNkDtLqjFgQDMEn5di3Ab9eqbrt4gaiNbUD" &&
printf "added $HASH" > expected_putStdinOut &&
printf "added $HASH\n" > expected_putStdinOut &&
test_cmp expected_putStdinOut actual_putStdinOut
'

Expand All @@ -133,7 +133,7 @@ test_object_cmd() {

test_expect_success "'ipfs object put' from stdin (pb) output looks good" '
HASH="QmUTSAdDi2xsNkDtLqjFgQDMEn5di3Ab9eqbrt4gaiNbUD" &&
printf "added $HASH" > expected_putStdinOut &&
printf "added $HASH\n" > expected_putStdinOut &&
test_cmp expected_putStdinOut actual_putPbStdinOut
'

Expand Down
4 changes: 2 additions & 2 deletions test/sharness/t0100-name.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ test_expect_success "'ipfs name resolve' succeeds" '
'

test_expect_success "resolve output looks good" '
printf "/ipfs/%s" "$HASH_WELCOME_DOCS" >expected2 &&
printf "/ipfs/%s\n" "$HASH_WELCOME_DOCS" >expected2 &&
test_cmp expected2 output
'

Expand All @@ -50,7 +50,7 @@ test_expect_success "'ipfs name resolve' succeeds" '
'

test_expect_success "resolve output looks good" '
printf "/ipfs/%s/help" "$HASH_WELCOME_DOCS" >expected4 &&
printf "/ipfs/%s/help\n" "$HASH_WELCOME_DOCS" >expected4 &&
test_cmp expected4 output
'

Expand Down
4 changes: 2 additions & 2 deletions test/sharness/t0160-resolve.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ test_resolve_setup_name() {
test_expect_success "resolve: prepare name" '
id_hash=$(ipfs id -f="<id>") &&
ipfs name publish "$ref" &&
printf "$ref" >expected_nameval &&
printf "$ref\n" >expected_nameval &&
ipfs name resolve >actual_nameval &&
test_cmp expected_nameval actual_nameval
'
Expand All @@ -47,7 +47,7 @@ test_resolve() {
'

test_expect_success "resolved correctly: $src -> $dst" '
printf "$dst" >expected &&
printf "$dst\n" >expected &&
test_cmp expected actual
'
}
Expand Down
2 changes: 1 addition & 1 deletion test/sharness/t0240-republisher.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ verify_can_resolve() {
'

test_expect_success "output looks right" '
printf "/ipfs/$expected" > expected &&
printf "/ipfs/$expected\n" > expected &&
test_cmp expected resolve
'
}
Expand Down