eac_git 0.18.1 → 0.18.2

data/vendor/git-subrepo/ext/bashplus/test/source-bash+.t

@@ -1,21 +1,20 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 
-source test/test.bash
+source test/setup
 
-PATH=$PWD/bin:$PATH
 source bash+
 
 functions=(
-    use
-    import
-    fcopy
-    findlib
-    die
-    warn
-    can
+  use
+  import
+  fcopy
+  findlib
+  die
+  warn
+  can
 )
 
-for f in ${functions[@]}; do
+for f in "${functions[@]}"; do
   is "$(type -t "bash+:$f")" function \
     "bash+:$f is a function"
 done

data/vendor/git-subrepo/ext/bashplus/test/use.t

@@ -1,18 +1,21 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 
-source test/test.bash
+source test/setup
 
-PATH=$PWD/bin:$PATH
 source bash+ :std can
 
+# shellcheck disable=2034
 BASHLIB=test/lib
 
 use Foo::Bar
+
 ok $?                         'use Foo::Bar - works'
-ok "`can Foo::Bar:baz`"       'Function Foo::Bar:baz exists'
+ok "$(can Foo::Bar:baz)"      'Function Foo::Bar:baz exists'
+
+# shellcheck disable=2016,2154
 is "$Foo__Bar_VERSION" 1.2.3  '$Foo__Bar_VERSION == 1.2.3'
 
-output=`use Foo::Foo Boo Booo`
+output=$(use Foo::Foo Boo Booo)
 ok $?                         'use Foo::Foo Boo Booo - works'
 is "$output" Boo---Booo       'Correct import called'
 

data/vendor/git-subrepo/ext/bashplus/test/version-check.t

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+source test/setup
+
+PATH=$PWD/bin:$PATH
+source bash+ version-check
+
+t1() (echo 0.1.2)
+t2() (echo 0.1)
+
+ok "$(version-check t1 0)" "0.1.2 >= 0"
+ok "$(version-check t1 0.1)" "0.1.2 >= 0.1"
+ok "$(version-check t1 0.1.1)" "0.1.2 >= 0.1.1"
+ok "$(version-check t1 0.1.2)" "0.1.2 >= 0.1.2"
+ok "$(! version-check t1 0.2)" "0.1.2 >= 0.2 fails"
+ok "$(! version-check t1 0.1.3)" "0.1.2 >= 0.1.3 fails"
+
+ok "$(version-check t2 0)" "0.1 >= 0"
+ok "$(version-check t2 0.1)" "0.1 >= 0.1"
+ok "$(! version-check t2 0.2)" "0.1 >= 0.2 fails"
+ok "$(! version-check t2 0.1.1)" "0.1 >= 0.1.1"
+
+done_testing 10

data/vendor/git-subrepo/ext/test-more-bash/.gitrepo

@@ -0,0 +1,12 @@
+; DO NOT EDIT (unless you know what you are doing)
+;
+; This subdirectory is a git "subrepo", and this file is maintained by the
+; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
+;
+[subrepo]
+	remote = git@github.com:ingydotnet/test-more-bash.git
+	branch = master
+	commit = c7df24fcb0814fbb62a33d92dc3c8d526ff710f0
+	parent = 914c2ae8e3b881f62ca987c1c3343df6a034d865
+	cmdver = 0.4.1
+	method = merge

data/vendor/git-subrepo/ext/test-more-bash/.travis.yml

@@ -0,0 +1,6 @@
+# C language gives closest shell env.
+language: c
+
+script:
+- git submodule update --init --recursive
+- PROVEOPT=-v make test

data/vendor/git-subrepo/ext/test-more-bash/Changes

@@ -1,4 +1,15 @@
 ---
+version: 0.0.5
+date:    Wed 11 Nov 2020 02:33:42 PM EST
+changes:
+- Refactor to modern bash
+---
+version: 0.0.4
+date:    Fri Sep 4 12:26:58 2020 -0700
+changes:
+- Make up to date
+- Apply a few PRs
+---
 version: 0.0.3
 date:    Sat Jan 23 16:39:20 PST 2016
 changes:

data/vendor/git-subrepo/ext/test-more-bash/License

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright © 2013-2016. Ingy döt Net.
+Copyright © 2013-2020. Ingy döt Net.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the ‘Software’), to deal in

data/vendor/git-subrepo/ext/test-more-bash/Makefile

@@ -2,6 +2,10 @@ NAME := test-more
 DOC  := doc/$(NAME).swim
 MAN3 := man/man3
 
