Merge branch 'main' into main

eza-community · Jul 27, 2024 · c414268 · c414268
2 parents c47b4e8 + 6ca47ee
commit c414268
Show file tree

Hide file tree

Showing 16 changed files with 219 additions and 68 deletions.
diff --git a/.github/workflows/flake.yml b/.github/workflows/flake.yml
@@ -40,7 +40,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v12
+        uses: DeterminateSystems/nix-installer-action@v13
       - name: Setup Nix cache
         uses: DeterminateSystems/magic-nix-cache-action@main
       - name: Nix Flake Check
@@ -57,7 +57,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v12
+        uses: DeterminateSystems/nix-installer-action@v13
       - name: Setup Nix cache
         uses: DeterminateSystems/magic-nix-cache-action@main
       - name: Nix Build

diff --git a/.github/workflows/unit-tests-bsd.yml b/.github/workflows/unit-tests-bsd.yml
@@ -21,29 +21,30 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  unit-tests-freebsd:
-      runs-on: ubuntu-22.04
-      timeout-minutes: 20
-      steps:
-        - uses: actions/checkout@v4
-          with:
-            submodules: recursive
-        - name: Compile
-          uses: vmactions/freebsd-vm@v1
-          with:
-            release: '14.0'
-            usesh: true
-            prepare: |
-              pkg install -y rust git
-              cargo install cargo-hack
-              git config --global --add safe.directory /home/runner/work/eza/eza
-            run: |
-              set -e
-              export CARGO_TERM_COLOR="always"
-              export RUSTFLAGS="--deny warnings"
-              cargo fmt --check
-              cargo clippy -- -D warnings
-              cargo hack test
+  # BUG: These tests are broken
+  # unit-tests-freebsd:
+  #     runs-on: ubuntu-22.04
+  #     timeout-minutes: 20
+  #     steps:
+  #       - uses: actions/checkout@v4
+  #         with:
+  #           submodules: recursive
+  #       - name: Compile
+  #         uses: vmactions/freebsd-vm@v1
+  #         with:
+  #           release: '14.1'
+  #           usesh: true
+  #           prepare: |
+  #             pkg install -y rust git
+  #             cargo install cargo-hack
+  #             git config --global --add safe.directory /home/runner/work/eza/eza
+  #           run: |
+  #             set -e
+  #             export CARGO_TERM_COLOR="always"
+  #             export RUSTFLAGS="--deny warnings"
+  #             cargo fmt --check
+  #             cargo clippy -- -D warnings
+  #             cargo hack test
 
   unit-tests-netbsd:
     runs-on: ubuntu-22.04

diff --git a/.pre-commit-config-non-nix.yaml b/.pre-commit-config-non-nix.yaml
@@ -0,0 +1,15 @@
+repos:
+  - repo: local
+    hooks:
+      - id: rust-linting
+        name: Rust linting
+        description: Run rustfmt on included files
+        entry: cargo fmt --
+        types: [file, rust]
+        language: system
+      - id: rust-clippy
+        name: Rust clippy
+        description: Run clippy on included files
+        entry: cargo clippy --workspace --all-targets --all-features --
+        types: [file, rust]
+        language: system
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,73 @@
 # Changelog
 
+## [0.18.23] - 2024-07-25
+
+### Bug Fixes
+
+- Disable broken freebsd tests
+
+### Documentation
+
+- Clear up confusion around ls
+
+### Build
+
+- Bump log from 0.4.21 to 0.4.22
+- Bump DeterminateSystems/nix-installer-action from 12 to 13
+- Bump plist from 1.6.1 to 1.7.0
+
+## [0.18.22] - 2024-07-18
+
+### Bug Fixes
+
+- Use NaiveDateTime::from_timestamp_opt instead of panicky From impl
+
+### Features
+
+- Add non-nix pre-commit rustfmt and clippy hooks
+
+### Miscellaneous Tasks
+
+- Release eza v0.18.22
+
+### Ci
+
+- Bump FreeBSD version.
+
+## [0.18.21] - 2024-07-01
+
+### Bug Fixes
+
+- Fix missing line breaks in _eza
+
+### Miscellaneous Tasks
+
+- Release eza v0.18.21
+
+## [0.18.20] - 2024-06-27
+
+### Features
+
+- Add --no-|show-symlinks flags for filtering output
+
+### Miscellaneous Tasks
+
+- Release eza v0.18.20
+
+## [0.18.19] - 2024-06-20
+
+### Bug Fixes
+
+- Ship release binaries
+
+### Miscellaneous Tasks
+
+- Release eza v0.18.19
+
+### Build
+
+- Bump git2 from 0.18.3 to 0.19.0
+
 ## [0.18.18] - 2024-06-13
 
 ### Features
@@ -9,6 +77,10 @@
 - Run on all features by default
 - Ask for shell and terminal in bug report template
 
