builder/parser/dumper: Handle newlines appropriately.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)

builder/parser/dumper/main.go

@@ -26,7 +26,7 @@ func main() {
 		if err != nil {
 			panic(err)
 		} else {
-			fmt.Print(ast.Dump())
+			fmt.Println(ast.Dump())
 		}
 	}
 }

builder/parser/testfiles/brimstone-consuldock/result

@@ -2,4 +2,4 @@
 (maintainer "brimstone@the.narro.ws")
 (env "GOPATH" "/go")
 (entrypoint "/usr/local/bin/consuldock")
-(run "apt-get update && dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.clean && apt-get install -y --no-install-recommends git golang ca-certificates && apt-get clean && rm -rf /var/lib/apt/lists && go get -v github.com/brimstone/consuldock && mv $GOPATH/bin/consuldock /usr/local/bin/consuldock && dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.dirty && apt-get remove --purge -y $(diff /tmp/dpkg.clean /tmp/dpkg.dirty | awk '/^>/ {print $2}') && rm /tmp/dpkg.* && rm -rf $GOPATH")
+(run "apt-get update && dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.clean && apt-get install -y --no-install-recommends git golang ca-certificates && apt-get clean && rm -rf /var/lib/apt/lists && go get -v github.com/brimstone/consuldock && mv $GOPATH/bin/consuldock /usr/local/bin/consuldock && dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.dirty && apt-get remove --purge -y $(diff /tmp/dpkg.clean /tmp/dpkg.dirty | awk '/^>/ {print $2}') && rm /tmp/dpkg.* && rm -rf $GOPATH")

builder/parser/testfiles/brimstone-docker-consul/result

@@ -6,4 +6,4 @@
 (run "cd /tmp && wget https://dl.bintray.com/mitchellh/consul/0.3.1_web_ui.zip -O web_ui.zip && unzip web_ui.zip && mv dist /webui && rm web_ui.zip")
 (run "apt-get update && dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.clean && apt-get install -y --no-install-recommends unzip wget && apt-get clean && rm -rf /var/lib/apt/lists && cd /tmp && wget https://dl.bintray.com/mitchellh/consul/0.3.1_web_ui.zip -O web_ui.zip && unzip web_ui.zip && mv dist /webui && rm web_ui.zip && dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.dirty && apt-get remove --purge -y $(diff /tmp/dpkg.clean /tmp/dpkg.dirty | awk '/^>/ {print $2}') && rm /tmp/dpkg.*")
 (env "GOPATH" "/go")
-(run "apt-get update && dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.clean && apt-get install -y --no-install-recommends git golang ca-certificates build-essential && apt-get clean && rm -rf /var/lib/apt/lists && go get -v github.com/hashicorp/consul && mv $GOPATH/bin/consul /usr/bin/consul && dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.dirty && apt-get remove --purge -y $(diff /tmp/dpkg.clean /tmp/dpkg.dirty | awk '/^>/ {print $2}') && rm /tmp/dpkg.* && rm -rf $GOPATH")
+(run "apt-get update && dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.clean && apt-get install -y --no-install-recommends git golang ca-certificates build-essential && apt-get clean && rm -rf /var/lib/apt/lists && go get -v github.com/hashicorp/consul && mv $GOPATH/bin/consul /usr/bin/consul && dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.dirty && apt-get remove --purge -y $(diff /tmp/dpkg.clean /tmp/dpkg.dirty | awk '/^>/ {print $2}') && rm /tmp/dpkg.* && rm -rf $GOPATH")

builder/parser/testfiles/cpuguy83-nagios/result

@@ -37,4 +37,4 @@
 (env "APACHE_LOG_DIR" "/var/log/apache2")
 (expose "80")
 (volume "/opt/nagios/var" "/opt/nagios/etc" "/opt/nagios/libexec" "/var/log/apache2" "/usr/share/snmp/mibs")
-(cmd "/usr/local/bin/start_nagios")
+(cmd "/usr/local/bin/start_nagios")

builder/parser/testfiles/docker/result

@@ -22,4 +22,4 @@
 (workdir "/go/src/github.com/docker/docker")
 (env "DOCKER_BUILDTAGS" "apparmor selinux")
 (entrypoint "hack/dind")
-(copy "." "/go/src/github.com/docker/docker")
+(copy "." "/go/src/github.com/docker/docker")

builder/parser/testfiles/escapes/result

@@ -2,4 +2,4 @@
 (maintainer "Erik \\\\Hollensbe <erik@hollensbe.org>\\\"")
 (run "apt-get \\update && apt-get \\\"install znc -y")
 (add "\\conf\\\\\"" "/.znc")
-(cmd "/usr\\\"/bin/znc" "-f" "-r")
+(cmd "/usr\\\"/bin/znc" "-f" "-r")

builder/parser/testfiles/influxdb/result

@@ -8,4 +8,4 @@
 (expose "8083")
 (expose "8086")
 (expose "8090")
-(expose "8099")
+(expose "8099")

builder/parser/testfiles/jeztah-invalid-json-json-inside-string-double/result

@@ -1 +1 @@
-(cmd "\"[\\\"echo\\\", \\\"Phew, I just managed to escaped those double quotes\\\"]\"")
+(cmd "\"[\\\"echo\\\", \\\"Phew, I just managed to escaped those double quotes\\\"]\"")

builder/parser/testfiles/jeztah-invalid-json-json-inside-string/result

@@ -1 +1 @@
-(cmd "'[\"echo\", \"Well, JSON in a string is JSON too?\"]'")
+(cmd "'[\"echo\", \"Well, JSON in a string is JSON too?\"]'")

builder/parser/testfiles/jeztah-invalid-json-single-quotes/result

@@ -1 +1 @@
-(cmd "['echo','single quotes are invalid JSON']")
+(cmd "['echo','single quotes are invalid JSON']")

builder/parser/testfiles/jeztah-invalid-json-unterminated-bracket/result

@@ -1 +1 @@
-(cmd "[\"echo\", \"Please, close the brackets when you're done\"")
+(cmd "[\"echo\", \"Please, close the brackets when you're done\"")

builder/parser/testfiles/jeztah-invalid-json-unterminated-string/result

@@ -1 +1 @@
-(cmd "[\"echo\", \"look ma, no quote!]")
+(cmd "[\"echo\", \"look ma, no quote!]")

builder/parser/testfiles/kartar-entrypoint-oddities/result

@@ -4,4 +4,4 @@
 (run "apt-get update")
 (run "apt-get -y install redis-server redis-tools")
 (expose "6379")
-(entrypoint "/usr/bin/redis-server")
+(entrypoint "/usr/bin/redis-server")

builder/parser/testfiles/lk4d4-the-edge-case-generator/result

@@ -26,4 +26,4 @@
 (volume "/test3")
 (workdir "/test")
 (add "." "/")
-(copy "." "copy")
+(copy "." "copy")

builder/parser/testfiles/mail/result

@@ -11,4 +11,4 @@
 (run "mkdir /Mail")
 (run "mkdir /.offlineimap")
 (run "echo \"export TERM=screen-256color\" >/.zshenv")
-(cmd "setsid cron; tmux -2")
+(cmd "setsid cron; tmux -2")

builder/parser/testfiles/mumble/result

@@ -1,4 +1,4 @@
 (from "ubuntu:14.04")
 (run "apt-get update && apt-get install libcap2-bin mumble-server -y")
 (add "./mumble-server.ini" "/etc/mumble-server.ini")
-(cmd "/usr/sbin/murmurd")
+(cmd "/usr/sbin/murmurd")

builder/parser/testfiles/nginx/result

@@ -8,4 +8,4 @@
 (run "mkdir /www")
 (cmd "/usr/sbin/nginx")
 (volume "/www")
-(expose "80")
+(expose "80")

builder/parser/testfiles/tf2/result

@@ -17,4 +17,4 @@
 (add "./configs" "/steam/tf2/tf/addons/sourcemod/configs")
 (run "mkdir -p /steam/tf2/tf/addons/sourcemod/translations/en")
 (run "cp /steam/tf2/tf/addons/sourcemod/translations/*.txt /steam/tf2/tf/addons/sourcemod/translations/en")
-(cmd "cd /steam/tf2 && ./srcds_run -port 27015 +ip 0.0.0.0 +map ctf_2fort -autoupdate -steam_dir /steam -steamcmd_script /steam/script +tf_bot_quota 12 +tf_bot_quota_mode fill")
+(cmd "cd /steam/tf2 && ./srcds_run -port 27015 +ip 0.0.0.0 +map ctf_2fort -autoupdate -steam_dir /steam -steamcmd_script /steam/script +tf_bot_quota 12 +tf_bot_quota_mode fill")

builder/parser/testfiles/weechat/result

@@ -3,4 +3,4 @@
 (add ".weechat" "/.weechat")
 (add ".tmux.conf" "/")
 (run "echo \"export TERM=screen-256color\" >/.zshenv")
-(cmd "zsh -c weechat")
+(cmd "zsh -c weechat")

builder/parser/testfiles/znc/result

@@ -2,4 +2,4 @@
 (maintainer "Erik Hollensbe <erik@hollensbe.org>")
 (run "apt-get update && apt-get install znc -y")
 (add "conf" "/.znc")
-(cmd "/usr/bin/znc" "-f" "-r")
+(cmd "/usr/bin/znc" "-f" "-r")