eac_git 0.18.1 → 0.19.0

data/vendor/git-subrepo/ext/bashplus/test/{test.bash → setup}

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
 
 #------------------------------------------------------------------------------
 # This is a tiny version of test-more-bash that I use here. test-more-bash uses
@@ -7,22 +7,28 @@
 # how nice Bash can be.
 #------------------------------------------------------------------------------
 
+set -e -o pipefail
+
+PATH=$PWD/bin:$PATH
+
+run=0
+
 plan() {
   echo "1..$1"
 }
 
 pass() {
-  let run=run+1
+  (( ++run ))
   echo "ok $run${1:+ - $1}"
 }
 
 fail() {
-  let run=run+1
+  (( ++run ))
   echo "not ok $run${1:+ - $1}"
 }
 
 is() {
-  if [ "$1" == "$2" ]; then
+  if [[ $1 == "$2" ]]; then
     pass "$3"
   else
     fail "$3"
@@ -32,13 +38,15 @@ is() {
 }
 
 ok() {
-  (exit ${1:-$?}) &&
-    pass "$2" ||
+  if (exit "${1:-$?}"); then
+    pass "$2"
+  else
     fail "$2"
+  fi
 }
 
 like() {
-  if [[ "$1" =~ "$2" ]]; then
+  if [[ $1 =~ $2 ]]; then
     pass "$3"
   else
     fail "$3"
@@ -48,7 +56,7 @@ like() {
 }
 
 unlike() {
-  if [[ ! "$1" =~ "$2" ]]; then
+  if [[ ! $1 =~ $2 ]]; then
     pass "$3"
   else
     fail "$3"
@@ -68,3 +76,5 @@ diag() {
 note() {
   echo "# ${1//$'\n'/$'\n'# }"
 }
+
+#! vim: ft=sh sw=2:

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

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+source test/setup
+
+source bash+
+
+if ! command -v shellcheck >/dev/null; then
+  plan skip_all "The 'shellcheck' utility is not installed"
+fi
+if [[ ! $(shellcheck --version) =~ 0\.7\.1 ]]; then
+  plan skip_all "This test wants shellcheck version 0.7.1"
+fi
+
+IFS=$'\n' read -d '' -r -a shell_files <<< "$(
+  find bin -type f
+  find lib -type f
+  echo test/setup
+  find test -name '*.t'
+)" || true
+
+skips=(
+  # We want to keep these 2 here always:
+  SC1090  # Can't follow non-constant source. Use a directive to specify location.
+  SC1091  # Not following: bash+ was not specified as input (see shellcheck -x).
+)
+
+skip=$(IFS=,; echo "${skips[*]}")
+
+for file in "${shell_files[@]}"; do
+  [[ $file == *swp ]] && continue
+  is "$(shellcheck -e "$skip" "$file")" "" \
+    "The shell file '$file' passes shellcheck"
+done
+
+done_testing
+
+# vim: set ft=sh:

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

@@ -1,18 +1,17 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 
-source test/test.bash
+source test/setup
 
-PATH=$PWD/bin:$PATH
 source bash+ :std
 
-ok "`bash+:can use`"         'use is imported'
-ok "`bash+:can die`"         'die is imported'
-ok "`bash+:can warn`"        'warn is imported'
+ok "$(bash+:can use)"         'use is imported'
+ok "$(bash+:can die)"         'die is imported'
+ok "$(bash+:can warn)"        'warn is imported'
 
-ok "`! bash+:can import`"    'import is not imported'
-ok "`! bash+:can main`"      'main is not imported'
-ok "`! bash+:can fcopy`"     'fcopy is not imported'
-ok "`! bash+:can findlib`"   'findlib is not imported'
-ok "`! bash+:can can`"       'can is not imported'
+ok "$(! bash+:can import)"    'import is not imported'
+ok "$(! bash+:can main)"      'main is not imported'
+ok "$(! bash+:can fcopy)"     'fcopy is not imported'
+ok "$(! bash+:can findlib)"   'findlib is not imported'
+ok "$(! bash+:can can)"       'can is not imported'
 
 done_testing 8

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).