From 5f3627b9b7ddbab83e3fdd2c5f3616a69675cc5f Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Fri, 15 Sep 2017 08:10:14 +0200
Subject: [PATCH] Change the enable/disable functions to use the global
 directory

---
 lib/helpers.bash      | 19 +++++++++++++++++++
 test/lib/helpers.bats | 35 ++++++++++++++++++++++++-----------
 2 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/lib/helpers.bash b/lib/helpers.bash
index 184ee700..8fbdaf43 100644
--- a/lib/helpers.bash
+++ b/lib/helpers.bash
@@ -273,6 +273,7 @@ _disable-thing ()
 
     if [ "$file_entity" = "all" ]; then
         typeset f $file_type
+        # Disable everything that's using the old structure
         for f in "${BASH_IT}/$subdirectory/available/"*.bash
         do
             plugin=$(basename $f)
@@ -283,6 +284,18 @@ _disable-thing ()
                 rm "${BASH_IT}/$subdirectory/enabled/"*$BASH_IT_LOAD_PRIORITY_SEPARATOR$(basename $plugin)
             fi
         done
+
+        local suffix=$(echo "$subdirectory" | sed -e 's/plugins/plugin/g')
+
+        # Disable everything in the global "enabled" directory
+        for f in "${BASH_IT}/$subdirectory/available/"*.${suffix}.bash
+        do
+          plugin=$(basename $f)
+
+          if [ -e "${BASH_IT}/enabled/"*$BASH_IT_LOAD_PRIORITY_SEPARATOR$plugin ]; then
+              rm "${BASH_IT}/enabled/"*$BASH_IT_LOAD_PRIORITY_SEPARATOR$(basename $plugin)
+          fi
+        done
     else
         typeset plugin_global=$(command ls $ "${BASH_IT}/enabled/"[0-9]*$BASH_IT_LOAD_PRIORITY_SEPARATOR$file_entity.*bash 2>/dev/null | head -1)
         if [ -z "$plugin_global" ]; then
@@ -380,6 +393,12 @@ _enable-thing ()
           return
         fi
 
+        typeset enabled_plugin=$(command ls "${BASH_IT}/enabled/"[0-9]*$BASH_IT_LOAD_PRIORITY_SEPARATOR$to_enable 2>/dev/null | head -1)
+        if [ ! -z "$enabled_plugin" ] ; then
+          printf '%s\n' "$file_entity is already enabled."
+          return
+        fi
+
         mkdir -p "${BASH_IT}/enabled"
 
         # Load the priority from the file if it present there
diff --git a/test/lib/helpers.bats b/test/lib/helpers.bats
index d9bf1922..7ab57ae7 100644
--- a/test/lib/helpers.bats
+++ b/test/lib/helpers.bats
@@ -11,7 +11,9 @@ load ../../lib/helpers
 function local_setup {
   mkdir -p "$BASH_IT"
   lib_directory="$(cd "$(dirname "$0")" && pwd)"
-  cp -r $lib_directory/../.. "$BASH_IT"
+  # Use rsync to copy Bash-it to the temp folder
+  # rsync is faster than cp, since we can exclude the large ".git" folder
+  rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../.. "$BASH_IT"
 
   rm -rf "$BASH_IT"/enabled
   rm -rf "$BASH_IT"/aliases/enabled
@@ -24,12 +26,6 @@ function local_setup {
   mkdir -p "$BASH_IT"/plugins/enabled
 }
 
-@test "bash-it: enable the ansible aliases through the bash-it function" {
-  run bash-it enable alias "ansible"
-  assert_line "0" 'ansible enabled with priority 150.'
-  assert [ -L "$BASH_IT/enabled/150---ansible.aliases.bash" ]
-}
-
 @test "bash-it: enable the todo.txt-cli aliases through the bash-it function" {
   run bash-it enable alias "todo.txt-cli"
   assert_line "0" 'todo.txt-cli enabled with priority 150.'
@@ -58,6 +54,13 @@ function local_setup {
   run _enable-plugin "node"
   assert_line "0" 'node enabled with priority 250.'
   assert [ -L "$BASH_IT/enabled/250---node.plugin.bash" ]
+
+  # TODO Check for the link target - readlink
+  # target_path=$HOME/Code/slate/.slate.js
+  #
+  # if [ "`readlink $HOME/.slate.js`" -ef "$target_path" ]; then
+  #     rm -rf "$HOME/.slate.js"
+  # fi
 }
 
 @test "bash-it: enable the node plugin through the bash-it function" {
@@ -248,19 +251,29 @@ function local_setup {
 @test "bash-it: enable all plugins" {
   run _enable-plugin "all"
   local available=$(find $BASH_IT/plugins/available -name *.plugin.bash | wc -l | xargs)
-  local enabled=$(find $BASH_IT/plugins/enabled -name [0-9]*.plugin.bash | wc -l | xargs)
+  local enabled=$(find $BASH_IT/enabled -name [0-9]*.plugin.bash | wc -l | xargs)
   assert_equal "$available" "$enabled"
 }
 
 @test "bash-it: disable all plugins" {
   run _enable-plugin "all"
   local available=$(find $BASH_IT/plugins/available -name *.plugin.bash | wc -l | xargs)
-  local enabled=$(find $BASH_IT/plugins/enabled -name [0-9]*.plugin.bash | wc -l | xargs)
+  local enabled=$(find $BASH_IT/enabled -name [0-9]*.plugin.bash | wc -l | xargs)
   assert_equal "$available" "$enabled"
 
+  run _enable-alias "ag"
+  assert [ -L "$BASH_IT/enabled/150---ag.aliases.bash" ]
+
   run _disable-plugin "all"
-  local enabled2=$(find $BASH_IT/plugins/enabled -name *.plugin.bash | wc -l | xargs)
-  assert_equal "$enabled2" "0"
+  local enabled2=$(find $BASH_IT/enabled -name [0-9]*.plugin.bash | wc -l | xargs)
+  assert_equal "0" "$enabled2"
+  assert [ -L "$BASH_IT/enabled/150---ag.aliases.bash" ]
+}
+
+@test "bash-it: enable the ansible aliases through the bash-it function" {
+  run bash-it enable alias "ansible"
+  assert_line "0" 'ansible enabled with priority 150.'
+  assert [ -L "$BASH_IT/enabled/150---ansible.aliases.bash" ]
 }
 
 @test "bash-it: describe the nvm plugin without enabling it" {