Merge new commits from upstream

.dir-locals.el

@@ -1,10 +1,10 @@
-;; bash-completion shell-script mode additional settings for Emacs
+;;; Directory Local Variables
+;;; For more information see (info "(emacs) Directory Variables")
 
-((sh-mode . ((sh-indent-comment . t)
-             ;; Somewhat fragile, waiting for flycheck-sh-bash-args
-             (eval . (setq flycheck-command-wrapper-function
-                           (lambda (command)
-                             (append (butlast command 1)
-                                     '("-O" "extglob")
-                                     (last command)))))
-             )))
+((python-mode
+  (eval add-hook 'before-save-hook 'blacken-buffer nil t))
+ (sh-mode
+  (mode . shfmt-on-save)
+  (shfmt-arguments "-s")
+  (flycheck-sh-bash-args "-O" "extglob")
+  (sh-indent-comment . t)))

.editorconfig

@@ -7,6 +7,15 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 max_line_length = 79
+# for shfmt
+function_next_line = true
+switch_case_indent = true
 
 [Makefile.am]
 indent_style = tab
+
+[*.{yml,yaml}]
+indent_size = 2
+
+[COMMIT_EDITMSG]
+max_line_length = 72

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,41 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+## Describe the bug
+
+<!-- A clear and concise description of what the bug is. -->
+
+## To reproduce
+
+<!-- Steps to reproduce the behavior: -->
+
+1. cd to '...'
+2. Type '....'
+3. See problem
+
+## Expected behavior
+
+<!-- A clear and concise description of what you expected to happen. -->
+
+## Versions (please complete the following information)
+
+- [ ] Operating system name/distribution and version:
+- [ ] bash version, `echo "$BASH_VERSION"`:
+- [ ] bash-completion version, `(IFS=.; echo "${BASH_COMPLETION_VERSINFO[*]}")`:
+
+## Additional context
+
+<!-- Add any other context about the problem here. -->
+
+## Debug trace
+
+<!--
+     See Troubleshooting section in README.md how to generate a debug trace,
+     copy-paste it into a separate file and attach the file here.
+-->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,24 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+## Describe the feature/solution
+
+<!-- A clear and concise description of what you want to happen. -->
+
+## Maintenance (please complete the following information)
+
+<!--
+     See CONTRIBUTING.md, many of the considerations for new completions
+     applies here, too. If upstream has been asked if they'd be interested in
+     shipping the completion instead of us here in bash-completion, include
+     link to the upstream query/issue below.
+-->
+
+- [ ] This is a request for new completion
+- [ ] Link to upstream project query about shipping the completion:

.github/workflows/ci.yaml

@@ -0,0 +1,147 @@
+name: ci
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+      - uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: pip-${{hashFiles('test/requirements*.txt')}}
+      - uses: actions/cache@v2
+        with:
+          path: ~/.cache/pre-commit
+          key: pre-commit-${{hashFiles('.pre-commit-config.yaml')}}
+      - name: Install dependencies
+        run: |
+          python3 -m venv venv  # for venv-run
+          source venv/bin/activate
+          python3 -m pip install -Ur test/requirements-dev.txt
+      - name: Run checks
+        run: |
+          source venv/bin/activate
+
+          # Commit message checks
+
+          tmpdir=$(mktemp -d)
+          trap "rm -r '$tmpdir'" EXIT
+          commits_json=$tmpdir/commits.json
+          commit_txt=$tmpdir/message.txt
+
+          # For push, commits are available directly in github.event.commits.
+          # For pull_request they're not: grab them from API, transform fields
+          # we want to a similar structure as pushes are.
+          if [[ "${{github.event.commits}}" ]]; then
+            cat <<\EOF >"$commits_json"
+            ${{toJSON(github.event.commits)}}
+          EOF
+          else
+            curl -fSsL ${{github.event.pull_request.commits_url}} | \
+              jq '[.[] | {id: .sha, message: .commit.message}]' >"$commits_json"
+          fi
+
+          git config user.name $(git log -1 --format=format:%an)
+          git config user.email $(git log -1 --format=format:%ae)
+          rc=0
+          for id in $(jq --raw-output '.[].id' <"$commits_json"); do
+            jq --raw-output ".[] | select(.id==\"$id\") | .message" \
+              <"$commits_json" >"$commit_txt"
+            echo "Linting commit $id message..."
+            set +e
+            pre-commit run gitlint \
+              --color=always \
+              --hook-stage=commit-msg \
+              --commit-msg-filename="$commit_txt"
+            ((rc+=$?))
+            set -e
+          done
+
+          # Other pre-commit checks
+
+          set +e
+          pre-commit run --color=always --all-files
+          ((rc+=$?))
+          set -e
+
+          exit $rc
+
+  distcheck:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - dist: alpine
+          - dist: centos7
+          - dist: debian10
+          - dist: debian10
+            bsd: true
+            network: none
+          - dist: fedoradev
+          - dist: ubuntu14
+    steps:
+      - uses: actions/checkout@v2
+      - uses: GoogleCloudPlatform/release-please-action@v2
+        with:
+          release-type: simple
+        id: release
+        if: github.event_name == 'push' && matrix.dist == 'alpine'
+      - name: Do release preparations
+        run: |
+          version=$(cat version.txt)
+          sed -i -re "s/^(BASH_COMPLETION_VERSINFO=).*/\\1(${version//./ })/" bash_completion
+          sed -i -re "s/^(AC_INIT\(.*\[)[0-9.]+(\].*)/\\1$version\\2/" configure.ac
+          git config user.name $(git log -1 --format=format:%an)
+          git config user.email $(git log -1 --format=format:%ae)
+          git commit --message="chore: bump release in dist files" bash_completion configure.ac
+          git tag --force ${{steps.release.outputs.tag_name}}
+          git push
+          git push --tags --force
+        if: steps.release.outputs.release_created
+      # A "container" workflow config would be cleaner here, but comes with
+      # some restrictions/oddities: changes root's $HOME to /github/home
+      # without changing the actual home dir that can cause some problems,
+      # and does not provide a way to run with --network none.
+      # fedoradev unconfined: https://bugzilla.redhat.com/1900021
+      - name: Run main build
+        run: >-
+          docker run
+          --rm
+          --tty
+          --env CI=true
+          --env DIST=${{matrix.dist}}
+          --env BSD=${{matrix.bsd}}
+          --env PYTESTFLAGS=--verbose
+          --env NETWORK=$NETWORK
+          ${NETWORK:+--network $NETWORK}
+          $(test $DIST = fedoradev && echo --security-opt seccomp=unconfined)
+          --volume $PWD:/usr/src/bash-completion
+          --workdir /usr/src/bash-completion
+          ghcr.io/scop/bash-completion/test:${{matrix.dist}}
+          test/docker/entrypoint.sh
+        env:
+          DIST: ${{matrix.dist}}
+          NETWORK: ${{matrix.network}}
+      - name: Upload release assets
+        run: |
+          set -x
+          upload_url="${{steps.release.outputs.upload_url}}"
+          tarball="bash-completion-$(cat version.txt).tar.xz"
+          curl \
+            --header "Authorization: Bearer ${{secrets.GITHUB_TOKEN}}" \
+            --header "Accept: application/vnd.github.v3+json" \
+            --header "Content-Type: application/x-xz-compressed-tar" \
+            --data-binary "@$tarball" \
+            "${upload_url%{*}?name=$tarball"
+        if: steps.release.outputs.release_created
+      - uses: actions/upload-artifact@v2
+        with:
+          path: bash-completion-*.tar.xz
+        if: matrix.dist == 'alpine'

