code review 4030044: doc/codelab/wiki: fixes

doc/codelab/wiki: fixes

make test.sh runnable as a command.
announce only on 127.0.0.1.
rebuild final-test.bin when final-test.go changes.

[rsc, 2011-01-27 19:08:59]

Hello adg (cc: golang-dev@googlegroups.com),

I'd like you to review this change.

[r, 2011-01-27 19:18:20]

http://codereview.appspot.com/4030044/diff/2001/doc/codelab/wiki/get.go
File doc/codelab/wiki/get.go (right):

http://codereview.appspot.com/4030044/diff/2001/doc/codelab/wiki/get.go#newco...
doc/codelab/wiki/get.go:16: port = flag.Bool("addr", false, "find open address
and print to stdout")
s/port/addr/ ?
may require editing the text of the lab but i would like the flag's name and
variable to match

http://codereview.appspot.com/4030044/diff/2001/doc/codelab/wiki/get.go#newco...
doc/codelab/wiki/get.go:21: if *port {
s/port/addr/?

http://codereview.appspot.com/4030044/diff/2001/doc/codelab/wiki/test.sh
File doc/codelab/wiki/test.sh (right):

http://codereview.appspot.com/4030044/diff/2001/doc/codelab/wiki/test.sh#newc...
doc/codelab/wiki/test.sh:1: #!/usr/bin/env bash
why?

[rsc, 2011-01-27 19:21:46]

>
http://codereview.appspot.com/4030044/diff/2001/doc/codelab/wiki/get.go#newco...
> doc/codelab/wiki/get.go:16: port = flag.Bool("addr", false, "find open
> address and print to stdout")
> s/port/addr/ ?
> may require editing the text of the lab but i would like the flag's name
> and variable to match
>
>
http://codereview.appspot.com/4030044/diff/2001/doc/codelab/wiki/get.go#newco...
> doc/codelab/wiki/get.go:21: if *port {
> s/port/addr/?

Done.  Didn't need to edit lab because get.go is only for testing.

> http://codereview.appspot.com/4030044/diff/2001/doc/codelab/wiki/test.sh
> File doc/codelab/wiki/test.sh (right):
>
>
http://codereview.appspot.com/4030044/diff/2001/doc/codelab/wiki/test.sh#newc...
> doc/codelab/wiki/test.sh:1: #!/usr/bin/env bash
> why?

Because /bin/bash is not correct on some systems.
That's the idiomatic (if surprising) way to write it.
See for example all.bash.

Russ

[r, 2011-01-27 19:24:33]

LGTM
unix just keeps improving

[adg, 2011-01-27 23:17:55]

LGTM

Thanks for fixing this up. Agree w/ r on s/port/addr/ for the flag.

On 28 January 2011 05:08,  <rsc@golang.org> wrote:
> Reviewers: adg,
>
> Message:
> Hello adg (cc: golang-dev@googlegroups.com),
>
> I'd like you to review this change.
>
>
> Description:
> doc/codelab/wiki: fixes
>
> make test.sh runnable as a command.
> announce only on 127.0.0.1.
> rebuild final-test.bin when final-test.go changes.
>
> Please review this at http://codereview.appspot.com/4030044/
>
> Affected files:
>  M doc/codelab/wiki/Makefile
>  M doc/codelab/wiki/get.go
>  M doc/codelab/wiki/test.sh
>
>
> Index: doc/codelab/wiki/Makefile
> ===================================================================
> --- a/doc/codelab/wiki/Makefile
> +++ b/doc/codelab/wiki/Makefile
> @@ -19,6 +19,7 @@
>
>  %.bin: %.$O
>        $(LD) -o $@ $<
> -%.$O:
> +
> +%.$O: %.go
>        $(GC) $*.go
>
> Index: doc/codelab/wiki/get.go
> ===================================================================
> --- a/doc/codelab/wiki/get.go
> +++ b/doc/codelab/wiki/get.go
> @@ -13,7 +13,7 @@
>
>  var (
>        post = flag.String("post", "", "urlencoded form data to POST")
> -       port = flag.Bool("port", false, "find open port and print to
> stdout")
> +       port = flag.Bool("addr", false, "find open address and print to
> stdout")
>  )
>
>  func main() {
> @@ -24,7 +24,7 @@
>                        log.Exit(err)
>                }
>                defer l.Close()
> -               fmt.Print(l.Addr().(*net.TCPAddr).Port)
> +               fmt.Print(l.Addr())
>                return
>        }
>        url := flag.Arg(0)
> Index: doc/codelab/wiki/test.sh
> ===================================================================
> --- a/doc/codelab/wiki/test.sh
> +++ b/doc/codelab/wiki/test.sh
> @@ -1,29 +1,27 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
>
> +set -e
>  wiki_pid=
> -
>  cleanup() {
>        kill $wiki_pid
>        rm -f test_*.out Test.txt final-test.bin final-test.go
> -       exit ${1:-1}
>  }
> -trap cleanup INT
> +trap cleanup 0 INT
>
> -port=$(./get.bin -port)
> -sed s/8080/$port/ < final.go > final-test.go
> -gomake final-test.bin || cleanup 1
> +gomake get.bin
> +addr=$(./get.bin -addr)
> +sed s/:8080/$addr/ < final.go > final-test.go
> +gomake final-test.bin
>  ./final-test.bin &
>  wiki_pid=$!
>
>  sleep 1
>
> -./get.bin http://127.0.0.1:$port/edit/Test > test_edit.out
> -diff -u test_edit.out test_edit.good || cleanup 1
> -./get.bin -post=body=some%20content http://127.0.0.1:$port/save/Test
> -diff -u Test.txt test_Test.txt.good || cleanup 1
> -./get.bin http://127.0.0.1:$port/view/Test > test_view.out
> -diff -u test_view.out test_view.good || cleanup 1
> +./get.bin http://$addr/edit/Test > test_edit.out
> +diff -u test_edit.out test_edit.good
> +./get.bin -post=body=some%20content http://$addr/save/Test
> +diff -u Test.txt test_Test.txt.good
> +./get.bin http://$addr/view/Test > test_view.out
> +diff -u test_view.out test_view.good
>
> -echo "Passed"
> -cleanup 0
> -
> +echo PASS
>
>
>

[rsc, 2011-01-28 14:42:58]

*** Submitted as 3a1d95d25cad ***

doc/codelab/wiki: fixes

make test.sh runnable as a command.
announce only on 127.0.0.1.
rebuild final-test.bin when final-test.go changes.

R=adg, r
CC=golang-dev
http://codereview.appspot.com/4030044