+DOCKER_IMAGE := ingy/bash-testing:0.0.1
+DOCKER_TESTS := 5.1 5.0 4.4 4.3 4.2 4.1 4.0 3.2
+DOCKER_TESTS := $(DOCKER_TESTS:%=docker-test-%)
+
 default: help
 
 help:
@@ -11,6 +15,13 @@ help:
 test:
 	prove $(PROVEOPT:%=% )test/
 
+test-all: test docker-test
+
+docker-test: $(DOCKER_TESTS)
+
+$(DOCKER_TESTS):
+	$(call docker-make-test,$(@:docker-test-%=%))
+
 doc: ReadMe.pod $(MAN3)/$(NAME).3
 
 ReadMe.pod: $(DOC)
@@ -18,3 +29,17 @@ ReadMe.pod: $(DOC)
 
 $(MAN3)/%.3: doc/%.swim
 	swim --to=man $< > $@
+
+define docker-make-test
+	docker run -i -t --rm \
+	    -v $(PWD):/git-subrepo \
+	    -w /git-subrepo \
+	    $(DOCKER_IMAGE) \
+		/bin/bash -c ' \
+		    set -x && \
+		    [[ -d /bash-$(1) ]] && \
+		    export PATH=/bash-$(1)/bin:$$PATH && \
+		    bash --version && \
+		    make test \
+		'
+endef

data/vendor/git-subrepo/ext/test-more-bash/Meta

@@ -1,12 +1,12 @@
 =meta: 0.0.2
 
 name: test-more
-version: 0.0.3
+version: 0.0.5
 abstract: TAP Testing for Bash
 homepage: http://bpan.org/package/test-more/
 
 license: MIT
-copyright: 2013-2016
+copyright: 2013-2020
 author:
   name: Ingy döt Net
   email: ingy@ingy.net
@@ -16,9 +16,9 @@ author:
   homepage: http://ingy.net
 
 requires:
-  bash: 3.2.0
-  bashplus: 0.0.7
-  test-tap: 0.0.4
+  bash: 4.4.0
+  bashplus: 0.0.9
+  test-tap: 0.0.5
 test:
   cmd: make test
 install:

data/vendor/git-subrepo/ext/test-more-bash/ReadMe.pod

@@ -1,7 +1,7 @@
 =pod
 
 =for comment
-DO NOT EDIT. This Pod was generated by Swim v0.1.41.
+DO NOT EDIT. This Pod was generated by Swim v0.1.48.
 See http://github.com/ingydotnet/swim-pm#readme
 
 =encoding utf8
@@ -54,6 +54,10 @@ Write a test file like this. Maybe call it C<test/test.t>:
 
     note "A message for stdout"
 
+    output=( $(ls) )
+    expected=(README lib bin)
+    cmp-array output expected "list files"
+
 Run the test with C<prove> like this:
 
     prove test/test.t
@@ -98,17 +102,19 @@ This is the basic usage:
 
 =item * C<BAIL_OUT "$reason">
 
+=item * `cmp-array output expected "message"
+
 =back
 
 More detailed info coming soon.
 
 =head1 Author
 
-Ingy döt Net <ingy@bpan.org>
+Ingy döt Net <ingy@ingy.net>
 
 =head1 Copyright & License
 
-Copyright 2013-2016. Ingy döt Net.
+Copyright 2013-2020. Ingy döt Net.
 
 The MIT License (MIT)
 

data/vendor/git-subrepo/ext/test-more-bash/doc/test-more.swim

@@ -46,6 +46,10 @@ Write a test file like this. Maybe call it `test/test.t`:
 
   note "A message for stdout"
 
+  output=( $(ls) )
+  expected=(README lib bin)
+  cmp-array output expected "list files"
+
 Run the test with `prove` like this:
 
   prove test/test.t
@@ -75,15 +79,16 @@ This is the basic usage:
 * `done_testing $count`
 * `plan skip_all "$reason"`
 * `BAIL_OUT "$reason"`
+* `cmp-array output expected "message"
 
 More detailed info coming soon.
 
 = Author
 
-Ingy döt Net <ingy@bpan.org>
+Ingy döt Net <ingy@ingy.net>
 
 = Copyright & License
 
-Copyright 2013-2016. Ingy döt Net.
+Copyright 2013-2020. Ingy döt Net.
 
 The MIT License (MIT)

data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/.gitrepo

@@ -0,0 +1,12 @@
+; DO NOT EDIT (unless you know what you are doing)
+;
+; This subdirectory is a git "subrepo", and this file is maintained by the
+; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
+;
+[subrepo]
+	remote = git@github.com:ingydotnet/bashplus.git
+	branch = master
+	commit = e49f45a1457fed3cceb15bd4a82b0f7515efd8e5
+	parent = c978e2afd6861203138f28d0021e03fa1ffbba0c
+	cmdver = 0.4.1
+	method = merge

