Skip to content

Commit 21e5116

Browse files
thomasrockhu-codecovthomasrockhu-codecov
authored
Merge pull request #28 from codecov/th/revamp-vars
fix: update var usage to split properly when run
2 parents 6d91f42 + a92bfaa commit 21e5116

File tree

9 files changed

+113
-92
lines changed

9 files changed

+113
-92
lines changed

‎dist/codecov.sh

Lines changed: 50 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
2-
CC_WRAPPER_VERSION="0.0.25"
2+
CC_WRAPPER_VERSION="0.0.26"
33
set +u
44
say() {
55
echo -e "$1"
@@ -15,16 +15,22 @@ exit_if_error() {
1515
lower() {
1616
echo $(echo $1 | sed 's/CC//' | sed 's/_/-/g' | tr '[:upper:]' '[:lower:]')
1717
}
18-
write_existing_args() {
19-
if [ -n "$(eval echo \$$1)" ];
18+
k_arg() {
19+
if [ -n "$(eval echo \$"CC_$1")" ];
2020
then
21-
echo " -$(lower "$1") $(eval echo \$$1)"
21+
echo "--$(lower "$1")"
22+
fi
23+
}
24+
v_arg() {
25+
if [ -n "$(eval echo \$"CC_$1")" ];
26+
then
27+
echo "$(eval echo \$"CC_$1")"
2228
fi
2329
}
2430
write_truthy_args() {
2531
if [ "$(eval echo \$$1)" = "true" ] || [ "$(eval echo \$$1)" = "1" ];
2632
then
27-
echo " -$(lower $1)"
33+
echo "-$(lower $1)"
2834
fi
2935
}
3036
b="\033[0;36m" # variables/constants
@@ -115,80 +121,80 @@ CC_PUBLIC_PGP_KEY=$(curl -s https://keybase.io/codecovsecurity/pgp_keys.asc)
115121
say
116122
fi
117123
cc_cli_args=()
118-
cc_cli_args+=( $(write_existing_args CC_AUTO_LOAD_PARAMS_FROM) )
119-
cc_cli_args+=( $(write_existing_args CC_ENTERPRISE_URL) )
120-
cc_cli_args+=( $(write_existing_args CC_YML_PATH) )
124+
cc_cli_args+=( $(k_arg AUTO_LOAD_PARAMS_FROM) $(v_arg AUTO_LOAD_PARAMS_FROM))
125+
cc_cli_args+=( $(k_arg ENTERPRISE_URL) $(v_arg ENTERPRISE_URL))
126+
cc_cli_args+=( $(k_arg YML_PATH) $(v_arg YML_PATH))
121127
cc_cli_args+=( $(write_truthy_args CC_VERBOSE) )
122128
cc_cc_args=()
123129
cc_cc_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) )
124-
cc_cc_args+=( $(write_existing_args CC_GIT_SERVICE) )
125-
cc_cc_args+=( $(write_existing_args CC_PARENT_SHA) )
126-
cc_cc_args+=( $(write_existing_args CC_PR) )
127-
cc_cc_args+=( $(write_existing_args CC_SHA) )
128-
cc_cc_args+=( $(write_existing_args CC_SLUG) )
130+
cc_du_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
131+
cc_du_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA))
132+
cc_du_args+=( $(k_arg PR) $(v_arg PR))
133+
cc_du_args+=( $(k_arg SHA) $(v_arg SHA))
134+
cc_du_args+=( $(k_arg SLUG) $(v_arg SLUG))
129135
cc_create_report_args=()
130-
cc_cr_args+=( $(write_existing_args CC_CODE) )
136+
cc_cr_args+=( $(k_arg CODE) $(v_arg CODE))
131137
cc_cr_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) )
132-
cc_cr_args+=( $(write_existing_args CC_GIT_SERVICE) )
133-
cc_cr_args+=( $(write_existing_args CC_PR) )
134-
cc_cr_args+=( $(write_existing_args CC_SHA) )
135-
cc_cr_args+=( $(write_existing_args CC_SLUG) )
138+
cc_cr_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
139+
cc_cr_args+=( $(k_arg PR) $(v_arg PR))
140+
cc_cr_args+=( $(k_arg SHA) $(v_arg SHA))
141+
cc_cr_args+=( $(k_arg SLUG) $(v_arg SLUG))
136142
cc_du_args=()
137-
cc_du_args+=( $(write_existing_args CC_ENV) )
143+
cc_du_args+=( $(k_arg ENV) $(v_arg ENV))
138144
OLDIFS=$IFS;IFS=,
139-
cc_du_args+=( $(write_existing_args CC_BRANCH) )
140-
cc_du_args+=( $(write_existing_args CC_BUILD) )
141-
cc_du_args+=( $(write_existing_args CC_BUILD_URL) )
142-
cc_du_args+=( $(write_existing_args CC_CODE) )
143-
cc_du_args+=( $(write_existing_args CC_DIR) )
145+
cc_du_args+=( $(k_arg BRANCH) $(v_arg BRANCH))
146+
cc_du_args+=( $(k_arg BUILD) $(v_arg BUILD))
147+
cc_du_args+=( $(k_arg BUILD_URL) $(v_arg BUILD_URL))
148+
cc_du_args+=( $(k_arg CODE) $(v_arg CODE))
149+
cc_du_args+=( $(k_arg DIR) $(v_arg DIR))
144150
cc_du_args+=( $(write_truthy_args CC_DISABLE_FILE_FIXES) )
145151
cc_du_args+=( $(write_truthy_args CC_DISABLE_SEARCH) )
146152
cc_du_args+=( $(write_truthy_args CC_DRY_RUN) )
147153
if [ -n "$CC_EXCLUDES" ];
148154
then
149155
for directory in $CC_EXCLUDES; do
150-
cc_du_args+=( " --exclude " "$directory" )
156+
cc_du_args+=( "--exclude" "$directory" )
151157
done
152158
fi
153159
cc_du_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) )
154160
if [ -n "$CC_FILES" ];
155161
then
156162
for file in $CC_FILES; do
157-
cc_du_args+=( " --file " "$file" )
163+
cc_du_args+=( "--file" "$file" )
158164
done
159165
fi
160166
if [ -n "$CC_FLAGS" ];
161167
then
162168
for flag in $CC_FLAGS; do
163-
cc_du_args+=( " --flag " "$flag" )
169+
cc_du_args+=( "--flag" "$flag" )
164170
done
165171
fi
166-
cc_du_args+=( $(write_existing_args CC_GCOV_ARGS) )
167-
cc_du_args+=( $(write_existing_args CC_GCOV_EXECUTABLE) )
168-
cc_du_args+=( $(write_existing_args CC_GCOV_IGNORE) )
169-
cc_du_args+=( $(write_existing_args CC_GCOV_INCLUDE) )
170-
cc_du_args+=( $(write_existing_args CC_GIT_SERVICE) )
172+
cc_du_args+=( $(k_arg GCOV_ARGS) $(v_arg GCOV_ARGS))
173+
cc_du_args+=( $(k_arg GCOV_EXECUTABLE) $(v_arg GCOV_EXECUTABLE))
174+
cc_du_args+=( $(k_arg GCOV_IGNORE) $(v_arg GCOV_IGNORE))
175+
cc_du_args+=( $(k_arg GCOV_INCLUDE) $(v_arg GCOV_INCLUDE))
176+
cc_du_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
171177
cc_du_args+=( $(write_truthy_args CC_HANDLE_NO_REPORTS_FOUND) )
172-
cc_du_args+=( $(write_existing_args CC_JOB_CODE) )
178+
cc_du_args+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE))
173179
cc_du_args+=( $(write_truthy_args CC_LEGACY) )
174180
if [ -n "$CC_NAME" ];
175181
then
176182
cc_du_args+=( "--name" "$CC_NAME" )
177183
fi
178-
cc_du_args+=( $(write_existing_args CC_NETWORK_FILTER) )
179-
cc_du_args+=( $(write_existing_args CC_NETWORK_PREFIX) )
180-
cc_du_args+=( $(write_existing_args CC_NETWORK_ROOT_FOLDER) )
184+
cc_du_args+=( $(k_arg NETWORK_FILTER) $(v_arg NETWORK_FILTER))
185+
cc_du_args+=( $(k_arg NETWORK_PREFIX) $(v_arg NETWORK_PREFIX))
186+
cc_du_args+=( $(k_arg NETWORK_ROOT_FOLDER) $(v_arg NETWORK_ROOT_FOLDER))
181187
if [ -n "$CC_PLUGINS" ];
182188
then
183189
for plugin in $CC_PLUGINS; do
184-
cc_du_args+=( " --plugin " "$plugin" )
190+
cc_du_args+=( "--plugin" "$plugin" )
185191
done
186192
fi
187-
cc_du_args+=( $(write_existing_args CC_PR) )
188-
cc_du_args+=( $(write_existing_args CC_REPORT_TYPE) )
189-
cc_du_args+=( $(write_existing_args CC_SHA) )
190-
cc_du_args+=( $(write_existing_args CC_SLUG) )
191-
cc_du_args+=( $(write_existing_args CC_SWIFT_PROJECT) )
193+
cc_du_args+=( $(k_arg PR) $(v_arg PR))
194+
cc_du_args+=( $(k_arg REPORT_TYPE) $(v_arg REPORT_TYPE))
195+
cc_du_args+=( $(k_arg SHA) $(v_arg SHA))
196+
cc_du_args+=( $(k_arg SLUG) $(v_arg SLUG))
197+
cc_du_args+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT))
192198
IFS=$OLDIFS
193199
unset NODE_OPTIONS
194200
# See https://github.com/codecov/uploader/issues/475
@@ -213,7 +219,7 @@ if ! ./$cc_filename \
213219
${cc_cli_args[*]} \
214220
create-commit \
215221
${token_arg[*]} \
216-
${cc_cc_args[*]};
222+
"${cc_cc_args[@]}";
217223
then
218224
exit_if_error "Failed to create-commit"
219225
fi
@@ -224,7 +230,7 @@ if ! ./$cc_filename \
224230
${cc_cli_args[*]} \
225231
create-report \
226232
${token_arg[*]} \
227-
${cc_cr_args[*]};
233+
"${cc_cr_args[@]}";
228234
then
229235
exit_if_error "Failed to create-report"
230236
fi

