Merge pull request #106 from nhomble/gh-105

relink on upgrade

libexec/basher-_link

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+package="$1"
+
+basher-_link-bins "$package"
+basher-_link-completions "$package"
+basher-_link-man "$package"

libexec/basher-_unlink

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+package="$1"
+
+basher-_unlink-man "$package"
+basher-_unlink-bins "$package"
+basher-_unlink-completions "$package"

libexec/basher-install

@@ -57,6 +57,4 @@ else
   basher-_clone "$use_ssh" "$site" "$package" "$ref"
 fi
 basher-_deps "$package"
-basher-_link-bins "$package"
-basher-_link-man "$package"
-basher-_link-completions "$package"
+basher-_link "$package"

libexec/basher-uninstall

@@ -40,8 +40,6 @@ if [ ! -d "$BASHER_PACKAGES_PATH/$package" ]; then
   exit 1
 fi
 
-basher-_unlink-man "$package"
-basher-_unlink-bins "$package"
-basher-_unlink-completions "$package"
+basher-_unlink "$package"
 
 rm -rf "${BASHER_PACKAGES_PATH}/$package"

libexec/basher-upgrade

@@ -34,4 +34,7 @@ if [ -z "$name" ]; then
 fi
 
 cd "${BASHER_PACKAGES_PATH}/$package"
+
+basher-_unlink "$package"
 git pull
+basher-_link "$package"

tests/basher-upgrade.bats

@@ -31,3 +31,41 @@ load test_helper
   run basher-outdated
   assert_output ""
 }
+
+@test "upgrade includes man page changes" {
+  mock_clone
+  create_package username/package
+  basher-install username/package
+  create_man username/package exec.1
+
+  assert [ ! -d "$BASHER_INSTALL_MAN" ]
+  basher-upgrade username/package
+
+
+  run basher-outdated
+  assert_output ""
+
+  assert [ -d "$BASHER_INSTALL_MAN" ]
+  assert [ -e "$BASHER_INSTALL_MAN/man1/exec.1" ]
+}
+
+@test "upgrade removes old binaries" {
+  mock_clone
+  create_package username/package
+  basher-install username/package
+  create_exec username/package "second"
+
+  basher-upgrade username/package
+
+  run basher-outdated
+  assert_output ""
+
+  assert [ -e "${BASHER_INSTALL_BIN}/second" ]
+
+  remove_exec username/package "second"
+  run basher-outdated
+  assert_output "username/package"
+  basher-upgrade username/package
+
+  assert [ ! -e "${BASHER_INSTALL_BIN}/second" ]
+}

tests/lib/package_helpers.bash

@@ -62,12 +62,22 @@ create_exec() {
   cd "${BASHER_ORIGIN_DIR}/$package"
   mkdir -p bin
   touch bin/$exec
+  chmod +x bin/$exec
 
   git add .
   git commit -m "Add $exec"
   cd ${BASHER_CWD}
 }
 
+remove_exec() {
+  local package="$1"
+  local exec="$2"
+  cd "${BASHER_ORIGIN_DIR}/$package"
+  git rm bin/$exec
+  git commit -a -m "Remove $exec"
+  cd ${BASHER_CWD}
+}
+
 create_root_exec() {
   local package="$1"
   local exec="$2"