thor-completion 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04d13f1834c0add34287b632d18e8e854457c28f42394e0bd44f5f70f6c132d8
-  data.tar.gz: a6095ce17d6b6f41c834d88ee078c7c5adadea8027cdeae51d34c51dc2aa3c25
+  metadata.gz: c49505c007d48270ffb369298b6f8b11917200030e3d00e96cb6582555fc76a5
+  data.tar.gz: f85beb78adb7934319054ef69f10092df9c9a610bf7a406b977d6d0be873253d
 SHA512:
-  metadata.gz: e0d00a39ec7b612794d7d0271f102729073efc28c5b280c5556dc25188b1d6624197e429635a4dcd79c22434ad2ffd799c482e7acf37b658e423da3ee3ba6b70
-  data.tar.gz: 04d07083431b0c28fb4a4f000d6d8601c14a81789851d48768ad83b98358a03b066db0f38dbd3e940e822884a42a822bd5f9a3361637fbe94ab06a6b2450016e
+  metadata.gz: 6545bcb815d53e9bc37cf24def563862462ab497bb0132eb251a46ae7e351872e1b6e2c296aedc0be93396d79f2d2f6215a6c3e7e5a263dcf56da9efd15badd6
+  data.tar.gz: ebc1fa9a160ef976a92ce3e58380c1d7da84f8d163a53451394e4bb59807e379ba14b15f68f726291aaf6b24ba4e403e7521add28e05051a4ce2442120473011

data/CHANGELOG.md

@@ -11,6 +11,12 @@ Prefix your message with one of the following:
 - [Security] in case of vulnerabilities.
 -->
 
+## v0.0.5
+
+- [Fixed] Remove position number from variadic arguments in zsh completions.
+- [Fixed] Prioritize subcommand state handling over arguments for commands with
+  subcommands.
+
 ## v0.0.4
 
 - [Fixed] Escape newlines in option descriptions for zsh completions.

data/lib/thor/completion/version.rb

@@ -2,6 +2,6 @@
 
 class Thor
   module Completion
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/lib/thor/completion/zsh.rb

@@ -152,7 +152,7 @@ class Thor
         end
 
         # Add positional arguments
-        if cmd[:arguments]&.any?
+        if cmd[:arguments]&.any? && !cmd[:subcommands]&.any?
           cmd[:arguments].each_with_index do |arg, idx|
             args << format_argument(arg, idx + 1)
           end
@@ -280,14 +280,15 @@ class Thor
         arg_name = arg[:name]
         arg_desc = arg[:description] || arg_name
         variadic = arg[:variadic] ? "*" : ""
+        pos = variadic.empty? ? position.to_s : ""
 
         if arg[:completion]
           completion = format_completion(arg[:completion])
-          "'#{variadic}#{position}:#{arg_desc}:#{completion}'"
+          "'#{variadic}#{pos}:#{arg_desc}:#{completion}'"
         elsif arg[:required] == false
-          "'#{variadic}#{position}::#{arg_desc}:_files'"
+          "'#{variadic}#{pos}::#{arg_desc}:_files'"
         else
-          "'#{variadic}#{position}:#{arg_desc}:_files'"
+          "'#{variadic}#{pos}:#{arg_desc}:_files'"
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thor-completion
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Nando Vieira
@@ -165,10 +165,10 @@ metadata:
   rubygems_mfa_required: 'true'
   homepage_uri: https://github.com/fnando/thor-completion
   bug_tracker_uri: https://github.com/fnando/thor-completion/issues
-  source_code_uri: https://github.com/fnando/thor-completion/tree/v0.0.4
-  changelog_uri: https://github.com/fnando/thor-completion/tree/v0.0.4/CHANGELOG.md
-  documentation_uri: https://github.com/fnando/thor-completion/tree/v0.0.4/README.md
-  license_uri: https://github.com/fnando/thor-completion/tree/v0.0.4/LICENSE.md
+  source_code_uri: https://github.com/fnando/thor-completion/tree/v0.0.5
+  changelog_uri: https://github.com/fnando/thor-completion/tree/v0.0.5/CHANGELOG.md
+  documentation_uri: https://github.com/fnando/thor-completion/tree/v0.0.5/README.md
+  license_uri: https://github.com/fnando/thor-completion/tree/v0.0.5/LICENSE.md
 rdoc_options: []
 require_paths:
 - lib