Compare commits
No commits in common. "main" and "watchexec-filterer-globset-v4.0.1" have entirely different histories.
main
...
watchexec-
|
|
@ -197,15 +197,9 @@ jobs:
|
|||
tool: cross
|
||||
|
||||
- name: Build
|
||||
shell: bash
|
||||
run: |
|
||||
${{ matrix.cross && 'cross' || 'cargo' }} build \
|
||||
-p watchexec-cli \
|
||||
--release --locked \
|
||||
--target ${{ matrix.target }}
|
||||
run: ${{ matrix.cross && 'cross' || 'cargo' }} build --package watchexec-cli --release --locked --target ${{ matrix.target }}
|
||||
|
||||
- name: Make manpage
|
||||
shell: bash
|
||||
run: |
|
||||
cargo run -p watchexec-cli \
|
||||
${{ (!matrix.cross) && '--release --target' || '' }} \
|
||||
|
|
@ -213,7 +207,6 @@ jobs:
|
|||
--locked -- --manual > doc/watchexec.1
|
||||
|
||||
- name: Make completions
|
||||
shell: bash
|
||||
run: |
|
||||
bin/completions \
|
||||
${{ (!matrix.cross) && '--release --target' || '' }} \
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ message: |
|
|||
If you use this software, please cite it using these metadata.
|
||||
title: "Watchexec: a tool to react to filesystem changes, and a crate ecosystem to power it"
|
||||
|
||||
version: "2.1.2"
|
||||
date-released: 2024-06-30
|
||||
version: "2.0.0"
|
||||
date-released: 2024-04-20
|
||||
|
||||
repository-code: https://github.com/watchexec/watchexec
|
||||
license: Apache-2.0
|
||||
|
|
|
|||
|
|
@ -488,7 +488,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "bosion"
|
||||
version = "1.1.0"
|
||||
version = "1.0.3"
|
||||
dependencies = [
|
||||
"gix",
|
||||
"time",
|
||||
|
|
@ -1317,7 +1317,6 @@ dependencies = [
|
|||
"gix-glob",
|
||||
"gix-hash",
|
||||
"gix-hashtable",
|
||||
"gix-index",
|
||||
"gix-lock",
|
||||
"gix-macros",
|
||||
"gix-object",
|
||||
|
|
@ -1355,15 +1354,6 @@ dependencies = [
|
|||
"winnow 0.6.6",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gix-bitmap"
|
||||
version = "0.2.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a371db66cbd4e13f0ed9dc4c0fea712d7276805fccc877f77e96374d317e87ae"
|
||||
dependencies = [
|
||||
"thiserror",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gix-chunk"
|
||||
version = "0.4.8"
|
||||
|
|
@ -1523,33 +1513,6 @@ dependencies = [
|
|||
"parking_lot",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gix-index"
|
||||
version = "0.32.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "881ab3b1fa57f497601a5add8289e72a7ae09471fc0b9bbe483b628ae8e418a1"
|
||||
dependencies = [
|
||||
"bitflags 2.5.0",
|
||||
"bstr",
|
||||
"filetime",
|
||||
"fnv",
|
||||
"gix-bitmap",
|
||||
"gix-features",
|
||||
"gix-fs",
|
||||
"gix-hash",
|
||||
"gix-lock",
|
||||
"gix-object",
|
||||
"gix-traverse",
|
||||
"gix-utils",
|
||||
"hashbrown 0.14.3",
|
||||
"itoa",
|
||||
"libc",
|
||||
"memmap2",
|
||||
"rustix",
|
||||
"smallvec",
|
||||
"thiserror",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gix-lock"
|
||||
version = "13.1.1"
|
||||
|
|
@ -4069,7 +4032,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "watchexec-cli"
|
||||
version = "2.1.2"
|
||||
version = "2.0.0"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
"argfile",
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ _watchexec() {
|
|||
|
||||
case "${cmd}" in
|
||||
watchexec)
|
||||
opts="-w -W -F -c -o -r -s -d -p -n -E -1 -N -q -e -f -j -i -v -h -V --watch --watch-non-recursive --watch-file --clear --on-busy-update --restart --signal --stop-signal --stop-timeout --map-signal --debounce --stdin-quit --no-vcs-ignore --no-project-ignore --no-global-ignore --no-default-ignore --no-discover-ignore --ignore-nothing --postpone --delay-run --poll --shell --no-environment --emit-events-to --only-emit-events --env --no-process-group --wrap-process --notify --color --timings --quiet --bell --project-origin --workdir --exts --filter --filter-file --filter-prog --ignore --ignore-file --fs-events --no-meta --print-events --manual --completions --verbose --log-file --help --version [COMMAND]..."
|
||||
opts="-w -W -c -o -r -s -d -p -n -E -1 -N -q -e -f -j -i -v -h -V --watch --watch-non-recursive --clear --on-busy-update --restart --signal --stop-signal --stop-timeout --map-signal --debounce --stdin-quit --no-vcs-ignore --no-project-ignore --no-global-ignore --no-default-ignore --no-discover-ignore --ignore-nothing --postpone --delay-run --poll --shell --no-environment --emit-events-to --only-emit-events --env --no-process-group --wrap-process --notify --color --timings --quiet --bell --project-origin --workdir --exts --filter --filter-file --filter-prog --ignore --ignore-file --fs-events --no-meta --print-events --manual --completions --verbose --log-file --help --version [COMMAND]..."
|
||||
if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
|
||||
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
|
||||
return 0
|
||||
|
|
@ -41,14 +41,6 @@ _watchexec() {
|
|||
COMPREPLY=($(compgen -f "${cur}"))
|
||||
return 0
|
||||
;;
|
||||
--watch-file)
|
||||
COMPREPLY=($(compgen -f "${cur}"))
|
||||
return 0
|
||||
;;
|
||||
-F)
|
||||
COMPREPLY=($(compgen -f "${cur}"))
|
||||
return 0
|
||||
;;
|
||||
--clear)
|
||||
COMPREPLY=($(compgen -W "clear reset" -- "${cur}"))
|
||||
return 0
|
||||
|
|
|
|||
|
|
@ -22,8 +22,6 @@ set edit:completion:arg-completer[watchexec] = {|@words|
|
|||
cand --watch 'Watch a specific file or directory'
|
||||
cand -W 'Watch a specific directory, non-recursively'
|
||||
cand --watch-non-recursive 'Watch a specific directory, non-recursively'
|
||||
cand -F 'Watch files and directories from a file'
|
||||
cand --watch-file 'Watch files and directories from a file'
|
||||
cand -c 'Clear screen before running command'
|
||||
cand --clear 'Clear screen before running command'
|
||||
cand -o 'What to do when receiving events while the command is running'
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
complete -c watchexec -s w -l watch -d 'Watch a specific file or directory' -r -F
|
||||
complete -c watchexec -s W -l watch-non-recursive -d 'Watch a specific directory, non-recursively' -r -F
|
||||
complete -c watchexec -s F -l watch-file -d 'Watch files and directories from a file' -r -F
|
||||
complete -c watchexec -s c -l clear -d 'Clear screen before running command' -r -f -a "{clear '',reset ''}"
|
||||
complete -c watchexec -s o -l on-busy-update -d 'What to do when receiving events while the command is running' -r -f -a "{queue '',do-nothing '',restart '',signal ''}"
|
||||
complete -c watchexec -s s -l signal -d 'Send a signal to the process when it\'s still running' -r
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ module completions {
|
|||
...command: string # Command to run on changes
|
||||
--watch(-w): string # Watch a specific file or directory
|
||||
--watch-non-recursive(-W): string # Watch a specific directory, non-recursively
|
||||
--watch-file(-F): string # Watch files and directories from a file
|
||||
--clear(-c): string@"nu-complete watchexec screen_clear" # Clear screen before running command
|
||||
--on-busy-update(-o): string@"nu-complete watchexec on_busy_update" # What to do when receiving events while the command is running
|
||||
--restart(-r) # Restart the process if it's still running
|
||||
|
|
|
|||
|
|
@ -25,8 +25,6 @@ Register-ArgumentCompleter -Native -CommandName 'watchexec' -ScriptBlock {
|
|||
[CompletionResult]::new('--watch', 'watch', [CompletionResultType]::ParameterName, 'Watch a specific file or directory')
|
||||
[CompletionResult]::new('-W', 'W ', [CompletionResultType]::ParameterName, 'Watch a specific directory, non-recursively')
|
||||
[CompletionResult]::new('--watch-non-recursive', 'watch-non-recursive', [CompletionResultType]::ParameterName, 'Watch a specific directory, non-recursively')
|
||||
[CompletionResult]::new('-F', 'F ', [CompletionResultType]::ParameterName, 'Watch files and directories from a file')
|
||||
[CompletionResult]::new('--watch-file', 'watch-file', [CompletionResultType]::ParameterName, 'Watch files and directories from a file')
|
||||
[CompletionResult]::new('-c', 'c', [CompletionResultType]::ParameterName, 'Clear screen before running command')
|
||||
[CompletionResult]::new('--clear', 'clear', [CompletionResultType]::ParameterName, 'Clear screen before running command')
|
||||
[CompletionResult]::new('-o', 'o', [CompletionResultType]::ParameterName, 'What to do when receiving events while the command is running')
|
||||
|
|
|
|||
|
|
@ -19,8 +19,6 @@ _watchexec() {
|
|||
'*--watch=[Watch a specific file or directory]:PATH:_files' \
|
||||
'*-W+[Watch a specific directory, non-recursively]:PATH:_files' \
|
||||
'*--watch-non-recursive=[Watch a specific directory, non-recursively]:PATH:_files' \
|
||||
'-F+[Watch files and directories from a file]:PATH:_files' \
|
||||
'--watch-file=[Watch files and directories from a file]:PATH:_files' \
|
||||
'-c+[Clear screen before running command]' \
|
||||
'--clear=[Clear screen before running command]' \
|
||||
'-o+[What to do when receiving events while the command is running]:MODE:(queue do-nothing restart signal)' \
|
||||
|
|
|
|||
|
|
@ -2,10 +2,6 @@
|
|||
|
||||
## Next (YYYY-MM-DD)
|
||||
|
||||
## v1.1.0 (2024-05-16)
|
||||
|
||||
- Add `git-describe` support (#832, by @lu-zero)
|
||||
|
||||
## v1.0.3 (2024-04-20)
|
||||
|
||||
- Deps: gix 0.62
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "bosion"
|
||||
version = "1.1.0"
|
||||
version = "1.0.3"
|
||||
|
||||
authors = ["Félix Saparelli <felix@passcod.name>"]
|
||||
license = "Apache-2.0 OR MIT"
|
||||
|
|
@ -22,7 +22,6 @@ features = ["macros", "formatting"]
|
|||
version = "0.62.0"
|
||||
optional = true
|
||||
default-features = false
|
||||
features = ["revision"]
|
||||
|
||||
[features]
|
||||
default = ["git", "reproducible", "std"]
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ In your `Cargo.toml`:
|
|||
|
||||
```toml
|
||||
[build-dependencies]
|
||||
bosion = "1.1.0"
|
||||
bosion = "1.0.3"
|
||||
```
|
||||
|
||||
In your `build.rs`:
|
||||
|
|
|
|||
|
|
@ -8,24 +8,6 @@ version = "1.0.2"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
|
||||
|
||||
[[package]]
|
||||
name = "ahash"
|
||||
version = "0.8.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"once_cell",
|
||||
"version_check",
|
||||
"zerocopy",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "allocator-api2"
|
||||
version = "0.2.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
|
||||
|
||||
[[package]]
|
||||
name = "anstream"
|
||||
version = "0.6.13"
|
||||
|
|
@ -100,7 +82,7 @@ checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
|
|||
|
||||
[[package]]
|
||||
name = "bosion"
|
||||
version = "1.0.3"
|
||||
version = "1.0.2"
|
||||
dependencies = [
|
||||
"gix",
|
||||
"time",
|
||||
|
|
@ -229,18 +211,6 @@ version = "2.0.2"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984"
|
||||
|
||||
[[package]]
|
||||
name = "filetime"
|
||||
version = "0.2.23"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"redox_syscall",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "flate2"
|
||||
version = "1.0.28"
|
||||
|
|
@ -251,12 +221,6 @@ dependencies = [
|
|||
"miniz_oxide",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fnv"
|
||||
version = "1.0.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
|
||||
|
||||
[[package]]
|
||||
name = "form_urlencoded"
|
||||
version = "1.2.1"
|
||||
|
|
@ -283,7 +247,6 @@ dependencies = [
|
|||
"gix-glob",
|
||||
"gix-hash",
|
||||
"gix-hashtable",
|
||||
"gix-index",
|
||||
"gix-lock",
|
||||
"gix-macros",
|
||||
"gix-object",
|
||||
|
|
@ -321,15 +284,6 @@ dependencies = [
|
|||
"winnow",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gix-bitmap"
|
||||
version = "0.2.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a371db66cbd4e13f0ed9dc4c0fea712d7276805fccc877f77e96374d317e87ae"
|
||||
dependencies = [
|
||||
"thiserror",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gix-chunk"
|
||||
version = "0.4.8"
|
||||
|
|
@ -489,33 +443,6 @@ dependencies = [
|
|||
"parking_lot",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gix-index"
|
||||
version = "0.32.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "881ab3b1fa57f497601a5add8289e72a7ae09471fc0b9bbe483b628ae8e418a1"
|
||||
dependencies = [
|
||||
"bitflags 2.5.0",
|
||||
"bstr",
|
||||
"filetime",
|
||||
"fnv",
|
||||
"gix-bitmap",
|
||||
"gix-features",
|
||||
"gix-fs",
|
||||
"gix-hash",
|
||||
"gix-lock",
|
||||
"gix-object",
|
||||
"gix-traverse",
|
||||
"gix-utils",
|
||||
"hashbrown",
|
||||
"itoa",
|
||||
"libc",
|
||||
"memmap2",
|
||||
"rustix",
|
||||
"smallvec",
|
||||
"thiserror",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gix-lock"
|
||||
version = "13.1.1"
|
||||
|
|
@ -775,10 +702,6 @@ name = "hashbrown"
|
|||
version = "0.14.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
"allocator-api2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "heck"
|
||||
|
|
@ -1153,12 +1076,6 @@ version = "0.2.1"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
|
||||
|
||||
[[package]]
|
||||
name = "version_check"
|
||||
version = "0.9.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
|
||||
|
||||
[[package]]
|
||||
name = "walkdir"
|
||||
version = "2.5.0"
|
||||
|
|
@ -1338,23 +1255,3 @@ checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352"
|
|||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zerocopy"
|
||||
version = "0.7.34"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
|
||||
dependencies = [
|
||||
"zerocopy-derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zerocopy-derive"
|
||||
version = "0.7.34"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
|
|
|||
|
|
@ -13,9 +13,6 @@ struct Args {
|
|||
|
||||
#[clap(long)]
|
||||
dates: bool,
|
||||
|
||||
#[clap(long)]
|
||||
describe: bool,
|
||||
}
|
||||
|
||||
fn main() {
|
||||
|
|
@ -26,15 +23,17 @@ fn main() {
|
|||
"{}",
|
||||
Bosion::long_version_with(&[("extra", "field"), ("custom", "1.2.3"),])
|
||||
);
|
||||
} else if args.features {
|
||||
} else
|
||||
|
||||
if args.features {
|
||||
println!("Features: {}", Bosion::CRATE_FEATURE_STRING);
|
||||
} else if args.dates {
|
||||
} else
|
||||
|
||||
if args.dates {
|
||||
println!("commit date: {}", Bosion::GIT_COMMIT_DATE);
|
||||
println!("commit datetime: {}", Bosion::GIT_COMMIT_DATETIME);
|
||||
println!("build date: {}", Bosion::BUILD_DATE);
|
||||
println!("build datetime: {}", Bosion::BUILD_DATETIME);
|
||||
} else if args.describe {
|
||||
println!("commit description: {}", Bosion::GIT_COMMIT_DESCRIPTION);
|
||||
} else {
|
||||
println!("{}", Bosion::LONG_VERSION);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -145,9 +145,6 @@ pub struct GitInfo {
|
|||
|
||||
/// The datetime of the current commit, in the format `YYYY-MM-DD HH:MM:SS`, at UTC.
|
||||
pub git_datetime: String,
|
||||
|
||||
/// The `git describe` equivalent output
|
||||
pub git_description: String,
|
||||
}
|
||||
|
||||
#[cfg(feature = "git")]
|
||||
|
|
@ -166,7 +163,6 @@ impl GitInfo {
|
|||
git_shorthash: head.short_id().err_string()?.to_string(),
|
||||
git_date: timestamp.format(DATE_FORMAT).err_string()?,
|
||||
git_datetime: timestamp.format(DATETIME_FORMAT).err_string()?,
|
||||
git_description: head.describe().format().err_string()?.to_string(),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,7 +74,6 @@ pub fn gather_to(filename: &str, structname: &str, public: bool) {
|
|||
git_shorthash,
|
||||
git_date,
|
||||
git_datetime,
|
||||
git_description,
|
||||
..
|
||||
}) = git
|
||||
{
|
||||
|
|
@ -105,11 +104,6 @@ pub fn gather_to(filename: &str, structname: &str, public: bool) {
|
|||
/// This is the date and time (`YYYY-MM-DD HH:MM:SS`) of the commit that was built. Same
|
||||
/// caveats as with `GIT_COMMIT_HASH` apply.
|
||||
pub const GIT_COMMIT_DATETIME: &'static str = {git_datetime:?};
|
||||
|
||||
/// The git description
|
||||
///
|
||||
/// This is the string equivalent to what `git describe` would output
|
||||
pub const GIT_COMMIT_DESCRIPTION: &'static str = {git_description:?};
|
||||
"
|
||||
), format!("{crate_version} ({git_shorthash} {git_date}) {crate_feature_string}\ncommit-hash: {git_hash}\ncommit-date: {git_date}\nbuild-date: {build_date}\nrelease: {crate_version}\nfeatures: {crate_feature_list}"))
|
||||
} else {
|
||||
|
|
@ -250,7 +244,6 @@ pub fn gather_to_env_with_prefix(prefix: &str) {
|
|||
git_shorthash,
|
||||
git_date,
|
||||
git_datetime,
|
||||
git_description,
|
||||
..
|
||||
}) = git
|
||||
{
|
||||
|
|
@ -258,6 +251,5 @@ pub fn gather_to_env_with_prefix(prefix: &str) {
|
|||
println!("cargo:rustc-env={prefix}GIT_COMMIT_SHORTHASH={git_shorthash}");
|
||||
println!("cargo:rustc-env={prefix}GIT_COMMIT_DATE={git_date}");
|
||||
println!("cargo:rustc-env={prefix}GIT_COMMIT_DATETIME={git_datetime}");
|
||||
println!("cargo:rustc-env={prefix}GIT_COMMIT_DESCRIPTION={git_description}");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "watchexec-cli"
|
||||
version = "2.1.2"
|
||||
version = "2.0.0"
|
||||
|
||||
authors = ["Félix Saparelli <felix@passcod.name>", "Matt Green <mattgreenrocks@gmail.com>"]
|
||||
license = "Apache-2.0"
|
||||
|
|
@ -130,7 +130,7 @@ mimalloc = "0.1.39"
|
|||
embed-resource = "2.4.0"
|
||||
|
||||
[build-dependencies.bosion]
|
||||
version = "1.1.0"
|
||||
version = "1.0.3"
|
||||
path = "../bosion"
|
||||
|
||||
[dev-dependencies]
|
||||
|
|
@ -171,7 +171,7 @@ assets = [
|
|||
["../../target/release/watchexec", "usr/bin/watchexec", "755"],
|
||||
["README.md", "usr/share/doc/watchexec/README", "644"],
|
||||
["../../doc/watchexec.1.md", "usr/share/doc/watchexec/watchexec.1.md", "644"],
|
||||
["../../doc/watchexec.1", "usr/share/man/man1/watchexec.1", "644"],
|
||||
["../../doc/watchexec.1", "usr/share/man/man1/watchexec.1.html", "644"],
|
||||
["../../completions/bash", "usr/share/bash-completion/completions/watchexec", "644"],
|
||||
["../../completions/fish", "usr/share/fish/vendor_completions.d/watchexec.fish", "644"],
|
||||
["../../completions/zsh", "usr/share/zsh/site-functions/_watchexec", "644"],
|
||||
|
|
@ -183,7 +183,7 @@ assets = [
|
|||
{ source = "../../target/release/watchexec", dest = "/usr/bin/watchexec", mode = "755" },
|
||||
{ source = "README.md", dest = "/usr/share/doc/watchexec/README", mode = "644", doc = true },
|
||||
{ source = "../../doc/watchexec.1.md", dest = "/usr/share/doc/watchexec/watchexec.1.md", mode = "644", doc = true },
|
||||
{ source = "../../doc/watchexec.1", dest = "/usr/share/man/man1/watchexec.1", mode = "644" },
|
||||
{ source = "../../doc/watchexec.1", dest = "/usr/share/man/man1/watchexec.1.html", mode = "644" },
|
||||
{ source = "../../completions/bash", dest = "/usr/share/bash-completion/completions/watchexec", mode = "644" },
|
||||
{ source = "../../completions/fish", dest = "/usr/share/fish/vendor_completions.d/watchexec.fish", mode = "644" },
|
||||
{ source = "../../completions/zsh", dest = "/usr/share/zsh/site-functions/_watchexec", mode = "644" },
|
||||
|
|
|
|||
|
|
@ -13,10 +13,7 @@ use clap::{
|
|||
ValueHint,
|
||||
};
|
||||
use miette::{IntoDiagnostic, Result};
|
||||
use tokio::{
|
||||
fs::File,
|
||||
io::{AsyncBufReadExt, AsyncReadExt, BufReader},
|
||||
};
|
||||
use tokio::{fs::File, io::AsyncReadExt};
|
||||
use tracing::{debug, info, trace, warn};
|
||||
use tracing_appender::non_blocking::WorkerGuard;
|
||||
use watchexec::{paths::PATH_SEPARATOR, sources::fs::WatchedPath};
|
||||
|
|
@ -154,23 +151,6 @@ pub struct Args {
|
|||
)]
|
||||
pub non_recursive_paths: Vec<PathBuf>,
|
||||
|
||||
/// Watch files and directories from a file
|
||||
///
|
||||
/// Each line in the file will be interpreted as if given to '-w'.
|
||||
///
|
||||
/// For more complex uses (like watching non-recursively), use the argfile capability: build a
|
||||
/// file containing command-line options and pass it to watchexec with `@path/to/argfile`.
|
||||
///
|
||||
/// The special value '-' will read from STDIN; this in incompatible with '--stdin-quit'.
|
||||
#[arg(
|
||||
short = 'F',
|
||||
long,
|
||||
help_heading = OPTSET_FILTERING,
|
||||
value_hint = ValueHint::AnyPath,
|
||||
value_name = "PATH",
|
||||
)]
|
||||
pub watch_file: Option<PathBuf>,
|
||||
|
||||
#[doc(hidden)]
|
||||
#[arg(skip)]
|
||||
pub paths: Vec<WatchedPath>,
|
||||
|
|
@ -1236,15 +1216,6 @@ pub async fn get_args() -> Result<(Args, Option<WorkerGuard>)> {
|
|||
.exit();
|
||||
}
|
||||
|
||||
if args.stdin_quit && args.watch_file == Some(PathBuf::from("-")) {
|
||||
Args::command()
|
||||
.error(
|
||||
ErrorKind::InvalidValue,
|
||||
"stdin-quit cannot be used when --watch-file=-",
|
||||
)
|
||||
.exit();
|
||||
}
|
||||
|
||||
let workdir = if let Some(w) = take(&mut args.workdir) {
|
||||
w
|
||||
} else {
|
||||
|
|
@ -1262,22 +1233,6 @@ pub async fn get_args() -> Result<(Args, Option<WorkerGuard>)> {
|
|||
info!(path=?project_origin, "effective project origin");
|
||||
args.project_origin = Some(project_origin.clone());
|
||||
|
||||
if let Some(watch_file) = args.watch_file.as_ref() {
|
||||
if watch_file == Path::new("-") {
|
||||
let file = tokio::io::stdin();
|
||||
let mut lines = BufReader::new(file).lines();
|
||||
while let Ok(Some(line)) = lines.next_line().await {
|
||||
args.recursive_paths.push(line.into());
|
||||
}
|
||||
} else {
|
||||
let file = File::open(watch_file).await.into_diagnostic()?;
|
||||
let mut lines = BufReader::new(file).lines();
|
||||
while let Ok(Some(line)) = lines.next_line().await {
|
||||
args.recursive_paths.push(line.into());
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
args.paths = take(&mut args.recursive_paths)
|
||||
.into_iter()
|
||||
.map(|path| {
|
||||
|
|
@ -1288,7 +1243,7 @@ pub async fn get_args() -> Result<(Args, Option<WorkerGuard>)> {
|
|||
canonicalize(project_origin.join(path)).into_diagnostic()
|
||||
}
|
||||
}
|
||||
.map(WatchedPath::recursive)
|
||||
.map(WatchedPath::non_recursive)
|
||||
})
|
||||
.chain(take(&mut args.non_recursive_paths).into_iter().map(|path| {
|
||||
{
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<assemblyIdentity
|
||||
type="win32"
|
||||
name="Watchexec.Cli.watchexec"
|
||||
version="2.1.2.0"
|
||||
version="2.0.0.0"
|
||||
/>
|
||||
|
||||
<trustInfo>
|
||||
|
|
|
|||
|
|
@ -74,8 +74,8 @@ mod watchexec;
|
|||
#[doc(inline)]
|
||||
pub use crate::{
|
||||
id::Id,
|
||||
watched_path::WatchedPath,
|
||||
watchexec::{ErrorHook, Watchexec},
|
||||
watched_path::WatchedPath,
|
||||
};
|
||||
|
||||
#[doc(no_inline)]
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
.ie \n(.g .ds Aq \(aq
|
||||
.el .ds Aq '
|
||||
.TH watchexec 1 "watchexec 2.1.2"
|
||||
.TH watchexec 1 "watchexec 2.0.0"
|
||||
.SH NAME
|
||||
watchexec \- Execute commands when watched files change
|
||||
.SH SYNOPSIS
|
||||
\fBwatchexec\fR [\fB\-w\fR|\fB\-\-watch\fR] [\fB\-W\fR|\fB\-\-watch\-non\-recursive\fR] [\fB\-F\fR|\fB\-\-watch\-file\fR] [\fB\-c\fR|\fB\-\-clear\fR] [\fB\-o\fR|\fB\-\-on\-busy\-update\fR] [\fB\-r\fR|\fB\-\-restart\fR] [\fB\-s\fR|\fB\-\-signal\fR] [\fB\-\-stop\-signal\fR] [\fB\-\-stop\-timeout\fR] [\fB\-\-map\-signal\fR] [\fB\-d\fR|\fB\-\-debounce\fR] [\fB\-\-stdin\-quit\fR] [\fB\-\-no\-vcs\-ignore\fR] [\fB\-\-no\-project\-ignore\fR] [\fB\-\-no\-global\-ignore\fR] [\fB\-\-no\-default\-ignore\fR] [\fB\-\-no\-discover\-ignore\fR] [\fB\-\-ignore\-nothing\fR] [\fB\-p\fR|\fB\-\-postpone\fR] [\fB\-\-delay\-run\fR] [\fB\-\-poll\fR] [\fB\-\-shell\fR] [\fB\-n \fR] [\fB\-\-emit\-events\-to\fR] [\fB\-\-only\-emit\-events\fR] [\fB\-E\fR|\fB\-\-env\fR] [\fB\-\-no\-process\-group\fR] [\fB\-\-wrap\-process\fR] [\fB\-N\fR|\fB\-\-notify\fR] [\fB\-\-color\fR] [\fB\-\-timings\fR] [\fB\-q\fR|\fB\-\-quiet\fR] [\fB\-\-bell\fR] [\fB\-\-project\-origin\fR] [\fB\-\-workdir\fR] [\fB\-e\fR|\fB\-\-exts\fR] [\fB\-f\fR|\fB\-\-filter\fR] [\fB\-\-filter\-file\fR] [\fB\-j\fR|\fB\-\-filter\-prog\fR] [\fB\-i\fR|\fB\-\-ignore\fR] [\fB\-\-ignore\-file\fR] [\fB\-\-fs\-events\fR] [\fB\-\-no\-meta\fR] [\fB\-\-print\-events\fR] [\fB\-\-manual\fR] [\fB\-\-completions\fR] [\fB\-v\fR|\fB\-\-verbose\fR]... [\fB\-\-log\-file\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fB\-V\fR|\fB\-\-version\fR] [\fICOMMAND\fR]
|
||||
\fBwatchexec\fR [\fB\-w\fR|\fB\-\-watch\fR] [\fB\-W\fR|\fB\-\-watch\-non\-recursive\fR] [\fB\-c\fR|\fB\-\-clear\fR] [\fB\-o\fR|\fB\-\-on\-busy\-update\fR] [\fB\-r\fR|\fB\-\-restart\fR] [\fB\-s\fR|\fB\-\-signal\fR] [\fB\-\-stop\-signal\fR] [\fB\-\-stop\-timeout\fR] [\fB\-\-map\-signal\fR] [\fB\-d\fR|\fB\-\-debounce\fR] [\fB\-\-stdin\-quit\fR] [\fB\-\-no\-vcs\-ignore\fR] [\fB\-\-no\-project\-ignore\fR] [\fB\-\-no\-global\-ignore\fR] [\fB\-\-no\-default\-ignore\fR] [\fB\-\-no\-discover\-ignore\fR] [\fB\-\-ignore\-nothing\fR] [\fB\-p\fR|\fB\-\-postpone\fR] [\fB\-\-delay\-run\fR] [\fB\-\-poll\fR] [\fB\-\-shell\fR] [\fB\-n \fR] [\fB\-\-emit\-events\-to\fR] [\fB\-\-only\-emit\-events\fR] [\fB\-E\fR|\fB\-\-env\fR] [\fB\-\-no\-process\-group\fR] [\fB\-\-wrap\-process\fR] [\fB\-N\fR|\fB\-\-notify\fR] [\fB\-\-color\fR] [\fB\-\-timings\fR] [\fB\-q\fR|\fB\-\-quiet\fR] [\fB\-\-bell\fR] [\fB\-\-project\-origin\fR] [\fB\-\-workdir\fR] [\fB\-e\fR|\fB\-\-exts\fR] [\fB\-f\fR|\fB\-\-filter\fR] [\fB\-\-filter\-file\fR] [\fB\-j\fR|\fB\-\-filter\-prog\fR] [\fB\-i\fR|\fB\-\-ignore\fR] [\fB\-\-ignore\-file\fR] [\fB\-\-fs\-events\fR] [\fB\-\-no\-meta\fR] [\fB\-\-print\-events\fR] [\fB\-\-manual\fR] [\fB\-\-completions\fR] [\fB\-v\fR|\fB\-\-verbose\fR]... [\fB\-\-log\-file\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fB\-V\fR|\fB\-\-version\fR] [\fICOMMAND\fR]
|
||||
.SH DESCRIPTION
|
||||
Execute commands when watched files change.
|
||||
.PP
|
||||
|
|
@ -55,15 +55,6 @@ Unlike \*(Aq\-w\*(Aq, folders watched with this option are not recursed into.
|
|||
|
||||
This option can be specified multiple times to watch multiple directories non\-recursively.
|
||||
.TP
|
||||
\fB\-F\fR, \fB\-\-watch\-file\fR=\fIPATH\fR
|
||||
Watch files and directories from a file
|
||||
|
||||
Each line in the file will be interpreted as if given to \*(Aq\-w\*(Aq.
|
||||
|
||||
For more complex uses (like watching non\-recursively), use the argfile capability: build a file containing command\-line options and pass it to watchexec with `@path/to/argfile`.
|
||||
|
||||
The special value \*(Aq\-\*(Aq will read from STDIN; this in incompatible with \*(Aq\-\-stdin\-quit\*(Aq.
|
||||
.TP
|
||||
\fB\-c\fR, \fB\-\-clear\fR=\fIMODE\fR
|
||||
Clear screen before running command
|
||||
|
||||
|
|
@ -591,6 +582,6 @@ Use @argfile as first argument to load arguments from the file \*(Aqargfile\*(Aq
|
|||
|
||||
Didn\*(Aqt expect this much output? Use the short \*(Aq\-h\*(Aq flag to get short help.
|
||||
.SH VERSION
|
||||
v2.1.2
|
||||
v2.0.0
|
||||
.SH AUTHORS
|
||||
Félix Saparelli <felix@passcod.name>, Matt Green <mattgreenrocks@gmail.com>
|
||||
|
|
|
|||
|
|
@ -5,11 +5,10 @@ watchexec - Execute commands when watched files change
|
|||
# SYNOPSIS
|
||||
|
||||
**watchexec** \[**-w**\|**\--watch**\]
|
||||
\[**-W**\|**\--watch-non-recursive**\] \[**-F**\|**\--watch-file**\]
|
||||
\[**-c**\|**\--clear**\] \[**-o**\|**\--on-busy-update**\]
|
||||
\[**-r**\|**\--restart**\] \[**-s**\|**\--signal**\]
|
||||
\[**\--stop-signal**\] \[**\--stop-timeout**\] \[**\--map-signal**\]
|
||||
\[**-d**\|**\--debounce**\] \[**\--stdin-quit**\]
|
||||
\[**-W**\|**\--watch-non-recursive**\] \[**-c**\|**\--clear**\]
|
||||
\[**-o**\|**\--on-busy-update**\] \[**-r**\|**\--restart**\]
|
||||
\[**-s**\|**\--signal**\] \[**\--stop-signal**\] \[**\--stop-timeout**\]
|
||||
\[**\--map-signal**\] \[**-d**\|**\--debounce**\] \[**\--stdin-quit**\]
|
||||
\[**\--no-vcs-ignore**\] \[**\--no-project-ignore**\]
|
||||
\[**\--no-global-ignore**\] \[**\--no-default-ignore**\]
|
||||
\[**\--no-discover-ignore**\] \[**\--ignore-nothing**\]
|
||||
|
|
@ -93,19 +92,6 @@ Unlike -w, folders watched with this option are not recursed into.
|
|||
This option can be specified multiple times to watch multiple
|
||||
directories non-recursively.
|
||||
|
||||
**-F**, **\--watch-file**=*PATH*
|
||||
|
||||
: Watch files and directories from a file
|
||||
|
||||
Each line in the file will be interpreted as if given to -w.
|
||||
|
||||
For more complex uses (like watching non-recursively), use the argfile
|
||||
capability: build a file containing command-line options and pass it to
|
||||
watchexec with \`@path/to/argfile\`.
|
||||
|
||||
The special value - will read from STDIN; this in incompatible with
|
||||
\--stdin-quit.
|
||||
|
||||
**-c**, **\--clear**=*MODE*
|
||||
|
||||
: Clear screen before running command
|
||||
|
|
@ -875,7 +861,7 @@ Didnt expect this much output? Use the short -h flag to get short help.
|
|||
|
||||
# VERSION
|
||||
|
||||
v2.1.2
|
||||
v2.0.0
|
||||
|
||||
# AUTHORS
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue