Bash-it · NoahGorny · Mar 3, 2022 · Mar 3, 2022 · Mar 3, 2022 · Mar 3, 2022
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,6 +22,23 @@ jobs:
     - name: Test code
       run: test/run
 
+  code-coverage:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/[email protected]
+      with:
+        ruby-version: '2.7'
+    - name: Install Ruby dependencies
+      run: bundle update --bundler && bundle install
+    - name: Run tests
+      run: bashcov test/run
+    - name: Upload reports to Codecov
+      run: |
+        curl -Os https://uploader.codecov.io/latest/linux/codecov
+        chmod +x codecov
+        ./codecov -f coverage/codecov-result.json -Z
+
   build-docs:
     runs-on: ubuntu-latest
 

diff --git a/Gemfile b/Gemfile
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'bashcov'
+gem 'codecov'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -0,0 +1,24 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    bashcov (1.8.1)
+      simplecov (~> 0.15)
+    codecov (0.4.2)
+      simplecov (>= 0.15, < 0.22)
+    docile (1.3.5)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bashcov
+  codecov
+
+BUNDLED WITH
+   1.17.3
diff --git a/install.sh b/install.sh
@@ -83,8 +83,8 @@ function _bash-it_check_for_backup() {
 	fi
 	echo -e "\033[0;33mBackup file already exists. Make sure to backup your .bashrc before running this installation.\033[0m" >&2
 
-	if [[ -z "${overwrite_backup}" ]]; then
-		while [[ -z "${silent}" ]]; do
+	if [[ -z "${overwrite_backup:-}" ]]; then
+		while [[ -z "${silent:-}" ]]; do
 			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
 			case $RESP in
 				[yY])
