dry-cli 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bb38a55577b2607724ceaafe32979ca39b83b62ece8d5e734f522646042d2f5
-  data.tar.gz: 05e3fe644ca5fceb2bd3dc740453faf8aab28faaf7ad5ae9ab39a23474f7f611
+  metadata.gz: 8ab3b2530b7f867fee473bfb808d816bcfefd9732f49e158d32d5d914873516c
+  data.tar.gz: 897275b361168f15eb760ced1d5a6db6ec1229361a9b323e06a3204bfe89cd8d
 SHA512:
-  metadata.gz: 97ff398081901a642d1d8d898a50eec46e33103defff2e4c77f11a0e5150dcb79fc7e568cbeaaeaa7e6af9f0e05835b265a2ceb7fda144f4983b8dfc27363728
-  data.tar.gz: 39b43443b842724a7096a909bba93dd93ceda1c470a2cfc2ec9ac9e02f2aee0b449f2dd6c2b7bf9c0c92485ad404a14ba1a352518d5070366535bbc19d5cb789
+  metadata.gz: c12f142b52bb3114425d7be016416603a951cc88b5252593a77f3cd48bbe73d0b7e453dca3519fd5025af9832b875f563208914cb5657d6d0b5eef19782d6412
+  data.tar.gz: 2749e9f49dcf611171bdcdb2f9dbc51106cf78d7658155b2229a6e391610c18f288235ebe2abac654b6dfa8a0461e54e325cd2d315aa9303b2a06e1ddc1119fa

data/CHANGELOG.md

