clamp 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0987845ae98be0a62e6501a780e42f4e73826df831d5d3809e17c8f8d335db2
-  data.tar.gz: 07665f169706158283c5e3d5fa9e231d668fa7105b8f4726e46f801679173071
+  metadata.gz: ceef639e7f7761b30abc7be04ab5384ee2dc238ba472a12c808e2cdffc14e540
+  data.tar.gz: 7f97fc3d84a9fad89123fad6ed35dffeb37efc9e82815a44a6ca76ad134905ec
 SHA512:
-  metadata.gz: 1a2b310ce3f8a1e2cd0bb100abf9a1fec7b8dc36ad639f4b2007824136dd77409d460a2305d36fba0c11999c5e8620406fef5326ab749e31505809631671ee0e
-  data.tar.gz: 3fbc558438ae5dd809e60562a9b799c034a3bbbf620eeb77a7cec2ca0c8eb4dd35a86330214a94bde6c22a449974527dc480c9d4278774af0dacb0212a6556fe
+  metadata.gz: 886c0eb9476e36c0c46e07812a412108f8575799f2a1b5588d0e6ed6feac5d7d8fe25ea27a1b8c4e244e691a62a9c502f0ecdb848eb56022cf48004f353d11ed
+  data.tar.gz: 18cc7167ae022ea13afd50b2367e47f5a9832e67d3754c683077125d4eaa99e75efba69b736fd327173ce9b2662f16be43bdbf53eea33f17b409703579f11b03

data/lib/clamp/completion/bash_generator.rb

@@ -54,7 +54,9 @@ module Clamp
           "        return",
           "    fi",
           "",
+          '    if [[ "$cur" == -* ]]; then',
           options_case("$subcmd"),
+          "    fi",
           "",
           '    if [ "$params_remaining" -eq 0 ]; then',
           subcommands_case("$subcmd"),

data/lib/clamp/completion/fish_generator.rb

@@ -17,16 +17,22 @@ module Clamp
         lines << "# Generated by Clamp"
         lines << ""
         helpers = [subcmd_args_function]
+
+        # Track visible option switches at each depth, so we can identify
+        # which options are new at each level. Depth-first walk order means
+        # the entry at depth N-1 is always the current node's parent.
+        switches_at_depth = []
+
         Completion.walk_command_tree(@command_class) do |cmd, path, has_children|
-          child_names = has_children ? cmd.recognised_subcommands.flat_map(&:names) : []
-          condition = condition_for(path, child_names)
-          Completion.visible_options(cmd).each do |option|
-            lines << option_completion(option, condition)
-          end
+          generate_option_completions(lines, cmd, path, switches_at_depth)
+
           next unless has_children
 
-          subcmd_condition = subcommand_condition(cmd, path, condition, helpers)
-          generate_subcommand_completions(lines, cmd, subcmd_condition)
+          # Subcommand names need an exclusive condition (only at this level).
+          child_names = cmd.recognised_subcommands.flat_map(&:names)
+          exclusive_cond = condition_for(path, child_names)
+          subcmd_cond = subcommand_condition(cmd, path, exclusive_cond, helpers)
+          generate_subcommand_completions(lines, cmd, subcmd_cond)
           lines << ""
         end
         "#{helpers.join("\n\n")}\n\n#{lines.join("\n")}\n"
@@ -52,6 +58,30 @@ module Clamp
         end
       end
 
+      # Emit only options new at this level (not inherited from parent).
+      # Use an inclusive condition so they also apply to child subcommands.
+      def generate_option_completions(lines, cmd, path, switches_at_depth)
+        depth = path.length
+        visible = Completion.visible_options(cmd)
+        parent_switches = depth.positive? ? switches_at_depth[depth - 1] : nil
+        new_options = if parent_switches
+                        visible.reject { |o| parent_switches.include?(o.switches) }
+                      else
+                        visible
+                      end
+        option_cond = depth.positive? ? inclusive_condition_for(path) : nil
+        new_options.each do |option|
+          lines << option_completion(option, option_cond)
+        end
+        switches_at_depth[depth] = Set.new(visible.map(&:switches))
+      end
+
+      # Condition that matches this level AND all child subcommands.
+      def inclusive_condition_for(path)
+        path.map { |sub| "#{completion_function}_seen_subcommand_from #{sub.names.join(' ')}" }.join("; and ")
+      end
+
+      # Condition that matches this level only (excludes child subcommands).
       def condition_for(path, child_names)
         if path.empty?
           "not #{completion_function}_subcmd_args >/dev/null"
@@ -96,9 +126,9 @@ module Clamp
         end
       end
 
-      def option_completion(option, condition)
+      def option_completion(option, condition = nil)
         parts = ["complete -c #{@executable_name} -f"]
-        parts << "-n '#{condition}'"
+        parts << "-n '#{condition}'" if condition
 
         Completion.expanded_switches(option).each do |switch|
           parts << if switch.start_with?("--")

data/lib/clamp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Clamp
-  VERSION = "1.5.1"
+  VERSION = "1.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clamp
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Mike Williams