‎package.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def package_scripts(source_dir, source_root, outfile):
1313
with open(outfile, 'w') as f:
1414
f.write(BASH_LINE)
1515
for line in lines:
16-
cc_vars.update(_get_vars(line))
16+
cc_vars.add(_get_vars(line))
1717
f.write(line)
1818

1919
st = os.stat(outfile)
@@ -30,9 +30,17 @@ def package_scripts(source_dir, source_root, outfile):
3030
exit(1)
3131

3232
def _get_vars(line):
33-
matcher = r'(CC_[^\r\n\t\f\v=]+)*'
34-
matcher = r'(CC_[\w_]+)*'
35-
return re.findall(matcher, line)
33+
matcher = r'(CC_[\w_]+)'
34+
matches = re.search(matcher, line)
35+
if matches and matches.groups():
36+
return matches.groups()[0]
37+
38+
matcher = r'v_arg ([\w_]+)'
39+
matches = re.search(matcher, line)
40+
if matches and matches.groups():
41+
return f"CC_{matches.groups()[0]}"
42+
43+
return ''
3644

3745
def _parse(file):
3846
lines = []

‎scripts/set_cli_args.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
codecov_cli_args=()
44

5-
codecov_cli_args+=( $(write_existing_args CODECOV_AUTO_LOAD_PARAMS_FROM) )
6-
codecov_cli_args+=( $(write_existing_args CODECOV_ENTERPRISE_URL) )
7-
codecov_cli_args+=( $(write_existing_args CODECOV_YML_PATH) )
5+
codecov_cli_args+=( $(k_arg AUTO_LOAD_PARAMS_FROM) $(v_arg AUTO_LOAD_PARAMS_FROM))
6+
codecov_cli_args+=( $(k_arg ENTERPRISE_URL) $(v_arg ENTERPRISE_URL))
7+
codecov_cli_args+=( $(k_arg YML_PATH) $(v_arg YML_PATH))
88
codecov_cli_args+=( $(write_truthy_args CODECOV_VERBOSE) )

