dkit 0.3.3 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0b4a5d2779f046a28fd08f82a5564621b5856617507e5e9a7891981818318ff
-  data.tar.gz: e5f0e728e94bc3b45a80f7834dfc3cdc76458689eda7b5000e6851d1e6ed31a8
+  metadata.gz: a3a9a92ddb91d679c5e3829e29555e41e350f28e21d5b23068c9f47aed0bfb71
+  data.tar.gz: 7cfdcde91b707f91065824ebd500b7d98ece0775a69cd0d859592c65200924f0
 SHA512:
-  metadata.gz: 7236faaaad611849ad0446036ab189bfd16fd54f39f7f032569658859a21c64236fc103b9516ca90369ae454ed5616f681ee1ce912a2729e5a2d321d7d86f1de
-  data.tar.gz: b0d487ab8e2df9f522bc7d6a9fd58a697492020f1dc8bd71ec8946e25f152b3a686d1489b7986e42fd128fa5a7cddb2f2f0a69550f2ce30089344e3839ddfb08
+  metadata.gz: f545daeb77092ee428d0ec2405e1cea0f9f83685bc918ba4900acfa0dd9e1355858bab85a2326ed8f0a944720b1a01d6dd635ee574a39ca9985efd4f118fdcb2
+  data.tar.gz: 83ff15a0ebf7e693aff3a40ce59c9deab9373aea4be9afbc45da082a970886c6c35e3344485827f7b9ed8486d29c54837b300e936f66e6c017a36508344669c4

data/CHANGELOG.md

@@ -5,6 +5,27 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.4.1] - 2026-04-13
+
+### Fixed
+- `dkit shell` now runs as a subprocess (`system`) instead of replacing the current process (`exec`), so `exit` returns to the host shell instead of closing the terminal
+
+### Changed
+- README: added zsh as explicit requirement, documented glob/wildcard intercept patterns, clarified zsh-specific hook mechanisms
+
+## [0.4.0] - 2026-04-13
+
+### Added
+- Glob/wildcard patterns in intercept file: `bin/*` intercepts all executables under `bin/` (e.g. `bin/rails`, `bin/rspec`)
+- New zsh helpers `_dkit_expand_glob` and `_dkit_refresh_globs` for dynamic function creation from glob patterns
+- `precmd` hook automatically picks up new executables and cleans up deleted ones between prompts
+- Help text documents glob usage with quoting example
+
+### Notes
+- Glob patterns must be quoted to prevent shell expansion: `dkit intercept add 'bin/*'`
+- Only executable files are matched (non-executable files like READMEs are skipped)
+- Requires `exec zsh` after gem update to reload the shell hook
+
 ## [0.3.3] - 2026-04-13
 
 ### Changed

data/README.md