@@ -100,9 +100,9 @@ function _bash-it_check_for_backup() {
 			esac
 		done
 	fi
-	if [[ -z "${overwrite_backup}" ]]; then
+	if [[ -z "${overwrite_backup:-}" ]]; then
 		echo -e "\033[91mInstallation aborted. Please come back soon!\033[m"
-		if [[ -n "${silent}" ]]; then
+		if [[ -n "${silent:-}" ]]; then
 			echo -e "\033[91mUse \"-f\" flag to force overwrite of backup.\033[m"
 		fi
 		exit 1
@@ -114,8 +114,8 @@ function _bash-it_check_for_backup() {
 function _bash-it_modify_config_files() {
 	_bash-it_check_for_backup
 
-	if [[ -z "${silent}" ]]; then
-		while [[ -z "${append_to_config}" ]]; do
+	if [[ -z "${silent:-}" ]]; then
+		while [[ -z "${append_to_config:-}" ]]; do
 			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
 			case $choice in
 				[yY])
@@ -131,7 +131,7 @@ function _bash-it_modify_config_files() {
 			esac
 		done
 	fi
-	if [[ -n "${append_to_config}" ]]; then
+	if [[ -n "${append_to_config:-}" ]]; then
 		# backup/append
 		_bash-it_backup_append
 	else
@@ -174,12 +174,12 @@ done
 
 shift $((OPTIND - 1))
 
-if [[ -n "${silent}" && -n "${interactive}" ]]; then
+if [[ -n "${silent:-}" && -n "${interactive:-}" ]]; then
 	echo -e "\033[91mOptions --silent and --interactive are mutually exclusive. Please choose one or the other.\033[m"
 	exit 1
 fi
 
-if [[ -n "${no_modify_config}" && -n "${append_to_config}" ]]; then
+if [[ -n "${no_modify_config:-}" && -n "${append_to_config:-}" ]]; then
 	echo -e "\033[91mOptions --no-modify-config and --append-to-config are mutually exclusive. Please choose one or the other.\033[m"
 	exit 1
 fi
@@ -214,7 +214,7 @@ cite _about _param _example _group _author _version
 # shellcheck source=./lib/helpers.bash
 source "$BASH_IT/lib/helpers.bash"
 
-if [[ -n $interactive && -z "${silent}" ]]; then
+if [[ -n ${interactive:-} && -z "${silent:-}" ]]; then
 	for type in "aliases" "plugins" "completion"; do
 		echo -e "\033[0;32mEnabling ${type}\033[0m"
 		_bash-it_load_some "$type"

diff --git a/test/completion/bash-it.completion.bats b/test/completion/bash-it.completion.bats
@@ -10,7 +10,7 @@ function local_setup {
 }
 
 @test "completion bash-it: ensure that the _bash-it function is available" {
-  type -a _bash-it &> /dev/null
+  run type -a _bash-it &> /dev/null
   assert_success
 }
 
@@ -71,12 +71,12 @@ function __check_completion () {
 
 @test "completion bash-it: search - show no options" {
   run __check_completion 'bash-it search '
-  assert_line -n 0 ""
+  assert_output ""
 }
 
 @test "completion bash-it: migrate - show no options" {
   run __check_completion 'bash-it migrate '
-  assert_line -n 0 ""
+  assert_output ""
 }
 
 @test "completion bash-it: show options" {
@@ -146,7 +146,7 @@ function __check_completion () {
 
 @test "completion bash-it: disable - provide nothing when atom is not enabled" {
   run __check_completion 'bash-it disable alias ato'
-  assert_line -n 0 ""
+  assert_output ""
 }
 
 @test "completion bash-it: disable - provide all when atom is not enabled" {

diff --git a/test/install/uninstall.bats b/test/install/uninstall.bats
@@ -27,7 +27,7 @@ function local_setup {
   echo "test file content for original file" > "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE"
   local md5_bak=$(md5sum "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE.bak" | awk '{print $1}')
 
-  ./uninstall.sh
+  run ./uninstall.sh
 
   assert_success
 
@@ -46,7 +46,7 @@ function local_setup {
   echo "test file content for original file" > "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE"
   local md5_orig=$(md5sum "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE" | awk '{print $1}')
 
-  ./uninstall.sh
+  run ./uninstall.sh
 
   assert_success
 

diff --git a/test/lib/helpers.bats b/test/lib/helpers.bats
@@ -73,7 +73,7 @@ function local_setup {
 
 @test "helpers: bash-it help aliases without any aliases enabled" {
   run bash-it help aliases
-  assert_line -n 0 ""
+  assert_output ""
 }
 
 @test "helpers: bash-it help plugins" {
@@ -521,7 +521,7 @@ function local_setup {
 function __migrate_all_components() {
   subdirectory="$1"
   one_type="$2"
-  priority="$3"
+  priority="${3:-}"
 
   for f in "${BASH_IT}/$subdirectory/available/"*.bash
   do

diff --git a/test/lib/preexec.bats b/test/lib/preexec.bats
@@ -12,8 +12,6 @@ function local_setup {
 	export PROMPT_COMMAND="$test_prompt_string"
 
 	load ../../vendor/github.com/rcaloras/bash-preexec/bash-preexec.sh
-	assert_success
-
 	assert_equal "${PROMPT_COMMAND}" $'__bp_trap_string="$(trap -p DEBUG)"\ntrap - DEBUG\n__bp_install'
 }
 
@@ -22,8 +20,6 @@ function local_setup {
 	export PROMPT_COMMAND="$test_prompt_string"
 
 	load ../../vendor/github.com/rcaloras/bash-preexec/bash-preexec.sh
-	assert_success
-
 	assert_equal "${PROMPT_COMMAND}" "$test_prompt_string"$'\n__bp_trap_string="$(trap -p DEBUG)"\ntrap - DEBUG\n__bp_install'
 }
 
@@ -33,8 +29,6 @@ function local_setup {
 	export __bp_delay_install="blarg"
 
 	load ../../vendor/github.com/rcaloras/bash-preexec/bash-preexec.sh
-	assert_success
-
 	assert_equal "${PROMPT_COMMAND}" "$test_prompt_string"
 
 	run __bp_install_after_session_init
@@ -49,7 +43,6 @@ function local_setup {
 	export PROMPT_COMMAND="$test_prompt_string"
 
 	load ../../vendor/github.com/rcaloras/bash-preexec/bash-preexec.sh
-	assert_success
 
 	run __bp_install
 	assert_success
@@ -63,7 +56,6 @@ function local_setup {
 	export PROMPT_COMMAND="$test_prompt_string"
 
 	load ../../vendor/github.com/rcaloras/bash-preexec/bash-preexec.sh
-	assert_success
 
 	run __bp_install
 	assert_success

diff --git a/test/plugins/base.plugin.bats b/test/plugins/base.plugin.bats
@@ -5,7 +5,7 @@ load ../test_helper_libs
 load ../../plugins/available/base.plugin
 
 @test 'plugins base: ips()' {
-  if [[ $CI ]]; then
+  if [[ -n "${CI:-}" ]]; then
     skip 'ifconfig probably requires sudo on TravisCI'
   fi
 
@@ -38,7 +38,7 @@ load ../../plugins/available/base.plugin
   rm -rf "${BASH_IT_ROOT}/${dir_name}"
 
   mkcd "${dir_name}"
-  assert_success
+
   assert_dir_exist "${BASH_IT_ROOT}/${dir_name}"
   assert_equal "${PWD}" "${BASH_IT_ROOT//\/\///}/${dir_name}"
 }

diff --git a/test/themes/base.theme.bats b/test/themes/base.theme.bats
@@ -22,7 +22,7 @@ load ../../themes/base.theme
   assert_line "function"
 
   run battery_char
-  assert_line -n 0 ""
+  assert_output ""
 }
 
 @test 'themes base: battery_char should exist if battery plugin loaded' {
@@ -51,7 +51,7 @@ load ../../themes/base.theme
 
   run battery_charge
   assert_success
-  assert_line -n 0 ""
+  assert_output ""
 }
 
 @test 'themes base: battery_charge should exist if battery plugin loaded' {

diff --git a/test_lib/bats-assert b/test_lib/bats-assert
diff --git a/test_lib/bats-file b/test_lib/bats-file
+3 −0		.gitignore
+3 −8		.travis.yml
+0 −39		CHANGELOG.md
+179 −189		README.md
+30 −0		load.bash
+10 −9		package.json
+0 −6		script/install-bats.sh
+29 −742		src/assert.bash
+42 −0		src/assert_equal.bash
+78 −0		src/assert_failure.bash
+248 −0		src/assert_line.bash
+42 −0		src/assert_not_equal.bash
+197 −0		src/assert_output.bash
+44 −0		src/assert_success.bash
+42 −0		src/refute.bash
+271 −0		src/refute_line.bash
+199 −0		src/refute_output.bash
+0 −50		test/50-assert-12-assert_equal.bats
+0 −36		test/50-assert-13-assert_success.bats
+0 −69		test/50-assert-14-assert_failure.bats
+0 −267		test/50-assert-15-assert_output.bats
+8 −7		test/assert.bats
+62 −0		test/assert_equal.bats
+75 −0		test/assert_failure.bats
+156 −139		test/assert_line.bats
+57 −0		test/assert_not_equal.bats
+285 −0		test/assert_output.bats
+40 −0		test/assert_success.bats
+7 −7		test/refute.bats
+149 −147		test/refute_line.bats
+98 −90		test/refute_output.bats
+24 −7		test/test_helper.bash
+1 −1		.travis.yml
+1 −1		CHANGELOG.md
+7 −7		README.md
+1 −1		package.json
+2 −2		script/install-bats.sh
+96 −96		src/file.bash
+3 −3		src/temp.bash
+3 −0		test/test_helper.bash