‎scripts/set_create_commit_args.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
codecov_cc_args=()
44

55
codecov_cc_args+=( $(write_truthy_args CODECOV_FAIL_ON_ERROR) )
6-
codecov_cc_args+=( $(write_existing_args CODECOV_GIT_SERVICE) )
7-
codecov_cc_args+=( $(write_existing_args CODECOV_PARENT_SHA) )
8-
codecov_cc_args+=( $(write_existing_args CODECOV_PR) )
9-
codecov_cc_args+=( $(write_existing_args CODECOV_SHA) )
10-
codecov_cc_args+=( $(write_existing_args CODECOV_SLUG) )
6+
codecov_du_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
7+
codecov_du_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA))
8+
codecov_du_args+=( $(k_arg PR) $(v_arg PR))
9+
codecov_du_args+=( $(k_arg SHA) $(v_arg SHA))
10+
codecov_du_args+=( $(k_arg SLUG) $(v_arg SLUG))

‎scripts/set_create_report_args.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
codecov_create_report_args=()
44

5-
codecov_cr_args+=( $(write_existing_args CODECOV_CODE) )
5+
codecov_cr_args+=( $(k_arg CODE) $(v_arg CODE))
66
codecov_cr_args+=( $(write_truthy_args CODECOV_FAIL_ON_ERROR) )
7-
codecov_cr_args+=( $(write_existing_args CODECOV_GIT_SERVICE) )
8-
codecov_cr_args+=( $(write_existing_args CODECOV_PR) )
9-
codecov_cr_args+=( $(write_existing_args CODECOV_SHA) )
10-
codecov_cr_args+=( $(write_existing_args CODECOV_SLUG) )
7+
codecov_cr_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
8+
codecov_cr_args+=( $(k_arg PR) $(v_arg PR))
9+
codecov_cr_args+=( $(k_arg SHA) $(v_arg SHA))
10+
codecov_cr_args+=( $(k_arg SLUG) $(v_arg SLUG))

