git subrepo pull ext/bashplus

subrepo:
  subdir:   "ext/bashplus"
  merged:   "030d196"
upstream:
  origin:   "[email protected]:ingydotnet/bashplus.git"
  branch:   "master"
  commit:   "030d196"
git-subrepo:
  version:  "0.4.1"
  origin:   "[email protected]:ingydotnet/git-subrepo"
  commit:   "2c14be6"

Author: ingydotnet

ext/bashplus/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = [email protected]:ingydotnet/bashplus.git
 	branch = master
-	commit = e49f45a1457fed3cceb15bd4a82b0f7515efd8e5
-	parent = 2e28e8a32166abdda154c4508c90176f356c1706
+	commit = 030d196bf621e971e223e95e73c235e6992b85e0
+	parent = 2c14be68fc5196ed1210d759421b33ef91c3e3db
 	cmdver = 0.4.1
 	method = merge

ext/bashplus/Changes

@@ -1,4 +1,12 @@
 ---
+version: 0.1.0
+date:    Sat 14 Nov 2020 10:14:14 AM EST
+changes:
+- Add tests for version-check
+- Improve version-check
+- Move PATH assignment into test/setup
+- Meta bashplus supports Bash 3.2
+---
 version: 0.0.9
 date:    Wed 11 Nov 2020 02:19:32 PM EST
 changes:

ext/bashplus/Meta

@@ -1,9 +1,9 @@
 =meta: 0.0.2
 
 name: bashplus
-version: 0.0.9
+version: 0.1.0
 abstract: Modern Bash Programming
-homepage: http://bpan.org/package/bashplus/
+homepage: https://github.com/ingydotnet/bashplus
 
 license: MIT
 copyright: 2013-2020
@@ -16,7 +16,7 @@ author:
   homepage: http://ingy.net
 
 requires:
-  bash: 4.4.0
+  bash: 3.2
 test:
   cmd: make test
 install:

ext/bashplus/lib/bash+.bash

@@ -6,13 +6,15 @@ set -e
 
 [[ ${BASHPLUS_VERSION-} ]] && return 0
 
-BASHPLUS_VERSION=0.0.9
+BASHPLUS_VERSION=0.1.0
 
 bash+:version-check() {
   local cmd want got out
 
   IFS=' ' read -r -a cmd <<< "${1:?}"
   IFS=. read -r -a want <<< "${2:?}"
+  : "${want[0]:=0}"
+  : "${want[1]:=0}"
   : "${want[2]:=0}"
 
   if [[ ${cmd[*]} == bash ]]; then
@@ -29,13 +31,11 @@ bash+: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
+  (( got[0] > want[0] || ((
+     got[0] == want[0] && ((
+       got[1] > want[1] || ((
+       got[1] == want[1] && got[2] >= want[2]
+  )) )) )) ))
 }
 
 bash+:version-check bash 3.2 ||

ext/bashplus/test/base.t

@@ -2,11 +2,10 @@
 
 source test/setup
 
-PATH=$PWD/bin:$PATH
 source bash+ :std
 
 ok $? "'source bash+' works"
 
-is "$BASHPLUS_VERSION" '0.0.9' 'BASHPLUS_VERSION is 0.0.9'
+is "$BASHPLUS_VERSION" '0.1.0' 'BASHPLUS_VERSION is 0.1.0'
 
 done_testing 2

ext/bashplus/test/die.t

@@ -2,12 +2,11 @@
 
 source test/setup
 
-PATH=$PWD/bin:$PATH
 source bash+ :std
 
 got=$(die "Nope" 2>&1) || true
 want="Nope
- at line 8 in main of test/die.t"
+ at line 7 in main of test/die.t"
 is "$got" "$want" "die() msg ok"
 
 got=$(die "Nope\n" 2>&1) || true

ext/bashplus/test/fcopy.t

@@ -2,7 +2,6 @@
 
 source test/setup
 
-PATH=$PWD/bin:$PATH
 source bash+
 
 foo() {

ext/bashplus/test/setup

@@ -7,8 +7,9 @@
 # how nice Bash can be.
 #------------------------------------------------------------------------------
 
-set -e -u -o pipefail
-[[ $BASH_VERSION == 4.0* ]] && set +u
+set -e -o pipefail
+
+PATH=$PWD/bin:$PATH
 
 run=0
 

ext/bashplus/test/shellcheck.t

@@ -2,7 +2,6 @@
 
 source test/setup
 
-PATH=$PWD/bin:$PATH
 source bash+
 
 if ! command -v shellcheck >/dev/null; then

ext/bashplus/test/source-bash+-std.t

@@ -2,7 +2,6 @@
 
 source test/setup
 
-PATH=$PWD/bin:$PATH
 source bash+ :std
 
 ok "$(bash+:can use)"         'use is imported'

ext/bashplus/test/source-bash+.t

@@ -2,7 +2,6 @@
 
 source test/setup
 
-PATH=$PWD/bin:$PATH
 source bash+
 
 functions=(

ext/bashplus/test/use.t

@@ -2,7 +2,6 @@
 
 source test/setup
 
-PATH=$PWD/bin:$PATH
 source bash+ :std can
 
 # shellcheck disable=2034

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