flo/scm_breeze
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into tobbe-uinstall-darwin

Browse Source
This commit is contained in:
Will Owens
2024-02-27 06:21:36 -05:00
committed by GitHub
parent 821097eec9 bb7fdaac15
commit 0cf557c7ba
9 changed files with 228 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
.github/workflows/test.yml vendored Normal file
View File

@@ -0,0 +1,40 @@
name: Test
on:
push:
branches:
- master
pull_request:
branches:
- master
jobs:
test:
strategy:
matrix:
os:
- ubuntu-latest
- macos-latest
test_shell:
- bash
- zsh
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v25
with:
github_access_token: ${{ secrets.GITHUB_TOKEN }}
nix_path: nixpkgs=channel:nixos-unstable
- run: |
git config --global init.defaultBranch master
git config --global user.name scm_breeze@scm_breeze
git config --global user.email "SCM Breeze"
- name: test
env:
TEST_SHELLS: ${{ matrix.test_shell }}
run: nix-shell -p ruby $TEST_SHELLS --command ./run_tests.sh
# - run: nix-shell -p shunit2 -i ./run_tests.sh
# - run: nix build
# - run: nix flake check

18
.travis.yml
View File

@@ -1,18 +0,0 @@
os:
- linux
- osx
env:
- TEST_SHELLS=bash
- TEST_SHELLS=zsh
sudo: required
install:
- ./test/support/travisci_deps.sh
before_script:
- echo -e "test_repo_11\ntest_repo_1" | sort
script:
- ./run_tests.sh

2
git.scmbrc.example
View File

@@ -126,6 +126,6 @@ git_add_and_amend_commit_keys="\C-xz" # CTRL+x, z
# Expand numbered args for common shell commands # Expand numbered args for common shell commands
shell_command_wrapping_enabled="true" shell_command_wrapping_enabled="true"
# Here you can tweak the list of wrapped commands. # Here you can tweak the list of wrapped commands.
scmb_wrapped_shell_commands="vim emacs gedit cat rm cp mv ln cd ls less subl code" scmb_wrapped_shell_commands=(vim emacs gedit cat rm cp mv ln cd ls less subl code)
# Add numbered shortcuts to output of ls -l, just like 'git status' # Add numbered shortcuts to output of ls -l, just like 'git status'
shell_ls_aliases_enabled="true" shell_ls_aliases_enabled="true"

11
lib/git/aliases.sh
View File

@@ -117,11 +117,12 @@ if [ "$git_setup_aliases" = "yes" ]; then
__git_alias "$git_restore_alias" 'git' 'restore' __git_alias "$git_restore_alias" 'git' 'restore'
# Custom default format for git log # Custom default format for git log
git_log_command="log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit" git_log_command=('log' '--graph' "--pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'"
__git_alias "$git_log_alias" 'git' "$git_log_command" '--abbrev-commit')
__git_alias "$git_log_alias" 'git' "${git_log_command[@]}"
# Same as the above, but displays all the branches and remotes # Same as the above, but displays all the branches and remotes
__git_alias "$git_log_all_alias" 'git' "$git_log_command" '--branches' '--remotes' __git_alias "$git_log_all_alias" 'git' "${git_log_command[@]}" '--branches' '--remotes'
# Standard commands # Standard commands
__git_alias "$git_clone_alias" 'git' 'clone' __git_alias "$git_clone_alias" 'git' 'clone'
@@ -172,8 +173,8 @@ if [ "$git_setup_aliases" = "yes" ]; then
_alias "$git_log_graph_alias" 'git log --graph --max-count=5' _alias "$git_log_graph_alias" 'git log --graph --max-count=5'
_alias "$git_add_all_alias" 'git add --all .' _alias "$git_add_all_alias" 'git add --all .'
# Hub aliases (https://github.com/github/hub) # GitHub CLI aliases (https://github.com/cli/cli)
_alias "$git_pull_request_alias" 'git pull-request' _alias "$git_pull_request_alias" 'gh pr'
fi fi

71
lib/git/shell_shortcuts.sh
View File

