thor-completion 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9a09943a60c0fa1ee8dc204e7f1ce67f86683d31651ce15f284c087313c1ce2
-  data.tar.gz: 8b82e6ded0bd726a29d701fa71ccaccadda97d76308385b5333766a83a06a66f
+  metadata.gz: 04d13f1834c0add34287b632d18e8e854457c28f42394e0bd44f5f70f6c132d8
+  data.tar.gz: a6095ce17d6b6f41c834d88ee078c7c5adadea8027cdeae51d34c51dc2aa3c25
 SHA512:
-  metadata.gz: 3feea415e81693e107ef457275d38207e1f495de6ea439e43a889b23ec7a59ae8f94f2e8329dc77b683e2b0de5adc239ce5384e87a4a849eebabe6358eea5b1f
-  data.tar.gz: e339618aa4c8e0a6054178a4d729fa9bcdfe3b898e104671fb3247bf96eac273d6dee2e73b00de156f95e749b810e7a9b9f8858b49d0e793e1990ad9d7725134
+  metadata.gz: e0d00a39ec7b612794d7d0271f102729073efc28c5b280c5556dc25188b1d6624197e429635a4dcd79c22434ad2ffd799c482e7acf37b658e423da3ee3ba6b70
+  data.tar.gz: 04d07083431b0c28fb4a4f000d6d8601c14a81789851d48768ad83b98358a03b066db0f38dbd3e940e822884a42a822bd5f9a3361637fbe94ab06a6b2450016e

data/CHANGELOG.md

@@ -11,6 +11,16 @@ Prefix your message with one of the following:
 - [Security] in case of vulnerabilities.
 -->
 
+## 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.
+
 ## v0.0.2
 
 - [Fixed] Fix completion property format to match schema (object instead of

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) }
           }
 
@@ -56,6 +75,15 @@ class Thor
         end
       end
 
+      def self.normalize_type(thor_type)
+        case thor_type.to_s
+        when "numeric"
+          "float"
+        else
+          thor_type.to_s
+        end
+      end
+
       def self.resolve_completion(value)
         value = value.to_s
 
@@ -69,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) }
           }
 
@@ -102,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
@@ -117,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:,
-            type: option.type.to_s,
-            description: option.description || "",
+            name: normalize_name(name),
+            type: normalize_type(option.type),
+            description: normalize_description(option.description),
             required: option.required,
             repeatable: option.repeatable || false,
             default: option.default,
@@ -148,7 +175,7 @@ class Thor
           if option.type == :boolean
             list << {
               name: "no-#{name}",
-              type: option.type.to_s,
+              type: normalize_type(option.type),
               description: "",
               required: false,
               repeatable: option.repeatable || false,
@@ -157,7 +184,7 @@ class Thor
 
             list << {
               name: "skip-#{name}",
-              type: option.type.to_s,
+              type: normalize_type(option.type),
               description: "",
               required: false,
               repeatable: option.repeatable || false,

data/lib/thor/completion/version.rb

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

data/lib/thor/completion/zsh.rb

@@ -293,7 +293,7 @@ class Thor
 
       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 +324,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.2
+  version: 0.0.4
 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.2
-  changelog_uri: https://github.com/fnando/thor-completion/tree/v0.0.2/CHANGELOG.md
-  documentation_uri: https://github.com/fnando/thor-completion/tree/v0.0.2/README.md
-  license_uri: https://github.com/fnando/thor-completion/tree/v0.0.2/LICENSE.md
+  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
 rdoc_options: []
 require_paths:
 - lib