completion 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 284727bae15655feaebf3d8757241257db50b763122a31cadc654d5319d7a2bf
-  data.tar.gz: e3e0ec43c86bcbc334cba971bfe019bd822c3a64ed03577cfc0a6a804d9a0834
+  metadata.gz: f782fa1466bc285fd68a570bb4e3d76b3651a07b5833e0b73ed5718928aa2017
+  data.tar.gz: 24a3282bd7e93bb9bace2f3637ecbb43b1f787210e9227a8352b3f5bb793f62c
 SHA512:
-  metadata.gz: 29ebeaf86a358ff8dd761326b06f7d718e9919f80c2b0d1d2a359d103032ef081101da49a46ac6808915703a8f30d8b06508c3e07ca65b7690414e9d8eab6ed4
-  data.tar.gz: 071a5afaffb9ee016b327434b7d87d19d57d8b0e1ae81cf823ca0b1aea0a66b26b2396f0177c992ece283bf4b31f97b4fbad1cebbb7911994cd6f0245ba83d38
+  metadata.gz: 0e6415c243214aa9c506a11e99482c52fbf222358eb5d7a6e8766afd4126484cfb7d771eccb9500be4f22046aff58814954131aeb022d5c0e8705d2601eda88a
+  data.tar.gz: 6eb0ac55618be64bfec46b8be4f72562624b0f92175e24d4d30ea8fa677c72a0bdfc0f8bbb4341f678ca2bd7f60f1e2a51f74333cb7f2390beac9dc4e54aaa75

checksums.yaml.gz.sig