.github/workflows/update-docker-images.yml

@@ -0,0 +1,43 @@
+name: update-docker-images
+
+# Update Docker images when the set of commands required present for testing
+# change. This is not perfect as it would be good to have the new commands
+# installed already at PR time, and at least at time the change lands in the
+# default branch. That way it'd be tested immediately then with images
+# containing it, instead of later along with some other, completely unrelated
+# change.
+
+on:
+  push:
+    paths:
+      - test/test-cmd-list.txt
+      - test/docker/*/Dockerfile
+      - test/docker/*/install-packages.sh
+  workflow_dispatch:
+
+jobs:
+  update-test-image:
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'scop' && github.ref == 'refs/heads/master'
+    strategy:
+      matrix:
+        include:
+          - dist: alpine
+          - dist: centos7
+          - dist: debian10
+          - dist: fedoradev
+          - dist: ubuntu14
+    steps:
+      - uses: actions/checkout@v2
+      - uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{github.repository_owner}}
+          password: ${{secrets.GITHUB_TOKEN}}
+      - uses: docker/build-push-action@v2
+        with:
+          context: test
+          file: test/docker/${{matrix.dist}}/Dockerfile
+          tags: |
+            ghcr.io/scop/bash-completion/test:${{matrix.dist}}
+          push: true

.gitignore

@@ -1,20 +1,23 @@
-*.tar*
 *.swp
+*.tar*
+*~
+.pytest_cache/
 Makefile
 Makefile.in
-aclocal.m4
-autom4te.cache
-config.log
-config.status
-configure
-install-sh
-missing
-doc/*.xml
-*~
-doc/html*
-bash_completion.sh
-bash-completion.pc
-bash-completion-config.cmake
-bash-completion-config-version.cmake
 __pycache__/
-.pytest_cache/
+pytestdebug.log
+/.python-version
+/aclocal.m4
+/autom4te.cache
+/bash-completion-config-version.cmake
+/bash-completion-config.cmake
+/bash-completion.pc
+/bash_completion.sh
+/config.log
+/config.status
+/configure
+/configure.lineno
+/doc/*.xml
+/doc/html*
+/install-sh
+/missing

.gitlint

@@ -0,0 +1,10 @@
+[general]
+ignore = body-is-missing
+ignore-fixup-commits = false
+ignore-revert-commits = false
+ignore-squash-commits = false
+ignore-stdin = true
+contrib = contrib-title-conventional-commits
+
+[ignore-body-lines]
+regex = ^(Co-authored-by:|(Refs )?https?://)

.perltidyrc

@@ -0,0 +1,6 @@
+--perl-best-practices
+--maximum-line-length=79
+--paren-tightness=2
+--cuddled-else
+--warning-output
+--converge