txtar-c: add -script flag #181

bitfield · 2022-08-27T13:30:45Z

TL;DR have txtar-c include an optional test script in the archive it creates.

Use case

Suppose we want to use the marvellous testscript runner to run a given script against a set of files. For example, we might want to test a directory containing Go files using some script test.txtar:

exec go test

Of course, we can't run this script as it stands, because it doesn't contain the Go files. So, how to add them?

We could create a txtar archive of the directory using txtar-c, concatenate the result with our original script, and run the result of that with testscript. This is straightforward:

cp test.txtar archive.txtar
txtar-c $DIR >>archive.txtar
testscript archive.txtar
rm archive.txtar

Unfortunately, if DIR has files containing txtar file marker lines, this produces the wrong result. txtar-c -quote prepends the necessary unquote lines to its archive:

unquote expect
-- expect --
> -- input.txt --
> hello world

Simple-mindedly prepending our test.txtar script to this would produce:

exec go test
unquote expect
...

That's no good, because presumably we need the files to be unquoted before running go test. So the script needs to go after any unquote lines, but before the file data. This is not straightforward, and this shell script is unsatisfactory for any number of reasons (bonus points if you spot all twelve):

txtar-c -quote $DIR >archive.tmp
# First, extract the leading 'unquote' lines
grep unquote archive.tmp >archive.txtar
# Next, append the script lines
cat test.txtar >>archive.txtar
# Finally, append the remaining file data
grep -v 'unquote' archive.tmp >>archive.txtar
testscript archive.txtar
rm archive.tmp archive.txtar

How much nicer it would be if we could simply ask txtar-c to include our script file in the appropriate place!

txtar-c -script test.txtar -quote $DIR | testscript

This makes it very easy and pleasant to use testscript to run scripts against some existing set of files, for example in a CI pipeline. A decent value-add for eight extra lines of code, I think.

myitcv · 2022-09-30T04:40:56Z

cmd/txtar-c/savedir.go

+		if err != nil {
+			log.Fatal(err)
+		}
+		a.Comment = append(a.Comment, script...)


What about the scenario when the -script argument contains unquote lines itself?

I'm not sure if I see what you mean. Could you say a little more?

He means that if the script file contains txtar syntax, like -- foo --, then it will leak out of the comment section and affect the rest of the txtar.

The flag should probably reject those scripts, because I don't think there is any easy quoting or escaping we can reach for.

Sorry, I still don't get it. Could you give an example of a script which would produce the wrong result?

I think I actually misunderstood what Paul said, so ignore me.

Assuming I have gotten the quoting right:

unquote expect unquote test.txtar unquote blah/needsquote.txtar exec txtar-c -quote -script test.txtar blah cmp stdout expect -- test.txtar -- >unquote my.txtar >exec cat my.txtar > >-- my.txtar -- >># This is a comment in my.txtar >> >>-- a.txt -- >>// This is a.txt within my.txtar >> -- blah/go.mod -- module example.com/blah -- blah/main.go -- package main import "fmt" func main() { fmt.Println("Hello, world!") } -- blah/needsquote.txtar -- >-- file_entry.txt -- -- expect -- >unquote needsquote.txtar >unquote my.txtar > >exec cat my.txtar > >-- my.txtar -- >># This is a comment in my.txtar >> >>-- a.txt -- >>// This is a.txt within my.txtar >> >-- go.mod -- >module example.com/blah > >-- main.go -- >package main > >import "fmt" > >func main() { > fmt.Println("Hello, world!") >} > >-- needsquote.txtar -- >>-- file_entry.txt -- >>

Which also points out that in this PR only the comment in the -script argument is used. Which seems quite specific. Was that intentional?

txtar files don't naturally compose as far as I can see, hence my question is really directed at questioning whether this could be adequately solved in a purpose built program, rather than trying to adapt txtar-c.

This does fail, but only because the script produces an extra unexpected blank line—is that what you meant?

> cmp stdout expect --- stdout +++ expect @@ -1,5 +1,6 @@ unquote needsquote.txtar unquote my.txtar + exec cat my.txtar -- my.txtar -- FAIL: /var/folders/q3/ybqqxyh92yd0yc865zqk0vpm0000gn/T/testscript1226362500/tmp.txtar/script.txtar:5: stdout and expect differ

only the comment in the -script argument is used. Which seems quite specific. Was that intentional?

I'm not sure I understand the question. If you mean "only the comment part of the script makes it into the resulting txtar, ignoring any file inclusions", that's not the case. The whole of the file referenced by -script FILE is included, and if it contains file inclusions, they will end up in the final txtar too. At least, that was the intention.

If you mean "only the comment part of the resulting txtar is modified, by including the script in it", that's correct, but I can't think of an alternative way of doing this that would make sense.

my question is really directed at questioning whether this could be adequately solved in a purpose built program, rather than trying to adapt txtar-c.

Certainly it could.

I'm not sure I understand the question. If you mean "only the comment part of the script makes it into the resulting txtar, ignoring any file inclusions", that's not the case. The whole of the file referenced by -script FILE is included, and if it contains file inclusions, they will end up in the final txtar too. At least, that was the intention.

I actually misread the code. As you say, the entire file passed to -script is included after unquote lines that are added by txtar-c. What threw me is that the contents of this file are added to the new archive's comments, even though that []byte contains files as interpreted by txtar.

Here's a case where I think things go wrong:

unquote expect unquote test.txtar unquote blah/needsquote.txtar # With both -script and -quote, it should include test.txtar after any 'unquote's exec txtar-c -quote -script test.txtar blah cmp stdout expect -- test.txtar -- >unquote needsquote.txtar >exec cat my.txtar > >-- needsquote.txtar -- >># This is a comment in my.txtar >> >>-- a.txt -- >>// This is a.txt within my.txtar >> -- blah/go.mod -- module example.com/blah -- blah/main.go -- package main import "fmt" func main() { fmt.Println("Hello, world!") } -- blah/needsquote.txtar -- >-- file_entry.txt -- -- expect -- >unquote needsquote.txtar >unquote needsquote.txtar >exec cat my.txtar > >-- needsquote.txtar -- >># This is a comment in my.txtar >> >>-- a.txt -- >>// This is a.txt within my.txtar >> >-- go.mod -- >module example.com/blah > >-- main.go -- >package main > >import "fmt" > >func main() { > fmt.Println("Hello, world!") >} > >-- needsquote.txtar -- >>-- file_entry.txt -- >>

The double unquote of needsquote.txtar is incorrect; there should only be one unquote.

The flag name -script is also a bit of a smell for me here. txtar-c is a command that is only concerned with the txtar format. It knows nothing about testscript. If we take the name "script" away, we are effectively passing in another txtar archive as the argument here. In that case, how would you describe the operation we are performing on what are two txtar archives? Merge? Append?

If you mean "only the comment part of the resulting txtar is modified, by including the script in it", that's correct, but I can't think of an alternative way of doing this that would make sense.

my question is really directed at questioning whether this could be adequately solved in a purpose built program, rather than trying to adapt txtar-c.

Certainly it could.

My sense is that we're struggling to define what this operation between two txtar archives is here. And as I said, I think that comes down to the fact that in the general case, operations on archives are not well defined: they don't compose, prepend, append etc. Hence I feel this probably belongs as a purpose-built tool for your situation, rather than something that is generally useful in txtar-c.

I feel this probably belongs as a purpose-built tool for your situation, rather than something that is generally useful in txtar-c.

That's perfectly fair—and I have exactly that tool, which is working perfectly for my use case. (It is, in fact, just vanilla txtar-c with this patch applied.)

I feel the sense of the meeting is that while a feature like this might be occasionally useful, to provide a really robust solution that works in theory, as well as merely in practice, would take a fair bit more work, if it's even possible at all. Accordingly, please close, with my thanks.

rogpeppe

As @myitcv points out, this tool isn't just about creating txtar files for testscript. How about naming this flag -comment, as then it's applicable to both situations (the script occupies the "comment" section of the txtar file). I think the command should fail if the comment contains a line matching ^-- .* --$.

Modulo the above, I think this will be useful functionality; thanks for suggesting it!

mvdan · 2022-10-06T09:50:54Z

I should also mention that https://pkg.go.dev/golang.org/x/exp/cmd/txtar exists now, alongside https://pkg.go.dev/golang.org/x/tools/txtar. It already supports comments via stdout when extracting, and stdin when archiving. It doesn't appear to do any form of sanity checking on the input, so I guess we could do the same.

I agree with Roger though - this tool should not be aware of testscript at all.

txtar-c: add -script flag

ad7408e

bitfield mentioned this pull request Sep 26, 2022

testscript: Add check for duplicate and out-of-order files #184

Closed

myitcv reviewed Sep 30, 2022

View reviewed changes

rogpeppe requested changes Oct 6, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

txtar-c: add -script flag #181

txtar-c: add -script flag #181

bitfield commented Aug 27, 2022

myitcv Sep 30, 2022

bitfield Sep 30, 2022

mvdan Sep 30, 2022

bitfield Sep 30, 2022

mvdan Sep 30, 2022

myitcv Sep 30, 2022

bitfield Sep 30, 2022

myitcv Oct 1, 2022

bitfield Oct 2, 2022

rogpeppe left a comment

mvdan commented Oct 6, 2022

txtar-c: add -script flag #181

Are you sure you want to change the base?

txtar-c: add -script flag #181

Conversation

bitfield commented Aug 27, 2022

Use case

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rogpeppe left a comment

Choose a reason for hiding this comment

mvdan commented Oct 6, 2022