@@ -1 +1,2 @@
-�0�6�[�cJgTL\��-gˆN���g���17�k(�Ƭ��^?����P�=�p�5o���c���8�s�(n��}X�:�w)�9�����+��MMk��];f]_G�L�n���}9G>T�Gzl3c�H���[z
+*��uA���4������'9���hk_�kP�u� �����,	b�J
+S�Jw���96��&fǝ�{?�LhO����˩Y��^����AtE����ڃ[?�;�\�&�	5��p�O;N�V$R���q׽�c`

data/guides/getting-started/readme.md

@@ -82,6 +82,34 @@ You can specify the shell and adapter directory explicitly:
 $ completion install --shell zsh --directory ~/.zsh/completions --command falcon
 ~~~
 
+## Uninstalling an Adapter
+
+Uninstall the generic adapter for the current shell:
+
+~~~ bash
+$ completion uninstall
+~~~
+
+Uninstall an adapter for a specific command:
+
+~~~ bash
+$ completion uninstall --command falcon
+~~~
+
+You can specify the shell and adapter directory explicitly:
+
+~~~ bash
+$ completion uninstall --shell zsh --directory ~/.zsh/completions --command falcon
+~~~
+
+Remove all managed adapters and helpers for the current shell:
+
+~~~ bash
+$ completion uninstall --all
+~~~
+
+`uninstall --all` only removes files generated with the completion metadata marker.
+
 ## Installed Files
 
 Installation writes a small adapter script and shared shell helpers.
@@ -109,6 +137,12 @@ Fish command adapters are installed into:
 ~/.config/fish/completions
 ~~~
 
+Fish generic adapters are installed into:
+
+~~~ text
+~/.config/fish/conf.d
+~~~
+
 ## Generating an Adapter
 
 You can generate an adapter script without installing it:

data/lib/completion/command/install.rb

@@ -28,7 +28,7 @@ module Completion
 			# @returns [void]
 			def call
 				shell = @options[:shell]
-				directory = @options[:directory] || Shell.default_directory(shell)
+				directory = Shell.adapter_directory(shell, @options[:command], directory: @options[:directory])
 				path = File.join(directory, Shell.file_name(shell, @options[:command]))
 				script = Shell.script(shell: shell, executable: @options[:command])
 				

data/lib/completion/command/top.rb

@@ -11,6 +11,7 @@ end
 
 require_relative "generate"
 require_relative "install"
+require_relative "uninstall"
 
 module Completion
 	module Command
@@ -25,6 +26,7 @@ module Completion
 			nested :command, {
 				"install" => Install,
 				"generate" => Generate,
+				"uninstall" => Uninstall,
 			}, default: "generate"
 			
 			# Execute the selected completion sub-command.

data/lib/completion/command/uninstall.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2026, by Samuel Williams.
+
+require "samovar"
+
+require_relative "../shell"
+
+module Completion
+	module Command
+		# Uninstall a shell completion adapter script from a user-local completion directory.
+		class Uninstall < Samovar::Command
+			self.description = "Uninstall a shell completion adapter script."
+			
+			options do
+				option "--shell <name>", "The shell to uninstall completions for.", default: Shell.method(:default_shell), completions: ["bash", "zsh", "fish"]
+				option "--directory <path>", "The completion directory to uninstall from."
+				option "--command <name>", "The command executable to stop completing."
+				option "--all", "Remove all managed completion scripts for the selected shell."
+			end
+			
+			# Remove the installed shell adapter script.
+			# 
+			# @returns [void]
+			def call
+				shell = @options[:shell]
+				
+				if @options[:all]
+					return uninstall_all(shell)
+				end
+				
+				directory = Shell.adapter_directory(shell, @options[:command], directory: @options[:directory])
+				path = File.join(directory, Shell.file_name(shell, @options[:command]))
+				
+				File.delete(path) if File.exist?(path)
+				
+				output.puts path
+			end
+			
+			private
+			
+			def uninstall_all(shell)
+				paths = managed_paths(shell, @options[:directory])
+				
+				paths.each do |path|
+					File.delete(path)
+					output.puts path
+				end
+				
+				return paths
+			end
+			
+			def managed_paths(shell, directory)
+				directories = managed_directories(shell, directory)
+				
+				return directories.flat_map do |directory|
+					Dir.children(directory).filter_map do |name|
+						path = File.join(directory, name)
+						
+						path if Shell.managed?(path)
+					end
+				end
+			end
+			
+			def managed_directories(shell, directory)
+				if directory
+					return [directory].select{|path| Dir.exist?(path)}
+				end
+				
+				case shell
+				when "fish"
+					[
+						Shell.default_directory(shell),
+						Shell.default_configuration_directory,
+						Shell.default_function_directory,
+					].select{|path| Dir.exist?(path)}
+				else
+					[
+						Shell.default_directory(shell),
+					].select{|path| Dir.exist?(path)}
+				end
+			end
+		end
+	end
+end

data/lib/completion/shell/bash.rb

@@ -15,7 +15,7 @@ module Completion
 				command = Shell.command_name(executable)
 				
 				if executable
-					return <<~SCRIPT
+					return Shell.annotate(<<~SCRIPT, kind: "adapter", shell: "bash", executable: executable)
 						_completion_source="${BASH_SOURCE[0]}"
 						if [[ "$_completion_source" == */* ]]; then
 							_completion_directory="${_completion_source%/*}"
@@ -27,7 +27,7 @@ module Completion
 					SCRIPT
 				end
 				
-				<<~SCRIPT
+				Shell.annotate(<<~SCRIPT, kind: "adapter", shell: "bash")
 					_completion_source="${BASH_SOURCE[0]}"
 					if [[ "$_completion_source" == */* ]]; then
 						_completion_directory="${_completion_source%/*}"
@@ -43,7 +43,7 @@ module Completion
 			# 
 			# @returns [String] The generated Bash helper script.
 			def self.shared_script
-				<<~SCRIPT
+				Shell.annotate(<<~SCRIPT, kind: "helper", shell: "bash")
 					__completion_resolve() {
 						local command="$1"
 						local basename="${command##*/}"

data/lib/completion/shell/fish.rb

@@ -15,12 +15,12 @@ module Completion
 				command = Shell.command_name(executable)
 				
 				if executable
-					return <<~SCRIPT
+					return Shell.annotate(<<~SCRIPT, kind: "adapter", shell: "fish", executable: executable)
 						__completion_register #{command}
 					SCRIPT
 				end
 				
-				<<~SCRIPT
+				Shell.annotate(<<~SCRIPT, kind: "adapter", shell: "fish")
 					__completion_register_default
 				SCRIPT
 			end
@@ -42,7 +42,7 @@ module Completion
 			# 
 			# @returns [String] The generated Fish function script.
 			def self.complete_function
-				<<~SCRIPT
+				Shell.annotate(<<~SCRIPT, kind: "helper", shell: "fish")
 					function __completion_complete --description 'Complete commands with adjacent completion executables'
 						set -l argv (commandline -opc)
 						set -e argv[1]
@@ -95,7 +95,7 @@ module Completion
 			# 
 			# @returns [String] The generated Fish function script.
 			def self.register_function
-				<<~SCRIPT
+				Shell.annotate(<<~SCRIPT, kind: "helper", shell: "fish")
 					function __completion_register --description 'Register command completion'
 						complete -c $argv[1] -f -a "(__completion_complete)"
 					end
@@ -106,7 +106,7 @@ module Completion
 			# 
 			# @returns [String] The generated Fish function script.
 			def self.register_default_function
-				<<~SCRIPT
+				Shell.annotate(<<~SCRIPT, kind: "helper", shell: "fish")
 					function __completion_register_default --description 'Register generic completion'
 						complete -c "*" -n "__completion_supported" -f -a "(__completion_complete)"
 					end
@@ -117,7 +117,7 @@ module Completion
 			# 
 			# @returns [String] The generated Fish function script.
 			def self.resolve_function
-				<<~SCRIPT
+				Shell.annotate(<<~SCRIPT, kind: "helper", shell: "fish")
 					function __completion_resolve --description 'Resolve completion command'
 						set -l argv (commandline -opc)
 						set -l command $argv[1]
@@ -136,10 +136,15 @@ module Completion
 			# 
 			# @returns [String] The generated Fish function script.
 			def self.supported_function
-				<<~SCRIPT
+				Shell.annotate(<<~SCRIPT, kind: "helper", shell: "fish")
 					function __completion_supported --description 'Check completion support'
 						set -l completer (__completion_resolve)
-						test -x "$completer"
+						
+						if string match -q "*/*" "$completer"
+							test -x "$completer"
+						else
+							type -q "$completer"
+						end
 					end
 				SCRIPT
 			end

data/lib/completion/shell/zsh.rb

@@ -15,7 +15,7 @@ module Completion
 				command = Shell.command_name(executable)
 				
 				if executable
-					return <<~SCRIPT
+					return Shell.annotate_after_first_line(<<~SCRIPT, kind: "adapter", shell: "zsh", executable: executable)
 						#compdef #{command}
 						
 						local _completion_source="${(%):-%x}"
@@ -25,7 +25,7 @@ module Completion
 					SCRIPT
 				end
 				
-				<<~SCRIPT
+				Shell.annotate_after_first_line(<<~SCRIPT, kind: "adapter", shell: "zsh")
 					#compdef -default-
 					
 					local _completion_source="${(%):-%x}"
@@ -40,7 +40,7 @@ module Completion
 			# 
 			# @returns [String] The generated Zsh helper script.
 			def self.shared_script
-				<<~SCRIPT
+				Shell.annotate(<<~SCRIPT, kind: "helper", shell: "zsh")
 					__completion_resolve() {
 						local command="$1"
 						local basename="${command:t}"

data/lib/completion/shell.rb

@@ -3,9 +3,90 @@
 # Released under the MIT License.
 # Copyright, 2026, by Samuel Williams.
 
+require "json"
+
 module Completion
 	# Shell adapter generation helpers.
 	module Shell
+		MARKER_PREFIX = "# Auto-generated completion: "
+		
+		# Generate a managed-file metadata marker.
+		# 
+		# @parameter kind [String] The generated file kind.
+		# @parameter shell [String | Symbol] The shell name.
+		# @parameter executable [String | Nil] The command executable, or nil for the generic adapter.
+		# @returns [String] The generated metadata marker.
+		def self.marker(kind:, shell:, executable: nil)
+			metadata = {
+				managed: true,
+				kind: kind,
+				shell: shell.to_s,
+			}
+			
+			if executable
+				metadata[:command] = command_name(executable)
+			end
+			
+			return "#{MARKER_PREFIX}#{JSON.generate(metadata)}"
+		end
+		
+		# Add a managed-file metadata marker to a generated script.
+		# 
+		# @parameter script [String] The generated script.
+		# @parameter kind [String] The generated file kind.
+		# @parameter shell [String | Symbol] The shell name.
+		# @parameter executable [String | Nil] The command executable, or nil for the generic adapter.
+		# @returns [String] The annotated script.
+		def self.annotate(script, kind:, shell:, executable: nil)
+			return "#{marker(kind: kind, shell: shell, executable: executable)}\n#{script}"
+		end
+		
+		# Add a managed-file metadata marker after the first line of a generated script.
+		# 
+		# @parameter script [String] The generated script.
+		# @parameter kind [String] The generated file kind.
+		# @parameter shell [String | Symbol] The shell name.
+		# @parameter executable [String | Nil] The command executable, or nil for the generic adapter.
+		# @returns [String] The annotated script.
+		def self.annotate_after_first_line(script, kind:, shell:, executable: nil)
+			first, rest = script.split("\n", 2)
+			
+			return "#{first}\n#{marker(kind: kind, shell: shell, executable: executable)}\n#{rest}"
+		end
+		
+		# Extract managed-file metadata from a generated script.
+		# 
+		# @parameter path [String] The script path to inspect.
+		# @returns [Hash | Nil] The parsed metadata, if present.
+		def self.metadata(path)
+			return nil unless File.file?(path)
+			
+			File.open(path) do |file|
+				2.times do
+					line = file.gets
+					break unless line
+					
+					if line.start_with?(MARKER_PREFIX)
+						return JSON.parse(line.delete_prefix(MARKER_PREFIX))
+					end
+				end
+			end
+			
+			return nil
+		rescue JSON::ParserError
+			return nil
+		end
+		
+		# Check whether a script is managed by completion.
+		# 
+		# @parameter path [String] The script path to inspect.
+		# @returns [Boolean] Whether the script is managed by completion.
+		def self.managed?(path)
+			metadata = self.metadata(path)
+			
+			return metadata && metadata["managed"] == true || false
+		end
+		
 		# Extract a shell name from a path.
 		# 
 		# @parameter path [String | Nil] The shell path.
@@ -45,6 +126,29 @@ module Completion
 			File.expand_path("~/.config/fish/functions")
 		end
 		
+		# Get the default Fish configuration directory.
+		# 
+		# @returns [String] The default Fish configuration directory.
+		def self.default_configuration_directory
+			File.expand_path("~/.config/fish/conf.d")
+		end
+		
+		# Get the adapter directory for a shell and executable.
+		# 
+		# @parameter shell [String] The shell name.
+		# @parameter executable [String | Nil] The command executable, or nil for the generic adapter.
+		# @parameter directory [String | Nil] The explicit adapter directory.
+		# @returns [String] The adapter directory.
+		def self.adapter_directory(shell, executable = nil, directory: nil)
+			return directory if directory
+			
+			if shell == "fish" && !executable
+				return default_configuration_directory
+			end
+			
+			return default_directory(shell)
+		end
+		
 		# Get the installed adapter file name for a shell.
 		# 
 		# @parameter shell [String] The shell name.

data/lib/completion/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2026, by Samuel Williams.
 
 module Completion
-	VERSION = "0.0.1"
+	VERSION = "0.0.2"
 end

data/readme.md

@@ -20,9 +20,14 @@ Please see the [project documentation](https://socketry.github.io/completion/) f
 
 Please see the [project releases](https://socketry.github.io/completion/releases/index) for all releases.
 
+### v0.0.2
+
+  - Add `completion uninstall` for removing installed shell adapter scripts.
+  - Add managed metadata markers to generated shell scripts and support `completion uninstall --all`.
+
 ### v0.0.1
 
-  - Initial release.
+  - Fix generic Fish completion installation by loading the adapter at shell startup and resolving completion executables from `PATH`.
 
 ## See Also
 

data/releases.md

@@ -1,5 +1,10 @@
 # Releases
 
+## v0.0.2
+
+  - Add `completion uninstall` for removing installed shell adapter scripts.
+  - Add managed metadata markers to generated shell scripts and support `completion uninstall --all`.
+
 ## v0.0.1
 
-  - Initial release.
+  - Fix generic Fish completion installation by loading the adapter at shell startup and resolving completion executables from `PATH`.

data.tar.gz.sig

@@ -1,3 +1 @@
-R�thbh M��&�o8��x����L��q���|��eD��JK֢������z+H����!�Aw�̫��7�
\p��k��9
-���ӈ4)T�H�!IJ�?�j�|�V���3݃T��qs<�DZ.:^Kk7���ə��#�{,���&�-:_����[E��M��((8ݱ���[�
-Ѡ6�+CN��sy��+���7�]ސ��)��Hׯ�
+Ymve��{����0Sa�(�X�LZ��4�̯��5�

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: completion
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Samuel Williams
@@ -66,6 +66,7 @@ files:
 - lib/completion/command/generate.rb
 - lib/completion/command/install.rb
 - lib/completion/command/top.rb
+- lib/completion/command/uninstall.rb
 - lib/completion/shell.rb
 - lib/completion/shell/bash.rb
 - lib/completion/shell/fish.rb