thor-completion 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 691cb833f0cc214e326a1b186f6c884cab5abe6102dc4357f1eee7cd6f82ed1e
-  data.tar.gz: fb8a29b2ceb7ae67e907d3e63e02717acfa6e44ab68a229ed85bc6c1f91db3a5
+  metadata.gz: c49505c007d48270ffb369298b6f8b11917200030e3d00e96cb6582555fc76a5
+  data.tar.gz: f85beb78adb7934319054ef69f10092df9c9a610bf7a406b977d6d0be873253d
 SHA512:
-  metadata.gz: bd116f5e939b154e1dce77cd86bb02ccf07f832c5591d6ba782aa3b8b0aa9d0fdf459fd9e6eddb0ecf500ccaf0fb911579a40b7f435996a9b417d42bfb63f4f5
-  data.tar.gz: 19120d0dba101995ae46132e91e45eea1c674ef47b27d4ca86c022c5bff6a6569b2c3dd7028db693840dcb74d8a6f5dbdc1f4260baff13cb88be33ebe42b026d
+  metadata.gz: 6545bcb815d53e9bc37cf24def563862462ab497bb0132eb251a46ae7e351872e1b6e2c296aedc0be93396d79f2d2f6215a6c3e7e5a263dcf56da9efd15badd6
+  data.tar.gz: ebc1fa9a160ef976a92ce3e58380c1d7da84f8d163a53451394e4bb59807e379ba14b15f68f726291aaf6b24ba4e403e7521add28e05051a4ce2442120473011

data/CHANGELOG.md

@@ -11,6 +11,18 @@ 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.
+- [Fixed] Properly escape single quotes in zsh completion strings.
+- [Fixed] Properly normalize command names.
+
 ## v0.0.3
 
 - [Fixed] Map Thor's `numeric` type to schema's `float` type.

data/lib/thor/completion/builder.rb

@@ -7,8 +7,8 @@ class Thor
 
       def self.call(name:, description:, version:, cli:)
         schema = {
-          name:,
-          description:,
+          name: normalize_name(name),
+          description: normalize_description(description),
           version:,
           commands: [],
           subcommands: [],
@@ -24,6 +24,25 @@ class Thor
         schema
       end
 
+      def self.dasherize(text) = text.to_s.tr("_", "-")
+
+      def self.normalize_description(description)
+        description.to_s.gsub(/(\r?\n)+/, " ")
+      end
+
+      def self.normalize_name(name)
+        case name
+        when "_run"
+          # Thor reserves the name `run` for its internal use.
+          # I've done ARGV manipulation to replace `run` with `_run` so that
+          # users can still use `run` as a command name. Let's assume this
+          # is the case and rename it back to `run`.
+          "run"
+        else
+          dasherize(name)
+        end
+      end
+
       def self.build_command(cli, parent)
         cli.options.each_value do |option|
           parent[:options] += build_option(option)
@@ -31,8 +50,8 @@ class Thor
 
         cli.all_commands.each_value do |command|
           cmd_schema = {
-            name: command.name,
-            description: command.description || "",
+            name: normalize_name(command.name),
+            description: normalize_description(command.description),
             options: command.options.each_value.flat_map { build_option(_1) }
           }
 
@@ -78,8 +97,8 @@ class Thor
       def self.build_subcommands(cli, parent)
         cli.all_commands.each_value do |command|
           subcmd_schema = {
-            name: command.name,
-            description: command.description || "",
+            name: normalize_name(command.name),
+            description: normalize_description(command.description),
             options: command.options.each_value.flat_map { build_option(_1) }
           }
 
@@ -111,7 +130,7 @@ class Thor
 
         values.map do |type, name|
           arg_hash = {
-            name: name.to_s,
+            name: normalize_name(name),
             description: name.to_s.tr("_", " ").capitalize,
             required: type == :req,
             variadic: type == :rest
@@ -126,15 +145,14 @@ class Thor
       end
 
       def self.build_option(option)
-        dasherize = proc { _1.to_s.tr("_", "-") }
-        name = dasherize.call(option.name)
+        name = dasherize(option.name)
 
         [].tap do |list|
-          short_opts = option.aliases.map { dasherize.call(_1.gsub(/^-+/, "")) }
+          short_opts = option.aliases.map { dasherize(_1.gsub(/^-+/, "")) }
           opt_hash = {
-            name:,
+            name: normalize_name(name),
             type: normalize_type(option.type),
-            description: option.description || "",
+            description: normalize_description(option.description),
             required: option.required,
             repeatable: option.repeatable || false,
             default: option.default,

data/lib/thor/completion/version.rb

@@ -2,6 +2,6 @@
 
 class Thor
   module Completion
-    VERSION = "0.0.3"
+    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,20 +280,21 @@ 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
 
       private def add_completion_spec(spec, completion)
         comp_spec = format_completion(completion)
-        spec.sub(/\]$/, "]:value:#{comp_spec}'")
+        spec + "]:value:#{comp_spec}'"
       end
 
       private def format_completion(completion)
@@ -324,11 +325,11 @@ class Thor
       end
 
       private def escape_description(desc)
-        desc.to_s.gsub(/[\[\]']/, '\\\\\&')
+        desc.to_s.gsub("\n", " ").gsub("'", "'\\\\''"  ).gsub(/[\[\]]/, '\\\\\&')
       end
 
       private def escape_value(value)
-        value.to_s.gsub(/[\s']/, '\\\\\&')
+        value.to_s.gsub("'", "'\\\\''"  ).gsub(/[\s]/, '\\\\\&')
       end
 
       private def quote(str)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thor-completion
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  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.3
-  changelog_uri: https://github.com/fnando/thor-completion/tree/v0.0.3/CHANGELOG.md
-  documentation_uri: https://github.com/fnando/thor-completion/tree/v0.0.3/README.md
-  license_uri: https://github.com/fnando/thor-completion/tree/v0.0.3/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