‎scripts/set_defaults.sh

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,24 @@ lower() {
1818
echo $(echo $1 | sed 's/CODECOV//' | sed 's/_/-/g' | tr '[:upper:]' '[:lower:]')
1919
}
2020

21-
write_existing_args() {
22-
if [ -n "$(eval echo \$$1)" ];
21+
k_arg() {
22+
if [ -n "$(eval echo \$"CODECOV_$1")" ];
2323
then
24-
echo " -$(lower "$1") $(eval echo \$$1)"
24+
echo "--$(lower "$1")"
25+
fi
26+
}
27+
28+
v_arg() {
29+
if [ -n "$(eval echo \$"CODECOV_$1")" ];
30+
then
31+
echo "$(eval echo \$"CODECOV_$1")"
2532
fi
2633
}
2734

2835
write_truthy_args() {
2936
if [ "$(eval echo \$$1)" = "true" ] || [ "$(eval echo \$$1)" = "1" ];
3037
then
31-
echo " -$(lower $1)"
38+
echo "-$(lower $1)"
3239
fi
3340
}
3441

‎scripts/set_do_upload_args.sh

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22

33
codecov_du_args=()
44

5-
codecov_du_args+=( $(write_existing_args CODECOV_ENV) )
5+
codecov_du_args+=( $(k_arg ENV) $(v_arg ENV))
66

77
OLDIFS=$IFS;IFS=,
88

9-
codecov_du_args+=( $(write_existing_args CODECOV_BRANCH) )
10-
codecov_du_args+=( $(write_existing_args CODECOV_BUILD) )
11-
codecov_du_args+=( $(write_existing_args CODECOV_BUILD_URL) )
12-
codecov_du_args+=( $(write_existing_args CODECOV_CODE) )
13-
codecov_du_args+=( $(write_existing_args CODECOV_DIR) )
9+
codecov_du_args+=( $(k_arg BRANCH) $(v_arg BRANCH))
10+
codecov_du_args+=( $(k_arg BUILD) $(v_arg BUILD))
11+
codecov_du_args+=( $(k_arg BUILD_URL) $(v_arg BUILD_URL))
12+
codecov_du_args+=( $(k_arg CODE) $(v_arg CODE))
13+
codecov_du_args+=( $(k_arg DIR) $(v_arg DIR))
1414
codecov_du_args+=( $(write_truthy_args CODECOV_DISABLE_FILE_FIXES) )
1515
codecov_du_args+=( $(write_truthy_args CODECOV_DISABLE_SEARCH) )
1616
codecov_du_args+=( $(write_truthy_args CODECOV_DRY_RUN) )
1717

1818
if [ -n "$CODECOV_EXCLUDES" ];
1919
then
2020
for directory in $CODECOV_EXCLUDES; do
21-
codecov_du_args+=( " --exclude " "$directory" )
21+
codecov_du_args+=( "--exclude" "$directory" )
2222
done
2323
fi
2424

@@ -27,44 +27,44 @@ codecov_du_args+=( $(write_truthy_args CODECOV_FAIL_ON_ERROR) )
2727
if [ -n "$CODECOV_FILES" ];
2828
then
2929
for file in $CODECOV_FILES; do
30-
codecov_du_args+=( " --file " "$file" )
30+
codecov_du_args+=( "--file" "$file" )
3131
done
3232
fi
3333

3434
if [ -n "$CODECOV_FLAGS" ];
3535
then
3636
for flag in $CODECOV_FLAGS; do
37-
codecov_du_args+=( " --flag " "$flag" )
37+
codecov_du_args+=( "--flag" "$flag" )
3838
done
3939
fi
4040

41-
codecov_du_args+=( $(write_existing_args CODECOV_GCOV_ARGS) )
42-
codecov_du_args+=( $(write_existing_args CODECOV_GCOV_EXECUTABLE) )
43-
codecov_du_args+=( $(write_existing_args CODECOV_GCOV_IGNORE) )
44-
codecov_du_args+=( $(write_existing_args CODECOV_GCOV_INCLUDE) )
45-
codecov_du_args+=( $(write_existing_args CODECOV_GIT_SERVICE) )
41+
codecov_du_args+=( $(k_arg GCOV_ARGS) $(v_arg GCOV_ARGS))
42+
codecov_du_args+=( $(k_arg GCOV_EXECUTABLE) $(v_arg GCOV_EXECUTABLE))
43+
codecov_du_args+=( $(k_arg GCOV_IGNORE) $(v_arg GCOV_IGNORE))
44+
codecov_du_args+=( $(k_arg GCOV_INCLUDE) $(v_arg GCOV_INCLUDE))
45+
codecov_du_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
4646
codecov_du_args+=( $(write_truthy_args CODECOV_HANDLE_NO_REPORTS_FOUND) )
47-
codecov_du_args+=( $(write_existing_args CODECOV_JOB_CODE) )
47+
codecov_du_args+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE))
4848
codecov_du_args+=( $(write_truthy_args CODECOV_LEGACY) )
4949
if [ -n "$CODECOV_NAME" ];
5050
then
5151
codecov_du_args+=( "--name" "$CODECOV_NAME" )
5252
fi
53-
codecov_du_args+=( $(write_existing_args CODECOV_NETWORK_FILTER) )
54-
codecov_du_args+=( $(write_existing_args CODECOV_NETWORK_PREFIX) )
55-
codecov_du_args+=( $(write_existing_args CODECOV_NETWORK_ROOT_FOLDER) )
53+
codecov_du_args+=( $(k_arg NETWORK_FILTER) $(v_arg NETWORK_FILTER))
54+
codecov_du_args+=( $(k_arg NETWORK_PREFIX) $(v_arg NETWORK_PREFIX))
55+
codecov_du_args+=( $(k_arg NETWORK_ROOT_FOLDER) $(v_arg NETWORK_ROOT_FOLDER))
5656

