Skip to content

Commit

Permalink
Add formatter for Caddyfile (#154)
Browse files Browse the repository at this point in the history
Add formatter for Caddyfile (#136)
  • Loading branch information
rassie authored Feb 19, 2023
1 parent 4f2e4cd commit 972b990
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 0 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,13 @@ The format is based on [Keep a Changelog].
* [gofumpt](https://pkg.go.dev/mvdan.cc/gofumpt) and
[goimports](https://pkg.go.dev/golang.org/x/tools/cmd/goimports) for
[Go](https://golang.google.cn/) ([#147]).
* [`caddy fmt`](https://caddyserver.com/docs/command-line#caddy-fmt)
for [Caddyfile](https://caddyserver.com/docs/caddyfile), used by
[Caddy 2](https://caddyserver.com/) ([#136])

[#131]: https://github.com/radian-software/apheleia/issues/131
[#134]: https://github.com/radian-software/apheleia/issues/134
[#136]: https://github.com/radian-software/apheleia/issues/136
[#137]: https://github.com/radian-software/apheleia/pull/137
[#138]: https://github.com/radian-software/apheleia/pull/138
[#143]: https://github.com/radian-software/apheleia/pull/143
Expand Down
2 changes: 2 additions & 0 deletions apheleia.el
Original file line number Diff line number Diff line change
Expand Up @@ -941,6 +941,7 @@ being run, for diagnostic purposes."
'((bean-format . ("bean-format"))
(black . ("black" "-"))
(brittany . ("brittany"))
(caddyfmt . ("caddy" "fmt" "-"))
(clang-format . ("clang-format"
"-assume-filename"
(or (buffer-file-name)
Expand Down Expand Up @@ -1133,6 +1134,7 @@ function: %s" command)))
(bash-ts-mode . shfmt)
(beancount-mode . bean-format)
(c++-ts-mode . clang-format)
(caddyfile-mode . caddyfmt)
(cc-mode . clang-format)
(c-mode . clang-format)
(c-ts-mode . clang-format)
Expand Down
18 changes: 18 additions & 0 deletions test/formatters/installers/caddyfmt.bash
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
ver="$(latest_release caddyserver/caddy)"

arch="$(uname -m)"
case "${arch}" in
"x86_64")
arch="amd64"
;;
"aarch64")
arch="arm64"
;;
*)
echo >&2 "unsupported architecture: ${arch}"
exit 1
;;
esac

curl -L -s "https://github.com/caddyserver/caddy/releases/download/${ver}/caddy_$(echo $ver | sed 's|^v||g')_linux_${arch}.tar.gz" | \
tar zxv -C /usr/local/bin/ caddy
4 changes: 4 additions & 0 deletions test/formatters/samplecode/caddyfmt/in.caddyfile1
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
example.com {
root * /var/www
file_server
}
4 changes: 4 additions & 0 deletions test/formatters/samplecode/caddyfmt/out.caddyfile1
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
example.com {
root * /var/www
file_server
}

0 comments on commit 972b990

Please sign in to comment.