@@ -4,7 +4,6 @@
# Released under the LGPL (GNU Lesser General Public License) # Released under the LGPL (GNU Lesser General Public License)
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
if sed -E 's///g' </dev/null &>/dev/null; then if sed -E 's///g' </dev/null &>/dev/null; then
SED_REGEX_ARG="E" SED_REGEX_ARG="E"
elif sed -r 's///g' </dev/null &>/dev/null; then elif sed -r 's///g' </dev/null &>/dev/null; then
@@ -13,7 +12,6 @@ else
echo "Cannot determine extended regex argument for sed! (Doesn't respond to either -E or -r)" echo "Cannot determine extended regex argument for sed! (Doesn't respond to either -E or -r)"
fi fi
# Wrap common commands with numeric argument expansion. # Wrap common commands with numeric argument expansion.
# Prepends everything with exec_scmb_expand_args, # Prepends everything with exec_scmb_expand_args,
# even if commands are already aliases or functions # even if commands are already aliases or functions
@@ -21,14 +19,14 @@ if [ "$shell_command_wrapping_enabled" = "true" ] || [ "$bash_command_wrapping_e
# Do it in a function so we don't bleed variables # Do it in a function so we don't bleed variables
function _git_wrap_commands() { function _git_wrap_commands() {
# Define 'whence' for bash, to get the value of an alias # Define 'whence' for bash, to get the value of an alias
type whence > /dev/null 2>&1 || function whence() { LC_MESSAGES="C" type "$@" | sed -$SED_REGEX_ARG -e "s/.*is aliased to \`//" -e "s/'$//"; } type whence >/dev/null 2>&1 || function whence() { LC_MESSAGES="C" type "$@" | sed -$SED_REGEX_ARG -e "s/.*is aliased to \`//" -e "s/'$//"; }
local cmd='' local cmd=''
for cmd in $scmb_wrapped_shell_commands; do for cmd in "${scmb_wrapped_shell_commands[@]}"; do
if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: Wrapping $cmd..."; fi if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: Wrapping $cmd..."; fi
# Special check for 'cd', to make sure SCM Breeze is loaded after RVM # Special check for 'cd', to make sure SCM Breeze is loaded after RVM
if [ "$cmd" = 'cd' ]; then if [ "$cmd" = 'cd' ]; then
if [ -e "$HOME/.rvm" ] && ! type rvm > /dev/null 2>&1; then if [ -e "$HOME/.rvm" ] && ! type rvm >/dev/null 2>&1; then
echo -e "\\033[0;31mSCM Breeze must be loaded \\033[1;31mafter\\033[0;31m RVM, otherwise there will be a conflict when RVM wraps the 'cd' command.\\033[0m" echo -e "\\033[0;31mSCM Breeze must be loaded \\033[1;31mafter\\033[0;31m RVM, otherwise there will be a conflict when RVM wraps the 'cd' command.\\033[0m"
echo -e "\\033[0;31mPlease move the line that loads SCM Breeze to the bottom of your ~/.bashrc\\033[0m" echo -e "\\033[0;31mPlease move the line that loads SCM Breeze to the bottom of your ~/.bashrc\\033[0m"
continue continue
@@ -39,12 +37,14 @@ if [ "$shell_command_wrapping_enabled" = "true" ] || [ "$bash_command_wrapping_e
# Don't do anything if command already aliased, or not found. # Don't do anything if command already aliased, or not found.
*'exec_scmb_expand_args'*) *'exec_scmb_expand_args'*)
if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: $cmd is already wrapped"; fi;; if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: $cmd is already wrapped"; fi
;;
*'not found'*) *'not found'*)
if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: $cmd not found!"; fi;; if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: $cmd not found!"; fi
;;
*'aliased to'*|*'is an alias for'*) *'aliased to'* | *'is an alias for'*)
if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: $cmd is an alias"; fi if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: $cmd is an alias"; fi
# Store original alias # Store original alias
local original_alias="$(whence $cmd)" local original_alias="$(whence $cmd)"
@@ -53,16 +53,17 @@ if [ "$shell_command_wrapping_enabled" = "true" ] || [ "$bash_command_wrapping_e
# Detect original $cmd type, and escape # Detect original $cmd type, and escape
case "$(LC_MESSAGES="C" type "$cmd" 2>&1)" in case "$(LC_MESSAGES="C" type "$cmd" 2>&1)" in
# Escape shell builtins with 'builtin' # Escape shell builtins with 'builtin'
*'is a shell builtin'*) local escaped_cmd="builtin $cmd";; *'is a shell builtin'*) local escaped_cmd="builtin $cmd" ;;
# Get full path for files with 'find_binary' function # Get full path for files with 'find_binary' function
*) local escaped_cmd="$(find_binary $cmd)";; *) local escaped_cmd="$(find_binary $cmd)" ;;
esac esac
# Expand original command into full path, to avoid infinite loops # Expand original command into full path, to avoid infinite loops
local expanded_alias="$(echo $original_alias | sed -$SED_REGEX_ARG "s%(^| )$cmd($| )%\\1$escaped_cmd\\2%")" local expanded_alias="$(echo $original_alias | sed -$SED_REGEX_ARG "s%(^| )$cmd($| )%\\1$escaped_cmd\\2%")"
# Wrap previous alias with escaped command # Wrap previous alias with escaped command
alias $cmd="exec_scmb_expand_args $expanded_alias";; alias $cmd="exec_scmb_expand_args $expanded_alias"
;;
*'is a'*'function'*) *'is a'*'function'*)
if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: $cmd is a function"; fi if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: $cmd is a function"; fi
@@ -71,30 +72,32 @@ if [ "$shell_command_wrapping_enabled" = "true" ] || [ "$bash_command_wrapping_e
# Remove function # Remove function
unset -f "$cmd" unset -f "$cmd"
# Create function that wraps old function # Create function that wraps old function
eval "${cmd}(){ exec_scmb_expand_args __original_${cmd} \"\$@\"; }";; eval "${cmd}(){ exec_scmb_expand_args __original_${cmd} \"\$@\"; }"
;;
*'is a shell builtin'*) *'is a shell builtin'*)
if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: $cmd is a shell builtin"; fi if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: $cmd is a shell builtin"; fi
# Handle shell builtin commands # Handle shell builtin commands
alias $cmd="exec_scmb_expand_args builtin $cmd";; alias $cmd="exec_scmb_expand_args builtin $cmd"
;;
*) *)
if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: $cmd is an executable file"; fi if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: $cmd is an executable file"; fi
# Otherwise, command is a regular script or binary, # Otherwise, command is a regular script or binary,
# and the full path can be found with 'find_binary' function # and the full path can be found with 'find_binary' function
alias $cmd="exec_scmb_expand_args '$(find_binary $cmd)'";; alias $cmd="exec_scmb_expand_args '$(find_binary $cmd)'"
;;
esac esac
done done
# Clean up # Clean up
declare -f whence > /dev/null && unset -f whence declare -f whence >/dev/null && unset -f whence
} }
_git_wrap_commands _git_wrap_commands
fi fi
# Function wrapper around 'll' # Function wrapper around 'll'
# Adds numbered shortcuts to output of ls -l, just like 'git status' # Adds numbered shortcuts to output of ls -l, just like 'git status'
if [ "$shell_ls_aliases_enabled" = "true" ] && builtin command -v ruby > /dev/null 2>&1; then if [ "$shell_ls_aliases_enabled" = "true" ] && builtin command -v ruby >/dev/null 2>&1; then
# BSD ls is different to Linux (GNU) ls # BSD ls is different to Linux (GNU) ls
# Test for BSD ls # Test for BSD ls
if ! (ls --version 2>/dev/null || echo "BSD") | grep GNU >/dev/null 2>&1; then if ! (ls --version 2>/dev/null || echo "BSD") | grep GNU >/dev/null 2>&1; then
@@ -103,18 +106,19 @@ if [ "$shell_ls_aliases_enabled" = "true" ] && builtin command -v ruby > /dev/nu
fi fi
# Test if readlink supports -f option, test for greadlink on Mac, then fallback to perl # Test if readlink supports -f option, test for greadlink on Mac, then fallback to perl
if \readlink -f / > /dev/null 2>&1; then if \readlink -f / >/dev/null 2>&1; then
_abs_path_command=(readlink -f) _abs_path_command=(readlink -f)
elif greadlink -f / > /dev/null 2>&1; then elif greadlink -f / >/dev/null 2>&1; then
_abs_path_command=(greadlink -f) _abs_path_command=(greadlink -f)
else else
_abs_path_command=(perl -e 'use Cwd abs_path; print abs_path(shift)') _abs_path_command=(perl -e 'use Cwd abs_path; print abs_path(shift)')
fi fi
unalias ll > /dev/null 2>&1; unset -f ll > /dev/null 2>&1 unalias ll >/dev/null 2>&1
unset -f ll >/dev/null 2>&1
function ls_with_file_shortcuts { function ls_with_file_shortcuts {
local ll_output local ll_output
local ll_command # Ensure sort ordering of the two invocations is the same local ll_command # Ensure sort ordering of the two invocations is the same
if [ "$_ls_bsd" != "BSD" ]; then if [ "$_ls_bsd" != "BSD" ]; then
ll_command=(\ls -hv --group-directories-first) ll_command=(\ls -hv --group-directories-first)
ll_output="$("${ll_command[@]}" -l --color "$@")" ll_output="$("${ll_command[@]}" -l --color "$@")"
@@ -139,11 +143,11 @@ if [ "$shell_ls_aliases_enabled" = "true" ] && builtin command -v ruby > /dev/nu
if [[ -z $rel_path ]]; then # We are seeing our first pathname if [[ -z $rel_path ]]; then # We are seeing our first pathname
if [[ -d $arg ]]; then # It's a directory if [[ -d $arg ]]; then # It's a directory
rel_path=$arg rel_path=$arg
else # It's a file, expand the current directory else # It's a file, expand the current directory
rel_path=. rel_path=.
fi fi
elif [[ -d $arg || ( -f $arg && $rel_path != . ) ]]; then elif [[ -d $arg || (-f $arg && $rel_path != .) ]]; then
if [[ -f $arg ]]; then arg=$PWD; fi # Get directory for current argument if [[ -f $arg ]]; then arg=$PWD; fi # Get directory for current argument
# We've already seen a different directory. Quit to avoid damage (issue #274) # We've already seen a different directory. Quit to avoid damage (issue #274)
printf 'scm_breeze: Cannot list relative to both directories:\n %s\n %s\n' "$arg" "$rel_path" >&2 printf 'scm_breeze: Cannot list relative to both directories:\n %s\n %s\n' "$arg" "$rel_path" >&2
printf 'Currently only listing a single directory is supported. See issue #274.\n' >&2 printf 'Currently only listing a single directory is supported. See issue #274.\n' >&2
@@ -159,7 +163,7 @@ if [ "$shell_ls_aliases_enabled" = "true" ] && builtin command -v ruby > /dev/nu
if [ -e "$HOME"/.user_sym ]; then if [ -e "$HOME"/.user_sym ]; then
# Little bit of ruby golf to rejustify the user/group/size columns after replacement # Little bit of ruby golf to rejustify the user/group/size columns after replacement
# TODO(ghthor): Convert this to a cat <<EOF to improve readibility # TODO(ghthor): Convert this to a cat <<EOF to improve readibility
function rejustify_ls_columns(){ function rejustify_ls_columns() {
ruby -e "o=STDIN.read;re=/^(([^ ]* +){2})(([^ ]* +){3})/;\ ruby -e "o=STDIN.read;re=/^(([^ ]* +){2})(([^ ]* +){3})/;\
u,g,s=o.lines.map{|l|l[re,3]}.compact.map(&:split).transpose.map{|a|a.map(&:size).max+1};\ u,g,s=o.lines.map{|l|l[re,3]}.compact.map(&:split).transpose.map{|a|a.map(&:size).max+1};\
puts o.lines.map{|l|l.sub(re){|m|\"%s%-#{u}s %-#{g}s%#{s}s \"%[\$1,*\$3.split]}}" puts o.lines.map{|l|l.sub(re){|m|\"%s%-#{u}s %-#{g}s%#{s}s \"%[\$1,*\$3.split]}}"
@@ -168,12 +172,12 @@ if [ "$shell_ls_aliases_enabled" = "true" ] && builtin command -v ruby > /dev/nu
local USER_SYM=$(/bin/cat $HOME/.user_sym) local USER_SYM=$(/bin/cat $HOME/.user_sym)
if [ -f "$HOME/.staff_sym" ]; then if [ -f "$HOME/.staff_sym" ]; then
local STAFF_SYM=$(/bin/cat $HOME/.staff_sym) local STAFF_SYM=$(/bin/cat $HOME/.staff_sym)
ll_output=$(echo "$ll_output" | \ ll_output=$(echo "$ll_output" |
\sed -$SED_REGEX_ARG "s/ $USER staff/ $USER_SYM $STAFF_SYM /g" | \ \sed -$SED_REGEX_ARG "s/ $USER staff/ $USER_SYM $STAFF_SYM /g" |
rejustify_ls_columns) rejustify_ls_columns)
else else
ll_output=$(echo "$ll_output" | \ ll_output=$(echo "$ll_output" |
\sed -$SED_REGEX_ARG "s/ $USER/ $USER_SYM /g" | \ \sed -$SED_REGEX_ARG "s/ $USER/ $USER_SYM /g" |
rejustify_ls_columns) rejustify_ls_columns)
fi fi
fi fi
@@ -186,7 +190,8 @@ if [ "$shell_ls_aliases_enabled" = "true" ] && builtin command -v ruby > /dev/nu
fi fi
# Use ruby to inject numbers into ls output # Use ruby to inject numbers into ls output
echo "$ll_output" | ruby -e "$( \cat <<EOF echo "$ll_output" | ruby -e "$(
\cat <<EOF
output = STDIN.read output = STDIN.read
e = 1 e = 1
re = /^(([^ ]* +){8})/ re = /^(([^ ]* +){8})/
@@ -196,7 +201,7 @@ output.lines.each do |line|
e += 1 e += 1
end end
EOF EOF
)" )"
# Set numbered file shortcut in variable # Set numbered file shortcut in variable
local e=1 local e=1

5
run_tests.sh
View File

@@ -3,6 +3,8 @@
failed=false failed=false
env | grep ^SHELL
# allow list of shells to run tests in to be overriden by environment variable # allow list of shells to run tests in to be overriden by environment variable
# if empty or null, use defaults # if empty or null, use defaults
if [ -z "$TEST_SHELLS" ]; then if [ -z "$TEST_SHELLS" ]; then
@@ -10,11 +12,12 @@ if [ -z "$TEST_SHELLS" ]; then
fi fi
echo "== Will run all tests with following shells: ${TEST_SHELLS}" echo "== Will run all tests with following shells: ${TEST_SHELLS}"
cd -P -- "${0%/*}" # Change to directory this script lives in cd -P -- "${0%/*}" # Change to directory this script lives in
for test in $(find test/lib -name *_test.sh); do for test in $(find test/lib -name *_test.sh); do
for shell in $TEST_SHELLS; do for shell in $TEST_SHELLS; do
echo "== Running tests with [$shell]: $test" echo "== Running tests with [$shell]: $test"
$shell $test || failed=true $shell $test || failed=true
printf '==\n\n'
done done
done done

53
test/lib/git/shell_shortcuts_test.sh
View File

@@ -7,11 +7,13 @@
# #
# Unit tests for shell command wrapping # Unit tests for shell command wrapping
export scmbDir="$( cd -P "$( dirname "$0" )" && pwd )/../../.." export scmbDir="$(cd -P "$(dirname "$0")" && pwd)/../../.."
# Zsh compatibility # Zsh compatibility
if [ -n "${ZSH_VERSION:-}" ]; then if [ -n "${ZSH_VERSION:-}" ]; then
shell="zsh"; SHUNIT_PARENT=$0; setopt shwordsplit shell="zsh"
SHUNIT_PARENT=$0
setopt shwordsplit
else else
# Bash needs this option so that 'alias' works in a non-interactive shell # Bash needs this option so that 'alias' works in a non-interactive shell
shopt -s expand_aliases shopt -s expand_aliases
@@ -25,7 +27,7 @@ source "$scmbDir/lib/scm_breeze.sh"
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
oneTimeSetUp() { oneTimeSetUp() {
export shell_command_wrapping_enabled="true" export shell_command_wrapping_enabled="true"
export scmb_wrapped_shell_commands="not_found cat rm cp mv ln cd sed" export scmb_wrapped_shell_commands=("not_found" "cat" "rm" "cp" "mv" "ln" "cd" "sed")
export shell_ls_aliases_enabled="true" export shell_ls_aliases_enabled="true"
alias rvm="test" # Ensure tests run if RVM isn't loaded but $HOME/.rvm is present alias rvm="test" # Ensure tests run if RVM isn't loaded but $HOME/.rvm is present
@@ -47,42 +49,47 @@ oneTimeSetUp() {
# Test already wrapped commands # Test already wrapped commands
alias cat="exec_scmb_expand_args $cat_path" alias cat="exec_scmb_expand_args $cat_path"
root_test_dir=/aaa
if [ "$(uname)" = "Darwin" ]; then
root_test_dir=/Applications
else
sudo mkdir $root_test_dir
fi
# Run shortcut wrapping # Run shortcut wrapping
source "$scmbDir/lib/git/shell_shortcuts.sh" source "$scmbDir/lib/git/shell_shortcuts.sh"
# Define 'whence' function for Bash. # Define 'whence' function for Bash.
# Must come after sourcing shell_shortcuts # Must come after sourcing shell_shortcuts
type whence > /dev/null 2>&1 || function whence() { type "$@" | sed -e "s/.*is aliased to \`//" -e "s/'$//"; } type whence >/dev/null 2>&1 || function whence() { type "$@" | sed -e "s/.*is aliased to \`//" -e "s/'$//"; }
} }
# Helper function to test that alias is defined properly. # Helper function to test that alias is defined properly.
# (Works for both zsh and bash) # (Works for both zsh and bash)
assertAliasEquals(){ assertAliasEquals() {
assertEquals "$1" "$(whence $2)" assertEquals "$1" "$(whence $2)"
} }
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Setup and tear down # Setup and tear down
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
setUp() { setUp() {
unset QUOTING_STYLE # Use default quoting style for ls unset QUOTING_STYLE # Use default quoting style for ls
} }
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Unit tests # Unit tests
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
test_shell_command_wrapping() { test_shell_command_wrapping() {
assertAliasEquals "exec_scmb_expand_args nocorrect $mv_path" "mv" assertAliasEquals "exec_scmb_expand_args nocorrect $mv_path" "mv"
assertAliasEquals "exec_scmb_expand_args $rm_path --option" "rm" assertAliasEquals "exec_scmb_expand_args $rm_path --option" "rm"
assertAliasEquals "exec_scmb_expand_args $sed_path" "sed" assertAliasEquals "exec_scmb_expand_args $sed_path" "sed"
assertAliasEquals "exec_scmb_expand_args $cat_path" "cat" assertAliasEquals "exec_scmb_expand_args $cat_path" "cat"
assertAliasEquals "exec_scmb_expand_args builtin cd" "cd" assertAliasEquals "exec_scmb_expand_args builtin cd" "cd"
assertIncludes "$(declare -f ln)" "ln ()" assertIncludes "$(declare -f ln)" "ln ()"
assertIncludes "$(declare -f ln)" "exec_scmb_expand_args __original_ln" assertIncludes "$(declare -f ln)" "exec_scmb_expand_args __original_ln"
} }
test_ls_with_file_shortcuts() { test_ls_with_file_shortcuts() {
@@ -105,7 +112,7 @@ test_ls_with_file_shortcuts() {
# Run command in shell, load output from temp file into variable # Run command in shell, load output from temp file into variable
# (This is needed so that env variables are exported in the current shell) # (This is needed so that env variables are exported in the current shell)
temp_file=$(mktemp -t scm_breeze.XXXXXXXXXX) temp_file=$(mktemp -t scm_breeze.XXXXXXXXXX)
ls_with_file_shortcuts > "$temp_file" ls_with_file_shortcuts >"$temp_file"
ls_output=$(<"$temp_file" strip_colors) ls_output=$(<"$temp_file" strip_colors)
# Compare as fixed strings (F), instead of normal grep behavior # Compare as fixed strings (F), instead of normal grep behavior
@@ -116,14 +123,14 @@ test_ls_with_file_shortcuts() {
assertIncludes "$ls_output" '[5] test_file' F assertIncludes "$ls_output" '[5] test_file' F
# Test filenames with single or double quotes escaped # Test filenames with single or double quotes escaped
assertEquals "$TEST_DIR/"'a "b"' "$e1" assertEquals "$TEST_DIR/"'a "b"' "$e1"
assertEquals "$TEST_DIR/a 'b'" "$e2" assertEquals "$TEST_DIR/a 'b'" "$e2"
assertEquals "$TEST_DIR/a [b]" "$e3" assertEquals "$TEST_DIR/a [b]" "$e3"
assertEquals "$TEST_DIR/test file" "$e4" assertEquals "$TEST_DIR/test file" "$e4"
assertEquals "$TEST_DIR/test_file" "$e5" assertEquals "$TEST_DIR/test_file" "$e5"
# Test ls with subdirectory # Test ls with subdirectory
ls_with_file_shortcuts 'a "b"' > $temp_file ls_with_file_shortcuts 'a "b"' >$temp_file
ls_output=$(<$temp_file strip_colors) ls_output=$(<$temp_file strip_colors)
assertIncludes "$ls_output" '[1] c' F assertIncludes "$ls_output" '[1] c' F
# Test that env variable is set correctly # Test that env variable is set correctly
@@ -141,10 +148,16 @@ test_ls_with_file_shortcuts() {
assertFalse 'Fails on <directory> <directory>/<file>' 'ls_with_file_shortcuts 1 1/file' assertFalse 'Fails on <directory> <directory>/<file>' 'ls_with_file_shortcuts 1 1/file'
# Files under the root directory # Files under the root directory
assertTrue 'Shortcuts under /' 'ls_with_file_shortcuts / > /dev/null && [[ $e1 =~ ^/[^/]+$ ]]' assertTrue 'Shortcuts under /' 'ls_with_file_shortcuts / >/dev/null && [[ $e1 =~ ^/[^/]+$ ]]'
ls_with_file_shortcuts / >/dev/null
assertTrue "$e1 == $root_test_dir" '[[ "$e1" == "$root_test_dir" ]]'
cd - cd -
rm -r "$TEST_DIR" "$temp_file" rm -r "$TEST_DIR" "$temp_file"
if [ "$(uname)" != "Darwin" ]; then
sudo rmdir "$root_test_dir"
fi
} }
# load and run shUnit2 # load and run shUnit2

182
test/lib/git/status_shortcuts_test.sh
View File

@@ -7,10 +7,15 @@
# #
# Unit tests for git shell scripts # Unit tests for git shell scripts
export scmbDir="$( cd -P "$( dirname "$0" )" && pwd )/../../.." export scmbDir="$(cd -P "$(dirname "$0")" && pwd)/../../.."
# Zsh compatibility # Zsh compatibility
if [ -n "${ZSH_VERSION:-}" ]; then shell="zsh"; SHUNIT_PARENT=$0; setopt shwordsplit; fi if [ -n "${ZSH_VERSION:-}" ]; then
shell="zsh"
SHUNIT_PARENT=$0
setopt shwordsplit
setopt append_history
fi
# Load test helpers # Load test helpers
source "$scmbDir/test/support/test_helper.sh" source "$scmbDir/test/support/test_helper.sh"
@@ -19,7 +24,6 @@ source "$scmbDir/test/support/test_helper.sh"
source "$scmbDir/lib/scm_breeze.sh" source "$scmbDir/lib/scm_breeze.sh"
source "$scmbDir/lib/git/status_shortcuts.sh" source "$scmbDir/lib/git/status_shortcuts.sh"
# Setup and tear down # Setup and tear down
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
oneTimeSetUp() { oneTimeSetUp() {
@@ -40,10 +44,9 @@ setupTestRepo() {
rm -rf "${testRepo}" rm -rf "${testRepo}"
mkdir -p "$testRepo" mkdir -p "$testRepo"
cd "$testRepo" cd "$testRepo"
git init > /dev/null git init >/dev/null
} }
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Unit tests # Unit tests
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
@@ -52,19 +55,37 @@ test_scmb_expand_args() {
local e1="one" e2="two" e3="three" e4="four" e5="five" e6="six" e7='$dollar' e8='two words' local e1="one" e2="two" e3="three" e4="four" e5="five" e6="six" e7='$dollar' e8='two words'
local error="Args not expanded correctly" local error="Args not expanded correctly"
assertEquals "$error" 'one three six' \ assertEquals "$error" 'one three six' \
"$(eval args="$(scmb_expand_args 1 3 6)"; token_quote "${args[@]}")" "$(
eval args="$(scmb_expand_args 1 3 6)"
token_quote "${args[@]}"
)"
assertEquals "$error" 'one two three five' \ assertEquals "$error" 'one two three five' \
"$(eval args="$(scmb_expand_args 1-3 5)"; token_quote "${args[@]}")" "$(
eval args="$(scmb_expand_args 1-3 5)"
token_quote "${args[@]}"
)"
assertEquals "$error" '\$dollar two three four one' \ assertEquals "$error" '\$dollar two three four one' \
"$(eval args="$(scmb_expand_args 7 2-4 1)"; token_quote "${args[@]}")" "$(
eval args="$(scmb_expand_args 7 2-4 1)"
token_quote "${args[@]}"
)"
# Test that any args with spaces remain quoted # Test that any args with spaces remain quoted
assertEquals "$error" '-m Test\ Commit\ Message one' \ assertEquals "$error" '-m Test\ Commit\ Message one' \
"$(eval args="$(scmb_expand_args -m "Test Commit Message" 1)"; token_quote "${args[@]}")" "$(
assertEquals "$error" '-ma Test\ Commit\ Message Unquoted'\ eval args="$(scmb_expand_args -m "Test Commit Message" 1)"
"$(eval args="$(scmb_expand_args -ma "Test Commit Message" "Unquoted")"; token_quote "${args[@]}")" token_quote "${args[@]}"
)"
assertEquals "$error" '-ma Test\ Commit\ Message Unquoted' \
"$(
eval args="$(scmb_expand_args -ma "Test Commit Message" "Unquoted")"
token_quote "${args[@]}"
)"
assertEquals "$error" '\$dollar one two\ words' \ assertEquals "$error" '\$dollar one two\ words' \
"$(eval args="$(scmb_expand_args 7 1-1 8)"; token_quote "${args[@]}")" "$(
eval args="$(scmb_expand_args 7 1-1 8)"
token_quote "${args[@]}"
)"
# Keep this code for use when minimum versions of {ba,z}sh can be increased. # Keep this code for use when minimum versions of {ba,z}sh can be increased.
# See token_quote() source and https://github.com/scmbreeze/scm_breeze/issues/260 # See token_quote() source and https://github.com/scmbreeze/scm_breeze/issues/260
@@ -89,14 +110,23 @@ test_scmb_expand_args() {
test_exec_scmb_expand_args() { test_exec_scmb_expand_args() {
local e1="one" e2="a b c" e3='$dollar' e4="single'quote" e5='double"quote' e6='a(){:;};a&' local e1="one" e2="a b c" e3='$dollar' e4="single'quote" e5='double"quote' e6='a(){:;};a&'
assertEquals "literals with spaces not preserved" 'foo bar\ baz' \ assertEquals "literals with spaces not preserved" 'foo bar\ baz' \
"$(eval args="$(scmb_expand_args foo 'bar baz')"; token_quote "${args[@]}")" "$(
eval args="$(scmb_expand_args foo 'bar baz')"
token_quote "${args[@]}"
)"
assertEquals "variables with spaces not preserved" 'one a\ b\ c' \ assertEquals "variables with spaces not preserved" 'one a\ b\ c' \
"$(eval args="$(scmb_expand_args 1-2)"; token_quote "${args[@]}")" "$(
eval args="$(scmb_expand_args 1-2)"
token_quote "${args[@]}"
)"
# Expecting text: '$dollar' "single'quote" 'double"quote' # Expecting text: '$dollar' "single'quote" 'double"quote'
# Generate quoted expected string with: token_quote "$(cat)" then copy/paste, ^D # Generate quoted expected string with: token_quote "$(cat)" then copy/paste, ^D
assertEquals "special characters are preserved" \ assertEquals "special characters are preserved" \
'\$dollar single\'\''quote double\"quote a\(\)\{:\;\}\;a\&' \ '\$dollar single\'\''quote double\"quote a\(\)\{:\;\}\;a\&' \
"$(eval args="$(scmb_expand_args 3-6)"; token_quote "${args[@]}")" "$(
eval args="$(scmb_expand_args 3-6)"
token_quote "${args[@]}"
)"
# Keep this code for use when minimum versions of {ba,z}sh can be increased. # Keep this code for use when minimum versions of {ba,z}sh can be increased.
# See token_quote() source and https://github.com/scmbreeze/scm_breeze/issues/260 # See token_quote() source and https://github.com/scmbreeze/scm_breeze/issues/260
@@ -113,8 +143,8 @@ test_exec_scmb_expand_args() {
} }
test_command_wrapping_escapes_special_characters() { test_command_wrapping_escapes_special_characters() {
assertEquals 'should escape | the pipe' "$(exec_scmb_expand_args echo should escape '|' the pipe)" assertEquals 'should escape | the pipe' "$(exec_scmb_expand_args echo should escape '|' the pipe)"
assertEquals 'should escape ; the semicolon' "$(exec_scmb_expand_args echo should escape ';' the semicolon)" assertEquals 'should escape ; the semicolon' "$(exec_scmb_expand_args echo should escape ';' the semicolon)"
} }
test_git_status_shortcuts() { test_git_status_shortcuts() {
@@ -129,7 +159,7 @@ test_git_status_shortcuts() {
touch new_file touch new_file
touch untracked_file touch untracked_file
git add new_file git add new_file
echo "changed" > new_file echo "changed" >new_file
rm deleted_file rm deleted_file
verboseGitCommands verboseGitCommands
@@ -153,19 +183,19 @@ test_git_status_shortcuts() {
# Run command in shell, load output from temp file into variable # Run command in shell, load output from temp file into variable
# (This is needed so that env variables are exported in the current shell) # (This is needed so that env variables are exported in the current shell)
temp_file=$(mktemp -t scm_breeze.XXXXXXXXXX) temp_file=$(mktemp -t scm_breeze.XXXXXXXXXX)
git_status_shortcuts > $temp_file git_status_shortcuts >$temp_file
git_status=$(<$temp_file strip_colors) git_status=$(<$temp_file strip_colors)
assertIncludes "$git_status" "new file: *\[1\] *new_file" || return assertIncludes "$git_status" "new file: *\[1\] *new_file" || return
assertIncludes "$git_status" "deleted: *\[2\] *deleted_file" || return assertIncludes "$git_status" "deleted: *\[2\] *deleted_file" || return
assertIncludes "$git_status" "modified: *\[3\] *new_file" || return assertIncludes "$git_status" "modified: *\[3\] *new_file" || return
assertIncludes "$git_status" "untracked: *\[4\] *untracked_file" || return assertIncludes "$git_status" "untracked: *\[4\] *untracked_file" || return
# Test that shortcut env variables are set with full path # Test that shortcut env variables are set with full path
local error="Env variable was not set" local error="Env variable was not set"
assertEquals "$error" "$testRepo/new_file" "$e1" || return assertEquals "$error" "$testRepo/new_file" "$e1" || return
assertEquals "$error" "$testRepo/deleted_file" "$e2" || return assertEquals "$error" "$testRepo/deleted_file" "$e2" || return
assertEquals "$error" "$testRepo/new_file" "$e3" || return assertEquals "$error" "$testRepo/new_file" "$e3" || return
assertEquals "$error" "$testRepo/untracked_file" "$e4" || return assertEquals "$error" "$testRepo/untracked_file" "$e4" || return
} }
@@ -181,28 +211,27 @@ test_git_status_produces_relative_paths() {
git add . git add .
git_status=$(git_status_shortcuts | strip_colors) git_status=$(git_status_shortcuts | strip_colors)
assertIncludes "$git_status" "dir1/sub1/subsub1/testfile" || return assertIncludes "$git_status" "dir1/sub1/subsub1/testfile" || return
cd $testRepo/dir1 cd $testRepo/dir1
git_status=$(git_status_shortcuts | strip_colors) git_status=$(git_status_shortcuts | strip_colors)
assertIncludes "$git_status" " sub1/subsub1/testfile" || return assertIncludes "$git_status" " sub1/subsub1/testfile" || return
assertIncludes "$git_status" " sub2/testfile" || return assertIncludes "$git_status" " sub2/testfile" || return
assertIncludes "$git_status" "../dir2/testfile" || return assertIncludes "$git_status" "../dir2/testfile" || return
cd $testRepo/dir1/sub1 cd $testRepo/dir1/sub1
git_status=$(git_status_shortcuts | strip_colors) git_status=$(git_status_shortcuts | strip_colors)
assertIncludes "$git_status" " subsub1/testfile" || return assertIncludes "$git_status" " subsub1/testfile" || return
assertIncludes "$git_status" " ../sub2/testfile" || return assertIncludes "$git_status" " ../sub2/testfile" || return
assertIncludes "$git_status" "../../dir2/testfile" || return assertIncludes "$git_status" "../../dir2/testfile" || return
cd $testRepo/dir1/sub1/subsub1 cd $testRepo/dir1/sub1/subsub1
git_status=$(git_status_shortcuts | strip_colors) git_status=$(git_status_shortcuts | strip_colors)
assertIncludes "$git_status" " testfile" || return assertIncludes "$git_status" " testfile" || return
assertIncludes "$git_status" " ../../sub2/testfile" || return assertIncludes "$git_status" " ../../sub2/testfile" || return
assertIncludes "$git_status" "../../../dir2/testfile" || return assertIncludes "$git_status" "../../../dir2/testfile" || return
} }
test_git_status_shortcuts_merge_conflicts() { test_git_status_shortcuts_merge_conflicts() {
setupTestRepo setupTestRepo
@@ -210,23 +239,23 @@ test_git_status_shortcuts_merge_conflicts() {
# Set up every possible merge conflict # Set up every possible merge conflict
touch both_modified both_deleted deleted_by_them deleted_by_us touch both_modified both_deleted deleted_by_them deleted_by_us
echo "renamed file needs some content" > renamed_file echo "renamed file needs some content" >renamed_file
git add both_modified both_deleted renamed_file deleted_by_them deleted_by_us git add both_modified both_deleted renamed_file deleted_by_them deleted_by_us
git commit -m "First commit" git commit -m "First commit"
git checkout -b conflict_branch git checkout -b conflict_branch
echo "added by branch" > both_added echo "added by branch" >both_added
echo "branch line" > both_modified echo "branch line" >both_modified
echo "deleted by us" > deleted_by_us echo "deleted by us" >deleted_by_us
git rm deleted_by_them both_deleted git rm deleted_by_them both_deleted
git mv renamed_file renamed_file_on_branch git mv renamed_file renamed_file_on_branch
git add both_added both_modified deleted_by_us git add both_added both_modified deleted_by_us
git commit -m "Branch commit" git commit -m "Branch commit"
git checkout master git checkout master
echo "added by master" > both_added echo "added by master" >both_added
echo "master line" > both_modified echo "master line" >both_modified
echo "deleted by them" > deleted_by_them echo "deleted by them" >deleted_by_them
git rm deleted_by_us both_deleted git rm deleted_by_us both_deleted
git mv renamed_file renamed_file_on_master git mv renamed_file renamed_file_on_master
git add both_added both_modified deleted_by_them git add both_added both_modified deleted_by_them
@@ -238,16 +267,15 @@ test_git_status_shortcuts_merge_conflicts() {
# Test output without stripped color codes # Test output without stripped color codes
git_status=$(git_status_shortcuts | strip_colors) git_status=$(git_status_shortcuts | strip_colors)
assertIncludes "$git_status" "both added: *\[[0-9]*\] *both_added" || return assertIncludes "$git_status" "both added: *\[[0-9]*\] *both_added" || return
assertIncludes "$git_status" "both modified: *\[[0-9]*\] *both_modified" || return assertIncludes "$git_status" "both modified: *\[[0-9]*\] *both_modified" || return
assertIncludes "$git_status" "deleted by them: *\[[0-9]*\] *deleted_by_them" || return assertIncludes "$git_status" "deleted by them: *\[[0-9]*\] *deleted_by_them" || return
assertIncludes "$git_status" "deleted by us: *\[[0-9]*\] *deleted_by_us" || return assertIncludes "$git_status" "deleted by us: *\[[0-9]*\] *deleted_by_us" || return
assertIncludes "$git_status" "both deleted: *\[[0-9]*\] *renamed_file" || return assertIncludes "$git_status" "both deleted: *\[[0-9]*\] *renamed_file" || return
assertIncludes "$git_status" "added by them: *\[[0-9]*\] *renamed_file_on_branch" || return assertIncludes "$git_status" "added by them: *\[[0-9]*\] *renamed_file_on_branch" || return
assertIncludes "$git_status" "added by us: *\[[0-9]*\] *renamed_file_on_master" || return assertIncludes "$git_status" "added by us: *\[[0-9]*\] *renamed_file_on_master" || return
} }
test_git_status_shortcuts_max_changes() { test_git_status_shortcuts_max_changes() {
setupTestRepo setupTestRepo
@@ -257,30 +285,29 @@ test_git_status_shortcuts_max_changes() {
touch a b c d e touch a b c d e
git_status=$(git_status_shortcuts | strip_colors) git_status=$(git_status_shortcuts | strip_colors)
for i in {1..5}; do for i in {1..5}; do
assertIncludes "$git_status" "\[$i\]" || return assertIncludes "$git_status" "\[$i\]" || return
done done
# 6 untracked files is more than $gs_max_changes # 6 untracked files is more than $gs_max_changes
touch f touch f
git_status=$(git_status_shortcuts | strip_colors) git_status=$(git_status_shortcuts | strip_colors)
assertNotIncludes "$git_status" "\[[0-9]*\]" || return assertNotIncludes "$git_status" "\[[0-9]*\]" || return
assertIncludes "$git_status" "There were more than 5 changed files." || return assertIncludes "$git_status" "There were more than 5 changed files." || return
export gs_max_changes="20" export gs_max_changes="20"
} }
test_git_add_shortcuts() { test_git_add_shortcuts() {
setupTestRepo setupTestRepo
touch a b c d e f g h i j touch a b c d e f g h i j
# Show git status, which sets up env variables # Show git status, which sets up env variables
git_status_shortcuts > /dev/null git_status_shortcuts >/dev/null
git_add_shortcuts 2-4 7 8 > /dev/null git_add_shortcuts 2-4 7 8 >/dev/null
git_status=$(git_status_shortcuts 1 | strip_colors) git_status=$(git_status_shortcuts 1 | strip_colors)
for c in b c d g h; do for c in b c d g h; do
assertIncludes "$git_status" "\[[0-9]*\] $c" || return assertIncludes "$git_status" "\[[0-9]*\] $c" || return
done done
} }
@@ -295,27 +322,29 @@ test_git_commit_prompt() {
export HISTSIZE=1000 export HISTSIZE=1000
touch a b c d touch a b c d
git add . > /dev/null git add . >/dev/null
# Zsh 'vared' doesn't handle input via pipe, so replace with function that reads into commit_msg variable. # Zsh 'vared' doesn't handle input via pipe, so replace with function that reads into commit_msg variable.
function vared(){ read commit_msg; } function vared() { read commit_msg; }
# Test the git commit prompt, by piping a commit message # Test the git commit prompt, by piping a commit message
# instead of user input. # instead of user input.
echo "$commit_msg" | git_commit_prompt > /dev/null echo "$commit_msg" | git_commit_prompt >/dev/null
git_show_output=$(git show --oneline --name-only) git_show_output=$(git show --oneline --name-only)
assertIncludes "$git_show_output" "$commit_msg" assertIncludes "$git_show_output" "$commit_msg"
# Test that history was appended correctly. # Test that history was appended correctly.
if [[ $shell == "zsh" ]]; then if [[ $shell == "zsh" ]]; then
test_history="$(history)" test_history="$(history)"
# TODO(ghthor): zsh isn't working here
# assertIncludes "$test_history" "git commit -m \"$dbl_escaped_msg\""
else else
# Need to load history from $HISTFILE # Need to load history from $HISTFILE
# (Couldn't get the 'history' builtin to work during tests.) # (Couldn't get the 'history' builtin to work during tests.)
test_history="$(cat $HISTFILE)" test_history="$(cat $HISTFILE)"
assertIncludes "$test_history" "git commit -m \"$dbl_escaped_msg\""
fi fi
assertIncludes "$test_history" "git commit -m \"$dbl_escaped_msg\""
} }
test_git_commit_prompt_with_append() { test_git_commit_prompt_with_append() {
@@ -324,31 +353,34 @@ test_git_commit_prompt_with_append() {
commit_msg="Updating README, no build please" commit_msg="Updating README, no build please"
# Create temporary history file # Create temporary history file
HISTFILE=$(mktemp -t scm_breeze.XXXXXXXXXX) export HISTFILE=$(mktemp -t scm_breeze.XXXXXXXXXX)
HISTFILESIZE=1000 export HISTFILESIZE=1000
HISTSIZE=1000 export HISTSIZE=1000
touch a b c touch a b c
git add . > /dev/null git add . >/dev/null
# Zsh 'vared' doesn't handle input via pipe, so replace with function that reads into commit_msg variable. # Zsh 'vared' doesn't handle input via pipe, so replace with function that reads into commit_msg variable.
function vared(){ read commit_msg; } function vared() { read commit_msg; }
# Test the git commit prompt, by piping a commit message # Test the git commit prompt, by piping a commit message
# instead of user input. # instead of user input.
echo "$commit_msg" | GIT_COMMIT_MSG_SUFFIX="[ci skip]" git_commit_prompt > /dev/null echo "$commit_msg" | GIT_COMMIT_MSG_SUFFIX="[ci skip]" git_commit_prompt >/dev/null
git_show_output=$(git show --oneline --name-only) git_show_output=$(git show --oneline --name-only)
assertIncludes "$git_show_output" "$commit_msg \[ci skip\]" assertIncludes "$git_show_output" "$commit_msg \[ci skip\]"
# Test that history was appended correctly. # Test that history was appended correctly.
if [[ $shell == "zsh" ]]; then if [[ $shell == "zsh" ]]; then
test_history="$(history)" test_history="$(history)"
# TODO(ghthor): zsh isn't working here
# assertIncludes "$test_history" "$commit_msg \[ci skip\]"
# assertIncludes "$test_history" "git commit -m \"$commit_msg \[ci skip\]\""
else else
test_history="$(cat $HISTFILE)" test_history="$(cat $HISTFILE)"
assertIncludes "$test_history" "$commit_msg \[ci skip\]"
assertIncludes "$test_history" "git commit -m \"$commit_msg \[ci skip\]\""
fi fi
assertIncludes "$test_history" "$commit_msg \[ci skip\]"
assertIncludes "$test_history" "git commit -m \"$commit_msg \[ci skip\]\""
} }
test_adding_files_with_spaces() { test_adding_files_with_spaces() {
@@ -358,14 +390,12 @@ test_adding_files_with_spaces() {
touch "$test_file" touch "$test_file"
e1="$testRepo/$test_file" e1="$testRepo/$test_file"
git_add_shortcuts 1 > /dev/null git_add_shortcuts 1 >/dev/null
# Test that file is added by looking at git status # Test that file is added by looking at git status
git_status=$(git_status_shortcuts | strip_colors) git_status=$(git_status_shortcuts | strip_colors)
assertIncludes "$git_status" "new file: \[1\] \"$test_file" assertIncludes "$git_status" "new file: \[1\] \"$test_file"
} }
# load and run shUnit2 # load and run shUnit2
source "$scmbDir/test/support/shunit2" source "$scmbDir/test/support/shunit2"

32
test/support/travisci_deps.sh
View File

@@ -1,32 +0,0 @@
#!/usr/bin/env bash
# Installs dependencies for travis-ci environments.
# Install dependencies, which looks to be just bash & zsh.
#
# Darwin has zsh preinstalled already, so only need to install on Ubuntu.
#
# Note: $TRAVIS_OS_NAME will only be set on text boxes with multi-os enabled,
# so use negation test so it will fail gracefully on normal Travis linux setup.
if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then
# okay, so we know we're probably on a linux box (or at least not an osx box)
# at this point. do we need to install zsh? let's say the default case is no:
needs_zsh=false
# check if zsh is listed in the TEST_SHELLS environment variable, set by
# our travis-ci build matrix.
if [[ $TEST_SHELLS =~ zsh ]]; then needs_zsh=true; fi
# if there is NO $TEST_SHELLS env variable persent (which should never happen,
# but maybe someone has been monkeying with the .travis.yml), run_tests.sh is
# going to fall back onto the default of testing everything, so we need zsh.
if [[ -z "$TEST_SHELLS" ]]; then needs_zsh=true; fi
# finally, we install zsh if needed!
if $needs_zsh; then
sudo apt-get update
sudo apt-get install zsh
else
echo "No deps required."
fi
fi