5757
if [ -n "$CODECOV_PLUGINS" ];
5858
then
5959
for plugin in $CODECOV_PLUGINS; do
60-
codecov_du_args+=( " --plugin " "$plugin" )
60+
codecov_du_args+=( "--plugin" "$plugin" )
6161
done
6262
fi
6363

64-
codecov_du_args+=( $(write_existing_args CODECOV_PR) )
65-
codecov_du_args+=( $(write_existing_args CODECOV_REPORT_TYPE) )
66-
codecov_du_args+=( $(write_existing_args CODECOV_SHA) )
67-
codecov_du_args+=( $(write_existing_args CODECOV_SLUG) )
68-
codecov_du_args+=( $(write_existing_args CODECOV_SWIFT_PROJECT) )
64+
codecov_du_args+=( $(k_arg PR) $(v_arg PR))
65+
codecov_du_args+=( $(k_arg REPORT_TYPE) $(v_arg REPORT_TYPE))
66+
codecov_du_args+=( $(k_arg SHA) $(v_arg SHA))
67+
codecov_du_args+=( $(k_arg SLUG) $(v_arg SLUG))
68+
codecov_du_args+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT))
6969

7070
IFS=$OLDIFS

‎scripts/upload.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ if ! ./$codecov_filename \
2727
${codecov_cli_args[*]} \
2828
create-commit \
2929
${token_arg[*]} \
30-
${codecov_cc_args[*]};
30+
"${codecov_cc_args[@]}";
3131
then
3232
exit_if_error "Failed to create-commit"
3333
fi
@@ -39,7 +39,7 @@ if ! ./$codecov_filename \
3939
${codecov_cli_args[*]} \
4040
create-report \
4141
${token_arg[*]} \
42-
${codecov_cr_args[*]};
42+
"${codecov_cr_args[@]}";
4343
then
4444
exit_if_error "Failed to create-report"
4545
fi

‎scripts/version.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/usr/bin/env bash
2-
CODECOV_WRAPPER_VERSION="0.0.25"
2+
CODECOV_WRAPPER_VERSION="0.0.26"

0 commit comments

Comments
 (0)