Skip to content

Commit 3cbecfc

Browse files
seefoodseefood
authored
Merge pull request #2336 from seefood/add-bashcov-report
2 parents 338ace2 + be8c526 commit 3cbecfc

File tree

4 files changed

+48
-43
lines changed

4 files changed

+48
-43
lines changed

‎.gitmodules‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
[submodule "test_lib/bats-core"]
22
path = test_lib/bats-core
33
url = https://github.com/bats-core/bats-core
4-
branch = tags/v1.9.0
4+
branch = tags/v1.11.1
55
[submodule "test_lib/bats-support"]
66
path = test_lib/bats-support
77
url = https://github.com/bats-core/bats-support
8-
branch = tags/v0.3.0
8+
branch = master
9+
#branch = tags/v0.3.0
910
[submodule "test_lib/bats-assert"]
1011
path = test_lib/bats-assert
1112
url = https://github.com/bats-core/bats-assert
1213
branch = tags/v2.1.0
1314
[submodule "test_lib/bats-file"]
1415
path = test_lib/bats-file
1516
url = https://github.com/bats-core/bats-file
16-
branch = tags/v0.4.0
17+
branch = master

‎install.sh‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ function _bash-it_check_for_backup() {
8282
fi
8383
echo -e "\033[0;33mBackup file already exists. Make sure to backup your .bashrc before running this installation.\033[0m" >&2
8484

85-
if [[ -z "${overwrite_backup}" ]]; then
86-
while [[ -z "${silent}" ]]; do
85+
if [[ -z "${overwrite_backup:-}" ]]; then
86+
while [[ -z "${silent:-}" ]]; do
8787
read -e -n 1 -r -p "Would you like to overwrite the existing backup? This will delete your existing backup file ($HOME/$BACKUP_FILE) [y/N] " RESP
8888
case $RESP in
8989
[yY])
@@ -99,9 +99,9 @@ function _bash-it_check_for_backup() {
9999
esac
100100
done
101101
fi
102-
if [[ -z "${overwrite_backup}" ]]; then
102+
if [[ -z "${overwrite_backup:-}" ]]; then
103103
echo -e "\033[91mInstallation aborted. Please come back soon!\033[m"
104-
if [[ -n "${silent}" ]]; then
104+
if [[ -n "${silent:-}" ]]; then
105105
echo -e "\033[91mUse \"-f\" flag to force overwrite of backup.\033[m"
106106
fi
107107
exit 1
@@ -113,8 +113,8 @@ function _bash-it_check_for_backup() {
113113
function _bash-it_modify_config_files() {
114114
_bash-it_check_for_backup
115115

116-
if [[ -z "${silent}" ]]; then
117-
while [[ -z "${append_to_config}" ]]; do
116+
if [[ -z "${silent:-}" ]]; then
117+
while [[ -z "${append_to_config:-}" ]]; do
118118
read -e -n 1 -r -p "Would you like to keep your $CONFIG_FILE and append bash-it templates at the end? [y/N] " choice
119119
case $choice in
120120
[yY])
@@ -130,7 +130,7 @@ function _bash-it_modify_config_files() {
130130
esac
131131
done
132132
fi
133-
if [[ -n "${append_to_config}" ]]; then
133+
if [[ -n "${append_to_config:-}" ]]; then
134134
# backup/append
135135
_bash-it_backup_append
136136
else
@@ -173,12 +173,12 @@ done
173173

174174
shift $((OPTIND - 1))
175175

176-
if [[ -n "${silent}" && -n "${interactive}" ]]; then
176+
if [[ -n "${silent:-}" && -n "${interactive:-}" ]]; then
177177
echo -e "\033[91mOptions --silent and --interactive are mutually exclusive. Please choose one or the other.\033[m"
178178
exit 1
179179
fi
180180

181-
if [[ -n "${no_modify_config}" && -n "${append_to_config}" ]]; then
181+
if [[ -n "${no_modify_config:-}" && -n "${append_to_config:-}" ]]; then
182182
echo -e "\033[91mOptions --no-modify-config and --append-to-config are mutually exclusive. Please choose one or the other.\033[m"
183183
exit 1
184184
fi
@@ -220,7 +220,7 @@ cite _about _param _example _group _author _version
220220
# shellcheck source=./lib/helpers.bash
221221
source "$BASH_IT/lib/helpers.bash"
222222

223-
if [[ -n $interactive && -z "${silent}" ]]; then
223+
if [[ -n ${interactive:-} && -z "${silent:-}" ]]; then
224224
for type in "aliases" "plugins" "completion"; do
225225
echo -e "\033[0;32mEnabling ${type}\033[0m"
226226
_bash-it_load_some "$type"

‎test/lib/helpers.bats‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -40,39 +40,39 @@ function local_setup() {
4040
}
4141

4242
@test "helpers: bash-it help list aliases with ag aliases enabled" {
43-
ln -s "${BASH_IT?}/aliases/available/ag.aliases.bash" "${BASH_IT?}/aliases/enabled/150---ag.aliases.bash"
43+
run ln -s "${BASH_IT?}/aliases/available/ag.aliases.bash" "${BASH_IT?}/aliases/enabled/150---ag.aliases.bash"
4444
assert_link_exist "${BASH_IT?}/aliases/enabled/150---ag.aliases.bash"
4545

4646
run _help-list-aliases "${BASH_IT?}/aliases/enabled/150---ag.aliases.bash"
4747
assert_line -n 0 "ag:"
4848
}
4949

5050
@test "helpers: bash-it help list aliases with todo.txt-cli aliases enabled" {
51-
ln -s "${BASH_IT?}/aliases/available/todo.txt-cli.aliases.bash" "${BASH_IT?}/aliases/enabled/150---todo.txt-cli.aliases.bash"
51+
run ln -s "${BASH_IT?}/aliases/available/todo.txt-cli.aliases.bash" "${BASH_IT?}/aliases/enabled/150---todo.txt-cli.aliases.bash"
5252
assert_link_exist "${BASH_IT?}/aliases/enabled/150---todo.txt-cli.aliases.bash"
5353

5454
run _help-list-aliases "${BASH_IT?}/aliases/enabled/150---todo.txt-cli.aliases.bash"
5555
assert_line -n 0 "todo.txt-cli:"
5656
}
5757

5858
@test "helpers: bash-it help list aliases with docker-compose aliases enabled" {
59-
ln -s "${BASH_IT?}/aliases/available/docker-compose.aliases.bash" "${BASH_IT?}/aliases/enabled/150---docker-compose.aliases.bash"
59+
run ln -s "${BASH_IT?}/aliases/available/docker-compose.aliases.bash" "${BASH_IT?}/aliases/enabled/150---docker-compose.aliases.bash"
6060
assert_link_exist "${BASH_IT?}/aliases/enabled/150---docker-compose.aliases.bash"
6161

6262
run _help-list-aliases "${BASH_IT?}/aliases/enabled/150---docker-compose.aliases.bash"
6363
assert_line -n 0 "docker-compose:"
6464
}
6565

6666
@test "helpers: bash-it help list aliases with ag aliases enabled in global directory" {
67-
ln -s "${BASH_IT?}/aliases/available/ag.aliases.bash" "${BASH_IT?}/enabled/150---ag.aliases.bash"
67+
run ln -s "${BASH_IT?}/aliases/available/ag.aliases.bash" "${BASH_IT?}/enabled/150---ag.aliases.bash"
6868
assert_link_exist "${BASH_IT?}/enabled/150---ag.aliases.bash"
6969

7070
run _help-list-aliases "${BASH_IT?}/enabled/150---ag.aliases.bash"
7171
assert_line -n 0 "ag:"
7272
}
7373

7474
@test "helpers: bash-it help aliases one alias enabled in the old directory" {
75-
ln -s "${BASH_IT?}/aliases/available/ag.aliases.bash" "${BASH_IT?}/aliases/enabled/150---ag.aliases.bash"
75+
run ln -s "${BASH_IT?}/aliases/available/ag.aliases.bash" "${BASH_IT?}/aliases/enabled/150---ag.aliases.bash"
7676
assert_link_exist "${BASH_IT?}/aliases/enabled/150---ag.aliases.bash"
7777

7878
run bash-it help aliases
@@ -192,7 +192,7 @@ function local_setup() {
192192
}
193193

194194
@test "helpers: disable the nvm plugin if it was enabled with a priority, but in the component-specific directory" {
195-
ln -s "${BASH_IT?}/plugins/available/nvm.plugin.bash" "${BASH_IT?}/plugins/enabled/225---nvm.plugin.bash"
195+
run ln -s "${BASH_IT?}/plugins/available/nvm.plugin.bash" "${BASH_IT?}/plugins/enabled/225---nvm.plugin.bash"
196196
assert_link_exist "${BASH_IT?}/plugins/enabled/225---nvm.plugin.bash"
197197
assert [ ! -L "${BASH_IT?}/enabled/225---nvm.plugin.bash" ]
198198

@@ -203,7 +203,7 @@ function local_setup() {
203203
}
204204

205205
@test "helpers: disable the nvm plugin if it was enabled without a priority" {
206-
ln -s "${BASH_IT?}/plugins/available/nvm.plugin.bash" "${BASH_IT?}/plugins/enabled/nvm.plugin.bash"
206+
run ln -s "${BASH_IT?}/plugins/available/nvm.plugin.bash" "${BASH_IT?}/plugins/enabled/nvm.plugin.bash"
207207
assert_link_exist "${BASH_IT?}/plugins/enabled/nvm.plugin.bash"
208208

209209
run _disable-plugin "nvm"
@@ -212,7 +212,7 @@ function local_setup() {
212212
}
213213

214214
@test "helpers: enable the nvm plugin if it was enabled without a priority" {
215-
ln -s "${BASH_IT?}/plugins/available/nvm.plugin.bash" "${BASH_IT?}/plugins/enabled/nvm.plugin.bash"
215+
run ln -s "${BASH_IT?}/plugins/available/nvm.plugin.bash" "${BASH_IT?}/plugins/enabled/nvm.plugin.bash"
216216
assert_link_exist "${BASH_IT?}/plugins/enabled/nvm.plugin.bash"
217217

218218
run _enable-plugin "nvm"
@@ -223,7 +223,7 @@ function local_setup() {
223223
}
224224

225225
@test "helpers: enable the nvm plugin if it was enabled with a priority, but in the component-specific directory" {
226-
ln -s "${BASH_IT?}/plugins/available/nvm.plugin.bash" "${BASH_IT?}/plugins/enabled/225---nvm.plugin.bash"
226+
run ln -s "${BASH_IT?}/plugins/available/nvm.plugin.bash" "${BASH_IT?}/plugins/enabled/225---nvm.plugin.bash"
227227
assert_link_exist "${BASH_IT?}/plugins/enabled/225---nvm.plugin.bash"
228228

229229
run _enable-plugin "nvm"
@@ -404,10 +404,10 @@ function local_setup() {
404404
}
405405

406406
@test "helpers: migrate plugins and completions that share the same name" {
407-
ln -s "${BASH_IT?}/completion/available/dirs.completion.bash" "${BASH_IT?}/completion/enabled/350---dirs.completion.bash"
407+
run ln -s "${BASH_IT?}/completion/available/dirs.completion.bash" "${BASH_IT?}/completion/enabled/350---dirs.completion.bash"
408408
assert_link_exist "${BASH_IT?}/completion/enabled/350---dirs.completion.bash"
409409

410-
ln -s "${BASH_IT?}/plugins/available/dirs.plugin.bash" "${BASH_IT?}/plugins/enabled/250---dirs.plugin.bash"
410+
run ln -s "${BASH_IT?}/plugins/available/dirs.plugin.bash" "${BASH_IT?}/plugins/enabled/250---dirs.plugin.bash"
411411
assert_link_exist "${BASH_IT?}/plugins/enabled/250---dirs.plugin.bash"
412412

413413
run _bash-it-migrate
@@ -426,13 +426,13 @@ function local_setup() {
426426
}
427427

428428
@test "helpers: migrate enabled plugins that don't use the new priority-based configuration" {
429-
ln -s "${BASH_IT?}/plugins/available/nvm.plugin.bash" "${BASH_IT?}/plugins/enabled/nvm.plugin.bash"
429+
run ln -s "${BASH_IT?}/plugins/available/nvm.plugin.bash" "${BASH_IT?}/plugins/enabled/nvm.plugin.bash"
430430
assert_link_exist "${BASH_IT?}/plugins/enabled/nvm.plugin.bash"
431431

432-
ln -s "${BASH_IT?}/plugins/available/node.plugin.bash" "${BASH_IT?}/plugins/enabled/node.plugin.bash"
432+
run ln -s "${BASH_IT?}/plugins/available/node.plugin.bash" "${BASH_IT?}/plugins/enabled/node.plugin.bash"
433433
assert_link_exist "${BASH_IT?}/plugins/enabled/node.plugin.bash"
434434

435-
ln -s "${BASH_IT?}/aliases/available/todo.txt-cli.aliases.bash" "${BASH_IT?}/aliases/enabled/todo.txt-cli.aliases.bash"
435+
run ln -s "${BASH_IT?}/aliases/available/todo.txt-cli.aliases.bash" "${BASH_IT?}/aliases/enabled/todo.txt-cli.aliases.bash"
436436
assert_link_exist "${BASH_IT?}/aliases/enabled/todo.txt-cli.aliases.bash"
437437

438438
run _enable-plugin "ssh"
@@ -453,13 +453,13 @@ function local_setup() {
453453
}
454454

455455
@test "helpers: migrate enabled plugins that use the new priority-based configuration in the individual directories" {
456-
ln -s "${BASH_IT?}/plugins/available/nvm.plugin.bash" "${BASH_IT?}/plugins/enabled/225---nvm.plugin.bash"
456+
run ln -s "${BASH_IT?}/plugins/available/nvm.plugin.bash" "${BASH_IT?}/plugins/enabled/225---nvm.plugin.bash"
457457
assert_link_exist "${BASH_IT?}/plugins/enabled/225---nvm.plugin.bash"
458458

459-
ln -s "${BASH_IT?}/plugins/available/node.plugin.bash" "${BASH_IT?}/plugins/enabled/250---node.plugin.bash"
459+
run ln -s "${BASH_IT?}/plugins/available/node.plugin.bash" "${BASH_IT?}/plugins/enabled/250---node.plugin.bash"
460460
assert_link_exist "${BASH_IT?}/plugins/enabled/250---node.plugin.bash"
461461

462-
ln -s "${BASH_IT?}/aliases/available/todo.txt-cli.aliases.bash" "${BASH_IT?}/aliases/enabled/250---todo.txt-cli.aliases.bash"
462+
run ln -s "${BASH_IT?}/aliases/available/todo.txt-cli.aliases.bash" "${BASH_IT?}/aliases/enabled/250---todo.txt-cli.aliases.bash"
463463
assert_link_exist "${BASH_IT?}/aliases/enabled/250---todo.txt-cli.aliases.bash"
464464

465465
run _enable-plugin "ssh"
@@ -495,9 +495,9 @@ function __migrate_all_components() {
495495
for f in "${BASH_IT}/$subdirectory/available/"*.bash; do
496496
to_enable=$(basename "$f")
497497
if [[ -z "$priority" ]]; then
498-
ln -s "../available/$to_enable" "${BASH_IT}/${subdirectory}/enabled/$to_enable"
498+
run ln -s "../available/$to_enable" "${BASH_IT}/${subdirectory}/enabled/$to_enable"
499499
else
500-
ln -s "../available/$to_enable" "${BASH_IT}/${subdirectory}/enabled/$priority---$to_enable"
500+
run ln -s "../available/$to_enable" "${BASH_IT}/${subdirectory}/enabled/$priority---$to_enable"
501501
fi
502502
done
503503

@@ -566,7 +566,7 @@ function __migrate_all_components() {
566566
}
567567

568568
@test "helpers: verify that existing components are automatically migrated when something is enabled" {
569-
ln -s "${BASH_IT?}/plugins/available/nvm.plugin.bash" "${BASH_IT?}/plugins/enabled/nvm.plugin.bash"
569+
run ln -s "${BASH_IT?}/plugins/available/nvm.plugin.bash" "${BASH_IT?}/plugins/enabled/nvm.plugin.bash"
570570
assert_link_exist "${BASH_IT?}/plugins/enabled/nvm.plugin.bash"
571571

572572
run bash-it enable plugin "node"
@@ -581,9 +581,9 @@ function __migrate_all_components() {
581581
}
582582

583583
@test "helpers: verify that existing components are automatically migrated when something is disabled" {
584-
ln -s "${BASH_IT?}/plugins/available/nvm.plugin.bash" "${BASH_IT?}/plugins/enabled/nvm.plugin.bash"
584+
run ln -s "${BASH_IT?}/plugins/available/nvm.plugin.bash" "${BASH_IT?}/plugins/enabled/nvm.plugin.bash"
585585
assert_link_exist "${BASH_IT?}/plugins/enabled/nvm.plugin.bash"
586-
ln -s "${BASH_IT?}/plugins/available/node.plugin.bash" "${BASH_IT?}/plugins/enabled/250---node.plugin.bash"
586+
run ln -s "${BASH_IT?}/plugins/available/node.plugin.bash" "${BASH_IT?}/plugins/enabled/250---node.plugin.bash"
587587
assert_link_exist "${BASH_IT?}/plugins/enabled/250---node.plugin.bash"
588588

589589
run bash-it disable plugin "node"
@@ -627,10 +627,10 @@ function __migrate_all_components() {
627627

628628
@test "helpers: disable all plugins in the old directory structure" {
629629
local enabled enabled2
630-
ln -s "${BASH_IT?}/plugins/available/nvm.plugin.bash" "${BASH_IT?}/plugins/enabled/nvm.plugin.bash"
630+
run ln -s "${BASH_IT?}/plugins/available/nvm.plugin.bash" "${BASH_IT?}/plugins/enabled/nvm.plugin.bash"
631631
assert_link_exist "${BASH_IT?}/plugins/enabled/nvm.plugin.bash"
632632

633-
ln -s "${BASH_IT?}/plugins/available/node.plugin.bash" "${BASH_IT?}/plugins/enabled/node.plugin.bash"
633+
run ln -s "${BASH_IT?}/plugins/available/node.plugin.bash" "${BASH_IT?}/plugins/enabled/node.plugin.bash"
634634
assert_link_exist "${BASH_IT?}/plugins/enabled/node.plugin.bash"
635635

636636
enabled=$(find "${BASH_IT?}/plugins/enabled" -name '*.plugin.bash' | wc -l | xargs)
@@ -647,10 +647,10 @@ function __migrate_all_components() {
647647

648648
@test "helpers: disable all plugins in the old directory structure with priority" {
649649
local enabled enabled2
650-
ln -s "${BASH_IT?}/plugins/available/nvm.plugin.bash" "${BASH_IT?}/plugins/enabled/250---nvm.plugin.bash"
650+
run ln -s "${BASH_IT?}/plugins/available/nvm.plugin.bash" "${BASH_IT?}/plugins/enabled/250---nvm.plugin.bash"
651651
assert_link_exist "${BASH_IT?}/plugins/enabled/250---nvm.plugin.bash"
652652

653-
ln -s "${BASH_IT?}/plugins/available/node.plugin.bash" "${BASH_IT?}/plugins/enabled/250---node.plugin.bash"
653+
run ln -s "${BASH_IT?}/plugins/available/node.plugin.bash" "${BASH_IT?}/plugins/enabled/250---node.plugin.bash"
654654
assert_link_exist "${BASH_IT?}/plugins/enabled/250---node.plugin.bash"
655655

656656
enabled=$(find "${BASH_IT?}/plugins/enabled" -name '*.plugin.bash' | wc -l | xargs)
@@ -698,14 +698,14 @@ function __migrate_all_components() {
698698
}
699699

700700
@test "helpers: describe the nvm plugin after enabling it in the old directory" {
701-
ln -s "${BASH_IT?}/plugins/available/nvm.plugin.bash" "${BASH_IT?}/plugins/enabled/nvm.plugin.bash"
701+
run ln -s "${BASH_IT?}/plugins/available/nvm.plugin.bash" "${BASH_IT?}/plugins/enabled/nvm.plugin.bash"
702702
assert_link_exist "${BASH_IT?}/plugins/enabled/nvm.plugin.bash"
703703

704704
_bash-it-plugins | grep "nvm" | grep "\[x\]"
705705
}
706706

707707
@test "helpers: describe the nvm plugin after enabling it in the old directory with priority" {
708-
ln -s "${BASH_IT?}/plugins/available/nvm.plugin.bash" "${BASH_IT?}/plugins/enabled/225---nvm.plugin.bash"
708+
run ln -s "${BASH_IT?}/plugins/available/nvm.plugin.bash" "${BASH_IT?}/plugins/enabled/225---nvm.plugin.bash"
709709
assert_link_exist "${BASH_IT?}/plugins/enabled/225---nvm.plugin.bash"
710710

711711
_bash-it-plugins | grep "nvm" | grep "\[x\]"

‎test/plugins/base.plugin.bats‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@ function local_setup_file() {
88
}
99

1010
@test 'plugins base: ips()' {
11-
readonly localhost='127.0.0.1'
11+
if [[ -n "${CI:-}" ]]; then
12+
skip 'ifconfig probably requires sudo on TravisCI'
13+
fi
14+
15+
declare -r localhost='127.0.0.1'
1216
run ips
1317
assert_success
14-
assert_line "$localhost"
18+
assert_line $localhost
1519
}
1620

1721
@test 'plugins base: myip()' {

0 commit comments

Comments
 (0)