busser-bats 0.2.0 → 0.3.0

data/vendor/bats/VERSION.txt

@@ -1 +1 @@
-https://github.com/sstephenson/bats/archive/v0.3.1.tar.gz
+https://github.com/sstephenson/bats/archive/v0.4.0.tar.gz

data/vendor/bats/bin/bats

@@ -2,7 +2,7 @@
 set -e
 
 version() {
-  echo "Bats 0.3.1"
+  echo "Bats 0.4.0"
 }
 
 usage() {
@@ -54,6 +54,7 @@ expand_path() {
 
 BATS_LIBEXEC="$(abs_dirname "$0")"
 export BATS_PREFIX="$(abs_dirname "$BATS_LIBEXEC")"
+export BATS_CWD="$(abs_dirname .)"
 export PATH="$BATS_LIBEXEC:$PATH"
 
 options=()
@@ -67,7 +68,7 @@ for arg in "$@"; do
       while option="${arg:$index:1}"; do
         [ -n "$option" ] || break
         options[${#options[*]}]="$option"
-        index=$(($index+1))
+        let index+=1
       done
     fi
   else
@@ -77,6 +78,7 @@ done
 
 unset count_flag pretty
 [ -t 0 ] && [ -t 1 ] && pretty="1"
+[ -n "$CI" ] && pretty=""
 
 for option in "${options[@]}"; do
   case "$option" in

data/vendor/bats/install.sh

@@ -28,8 +28,10 @@ if [ -z "$1" ]; then
 fi
 
 BATS_ROOT="$(abs_dirname "$0")"
-mkdir -p "$PREFIX"/{bin,libexec}
+mkdir -p "$PREFIX"/{bin,libexec,share/man/man{1,7}}
 cp -R "$BATS_ROOT"/bin/* "$PREFIX"/bin
 cp -R "$BATS_ROOT"/libexec/* "$PREFIX"/libexec
+cp "$BATS_ROOT"/man/bats.1 "$PREFIX"/share/man/man1
+cp "$BATS_ROOT"/man/bats.7 "$PREFIX"/share/man/man7
 
 echo "Installed Bats to $PREFIX/bin/bats"

data/vendor/bats/libexec/bats

@@ -2,7 +2,7 @@
 set -e
 
 version() {
-  echo "Bats 0.3.1"
+  echo "Bats 0.4.0"
 }
 
 usage() {
@@ -54,6 +54,7 @@ expand_path() {
 
 BATS_LIBEXEC="$(abs_dirname "$0")"
 export BATS_PREFIX="$(abs_dirname "$BATS_LIBEXEC")"
+export BATS_CWD="$(abs_dirname .)"
 export PATH="$BATS_LIBEXEC:$PATH"
 
 options=()
@@ -67,7 +68,7 @@ for arg in "$@"; do
       while option="${arg:$index:1}"; do
         [ -n "$option" ] || break
         options[${#options[*]}]="$option"
-        index=$(($index+1))
+        let index+=1
       done
     fi
   else
@@ -77,6 +78,7 @@ done
 
 unset count_flag pretty
 [ -t 0 ] && [ -t 1 ] && pretty="1"
+[ -n "$CI" ] && pretty=""
 
 for option in "${options[@]}"; do
   case "$option" in

data/vendor/bats/libexec/bats-exec-suite

@@ -17,7 +17,7 @@ trap "kill 0; exit 1" int
 
 count=0
 for filename in "$@"; do
-  count=$(($count + $(bats-exec-test -c "$filename")))
+  let count+="$(bats-exec-test -c "$filename")"
 done
 
 if [ -n "$count_only_flag" ]; then
@@ -35,11 +35,11 @@ for filename in "$@"; do
     while IFS= read -r line; do
       case "$line" in
       "begin "* )
-        index=$(($index + 1))
+        let index+=1
         echo "${line/ $index / $(($offset + $index)) }"
         ;;
       "ok "* | "not ok "* )
-        [ -n "$extended_syntax_flag" ] || index=$(($index + 1))
+        [ -n "$extended_syntax_flag" ] || let index+=1
         echo "${line/ $index / $(($offset + $index)) }"
         [ "${line:0:6}" != "not ok" ] || status=1
         ;;

data/vendor/bats/libexec/bats-exec-test

@@ -30,13 +30,21 @@ BATS_TEST_DIRNAME="$(dirname "$BATS_TEST_FILENAME")"
 BATS_TEST_NAMES=()
 
 load() {
-  local filename="$BATS_TEST_DIRNAME/$1.bash"
+  local name="$1"
+  local filename
+
+  if [ "${name:0:1}" = "/" ]; then
+    filename="${name}"
+  else
+    filename="$BATS_TEST_DIRNAME/${name}.bash"
+  fi
+
   [ -f "$filename" ] || {
     echo "bats: $filename does not exist" >&2
     exit 1
   }
 
-  source "$BATS_TEST_DIRNAME/$1.bash"
+  source "${filename}"
 }
 
 run() {
@@ -82,20 +90,150 @@ bats_test_function() {
   BATS_TEST_NAMES["${#BATS_TEST_NAMES[@]}"]="$test_name"
 }
 
+bats_capture_stack_trace() {
+  BATS_PREVIOUS_STACK_TRACE=( "${BATS_CURRENT_STACK_TRACE[@]}" )
+  BATS_CURRENT_STACK_TRACE=()
+
+  local test_pattern=" $BATS_TEST_NAME $BATS_TEST_SOURCE"
+  local setup_pattern=" setup $BATS_TEST_SOURCE"
+  local teardown_pattern=" teardown $BATS_TEST_SOURCE"
+
+  local frame
+  local index=1
+
+  while frame="$(caller "$index")"; do
+    BATS_CURRENT_STACK_TRACE["${#BATS_CURRENT_STACK_TRACE[@]}"]="$frame"
+    if [[ "$frame" = *"$test_pattern"     || \
+          "$frame" = *"$setup_pattern"    || \
+          "$frame" = *"$teardown_pattern" ]]; then
+      break
+    else
+      let index+=1
+    fi
+  done
+
+  BATS_SOURCE="$(bats_frame_filename "${BATS_CURRENT_STACK_TRACE[0]}")"
+  BATS_LINENO="$(bats_frame_lineno "${BATS_CURRENT_STACK_TRACE[0]}")"
+}
+
+bats_print_stack_trace() {
+  local frame
+  local index=1
+  local count="${#@}"
+
+  for frame in "$@"; do
+    local filename="$(bats_trim_filename "$(bats_frame_filename "$frame")")"
+    local lineno="$(bats_frame_lineno "$frame")"
+
+    if [ $index -eq 1 ]; then
+      echo -n "# ("
+    else
+      echo -n "#  "
+    fi
+
+    local fn="$(bats_frame_function "$frame")"
+    if [ "$fn" != "$BATS_TEST_NAME" ]; then
+      echo -n "from function \`$fn' "
+    fi
+
+    if [ $index -eq $count ]; then
+      echo "in test file $filename, line $lineno)"
+    else
+      echo "in file $filename, line $lineno,"
+    fi
+
+    let index+=1
+  done
+}
+
+bats_print_failed_command() {
+  local frame="$1"
+  local status="$2"
+  local filename="$(bats_frame_filename "$frame")"
+  local lineno="$(bats_frame_lineno "$frame")"
+
+  local failed_line="$(bats_extract_line "$filename" "$lineno")"
+  local failed_command="$(bats_strip_string "$failed_line")"
+  echo -n "#   \`${failed_command}' "
+
+  if [ $status -eq 1 ]; then
+    echo "failed"
+  else
+    echo "failed with status $status"
+  fi
+}
+
+bats_frame_lineno() {
+  local frame="$1"
+  local lineno="${frame%% *}"
+  echo "$lineno"
+}
+
+bats_frame_function() {
+  local frame="$1"
+  local rest="${frame#* }"
+  local fn="${rest%% *}"
+  echo "$fn"
+}
+
+bats_frame_filename() {
+  local frame="$1"
+  local rest="${frame#* }"
+  local filename="${rest#* }"
+
+  if [ "$filename" = "$BATS_TEST_SOURCE" ]; then
+    echo "$BATS_TEST_FILENAME"
+  else
+    echo "$filename"
+  fi
+}
+
+bats_extract_line() {
+  local filename="$1"
+  local lineno="$2"
+  sed -n "${lineno}p" "$filename"
+}
+
+bats_strip_string() {
+  local string="$1"
+  printf "%s" "$string" | sed -e "s/^[ "$'\t'"]*//" -e "s/[ "$'\t'"]*$//"
+}
+
+bats_trim_filename() {
+  local filename="$1"
+  local length="${#BATS_CWD}"
+
+  if [ "${filename:0:length+1}" = "${BATS_CWD}/" ]; then
+    echo "${filename:length+1}"
+  else
+    echo "$filename"
+  fi
+}
+
 bats_debug_trap() {
   if [ "$BASH_SOURCE" != "$1" ]; then
-    BATS_LINE_NUMBER="$BATS_LINE_NUMBER_"
-    BATS_LINE_NUMBER_="$2"
+    bats_capture_stack_trace
   fi
 }
 
 bats_error_trap() {
+  BATS_ERROR_STATUS="$?"
+  BATS_ERROR_STACK_TRACE=( "${BATS_PREVIOUS_STACK_TRACE[@]}" )
   trap - debug
 }
 
 bats_teardown_trap() {
-  trap bats_exit_trap exit
-  teardown >>"$BATS_OUT" 2>&1
+  trap "bats_exit_trap" exit
+  local status=0
+  teardown >>"$BATS_OUT" 2>&1 || status="$?"
+
+  if [ $status -eq 0 ]; then
+    BATS_TEARDOWN_COMPLETED=1
+  elif [ -n "$BATS_TEST_COMPLETED" ]; then
+    BATS_ERROR_STATUS="$status"
+    BATS_ERROR_STACK_TRACE=( "${BATS_CURRENT_STACK_TRACE[@]}" )
+  fi
+
   bats_exit_trap
 }
 
@@ -112,9 +250,10 @@ bats_exit_trap() {
     fi
   fi
 
-  if [ -z "$BATS_TEST_COMPLETED" ]; then
+  if [ -z "$BATS_TEST_COMPLETED" ] || [ -z "$BATS_TEARDOWN_COMPLETED" ]; then
     echo "not ok $BATS_TEST_NUMBER $BATS_TEST_DESCRIPTION" >&3
-    echo "# (in test file $BATS_TEST_FILENAME, line $BATS_LINE_NUMBER)" >&3
+    bats_print_stack_trace "${BATS_ERROR_STACK_TRACE[@]}" >&3
+    bats_print_failed_command "${BATS_ERROR_STACK_TRACE[${#BATS_ERROR_STACK_TRACE[@]}-1]}" "$BATS_ERROR_STATUS" >&3
     sed -e "s/^/# /" < "$BATS_OUT" >&3
     status=1
   else
@@ -132,7 +271,7 @@ bats_perform_tests() {
   status=0
   for test_name in "$@"; do
     "$0" $BATS_EXTENDED_SYNTAX "$BATS_TEST_FILENAME" "$test_name" "$test_number" || status=1
-    test_number=$(($test_number + 1))
+    let test_number+=1
   done
   exit "$status"
 }
@@ -147,8 +286,8 @@ bats_perform_test() {
     fi
 
     BATS_TEST_COMPLETED=""
-    BATS_ERROR_LINE=""
-    trap "bats_debug_trap \"\$BASH_SOURCE\" \$LINENO" debug
+    BATS_TEARDOWN_COMPLETED=""
+    trap "bats_debug_trap \"\$BASH_SOURCE\"" debug
     trap "bats_error_trap" err
     trap "bats_teardown_trap" exit
     "$BATS_TEST_NAME" >>"$BATS_OUT" 2>&1
@@ -173,7 +312,7 @@ BATS_OUT="${BATS_TMPNAME}.out"
 bats_preprocess_source() {
   BATS_TEST_SOURCE="${BATS_TMPNAME}.src"
   { tr -d '\r' < "$BATS_TEST_FILENAME"; echo; } | bats-preprocess > "$BATS_TEST_SOURCE"
-  trap bats_cleanup_preprocessed_source err exit
+  trap "bats_cleanup_preprocessed_source" err exit
   trap "bats_cleanup_preprocessed_source; exit 1" int
 }
 

data/vendor/bats/libexec/bats-format-tap-stream

@@ -11,6 +11,7 @@ if [[ "$header" =~ $header_pattern ]]; then
   count="${header:3}"
   index=0
   failures=0
+  skipped=0
   name=""
   count_column_width=$(( ${#count} * 2 + 2 ))
 else
@@ -64,9 +65,15 @@ log() {
 }
 
 summary() {
-  printf "\n%d test%s, %d failure%s\n" \
-    "$count" "$(plural "$count")" \
-    "$failures" "$(plural "$failures")"
+  printf "\n%d test%s" "$count" "$(plural "$count")"
+
+  printf ", %d failure%s" "$failures" "$(plural "$failures")"
+
+  if [ "$skipped" -gt 0 ]; then
+    printf ", %d skipped" "$skipped"
+  fi
+
+  printf "\n"
 }
 
 printf_with_truncation() {
@@ -131,7 +138,7 @@ trap finish EXIT
 while IFS= read -r line; do
   case "$line" in
   "begin "* )
-    index=$(( $index + 1 ))
+    let index+=1
     name="${line#* $index }"
     buffer begin
     flush
@@ -139,17 +146,17 @@ while IFS= read -r line; do
   "ok "* )
     skip_expr="ok $index # skip (\(([^)]*)\))?"
     if [[ "$line" =~ $skip_expr ]]; then
+      let skipped+=1
       buffer skip "${BASH_REMATCH[2]}"
     else
       buffer pass
     fi
     ;;
   "not ok "* )
-    failures=$(( $failures + 1 ))
+    let failures+=1
     buffer fail
     ;;
   "# "* )
-
     buffer log "${line:2}"
     ;;
   esac

data/vendor/bats/libexec/bats-preprocess

@@ -31,16 +31,17 @@ encode_name() {
 
 tests=()
 index=0
+pattern='^ *@test  *([^ ].*)  *\{ *(.*)$'
 
 while IFS= read -r line; do
-  index=$(($index + 1))
-  quoted_name="$(expr "$line" : ' *@test  *\([^ ].*\)  *{ *$' || true)"
-
-  if [ -n "$quoted_name" ]; then
+  let index+=1
+  if [[ "$line" =~ $pattern ]]; then
+    quoted_name="${BASH_REMATCH[1]}"
+    body="${BASH_REMATCH[2]}"
     name="$(eval echo "$quoted_name")"
     encoded_name="$(encode_name "$name")"
     tests["${#tests[@]}"]="$encoded_name"
-    echo "${encoded_name}() { bats_test_begin ${quoted_name} ${index}"
+    echo "${encoded_name}() { bats_test_begin ${quoted_name} ${index}; ${body}"
   else
     printf "%s\n" "$line"
   fi

data/vendor/bats/man/Makefile

@@ -0,0 +1,10 @@
+RONN := ronn
+PAGES := bats.1 bats.7
+
+all: $(PAGES)
+
+bats.1: bats.1.ronn
+	$(RONN) -r $<
+
+bats.7: bats.7.ronn
+	$(RONN) -r $<

data/vendor/bats/man/README.md

@@ -0,0 +1,5 @@
+Bats man pages are generated with [Ronn](http://rtomayko.github.io/ronn/).
+
+After making changes to `bats.1.ronn` or `bats.7.ronn`, run `make` in
+this directory to generate `bats.1` and `bats.7`. **Do not edit the
+`bats.1` or `bats.7` files directly.**

data/vendor/bats/man/bats.1

@@ -0,0 +1,101 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BATS" "1" "August 2014" "" ""
+.
+.SH "NAME"
+\fBbats\fR \- Bash Automated Testing System
+.
+.SH "SYNOPSIS"
+bats [\-c] [\-p | \-t] \fItest\fR [\fItest\fR \.\.\.]
+.
+.P
+\fItest\fR is the path to a Bats test file, or the path to a directory containing Bats test files\.
+.
+.SH "DESCRIPTION"
+Bats is a TAP\-compliant testing framework for Bash\. It provides a simple way to verify that the UNIX programs you write behave as expected\.
+.
+.P
+A Bats test file is a Bash script with special syntax for defining test cases\. Under the hood, each test case is just a function with a description\.
+.
+.P
+Test cases consist of standard shell commands\. Bats makes use of Bash\'s \fBerrexit\fR (\fBset \-e\fR) option when running test cases\. If every command in the test case exits with a \fB0\fR status code (success), the test passes\. In this way, each line is an assertion of truth\.
+.
+.P
+See \fBbats\fR(7) for more information on writing Bats tests\.
+.
+.SH "RUNNING TESTS"
+To run your tests, invoke the \fBbats\fR interpreter with a path to a test file\. The file\'s test cases are run sequentially and in isolation\. If all the test cases pass, \fBbats\fR exits with a \fB0\fR status code\. If there are any failures, \fBbats\fR exits with a \fB1\fR status code\.
+.
+.P
+You can invoke the \fBbats\fR interpreter with multiple test file arguments, or with a path to a directory containing multiple \fB\.bats\fR files\. Bats will run each test file individually and aggregate the results\. If any test case fails, \fBbats\fR exits with a \fB1\fR status code\.
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-c\fR, \fB\-\-count\fR
+Count the number of test cases without running any tests
+.
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Display help message
+.
+.TP
+\fB\-p\fR, \fB\-\-pretty\fR
+Show results in pretty format (default for terminals)
+.
+.TP
+\fB\-t\fR, \fB\-\-tap\fR
+Show results in TAP format
+.
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Display the version number
+.
+.SH "OUTPUT"
+When you run Bats from a terminal, you\'ll see output as each test is performed, with a check\-mark next to the test\'s name if it passes or an "X" if it fails\.
+.
+.IP "" 4
+.
+.nf
+
+$ bats addition\.bats
+ ✓ addition using bc
+ ✓ addition using dc
+
+2 tests, 0 failures
+.
+.fi
+.
+.IP "" 0
+.
+.P
+If Bats is not connected to a terminal\-\-in other words, if you run it from a continuous integration system or redirect its output to a file\-\-the results are displayed in human\-readable, machine\-parsable TAP format\. You can force TAP output from a terminal by invoking Bats with the \fB\-\-tap\fR option\.
+.
+.IP "" 4
+.
+.nf
+
+$ bats \-\-tap addition\.bats
+1\.\.2
+ok 1 addition using bc
+ok 2 addition using dc
+.
+.fi
+.
+.IP "" 0
+.
+.SH "EXIT STATUS"
+The \fBbats\fR interpreter exits with a value of \fB0\fR if all test cases pass, or \fB1\fR if one or more test cases fail\.
+.
+.SH "SEE ALSO"
+Bats wiki: \fIhttps://github\.com/sstephenson/bats/wiki/\fR
+.
+.P
+\fBbash\fR(1), \fBbats\fR(7)
+.
+.SH "COPYRIGHT"
+(c) 2014 Sam Stephenson
+.
+.P
+Bats is released under the terms of an MIT\-style license\.