Copied command_exists function to the helpers lib so that there is no hidden dependency on the base plugin

The original command_exists function will stay in the base plugin, but will no longer be used by other plugins or themes.

lib/helpers.bash

@@ -5,6 +5,15 @@ BASH_IT_LOAD_PRIORITY_DEFAULT_PLUGIN=${BASH_IT_LOAD_PRIORITY_DEFAULT_PLUGIN:-250
 BASH_IT_LOAD_PRIORITY_DEFAULT_COMPLETION=${BASH_IT_LOAD_PRIORITY_DEFAULT_COMPLETION:-350}
 BASH_IT_LOAD_PRIORITY_SEPARATOR="---"
 
+function _command_exists ()
+{
+  _about 'checks for existence of a command'
+  _param '1: command to check'
+  _example '$ _command_exists ls && echo exists'
+  _group 'lib'
+  type "$1" &> /dev/null ;
+}
+
 # Helper function loading various enable-able files
 function _load_bash_it_files() {
   subdirectory="$1"

plugins/available/battery.plugin.bash

@@ -2,23 +2,23 @@ cite about-plugin
 about-plugin 'display info about your battery charge level'
 
 ac_adapter_connected(){
-  if command_exists upower;
+  if _command_exists upower;
   then
     upower -i $(upower -e | grep BAT) | grep 'state' | grep -q 'charging\|fully-charged'
     return $?
-  elif command_exists acpi;
+  elif _command_exists acpi;
   then
     acpi -a | grep -q "on-line"
     return $?
-  elif command_exists pmset;
+  elif _command_exists pmset;
   then
     pmset -g batt | grep -q 'AC Power'
     return $?
-  elif command_exists ioreg;
+  elif _command_exists ioreg;
   then
     ioreg -n AppleSmartBattery -r | grep -q '"ExternalConnected" = Yes'
     return $?
-  elif command_exists WMIC;
+  elif _command_exists WMIC;
   then
     WMIC Path Win32_Battery Get BatteryStatus /Format:List | grep -q 'BatteryStatus=2'
     return $?
@@ -26,23 +26,23 @@ ac_adapter_connected(){
 }
 
 ac_adapter_disconnected(){
-  if command_exists upower;
+  if _command_exists upower;
   then
     upower -i $(upower -e | grep BAT) | grep 'state' | grep -q 'discharging'
     return $?
-  elif command_exists acpi;
+  elif _command_exists acpi;
   then
     acpi -a | grep -q "off-line"
     return $?
-  elif command_exists pmset;
+  elif _command_exists pmset;
   then
     pmset -g batt | grep -q 'Battery Power'
     return $?
-  elif command_exists ioreg;
+  elif _command_exists ioreg;
   then
     ioreg -n AppleSmartBattery -r | grep -q '"ExternalConnected" = No'
     return $?
-  elif command_exists WMIC;
+  elif _command_exists WMIC;
   then
     WMIC Path Win32_Battery Get BatteryStatus /Format:List | grep -q 'BatteryStatus=1'
     return $?
@@ -53,11 +53,11 @@ battery_percentage(){
   about 'displays battery charge as a percentage of full (100%)'
   group 'battery'
 
-  if command_exists upower;
+  if _command_exists upower;
   then
     local UPOWER_OUTPUT=$(upower --show-info $(upower --enumerate | grep BAT) | grep percentage | tail --bytes 5)
     echo ${UPOWER_OUTPUT: : -1}
-  elif command_exists acpi;
+  elif _command_exists acpi;
   then
     local ACPI_OUTPUT=$(acpi -b)
     case $ACPI_OUTPUT in
@@ -84,7 +84,7 @@ battery_percentage(){
         echo '-1'
       ;;
     esac
-  elif command_exists pmset;
+  elif _command_exists pmset;
   then
     local PMSET_OUTPUT=$(pmset -g ps | sed -n 's/.*[[:blank:]]+*\(.*%\).*/\1/p')
     case $PMSET_OUTPUT in
@@ -95,7 +95,7 @@ battery_percentage(){
         echo $PMSET_OUTPUT | head -c 2
       ;;
     esac
-  elif command_exists ioreg;
+  elif _command_exists ioreg;
   then
     local IOREG_OUTPUT=$(ioreg -n AppleSmartBattery -r | awk '$1~/Capacity/{c[$1]=$3} END{OFMT="%05.2f%%"; max=c["\"MaxCapacity\""]; print (max>0? 100*c["\"CurrentCapacity\""]/max: "?")}')
     case $IOREG_OUTPUT in
@@ -106,7 +106,7 @@ battery_percentage(){
         echo $IOREG_OUTPUT | head -c 2
       ;;
     esac
-  elif command_exists WMIC;
+  elif _command_exists WMIC;
   then
     local WINPC=$(echo porcent=$(WMIC PATH Win32_Battery Get EstimatedChargeRemaining /Format:List) | grep -o '[0-9]*')
     case $WINPC in

test/lib/helpers.bats

@@ -30,6 +30,26 @@ function local_setup {
 # TODO Create global __get_base_name function
 # TODO Create global __get_enabled_name function
 
+@test "helpers: _command_exists function exists" {
+  type -a _command_exists &> /dev/null
+  assert_success
+}
+
+@test "helpers: _command_exists function positive test ls" {
+  run _command_exists ls
+  assert_success
+}
+
+@test "helpers: _command_exists function positive test bash-it" {
+  run _command_exists bash-it
+  assert_success
+}
+
+@test "helpers: _command_exists function negative test" {
+  run _command_exists __addfkds_dfdsjdf
+  assert_failure
+}
+
 @test "helpers: bash-it help aliases ag" {
   run bash-it help aliases "ag"
   assert_line "0" "ag='ag --smart-case --pager=\"less -MIRFX'"

test/themes/base.theme.bats

@@ -2,7 +2,10 @@
 
 load ../test_helper
 load ../../lib/composure
-load ../../plugins/available/base.plugin
+
+cite _about _param _example _group _author _version
+
+load ../../lib/helpers
 load ../../themes/base.theme
 
 @test 'themes base: battery_percentage should not exist' {

themes/atomic/atomic.theme.bash

@@ -164,7 +164,7 @@ ___atomic_prompt_clock() {
 }
 
 ___atomic_prompt_battery() {
-  ! command_exists battery_percentage ||
+  ! _command_exists battery_percentage ||
   [ "${THEME_SHOW_BATTERY}" != "true" ] ||
   [ "$(battery_percentage)" = "no" ] && return
 

themes/base.theme.bash

@@ -474,7 +474,7 @@ function battery_char {
     fi
 }
 
-if ! command_exists battery_charge ; then
+if ! _command_exists battery_charge ; then
     # if user has installed battery plugin, skip this...
     function battery_charge (){
 	# no op
@@ -484,7 +484,7 @@ fi
 
 # The battery_char function depends on the presence of the battery_percentage function.
 # If battery_percentage is not defined, then define battery_char as a no-op.
-if ! command_exists battery_percentage ; then
+if ! _command_exists battery_percentage ; then
     function battery_char (){
 	# no op
 	echo -n

themes/brainy/brainy.theme.bash

@@ -152,7 +152,7 @@ ___brainy_prompt_clock() {
 }
 
 ___brainy_prompt_battery() {
-	! command_exists battery_percentage ||
+	! _command_exists battery_percentage ||
 	[ "${THEME_SHOW_BATTERY}" != "true" ] ||
 	[ "$(battery_percentage)" = "no" ] && return
 

themes/demula/demula.theme.bash

@@ -84,7 +84,7 @@ ${D_BRANCH_COLOR}%b %r ${D_CHANGES_COLOR}%m%u ${D_DEFAULT_COLOR}"
 
 # checks if the plugin is installed before calling battery_charge
 safe_battery_charge() {
-  if command_exists battery_charge ;
+  if _command_exists battery_charge ;
   then
     battery_charge
   fi

themes/powerline/powerline.base.bash

@@ -43,9 +43,9 @@ function __powerline_user_info_prompt {
 function __powerline_ruby_prompt {
   local ruby_version=""
 
-  if command_exists rvm; then
+  if _command_exists rvm; then
     ruby_version="$(rvm_version_prompt)"
-  elif command_exists rbenv; then
+  elif _command_exists rbenv; then
     ruby_version=$(rbenv_version_prompt)
   fi
 

themes/rana/rana.theme.bash

@@ -117,7 +117,7 @@ ${D_BRANCH_COLOR}%b %r ${D_CHANGES_COLOR}%m%u ${D_DEFAULT_COLOR}"
 
 # checks if the plugin is installed before calling battery_charge
 safe_battery_charge() {
-  if command_exists battery_charge ;
+  if _command_exists battery_charge ;
   then
     battery_charge
   fi