+### Miscellaneous Tasks
+
+- Release eza v0.18.18
+
 ### Build
 
 - Bump unicode-width from 0.1.12 to 0.1.13

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -44,6 +44,11 @@ Some useful commands include:
   pre-commit-hooks.nix
 - `just itest`: runs integration tests
 
+**For non-nix users,**
+There are traditional `pre-commit` hooks, which you can install with your system package manager or
+`brew|pip install pre-commit`, and run `pre-commit install -c .pre-commit-config-non-nix.yaml` in the root of the repository.
+Then these hooks will run automatically when you commit.
+
 The [just](https://github.com/casey/just) command runner can be used to run some
 helpful development commands, in a manner similar to `make`.  Run `just --list`
 to get an overview of what’s available.

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,7 +16,7 @@ readme = "README.md"
 homepage = "https://github.com/eza-community/eza"
 license = "MIT"
 repository = "https://github.com/eza-community/eza"
-version = "0.18.18"
+version = "0.18.23"
 
 
 [package.metadata.deb]
@@ -84,7 +84,7 @@ palette = { version = "0.7.6", default-features = false, features = ["std"] }
 once_cell = "1.19.0"
 percent-encoding = "2.3.1"
 phf = { version = "0.11.2", features = ["macros"] }
-plist = { version = "1.6.1", default-features = false }
+plist = { version = "1.7.0", default-features = false }
 uutils_term_grid = "0.6.0"
 terminal_size = "0.3.0"
 timeago = { version = "0.4.2", default-features = false }
@@ -94,7 +94,7 @@ rayon = "1.10.0"
 ansi-width = "0.1.0"
 
 [dependencies.git2]
-version = "0.18"
+version = "0.19"
 optional = true
 default-features = false
 

diff --git a/README.md b/README.md
@@ -2,8 +2,7 @@
 
 # eza
 
-A modern, maintained replacement for ls.
-
+A modern replacement for ls.
 
 <a href="https://matrix.to/#/#eza-community:gitter.im"><img alt="Gitter" src="https://img.shields.io/gitter/room/eza-community/eza?logo=element&link=https%3A%2F%2Fapp.gitter.im%2F%23%2Froom%2F%23eza%3Agitter.im&link=Gitter%20matrix%20room%20for%20Eza" width=200></a>
 
@@ -110,6 +109,8 @@ eza’s options are almost, but not quite, entirely unlike `ls`’s. Quick overv
 - **--group-directories-first**: list directories before other files
 - **-D**, **--only-dirs**: list only directories
 - **-f**, **--only-files**: list only files
+- **--no-symlinks**: don't show symbolic links
+- **--show-symlinks**: explicitly show links (with `--only-dirs`, `--only-files`, to show symlinks that match the filter)
 - **--git-ignore**: ignore files mentioned in `.gitignore`
 - **-I**, **--ignore-glob=(globs)**: glob patterns (pipe-separated) of files to ignore
 

diff --git a/completions/fish/eza.fish b/completions/fish/eza.fish
@@ -81,6 +81,8 @@ complete -c eza -s s -l sort -d "Which field to sort by" -x -a "
 complete -c eza -s I -l ignore-glob -d "Ignore files that match these glob patterns" -r
 complete -c eza -s D -l only-dirs -d "List only directories"
 complete -c eza -s f -l only-files -d "List only files"
+complete -c eza -l show-symlinks -d "Explicitly show symbolic links (For use with --only-dirs | --only-files)"
+complete -c eza -l no-symlinks -d "Do not show symbolic links"
 
 # Long view options
 complete -c eza -s b -l binary -d "List file sizes with binary prefixes"

diff --git a/completions/nush/eza.nu b/completions/nush/eza.nu
@@ -30,6 +30,8 @@ export extern "eza" [
     --sort(-s)                 # Which field to sort by
     --only-dirs(-D)            # List only directories
     --only-files(-f)           # List only files
+    --show-symlinks            # Explicitly show symbolic links (for use with --only-dirs | --only-files)
+    --no-symlinks              # Do not show symbolic links
     --binary(-b)               # List file sizes with binary prefixes
     --bytes(-B)                # List file sizes in bytes, without any prefixes
     --group(-g)                # List each file's group

diff --git a/completions/zsh/_eza b/completions/zsh/_eza
@@ -33,6 +33,8 @@ __eza() {
         {-A,--almost-all}"[Equivalent to --all; included for compatibility with \'ls -A\']" \
         {-d,--list-dirs}"[List directories like regular files]" \
         {-D,--only-dirs}"[List only directories]" \
+        --no-symlinks"[Do not show symbolic links]" \
+        --show-symlinks"[Explictly show symbolic links: for use with '--only-dirs'| '--only-files']" \
         {-f,--only-files}"[List only files]" \
         {-L,--level}"+[Limit the depth of recursion]" \
         {-w,--width}"+[Limits column output of grid, 0 implies auto-width]" \