215
96%
master: 97%

Ran 07 Feb 2018 04:41PM UTC

Jobs 6

Files 4

Run time 7min

Badge

Embed ▾

pending completion

Build # 215

Build Type

push

travis-ci

Committed by

twaugh

Commit Message

Combine environment variable substitution with quote removal

This fixes the tests added in the previous commit.

The EnvSubst class is renamed to WordSplitter, and provides
two methods:
* dequote() returns the string with quotes/escaped consumed
* split() breaks the string into words at whitespace

This new class can be told whether or not to apply
environment variable substitutions.

The way we process ENV/LABEL instructions is now to first
break the instruction value into words, without quoting or
applying environment variable substitutions. We can then
inspect the first word to find out which key/value form is
in use ("key=value" vs "key the value").

Based on this we now apply environment variable substitution
to each key and value separately, consuming quotes and
escape characters.

A similar process is used when modifying an ENV/LABEL
instruction, with the exception that key=value forms are
left alone with quotes and escapes intact unless modified.
This is the reason for changing some existing test cases.

Signed-off-by: Tim Waugh <twaugh@redhat.com>

Run Details

427 of 446 relevant lines covered (95.74%)

5.74 hits per line

Jobs

ID	Job ID	Ran	Coverage
1	215.1 (OS=centos OS_VERSION=6 PYTHON_VERSION=2)	07 Feb 2018 04:41PM UTC	95.74	Travis Job 215.1
2	215.2 (OS=centos OS_VERSION=7 PYTHON_VERSION=2)	07 Feb 2018 04:42PM UTC	95.74	Travis Job 215.2
3	215.3 (OS=fedora OS_VERSION=26 PYTHON_VERSION=2)	07 Feb 2018 04:42PM UTC	95.74	Travis Job 215.3
4	215.4 (OS=fedora OS_VERSION=26 PYTHON_VERSION=3)	07 Feb 2018 04:43PM UTC	95.29	Travis Job 215.4
5	215.5 (OS=fedora OS_VERSION=27 PYTHON_VERSION=2)	07 Feb 2018 04:45PM UTC	95.74	Travis Job 215.5
6	215.6 (OS=fedora OS_VERSION=27 PYTHON_VERSION=3)	07 Feb 2018 04:46PM UTC	95.29	Travis Job 215.6

Source Files on build 215

Detailed source file information is not available for this build.

DBuildService / dockerfile-parse / 215
96%
master: 97%

README BADGES
x

Markdown

Textile

RDoc

HTML

Rst

Jobs

Source Files on build 215

DBuildService / dockerfile-parse / 215 96% master: 97%

README BADGES x

Markdown

Textile

RDoc

HTML

Rst

Jobs

Source Files on build 215

DBuildService / dockerfile-parse / 215
96%
master: 97%

README BADGES
x