@@ -10,6 +10,7 @@ When you `cd` into a project, dkit intercepts configured commands (e.g. `rails`,
 ## Requirements
 
 - macOS or Linux
+- zsh (bash and other shells are not supported)
 - Ruby >= 2.7
 - Docker with Compose v2 (`docker compose`)
 - A project with `.devcontainer/devcontainer.json` using `dockerComposeFile` + `service`
@@ -56,10 +57,13 @@ git commit -m "chore: add dkit intercept config"
 ```sh
 dkit intercept list              # show active commands for this project
 dkit intercept add terraform     # add a command
+dkit intercept add 'bin/*'       # add a glob pattern (quote to prevent shell expansion)
 dkit intercept remove terraform  # remove a command
 exec zsh                         # reload shell to apply changes
 ```
 
+Glob patterns like `bin/*` intercept all matching executables at once (e.g. `bin/rails`, `bin/rspec`). New files are picked up automatically at each prompt.
+
 ### Verbose routing messages
 
 By default, dkit prints a line to stderr whenever it intercepts a command:
@@ -100,17 +104,18 @@ dkit down  [flags]          docker compose down
 dkit logs  [service]        docker compose logs -f
 
 dkit init                   Create .devcontainer/dkit-intercept
-dkit intercept list|add|remove <cmd>
+dkit intercept list|add|remove <cmd|pattern>
 dkit hook                   Emit shell hook for ~/.zshrc
 dkit version
 ```
 
 ## How it works
 
-1. On `cd`, the shell hook calls `dkit root` to find the nearest `.devcontainer/devcontainer.json`.
-2. It reads `.devcontainer/dkit-intercept` and defines a shell function for each listed command.
+1. On `cd`, the zsh `chpwd` hook calls `dkit root` to find the nearest `.devcontainer/devcontainer.json`.
+2. It reads `.devcontainer/dkit-intercept` and defines a zsh function for each listed command. Glob patterns (e.g. `bin/*`) are expanded to matching executables.
 3. Each function calls `dkit status --quiet` to check if the container is running. If yes, it delegates to `dkit run <cmd>`; otherwise it calls the host binary.
 4. `dkit run` resolves the container name from the devcontainer config (via compose YAML, docker labels, or `docker compose ps`) and execs into it at the mirrored working directory.
+5. A `precmd` hook re-expands glob patterns before each prompt, picking up new files and cleaning up deleted ones.
 
 ## devcontainer.json requirements
 

data/bin/dkit

@@ -16,7 +16,7 @@ require 'pathname'
 require 'shellwords'
 require 'fileutils'
 
-VERSION   = "0.3.3"
+VERSION   = "0.4.1"
 DC_CONFIG = ".devcontainer/devcontainer.json"
 DC_INTERCEPT = ".devcontainer/dkit-intercept"
 
@@ -228,6 +228,8 @@ def cmd_hook
 
     _DKIT_ROOT=""
     _DKIT_ACTIVE_CMDS=()
+    _DKIT_GLOB_PATTERNS=()
+    _DKIT_GLOB_CMDS=()
 
     _dkit_reset() {
       local cmd
@@ -235,6 +237,8 @@ def cmd_hook
         unfunction "$cmd" 2>/dev/null
       done
       _DKIT_ACTIVE_CMDS=()
+      _DKIT_GLOB_PATTERNS=()
+      _DKIT_GLOB_CMDS=()
     }
 
     _dkit_verbose_fallback() {
@@ -244,6 +248,43 @@ def cmd_hook
       printf '\033[31m[dkit] %s → host (fallback)\033[0m\n' "$1" >&2
     }
 
+    _dkit_expand_glob() {
+      local root="$1" pattern="$2"
+      local full_pattern="$root/$pattern"
+      local matches=( ${~full_pattern}(N*) )
+      local m rel
+      for m in "${matches[@]}"; do
+        rel="${m#$root/}"
+        (( ${_DKIT_ACTIVE_CMDS[(Ie)$rel]} )) && continue
+        eval "function ${rel}() {
+          if dkit status --quiet 2>/dev/null; then
+            dkit run ${rel} \"\$@\"
+          else
+            _dkit_verbose_fallback \"${rel}\"
+            command ${rel} \"\$@\"
+          fi
+        }"
+        _DKIT_ACTIVE_CMDS+=("${rel}")
+        _DKIT_GLOB_CMDS+=("${rel}")
+      done
+    }
+
+    _dkit_refresh_globs() {
+      [[ -z "$_DKIT_ROOT" || ${#_DKIT_GLOB_PATTERNS[@]} -eq 0 ]] && return
+      local cmd
+      for cmd in "${_DKIT_GLOB_CMDS[@]}"; do
+        if [[ ! -e "$_DKIT_ROOT/$cmd" ]]; then
+          unfunction "$cmd" 2>/dev/null
+          _DKIT_ACTIVE_CMDS=("${(@)_DKIT_ACTIVE_CMDS:#$cmd}")
+        fi
+      done
+      _DKIT_GLOB_CMDS=()
+      local pat
+      for pat in "${_DKIT_GLOB_PATTERNS[@]}"; do
+        _dkit_expand_glob "$_DKIT_ROOT" "$pat"
+      done
+    }
+
     _dkit_load() {
       local root="$1"
       local intercept="$root/.devcontainer/dkit-intercept"
@@ -255,6 +296,12 @@ def cmd_hook
         cmd="${cmd## }"
         cmd="${cmd%% }"
         [[ -z "$cmd" ]] && continue
+        # Glob pattern: expand matching executables
+        if [[ "$cmd" == *[\*\?\[]* ]]; then
+          _DKIT_GLOB_PATTERNS+=("${cmd}")
+          _dkit_expand_glob "$root" "$cmd"
+          continue
+        fi
         eval "function ${cmd}() {
           if dkit status --quiet 2>/dev/null; then
             dkit run ${cmd} \"\$@\"
@@ -301,6 +348,7 @@ def cmd_hook
 
     autoload -U add-zsh-hook
     add-zsh-hook chpwd _dkit_chpwd
+    add-zsh-hook precmd _dkit_refresh_globs
     _dkit_chpwd
   ZSH
 end
@@ -319,7 +367,7 @@ def cmd_run(ctx, args)
 end
 
 def cmd_shell(ctx)
-  exec("docker", "exec", "-it", "--user", ctx.user, "--workdir", ctx.cwd, ctx.container, "zsh", "-l")
+  system("docker", "exec", "-it", "--user", ctx.user, "--workdir", ctx.cwd, ctx.container, "zsh", "-l")
 end
 
 def cmd_claude(ctx, args)
@@ -393,6 +441,7 @@ def cmd_help
       dkit init                       Create .devcontainer/dkit-intercept with auto-detected defaults
       dkit intercept list             List intercepted commands for current project
       dkit intercept add <cmd>        Add command to current project's intercept list
+      dkit intercept add 'bin/*'      Add glob pattern (quote to prevent shell expansion)
       dkit intercept remove <cmd>     Remove command from current project's intercept list
 
     Verbose routing messages (on by default):

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dkit
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.1
 platform: ruby
 authors:
 - Augusto Stroligo