Skip to content

Commit a00ade8

Browse files
yarikopticyarikoptic
committed
Merge tag 'v1.1.0' into debian
Bats 1.1.0 - 2018-07-08 This is the first release with new features relative to the original Bats 0.4.0. Added: * The `-r, --recursive` flag to scan directory arguments recursively for `*.bats` files (sstephenson#109) * The `contrib/rpm/bats.spec` file to build RPMs (sstephenson#111) Changed: * Travis exercises latest versions of Bash from 3.2 through 4.4 (sstephenson#116, sstephenson#117) * Error output highlights invalid command line options (sstephenson#45, sstephenson#46, sstephenson#118) * Replaced `echo` with `printf` (sstephenson#120) Fixed: * Fixed `BATS_ERROR_STATUS` getting lost when `bats_error_trap` fired multiple times under Bash 4.2.x (sstephenson#110) * Updated `bin/bats` symlink resolution, handling the case on CentOS where `/bin` is a symlink to `/usr/bin` (sstephenson#113, sstephenson#115) * tag 'v1.1.0': (198 commits) Bats 1.1.0 bats: Replace echo with printf Extract `abort()` function travis: Remove `bats -c` wrapper travis: Enable build with default Linux image Bash Add Bash version test to Travis job. Revert "Re-add Bash version check to Docker image build" Re-add Bash version check to Docker image build Move timing test to Docker run for Linux jobs Remove version check from Docker image build Bash version via build matrix instead of script loop Fix merge error. Add return code storage for Bash version loop Add Bash version output during 'docker build' Clean up Docker image tags Add default value for Bash version Cover more Bash versions with Docker BATS_ROOT: Elide options to reset shell options BATS_ROOT: Restore comment noting issue sstephenson#113 BATS_ROOT: Use `set -P`, remove `PWD` resolution ...
2 parents b6e2761 + c706d14 commit a00ade8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+2459
-755
lines changed

Diff for: ‎.appveyor.yml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
version: 'v1.1.0.{build}'
2+
3+
build: off
4+
5+
# This presumes that Git bash is installed at `C:\Program Files\Git` and the
6+
# bash we're using is `C:\Program Files\Git\bin\bash.exe`.
7+
#
8+
# If instead it finds the Windows Subsystem for Linux bash at
9+
# `C:\Windows\System32\bash.exe`, it will fail with an error like:
10+
# /mnt/c/.../bats-core/test/test_helper.bash: line 1:
11+
# syntax error near unexpected token `$'{\r''
12+
test_script:
13+
- where bash
14+
- bash --version
15+
- bash -c 'export'
16+
- bash -c 'time PATH="/usr/bin:${PATH}" bin/bats test'

Diff for: ‎.travis.yml

+31-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,34 @@
1-
language: c
2-
script: bin/bats --tap test
1+
language: bash
2+
3+
os:
4+
- linux
5+
6+
env:
7+
- BASHVER=
8+
- BASHVER=3.2
9+
- BASHVER=4.0
10+
- BASHVER=4.1
11+
- BASHVER=4.2
12+
- BASHVER=4.3
13+
- BASHVER=4.4
14+
15+
matrix:
16+
include:
17+
- os: osx
18+
19+
services:
20+
- docker
21+
22+
script:
23+
- |
24+
if [[ "$TRAVIS_OS_NAME" == 'linux' && -n "$BASHVER" ]]; then
25+
docker build --build-arg bashver=${BASHVER} --tag bats/bats:bash-${BASHVER} .
26+
docker run -it bash:${BASHVER} --version
27+
time docker run -it bats/bats:bash-${BASHVER} --tap /opt/bats/test
28+
else
29+
time bin/bats --tap test
30+
fi
31+
332
notifications:
433
email:
534
on_success: never

Diff for: ‎AUTHORS

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Andrew Martin (https://control-plane.io/)
2+
Bianca Tamayo <[email protected]> (https://biancatamayo.me/)
3+
Jason Karns <[email protected]> (http://jasonkarns.com/)
4+
Mike Bland <[email protected]> (https://mike-bland.com/)

Diff for: ‎Dockerfile

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
ARG bashver=latest
2+
3+
FROM bash:${bashver}
4+
5+
RUN ln -s /opt/bats/bin/bats /usr/sbin/bats
6+
7+
COPY . /opt/bats/
8+
9+
ENTRYPOINT ["bash", "/usr/sbin/bats"]

Diff for: ‎LICENSE

-20
This file was deleted.

Diff for: ‎LICENSE.md

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
Copyright (c) 2017 bats-core contributors
2+
3+
Permission is hereby granted, free of charge, to any person obtaining
4+
a copy of this software and associated documentation files (the
5+
"Software"), to deal in the Software without restriction, including
6+
without limitation the rights to use, copy, modify, merge, publish,
7+
distribute, sublicense, and/or sell copies of the Software, and to
8+
permit persons to whom the Software is furnished to do so, subject to
9+
the following conditions:
10+
11+
The above copyright notice and this permission notice shall be
12+
included in all copies or substantial portions of the Software.
13+
14+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
21+
22+
---
23+
24+
* [bats-core] is a continuation of [bats]. Copyright for portions of the
25+
bats-core project are held by Sam Stephenson, 2014 as part of the project
26+
[bats], licensed under MIT:
27+
28+
Copyright (c) 2014 Sam Stephenson
29+
30+
Permission is hereby granted, free of charge, to any person obtaining
31+
a copy of this software and associated documentation files (the
32+
"Software"), to deal in the Software without restriction, including
33+
without limitation the rights to use, copy, modify, merge, publish,
34+
distribute, sublicense, and/or sell copies of the Software, and to
35+
permit persons to whom the Software is furnished to do so, subject to
36+
the following conditions:
37+
38+
The above copyright notice and this permission notice shall be
39+
included in all copies or substantial portions of the Software.
40+
41+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
42+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
43+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
44+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
45+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
46+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
47+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
48+
49+
For details, please see the [version control history][commits].
50+
51+
[bats-core]: https://github.com/bats-core/bats-core
52+
[bats]:https://github.com/sstephenson/bats
53+
[commits]:https://github.com/bats-core/bats-core/commits/master

0 commit comments

Comments
 (0)