@@ -1,5 +1,49 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 1.3.0 2025-07-29
+
+
+### Added
+
+- Support unlimited nesting when registering commands via `register` with blocks. (@aaronmallen in #149)
+
+  You could previously do this only with fully qualified registrations:
+
+  ```ruby
+  Commands.register "nested one", MyFirstNestedCommand
+  Commands.register "nested one two", MySecondNestedCommand
+  Commands.register "nested one two three", MyThirdNestedCommand
+  ```
+
+  Now you can do the same via blocks:
+
+  ```ruby
+  Commands.register "nested" do
+    register "one", MyFirstNestedCommand do
+      register "two", MySecondNestedCommand do
+        register "three", MyThirdNestedCommand
+      end
+    end
+  end
+  ```
+
+### Changed
+
+- Set minimum Ruby version to 3.1. (@timriley)
+
+[Compare v1.2.0...v1.3.0](https://github.com/dry-rb/dry-cli/compare/v1.2.0...v1.3.0)
+
+## 1.2.0 2024-10-15
+
+
+### Added
+
+- Added `:hidden` option to register commands that should not be shown in the help output. (@benoittgt in #137)
+- Provide suggestions when there is a typo in a command name. (@benoittgt in #138)
+
+
+[Compare v1.1.0...v1.2.0](https://github.com/dry-rb/dry-cli/compare/v1.1.0...v1.2.0)
+
 ## 1.1.0 2024-07-14
 
 

data/README.md

@@ -14,7 +14,7 @@
 
 This library officially supports the following Ruby versions:
 
-* MRI `>= 2.4.0`
+* MRI `>= 3.1.0`
 * jruby `>= 9.4` (not tested on CI)
 
 ## License

data/dry-cli.gemspec

@@ -26,13 +26,12 @@ Gem::Specification.new do |spec|
   spec.metadata["source_code_uri"]   = "https://github.com/dry-rb/dry-cli"
   spec.metadata["bug_tracker_uri"]   = "https://github.com/dry-rb/dry-cli/issues"
 
-  spec.required_ruby_version = ">= 2.4.0"
+  spec.required_ruby_version = ">= 3.1"
 
   # to update dependencies edit project.yml
 
   spec.add_development_dependency "bundler", ">= 1.6", "< 3"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.7"
-  spec.add_development_dependency "rubocop", "~> 0.82"
   spec.add_development_dependency "simplecov", "~> 0.17.1"
 end

data/lib/dry/cli/command_registry.rb

@@ -18,7 +18,7 @@ module Dry
 
       # @since 0.1.0
       # @api private
-      def set(name, command, aliases)
+      def set(name, command, aliases, hidden)
         @_mutex.synchronize do
           node = @root
           name.split(/[[:space:]]/).each do |token|
@@ -26,6 +26,7 @@ module Dry
           end
 
           node.aliases!(aliases)
+          node.hidden!(hidden)
           if command
             node.leaf!(command)
             node.subcommands!(command)
@@ -91,6 +92,10 @@ module Dry
         # @api private
         attr_reader :aliases
 
+        # @since 1.1.1
+        # @api private
+        attr_reader :hidden
+
         # @since 0.1.0
         # @api private
         attr_reader :command
@@ -109,6 +114,7 @@ module Dry
           @parent   = parent
           @children = {}
           @aliases  = {}
+          @hidden   = hidden
           @command  = nil
 
           @before_callbacks = Chain.new
@@ -154,6 +160,12 @@ module Dry
           end
         end
 
+        # @since 1.1.1
+        # @api private
+        def hidden!(hidden)
+          @hidden = hidden
+        end
+
         # @since 0.1.0
         # @api private
         def leaf?

data/lib/dry/cli/registry.rb

@@ -75,11 +75,11 @@ module Dry
       #       end
       #     end
       #   end
-      def register(name, command = nil, aliases: [], &block)
-        @commands.set(name, command, aliases)
+      def register(name, command = nil, aliases: [], hidden: false, &block)
+        @commands.set(name, command, aliases, hidden)
 
         if block_given?
-          prefix = Prefix.new(@commands, name, aliases)
+          prefix = Prefix.new(@commands, name, aliases, hidden)
           if block.arity.zero?
             prefix.instance_eval(&block)
           else
@@ -308,19 +308,28 @@ module Dry
       class Prefix
         # @since 0.1.0
         # @api private
-        def initialize(registry, prefix, aliases)
+        def initialize(registry, prefix, aliases, hidden)
           @registry = registry
           @prefix   = prefix
 
-          registry.set(prefix, nil, aliases)
+          registry.set(prefix, nil, aliases, hidden)
         end
 
         # @since 0.1.0
         #
         # @see Dry::CLI::Registry#register
-        def register(name, command, aliases: [])
+        def register(name, command = nil, aliases: [], hidden: false, &block)
           command_name = "#{prefix} #{name}"
-          registry.set(command_name, command, aliases)
+          registry.set(command_name, command, aliases, hidden)
+
+          if block_given?
+            prefix = self.class.new(registry, command_name, aliases, hidden)
+            if block.arity.zero?
+              prefix.instance_eval(&block)
+            else
+              yield(prefix)
+            end
+          end
         end
 
         private

data/lib/dry/cli/spell_checker.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require "dry/cli/program_name"
+require "did_you_mean"
+
+module Dry
+  class CLI
+    # Command(s) usage
+    #
+    # @since 1.1.1
+    # @api private
+    module SpellChecker
+      # @since 1.1.1
+      # @api private
+      def self.call(result, arguments)
+        commands = result.children.keys
+        cmd = cmd_to_spell(arguments, result.names)
+
+        suggestions = DidYouMean::SpellChecker.new(dictionary: commands).correct(cmd.first)
+        if suggestions.any?
+          "I don't know how to '#{cmd.join(" ")}'. Did you mean: '#{suggestions.first}' ?"
+        end
+      end
+
+      # @since 1.1.1
+      # @api private
+      def self.cmd_to_spell(arguments, result_names)
+        arguments - result_names
+      end
+
+      # @since 1.1.1
+      # @api private
+      def self.ignore?(cmd)
+        cmd.empty? || cmd.first.start_with?("-")
+      end
+    end
+  end
+end

data/lib/dry/cli/usage.rb

@@ -21,9 +21,11 @@ module Dry
         max_length, commands = commands_and_arguments(result)
 
         commands.map do |banner, node|
+          next if node.hidden
+
           usage = description(node.command) if node.leaf?
           "#{justify(banner, max_length, usage)}#{usage}"
-        end.unshift(header).join("\n")
+        end.compact.unshift(header).join("\n")
       end
 
       # @since 0.1.0

data/lib/dry/cli/version.rb

@@ -3,6 +3,6 @@
 module Dry
   class CLI
     # @since 0.1.0
-    VERSION = "1.1.0"
+    VERSION = "1.3.0"
   end
 end

data/lib/dry/cli.rb

@@ -14,6 +14,7 @@ module Dry
     require "dry/cli/registry"
     require "dry/cli/parser"
     require "dry/cli/usage"
+    require "dry/cli/spell_checker"
     require "dry/cli/banner"
     require "dry/cli/inflector"
 
@@ -108,7 +109,7 @@ module Dry
     # @api private
     def perform_registry(arguments)
       result = registry.get(arguments)
-      return usage(result) unless result.found?
+      return spell_checker(result, arguments) unless result.found?
 
       command, args = parse(result.command, result.arguments, result.names)
 
@@ -161,9 +162,11 @@ module Dry
       exit(1)
     end
 
-    # @since 0.1.0
-    # @api private
-    def usage(result)
+    # @since 1.1.1
+    def spell_checker(result, arguments)
+      spell_checker = SpellChecker.call(result, arguments)
+      err.puts spell_checker if spell_checker
+      puts
       err.puts Usage.call(result)
       exit(1)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-cli
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Luca Guidi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-14 00:00:00.000000000 Z
+date: 2025-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,20 +58,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.82'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.82'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +94,7 @@ files:
 - lib/dry/cli/parser.rb
 - lib/dry/cli/program_name.rb
 - lib/dry/cli/registry.rb
+- lib/dry/cli/spell_checker.rb
 - lib/dry/cli/usage.rb
 - lib/dry/cli/version.rb
 homepage: https://dry-rb.org/gems/dry-cli
@@ -118,7 +105,7 @@ metadata:
   changelog_uri: https://github.com/dry-rb/dry-cli/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/dry-rb/dry-cli
   bug_tracker_uri: https://github.com/dry-rb/dry-cli/issues
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -126,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -134,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Common framework to build command line interfaces with Ruby
 test_files: []