data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/.travis.yml

@@ -0,0 +1,6 @@
+# C language gives closest shell env.
+language: c
+
+script:
+- git submodule update --init --recursive
+- PROVEOPT=-v make test

data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/Changes

@@ -1,4 +1,15 @@
 ---
+version: 0.0.9
+date:    Wed 11 Nov 2020 02:19:32 PM EST
+changes:
+- Apply shellcheck fixes
+- Modernize bash code
+---
+version: 0.0.8
+date:    Fri Aug 21 08:00:45 PDT 2020
+changes:
+- Support paths with spaces @admorgan++
+---
 version: 0.0.7
 date:    Sat Jan 23 16:28:59 PST 2016
 changes:

data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/License

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright © 2013-2016 Ingy döt Net
+Copyright © 2013-2020 Ingy döt Net
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the ‘Software’), to deal in

data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/Makefile

@@ -15,6 +15,10 @@ INSTALL_DIR  ?= test
 INSTALL_MAN1 ?= $(shell bpan env BPAN_MAN1)
 INSTALL_MAN3 ?= $(shell bpan env BPAN_MAN3)
 
+DOCKER_IMAGE := ingy/bash-testing:0.0.1
+DOCKER_TESTS := 5.1 5.0 4.4 4.3 4.2 4.1 4.0 3.2
+DOCKER_TESTS := $(DOCKER_TESTS:%=docker-test-%)
+
 default: help
 
 help:
@@ -24,6 +28,13 @@ help:
 test:
 	prove $(PROVEOPT:%=% )test/
 
+test-all: test docker-test
+
+docker-test: $(DOCKER_TESTS)
+
+$(DOCKER_TESTS):
+	$(call docker-make-test,$(@:docker-test-%=%))
+
 install:
 	install -C -d -m 0755 $(INSTALL_LIB)/$(INSTALL_DIR)/
 	install -C -m 0755 $(LIB) $(INSTALL_LIB)/$(INSTALL_DIR)/
@@ -43,3 +54,17 @@ $(MAN1)/%.1: doc/%.swim
 
 $(MAN3)/%.3: doc/%.swim
 	swim --to=man $< > $@
+
+define docker-make-test
+	docker run -i -t --rm \
+	    -v $(PWD):/git-subrepo \
+	    -w /git-subrepo \
+	    $(DOCKER_IMAGE) \
+		/bin/bash -c ' \
+		    set -x && \
+		    [[ -d /bash-$(1) ]] && \
+		    export PATH=/bash-$(1)/bin:$$PATH && \
+		    bash --version && \
+		    make test \
+		'
+endef

data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/Meta

@@ -1,12 +1,12 @@
 =meta: 0.0.2
 
 name: bashplus
-version: 0.0.7
+version: 0.0.9
 abstract: Modern Bash Programming
 homepage: http://bpan.org/package/bashplus/
 
 license: MIT
-copyright: 2013-2016
+copyright: 2013-2020
 author:
   name: Ingy döt Net
   email: ingy@ingy.net
@@ -16,7 +16,7 @@ author:
   homepage: http://ingy.net
 
 requires:
-  bash: 3.2.0
+  bash: 4.4.0
 test:
   cmd: make test
 install:

data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/ReadMe.pod

@@ -1,7 +1,7 @@
 =pod
 
 =for comment
-DO NOT EDIT. This Pod was generated by Swim v0.1.41.
+DO NOT EDIT. This Pod was generated by Swim v0.1.48.
 See http://github.com/ingydotnet/swim-pm#readme
 
 =encoding utf8
@@ -70,7 +70,7 @@ Written by Ingy döt Net <ingy@ingy.net>
 
 =head1 Copyright & License
 
-Copyright 2013-2016. Ingy döt Net.
+Copyright 2013-2020. Ingy döt Net.
 
 The MIT License (MIT).
 

data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/bin/bash+

@@ -2,29 +2,30 @@
 #------------------------------------------------------------------------------
 # Bash+ - Modern Bash Programming
 #
-# Copyright (c) 2013-2016 Ingy döt Net
+# Copyright (c) 2013-2020 Ingy döt Net
 #------------------------------------------------------------------------------
 
 set -e
-shopt -s compat31&>/dev/null||:
+shopt -s compat31 &>/dev/null || true
 
 #------------------------------------------------------------------------------
 # Determine how `bash+` was called, and do the right thing:
 #------------------------------------------------------------------------------
-if [ "${BASH_SOURCE[0]}" != "$0" ]; then
+if [[ ${BASH_SOURCE[0]} != "$0" ]]; then
   # 'bash+' is being sourced:
-  [[ "${BASH_SOURCE[0]}" =~ /bin/bash\\+$ ]] || {
+  [[ ${BASH_SOURCE[0]} =~ /bin/bash\\+$ ]] || {
     echo "Invalid Bash+ path '${BASH_SOURCE[0]}'" 2> /dev/null
     exit 1
   }
   source "${BASH_SOURCE[0]%/bin/*}"/lib/bash+.bash || return $?
   bash+:import "$@"
   return $?
+
 else
-  if [ $# -eq 1 -a "$1" == --version ]; then
-    echo 'bash+   version 0.0.7'
+  if [[ $# -eq 1 ]] && [[ $1 == --version ]]; then
+    echo 'bash+   version 0.0.9'
   else
-  cat <<...
+    cat <<'...'
 
 Greetings modern Bash programmer. Welcome to Bash+!
 

data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/doc/bash+.swim

@@ -56,6 +56,6 @@ Written by Ingy döt Net <ingy@ingy.net>
 
 = Copyright & License
 
-Copyright 2013-2016. Ingy döt Net.
+Copyright 2013-2020. Ingy döt Net.
 
 The MIT License (MIT).

data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/lib/bash+.bash

@@ -1,34 +1,66 @@
 # bash+ - Modern Bash Programming
 #
-# Copyright (c) 2013-2016 Ingy döt Net
+# Copyright (c) 2013-2020 Ingy döt Net
 
-{
-  bash+:version-check() {
-    test $1 -ge 4 && return
-    test $1 -eq 3 -a $2 -ge 2 && return
-    echo "Bash version 3.2 or higher required for 'git hub'" >&2
-    exit 1
-  }
-  bash+:version-check "${BASH_VERSINFO[@]}"
-  unset -f Bash:version-check
+set -e
+
+[[ ${BASHPLUS_VERSION-} ]] && return 0
+
+BASHPLUS_VERSION=0.0.9
+
+bash+:version-check() {
+  local cmd want got out
+
+  IFS=' ' read -r -a cmd <<< "${1:?}"
+  IFS=. read -r -a want <<< "${2:?}"
+  : "${want[2]:=0}"
+
+  if [[ ${cmd[*]} == bash ]]; then
+    got=("${BASH_VERSINFO[@]}")
+    BASHPLUS_VERSION_CHECK=${BASH_VERSION-}
+  else
+    [[ ${#cmd[*]} -gt 1 ]] || cmd+=(--version)
+    out=$("${cmd[@]}") ||
+      { echo "Failed to run '${cmd[*]}'" >&2; exit 1; }
+    [[ $out =~ ([0-9]+\.[0-9]+(\.[0-9]+)?) ]] ||
+      { echo "Can't determine version number from '${cmd[*]}'" >&2; exit 1; }
+    BASHPLUS_VERSION_CHECK=${BASH_REMATCH[1]}
+    IFS=. read -r -a got <<< "$BASHPLUS_VERSION_CHECK"
+  fi
+  : "${got[2]:=0}"
+
+  ((
+    got[0] > want[0] ||
+    got[0] == want[0] && got[1] > want[1] ||
+    got[0] == want[0] && got[1] == want[1] && got[2] >= want[2]
+  )) || return 1
+
+  return 0
 }
 
-set -e
+bash+:version-check bash 3.2 ||
+  { echo "The 'bashplus' library requires 'Bash 3.2+'." >&2; exit 1; }
 
-[ -z "$BASHPLUS_VERSION" ] || return 0
+@() (echo "$@")  # XXX do we want to keep this?
 
-BASHPLUS_VERSION='0.0.7'
+bash+:export:std() {
+  set -o pipefail
 
-@() { echo "$@"; }
-bash+:export:std() { @ use die warn; }
+  if bash+:version-check bash 4.4; then
+    set -o nounset
+    shopt -s inherit_errexit
+  fi
+
+  echo use die warn
+}
 
 # Source a bash library call import on it:
 bash+:use() {
-  local library_name="${1:?bash+:use requires library name}"; shift
-  local library_path=; library_path="$(bash+:findlib $library_name)"
-  [[ -n $library_path ]] || {
+  local library_name=${1:?bash+:use requires library name}; shift
+  local library_path=; library_path=$(bash+:findlib "$library_name") || true
+  [[ $library_path ]] ||
     bash+:die "Can't find library '$library_name'." 1
-  }
+
   source "$library_path"
   if bash+:can "$library_name:import"; then
     "$library_name:import" "$@"
@@ -42,9 +74,11 @@ bash+:import() {
   local arg=
   for arg; do
     if [[ $arg =~ ^: ]]; then
-      bash+:import `bash+:export$arg`
+      # Word splitting required here
+      # shellcheck disable=2046
+      bash+:import $(bash+:export"$arg")
     else
-      bash+:fcopy bash+:$arg $arg
+      bash+:fcopy "bash+:$arg" "$arg"
     fi
   done
 }
@@ -53,38 +87,51 @@ bash+:import() {
 bash+:fcopy() {
   bash+:can "${1:?bash+:fcopy requires an input function name}" ||
     bash+:die "'$1' is not a function" 2
-  local func=; func=$(type "$1" 3>/dev/null | tail -n+3)
-  [[ -n $3 ]] && "$3"
+  local func
+  func=$(type "$1" 3>/dev/null | tail -n+3)
+  [[ ${3-} ]] && "$3"
   eval "${2:?bash+:fcopy requires an output function name}() $func"
 }
 
 # Find the path of a library
 bash+:findlib() {
-  local library_name=; library_name="$(tr 'A-Z' 'a-z' <<< "${1//:://}").bash"
-  local lib="${BASHPLUSLIB:-${BASHLIB:-$PATH}}"
-  library_name="${library_name//+/\\+}"
-  find ${lib//:/ } -name ${library_name##*/} 2>/dev/null |
+  local library_name
+  library_name=$(tr '[:upper:]' '[:lower:]' <<< "${1//:://}").bash
+  local lib=${BASHPLUSLIB:-${BASHLIB:-$PATH}}
+  library_name=${library_name//+/\\+}
+  IFS=':' read -r -a libs <<< "$lib"
+  find "${libs[@]}" -name "${library_name##*/}" 2>/dev/null |
     grep -E "$library_name\$" |
     head -n1
 }
 
 bash+:die() {
-  local msg="${1:-Died}"
-  printf "${msg//\\n/$'\n'}" >&2
-  local trailing_newline_re=$'\n''$'
-  [[ $msg =~ $trailing_newline_re ]] && exit 1
-
-  local c=($(caller ${DIE_STACK_LEVEL:-${2:-0}}))
-  (( ${#c[@]} == 2 )) &&
-    msg=" at line %d of %s" ||
+  local msg=${1:-Died}
+  msg=${msg//\\n/$'\n'}
+
+  printf "%s" "$msg" >&2
+  if [[ $msg == *$'\n' ]]; then
+    exit 1
+  else
+    printf "\n"
+  fi
+
+  local c
+  IFS=' ' read -r -a c <<< "$(caller "${DIE_STACK_LEVEL:-${2:-0}}")"
+  if (( ${#c[@]} == 2 )); then
+    msg=" at line %d of %s"
+  else
     msg=" at line %d in %s of %s"
-  printf "$msg\n" ${c[@]} >&2
+  fi
+
+  # shellcheck disable=2059
+  printf "$msg\n" "${c[@]}" >&2
   exit 1
 }
 
 bash+:warn() {
-  local msg="${1:-Warning}"
-  printf "${msg//\\n/$'\n'}\n" >&2
+  local msg=${1:-Warning}
+  printf "%s" "${msg//\\n/$'\n'}\n" >&2
 }
 
 bash+:can() {

data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/man/man1/bash+.1

@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
@@ -56,12 +56,12 @@
 ..
 .nr rF 0
 .if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
+.if (\n(rF:(\n(.g==0)) \{\
+.    if \nF \{\
 .        de IX
 .        tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.        if !\nF==2 \{
+.        if !\nF==2 \{\
 .            nr % 0
 .            nr F 2
 .        \}
@@ -70,8 +70,8 @@
 .rr rF
 .\" ========================================================================
 .\"
-.IX Title "Bash+(1) 1"
-.TH Bash+(1) 1 "January 2016" "Generated by Swim v0.1.41" "Modern Bash Programming"
+.IX Title "STDIN 1"
+.TH STDIN 1 "November 2020" "Generated by Swim v0.1.48" "Modern Bash Programming"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -129,6 +129,6 @@ If you are interested in chatting about this, \f(CW\*(C`/join #bpan\*(C'\fR on i
 Written by Ingy döt Net <ingy@ingy.net>
 .SH "Copyright & License"
 .IX Header "Copyright & License"
-Copyright 2013\-2016. Ingy döt Net.
+Copyright 2013\-2020. Ingy döt Net.
 .PP
 The \s-1MIT\s0 License (\s-1MIT\s0).