cli-kit 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e576da52278c6b0596840691bffbb12546b54bf2238145455a45333d6101f773
-  data.tar.gz: 24243f1a2d66ad3b12fb2728b73b608038950d958ffc31dc0ab7951c3714533a
+  metadata.gz: 2d726194921593173c9e5ddc6825b4bb450b3b5b349be39801b0178668c3e94a
+  data.tar.gz: 3ab180c9b128bc0c6bdee63b68275273a12a938df484eb94e743f11ff81d28a2
 SHA512:
-  metadata.gz: 8e7f4f5c4cc6620a2d98eca89e85ad57e6a9a0bd94ec704503ac0c9ba84f631984beb7c71c60e8b24ddbd2c4cf88b30cc298d3b05009f565450348a5b82c8d7f
-  data.tar.gz: ac1c63ad107ca13fda07413a17054a17bb69ec6ae793f2a0abb97a5c2616c15fe7aaeaf7c3328b7ce035136dd72007df51fe7f5aab15e0c90199ede7ddd8d1e0
+  metadata.gz: 7677c4a9ccf218206b5b31f261507f66e12e7d8148be5857025979e282c8e524546015df0c6a612c818de297d6c93157fc15394592d0914eada8b5acd17469aa
+  data.tar.gz: 1a7882f6f3bb2a81dfa50c655c02fef3286badba79e4f5f6e384fc87a5d0953beba48b92eb83981c8124db91980c14d11c41a16d012b99eb3ef8151cc895fd86

data/.github/dependabot.yml

@@ -8,3 +8,6 @@ updates:
     time: "07:00"
     timezone: America/Toronto
   open-pull-requests-limit: 99
+  groups:
+    dev-dependencies:
+      dependency-type: "development"

data/.github/workflows/ruby.yml

@@ -11,7 +11,6 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '2.7'
         bundler-cache: true
     - name: Check style
       run: bundle exec rake style
@@ -23,7 +22,6 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '2.7'
         bundler-cache: true
     - name: Typecheck
       run: bundle exec srb tc
@@ -32,25 +30,9 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, ubuntu-latest]
-        ruby-version: ['2.7', '3.0']
+        ruby-version: ['3.1', '3.2', '3.3', '3.4']
 
     runs-on: ${{ matrix.os }}
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby-version }}
-        bundler-cache: true
-    - name: Run tests
-      run: bundle exec rake test
-
-  test-windows:
-    strategy:
-      matrix:
-        ruby-version: ['2.7', '3.0']
-
-    runs-on: windows-latest
     env:
       BUNDLE_WITHOUT: typecheck
     steps:

data/.rubocop.yml

@@ -11,7 +11,7 @@ AllCops:
   Exclude:
     - gen/template/**/*
     - vendor/**/*
-  TargetRubyVersion: 2.7
+    - lib/cli/kit/levenshtein.rb # Vendored
   NewCops: disable
 
 Style/ClassAndModuleChildren:
@@ -51,3 +51,19 @@ Style/GlobalStdStream:
 # Sometimes (often) explicit is good
 Style/EmptyElse:
   Enabled: false
+
+# We make frequent use Open3 methods to run other programs. When passing long command lines, it's useful and informative
+# to place the argument to an option on the same line as its option, eg:
+# Open3.capture3(
+#   'curl',
+#   '-H', 'X-Header: value',
+#   '-o', 'file.txt',
+#   '-L',
+#   'https://example.com/',
+# )
+Layout/MultilineMethodArgumentLineBreaks:
+  Enabled: false
+Layout/MultilineArrayLineBreaks:
+  Enabled: false
+Layout/MultilineHashKeyLineBreaks:
+  Enabled: false

data/.ruby-version

@@ -0,0 +1 @@
+3.4.3

data/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'cli-ui', git: 'https://github.com/Shopify/cli-ui', ref: '0eefd57248f42ec163639884e77a071d82bfbda8'
+  gem 'cli-ui'
   gem 'rubocop'
   gem 'rubocop-rake'
   gem 'rubocop-shopify'
@@ -20,7 +20,7 @@ group :typecheck do
 end
 
 group :test do
-  gem 'mocha', '~> 2.0.1', require: false
+  gem 'mocha', '~> 2.4.0', require: false
   gem 'minitest', '>= 5.0.0', require: false
   gem 'minitest-reporters', require: false
 end

data/Gemfile.lock

@@ -1,118 +1,118 @@
-GIT
-  remote: https://github.com/Shopify/cli-ui
-  revision: 0eefd57248f42ec163639884e77a071d82bfbda8
-  ref: 0eefd57248f42ec163639884e77a071d82bfbda8
-  specs:
-    cli-ui (1.5.1)
-
 PATH
   remote: .
   specs:
-    cli-kit (4.0.0)
-      cli-ui (>= 1.1.4)
+    cli-kit (5.1.0)
+      cli-ui (~> 2.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ansi (1.5.0)
-    ast (2.4.2)
-    builder (3.2.4)
-    byebug (11.1.3)
-    diff-lcs (1.5.0)
-    docile (1.4.0)
-    json (2.6.2)
-    method_source (1.0.0)
-    minitest (5.16.3)
-    minitest-reporters (1.5.0)
+    ast (2.4.3)
+    benchmark (0.4.1)
+    builder (3.3.0)
+    byebug (12.0.0)
+    cli-ui (2.4.0)
+    docile (1.4.1)
+    erubi (1.13.1)
+    json (2.13.2)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    method_source (1.1.0)
+    minitest (5.25.5)
+    minitest-reporters (1.7.1)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    mocha (2.0.2)
+    mocha (2.4.5)
       ruby2_keywords (>= 0.0.5)
     netrc (0.11.0)
-    parallel (1.22.1)
-    parser (3.1.2.1)
+    parallel (1.27.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
+      racc
+    prism (1.4.0)
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.0.6)
-    rbi (0.0.16)
-      ast
-      parser (>= 2.6.4.0)
-      sorbet-runtime (>= 0.5.9204)
-      unparser
-    regexp_parser (2.6.0)
-    rexml (3.2.5)
-    rubocop (1.39.0)
+    rake (13.3.0)
+    rbi (0.3.6)
+      prism (~> 1.0)
+      rbs (>= 3.4.4)
+    rbs (3.9.4)
+      logger
+    regexp_parser (2.10.0)
+    rexml (3.4.1)
+    rubocop (1.79.0)
       json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.23.0, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.46.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.23.0)
-      parser (>= 3.1.1.0)
-    rubocop-rake (0.6.0)
-      rubocop (~> 1.0)
-    rubocop-shopify (2.10.1)
-      rubocop (~> 1.35)
-    rubocop-sorbet (0.6.11)
-      rubocop (>= 0.90.0)
-    ruby-progressbar (1.11.0)
+      tsort (>= 0.2.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.46.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-rake (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1)
+    rubocop-shopify (2.17.1)
+      rubocop (~> 1.62)
+    rubocop-sorbet (0.10.5)
+      lint_roller
+      rubocop (>= 1.75.2)
+    ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    simplecov (0.21.2)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
-    sorbet (0.5.10554)
-      sorbet-static (= 0.5.10554)
-    sorbet-runtime (0.5.10554)
-    sorbet-static (0.5.10554-universal-darwin-14)
-    sorbet-static (0.5.10554-universal-darwin-15)
-    sorbet-static (0.5.10554-universal-darwin-16)
-    sorbet-static (0.5.10554-universal-darwin-17)
-    sorbet-static (0.5.10554-universal-darwin-18)
-    sorbet-static (0.5.10554-universal-darwin-19)
-    sorbet-static (0.5.10554-universal-darwin-20)
-    sorbet-static (0.5.10554-universal-darwin-21)
-    sorbet-static (0.5.10554-universal-darwin-22)
-    sorbet-static (0.5.10554-x86_64-linux)
-    sorbet-static-and-runtime (0.5.10554)
-      sorbet (= 0.5.10554)
-      sorbet-runtime (= 0.5.10554)
-    spoom (1.1.12)
-      sorbet (>= 0.5.9204)
-      sorbet-runtime (>= 0.5.9204)
+    sorbet (0.5.12358)
+      sorbet-static (= 0.5.12358)
+    sorbet-runtime (0.5.12358)
+    sorbet-static (0.5.12358-aarch64-linux)
+    sorbet-static (0.5.12358-universal-darwin)
+    sorbet-static (0.5.12358-x86_64-linux)
+    sorbet-static-and-runtime (0.5.12358)
+      sorbet (= 0.5.12358)
+      sorbet-runtime (= 0.5.12358)
+    spoom (1.6.3)
+      erubi (>= 1.10.0)
+      prism (>= 0.28.0)
+      rbi (>= 0.3.3)
+      rexml (>= 3.2.6)
+      sorbet-static-and-runtime (>= 0.5.10187)
       thor (>= 0.19.2)
-    tapioca (0.10.3)
-      bundler (>= 1.17.3)
+    tapioca (0.16.11)
+      benchmark
+      bundler (>= 2.2.25)
       netrc (>= 0.11.0)
       parallel (>= 1.21.0)
-      rbi (~> 0.0.0, >= 0.0.16)
-      sorbet-static-and-runtime (>= 0.5.9892)
-      spoom (~> 1.1.0, >= 1.1.11)
+      rbi (~> 0.2)
+      sorbet-static-and-runtime (>= 0.5.11087)
+      spoom (>= 1.2.0)
       thor (>= 1.2.0)
       yard-sorbet
-    thor (1.2.1)
-    unicode-display_width (2.3.0)
-    unparser (0.6.5)
-      diff-lcs (~> 1.3)
-      parser (>= 3.1.0)
-    webrick (1.7.0)
-    yard (0.9.28)
-      webrick (~> 1.7.0)
-    yard-sorbet (0.7.0)
-      sorbet-runtime (>= 0.5)
-      yard (>= 0.9)
+    thor (1.4.0)
+    tsort (0.2.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    yard (0.9.37)
+    yard-sorbet (0.9.0)
+      sorbet-runtime
+      yard
 
 PLATFORMS
-  arm64-darwin-21
-  ruby
+  aarch64-linux
   universal-darwin
   x86_64-linux
 
@@ -120,11 +120,11 @@ DEPENDENCIES
   bundler (~> 2.1)
   byebug
   cli-kit!
-  cli-ui!
+  cli-ui
   method_source
   minitest (>= 5.0.0)
   minitest-reporters
-  mocha (~> 2.0.1)
+  mocha (~> 2.4.0)
   rake (~> 13.0)
   rubocop
   rubocop-rake
@@ -135,4 +135,4 @@ DEPENDENCIES
   tapioca
 
 BUNDLED WITH
-   2.2.24
+   2.6.7

data/bin/tapioca

@@ -9,8 +9,7 @@
 #
 
 require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
-  Pathname.new(__FILE__).realpath)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', Pathname.new(__FILE__).realpath)
 
 bundle_binstub = File.expand_path('../bundle', __FILE__)
 

data/cli-kit.gemspec

@@ -7,8 +7,11 @@ require 'cli/kit/version'
 Gem::Specification.new do |spec|
   spec.name          = 'cli-kit'
   spec.version       = CLI::Kit::VERSION
-  spec.authors       = ['Burke Libbey', 'Aaron Olson', 'Lisa Ugray']
-  spec.email         = ['burke.libbey@shopify.com', 'aaron.olson@shopify.com', 'lisa.ugray@shopify.com']
+  spec.authors       = ['Burke Libbey', 'Aaron Olson', 'Lisa Ugray', 'Don Kelly']
+  spec.email         = [
+    'burke.libbey@shopify.com', 'aaron.olson@shopify.com', 'lisa.ugray@shopify.com',
+    'don.kelly@shopify.com',
+  ]
 
   spec.summary       = 'Terminal UI framework extensions'
   spec.description   = 'Terminal UI framework extensions'
@@ -22,7 +25,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency('cli-ui', '~> 2.0')
+  spec.add_runtime_dependency('cli-ui', '~> 2.4')
+
+  spec.required_ruby_version = '>= 3.0'
 
   spec.add_development_dependency('bundler', '~> 2.1')
   spec.add_development_dependency('minitest', '~> 5.0')

data/dev.yml

@@ -1,10 +1,15 @@
+nix: true
+
 up:
-  - homebrew:
+  - packages:
       - fswatch
-  - ruby: 3.0.4
+  - ruby
   - bundler
 
 commands:
+  add-back-ruby:
+    run: bundle lock --add-platform ruby && git commit -a -m 'Add back ruby platform' && git push
+    aliases: [abr]
   console: irb -I./lib -rcli/kit
   check:
     run: 'srb && rake style test'

data/examples/minimal/example.rb

@@ -9,12 +9,15 @@ CLI::UI::StdoutRouter.enable
 include(CLI::Kit)
 
 registry = CommandRegistry.new(default: 'hello')
-registry.add(Class.new(BaseCommand) do
-  sig { params(_args: T::Array[String], _name: String).void }
-  def call(_args, _name)
-    puts 'hello, world!'
-  end
-end, 'hello')
+registry.add(
+  Class.new(BaseCommand) do
+    sig { params(_args: T::Array[String], _name: String).void }
+    def call(_args, _name)
+      puts 'hello, world!'
+    end
+  end,
+  'hello',
+)
 
 executor      = Executor.new(log_file: '/tmp/example.log')
 error_handler = ErrorHandler.new(log_file: '/tmp/example.log', exception_reporter: nil)

data/gen/lib/gen/generator.rb

@@ -149,10 +149,10 @@ module Gen
     sig { params(s: String).returns(String) }
     def apply_template_variables(s)
       s
-        .gsub(/__app__/, @project_name)
-        .gsub(/__App__/, @title_case_project_name)
-        .gsub(/__cli-kit-version__/, cli_kit_version)
-        .gsub(/__cli-ui-version__/, cli_ui_version)
+        .gsub('__app__', @project_name)
+        .gsub('__App__', @title_case_project_name)
+        .gsub('__cli-kit-version__', cli_kit_version)
+        .gsub('__cli-ui-version__', cli_ui_version)
     end
 
     sig { returns(String) }

data/gen/lib/gen/help.rb

@@ -40,7 +40,7 @@ module Gen
         max_len = cmds.map(&:first).map(&:length).max
 
         cmds.each do |name, desc|
-          to.write(CLI::UI.fmt("  {{command:#{name.ljust(max_len)}}}  #{desc}\n"))
+          to.write(CLI::UI.fmt("  {{command:#{name.ljust(T.must(max_len))}}}  #{desc}\n"))
         end
       end
 

data/gen/template/dev-gems.yml

@@ -1,3 +1,3 @@
 up:
-  - ruby: 2.5.0
+  - ruby: 3.2.2
   - bundler

data/gen/template/dev-vendor.yml

@@ -1,4 +1,4 @@
 up:
-  - ruby: 2.5.0
+  - ruby: 3.2.2
 
 build: bin/update-deps

data/lib/cli/kit/args/evaluation.rb

@@ -151,7 +151,7 @@ module CLI
             next unless opt.required?
 
             node = @parse.detect do |node|
-              node.is_a?(Parser::Node::Option) && node.name == opt.name
+              node.is_a?(Parser::Node::Option) && node.name.to_sym == opt.name
             end
             if !node || T.cast(node, Parser::Node::Option).value.nil?
               raise(MissingRequiredOption, opt.as_written_by_user)
@@ -199,26 +199,15 @@ module CLI
 
         sig { params(opt: Definition::Option).returns(T.any(NilClass, String, T::Array[String])) }
         def lookup_option(opt)
-          if opt.short
-            opts = T.cast(
-              parse.select { |node| node.is_a?(Parser::Node::ShortOption) },
-              T::Array[Parser::Node::ShortOption],
-            )
-            matches = opts.select { |node| node.name == opt.short }
-            if (last = matches.last)
-              return(opt.multi? ? matches.map(&:value) : last.value)
-            end
-          end
-          if opt.long
-            opts = T.cast(
-              parse.select { |node| node.is_a?(Parser::Node::LongOption) },
-              T::Array[Parser::Node::LongOption],
-            )
-            matches = opts.select { |node| node.name == opt.long }
-            if (last = matches.last)
-              return(opt.multi? ? matches.map(&:value) : last.value)
-            end
+          opts = T.cast(
+            parse.select { |node| node.is_a?(Parser::Node::ShortOption) || node.is_a?(Parser::Node::LongOption) },
+            T::Array[T.any(Parser::Node::ShortOption, Parser::Node::LongOption)],
+          )
+          matches = opts.select { |node| (opt.short && node.name == opt.short) || (opt.long && node.name == opt.long) }
+          if (last = matches.last)
+            return (opt.multi? ? matches.map(&:value) : last.value)
           end
+
           opt.default
         end
 

data/lib/cli/kit/command_help.rb

@@ -135,7 +135,7 @@ module CLI
         sig { returns(T.nilable(String)) }
         def build_options
           opts = opts_class
-          return(nil) unless opts
+          return unless opts
 
           methods = []
           loop do
@@ -149,7 +149,7 @@ module CLI
           o = opts.new
           o.define!(@defn)
 
-          return nil if @defn.options.empty? && @defn.flags.empty?
+          return if @defn.options.empty? && @defn.flags.empty?
 
           merged = T.let(@defn.options, T::Array[T.any(Args::Definition::Option, Args::Definition::Flag)])
           merged += @defn.flags
@@ -238,7 +238,7 @@ module CLI
 
         sig { returns(T.nilable(String)) }
         def build_examples
-          return nil unless @examples
+          return unless @examples
 
           cmd_prefix = "  {{command:#{CommandHelp._tool_name} #{_command_name}}}"
           "{{bold:Examples:}}\n" + @examples.map do |command, explanation|

data/lib/cli/kit/command_registry.rb

@@ -107,15 +107,15 @@ module CLI
       sig { params(name: String).returns([T.nilable(T.class_of(CLI::Kit::BaseCommand)), String]) }
       def resolve_command(name)
         name = resolve_alias(name)
-        resolve_global_command(name) || \
-          resolve_contextual_command(name) || \
+        resolve_global_command(name) ||
+          resolve_contextual_command(name) ||
           [nil, name]
       end
 
       sig { params(name: String).returns(T.nilable([T.class_of(CLI::Kit::BaseCommand), String])) }
       def resolve_global_command(name)
         klass = resolve_class(commands.fetch(name, nil))
-        return nil unless klass
+        return unless klass
 
         [klass, name]
       rescue NameError
@@ -125,7 +125,7 @@ module CLI
       sig { params(name: String).returns(T.nilable([T.class_of(CLI::Kit::BaseCommand), String])) }
       def resolve_contextual_command(name)
         found = @contextual_resolver.command_names.include?(name)
-        return nil unless found
+        return unless found
 
         [@contextual_resolver.command_class(name), name]
       end

data/lib/cli/kit/core_ext.rb

@@ -1,4 +1,4 @@
-# typed: strong
+# typed: strict
 # frozen_string_literal: true
 
 class Exception

data/lib/cli/kit/error_handler.rb

@@ -133,9 +133,9 @@ module CLI
       sig { params(error: T.nilable(Exception)).returns(T.nilable(Exception)) }
       def exception_for_submission(error)
         # happens on normal non-error termination
-        return(nil) if error.nil?
+        return if error.nil?
 
-        return(nil) unless error.bug?
+        return unless error.bug?
 
         case error
         when SignalException

data/lib/cli/kit/executor.rb

@@ -56,8 +56,9 @@ module CLI
       end
 
       sig do
-        type_parameters(:T).params(signal: String, handler: Method,
-          block: T.proc.returns(T.type_parameter(:T))).returns(T.type_parameter(:T))
+        type_parameters(:T)
+          .params(signal: String, handler: Method, block: T.proc.returns(T.type_parameter(:T)))
+          .returns(T.type_parameter(:T))
       end
       def twrap(signal, handler, &block)
         return yield unless Signal.list.key?(signal)

data/lib/cli/kit/opts.rb

@@ -180,17 +180,24 @@ module CLI
 
         private
 
+        sig { params(label: T.nilable(String)).returns(T.nilable(Symbol)) }
+        def symbolize(label)
+          return if label.nil?
+
+          label.split('#').last&.to_sym
+        end
+
         sig { returns(Symbol) }
         def infer_name
           to_skip = 1
-          Kernel.caller_locations&.each do |loc|
+          Kernel.caller_locations.each do |loc|
             next if loc.path =~ /sorbet-runtime/
 
             if to_skip > 0
               to_skip -= 1
               next
             end
-            return(T.must(loc.label&.to_sym))
+            return T.must(symbolize(loc.label))
           end
           raise(ArgumentError, 'could not infer name')
         end
@@ -218,7 +225,7 @@ module CLI
         ).returns(T.untyped)
       end
       def each_option(&block)
-        return(enum_for(:each_option)) unless block_given?
+        return enum_for(:each_option) unless block_given?
 
         obj = assert_result!
         obj.defn.options.each do |opt|
@@ -236,7 +243,7 @@ module CLI
         ).returns(T.untyped)
       end
       def each_flag(&block)
-        return(enum_for(:each_flag)) unless block_given?
+        return enum_for(:each_flag) unless block_given?
 
         obj = assert_result!
         obj.defn.flags.each do |flag|

data/lib/cli/kit/parse_args.rb

@@ -0,0 +1,60 @@
+# typed: true
+
+module CLI
+  module Kit
+    module ParseArgs
+      # because sorbet type-checking takes the pedantic route that module doesn't include Kernel, therefore
+      # this is necessary (even tho it's ~probably fine~)
+      include Kernel
+      extend T::Sig
+
+      # T.untyped is used in two places. The interpretation of dynamic values from the provided `opts`
+      # and the resulting args[:opts] is pretty broad. There seems to be minimal value in expressing a
+      # tighter subset of T.untyped.
+
+      sig do
+        params(
+          args: T.any(Array, String),
+          opts_defn: T::Hash[Symbol, T::Array[T.untyped]],
+        ).returns(T::Hash[Symbol, T.untyped])
+      end
+      def parse_args(args, opts_defn)
+        start_opts, parser_config = opts_defn.reduce([{}, []]) do |(ini, pcfg), (n, cfg)|
+          (vals, desc, short, klass) = cfg
+          (init_val, def_val) = Array(vals)
+
+          [
+            init_val.nil? ? ini : ini.merge(n => init_val),
+            pcfg + [[n, short, desc, def_val, klass]],
+          ]
+        end
+
+        require('optparse')
+
+        acc_opts = {}
+        prsr = OptionParser.new do |opt_p|
+          parser_config.each do |(n, short, desc, def_val, klass)|
+            (_, mark) = short.split(' ')
+            long = "--#{n.to_s.tr("_", "-")}" + (mark.nil? ? '' : " #{mark}")
+            opt_args = klass.nil? ? [short, long, desc] : [short, long, klass, desc]
+
+            T.unsafe(opt_p).on(*opt_args) do |v|
+              acc_opts[n] = if acc_opts.key?(n)
+                Array(acc_opts[n]) + Array(v || def_val)
+              else
+                v || def_val
+              end
+            end
+          end
+        end
+
+        arg_v = (args.is_a?(Array) ? args : args.strip.split(/\s+/)).map(&:strip)
+        sub = prsr.parse(arg_v)
+
+        { opts: start_opts.merge(acc_opts) }.tap do |a|
+          a[:sub] = sub if sub
+        end
+      end
+    end
+  end
+end

data/lib/cli/kit/sorbet_runtime_stub.rb

@@ -94,10 +94,8 @@ module T
       def log_info_handler=(value); end
       def scalar_types; end
       def scalar_types=(values); end
-      # rubocop:disable Naming/InclusiveLanguage
       def sealed_violation_whitelist; end
       def sealed_violation_whitelist=(sealed_violation_whitelist); end
-      # rubocop:enable Naming/InclusiveLanguage
       def sig_builder_error_handler=(value); end
       def sig_validation_error_handler(error, opts); end
       def sig_validation_error_handler=(value); end

data/lib/cli/kit/support/test_helper.rb

@@ -21,6 +21,8 @@ module CLI
         def teardown
           super
           assert_all_commands_run
+        rescue Errno::EACCES
+          # this sometimes happens on windows builds - let's ignore it
         end
 
         module FakeConfig
@@ -223,7 +225,7 @@ module CLI
                     EOF
                   end
 
-                  return nil if final_error.empty?
+                  return if final_error.empty?
 
                   "\n" + final_error.join("\n") # Initial new line for formatting reasons
                 end
@@ -235,7 +237,7 @@ module CLI
 
                   if expected_cmd.nil?
                     @delegate_open3[a.join(' ')] = { unexpected: true }
-                    return nil
+                    return
                   end
 
                   expected_cmd[:run] = true

data/lib/cli/kit/system.rb

@@ -237,11 +237,15 @@ module CLI
 
           previous_trailing = Hash.new('')
           loop do
+            break if Process.wait(pid, Process::WNOHANG)
+
             ios = [err_r, out_r].reject(&:closed?)
-            break if ios.empty?
+            next if ios.empty?
+
+            readers, = IO.select(ios, [], [], 1)
+            next if readers.nil? # If IO.select times out we iterate again so we can check if the process has exited
 
-            readers, = IO.select(ios)
-            (readers || []).each do |io|
+            readers.each do |io|
               data, trailing = split_partial_characters(io.readpartial(4096))
               handlers[io].call(previous_trailing[io] + data)
               previous_trailing[io] = trailing
@@ -250,7 +254,6 @@ module CLI
             end
           end
 
-          Process.wait(pid)
           $CHILD_STATUS
         end
 
@@ -297,7 +300,7 @@ module CLI
         def os
           return :mac if /darwin/.match(RUBY_PLATFORM)
           return :linux if /linux/.match(RUBY_PLATFORM)
-          return :windows if /mingw32/.match(RUBY_PLATFORM)
+          return :windows if /mingw/.match(RUBY_PLATFORM)
 
           raise "Could not determine OS from platform #{RUBY_PLATFORM}"
         end
@@ -322,7 +325,7 @@ module CLI
             .returns([String, T::Array[String]])
         end
         def apply_sudo(cmd, args, sudo)
-          return [cmd, args] unless sudo
+          return [cmd, args] if !sudo || Process.uid.zero?
 
           sudo_reason(sudo) if sudo.is_a?(String)
           ['sudo', args.unshift('-E', '-S', '-p', SUDO_PROMPT, '--', cmd)]

data/lib/cli/kit/util.rb

@@ -18,8 +18,8 @@ module CLI
         # Converts a number to a human readable format on the SI scale
         #
         sig do
-          params(number: Numeric, unit: String, factor: Integer, precision: Integer,
-            space: T::Boolean).returns(String)
+          params(number: Numeric, unit: String, factor: Integer, precision: Integer, space: T::Boolean)
+            .returns(String)
         end
         def to_si_scale(number, unit = '', factor: 1000, precision: 2, space: false)
           raise ArgumentError, 'factor should only be 1000 or 1024' unless [1000, 1024].include?(factor)

data/lib/cli/kit/version.rb

@@ -2,6 +2,6 @@
 
 module CLI
   module Kit
-    VERSION = '5.0.0'
+    VERSION = '5.1.0'
   end
 end

data/lib/cli/kit.rb

@@ -23,6 +23,7 @@ module CLI
     autoload :Levenshtein,     'cli/kit/levenshtein'
     autoload :Logger,          'cli/kit/logger'
     autoload :Opts,            'cli/kit/opts'
+    autoload :ParseArgs,       'cli/kit/parse_args'
     autoload :Resolver,        'cli/kit/resolver'
     autoload :Support,         'cli/kit/support'
     autoload :System,          'cli/kit/system'

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: cli-kit
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Burke Libbey
 - Aaron Olson
 - Lisa Ugray
-autorequire:
+- Don Kelly
 bindir: exe
 cert_chain: []
-date: 2022-11-18 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cli-ui
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +73,7 @@ email:
 - burke.libbey@shopify.com
 - aaron.olson@shopify.com
 - lisa.ugray@shopify.com
+- don.kelly@shopify.com
 executables:
 - cli-kit
 extensions: []
@@ -85,6 +86,7 @@ files:
 - ".gitignore"
 - ".rubocop.sorbet.yml"
 - ".rubocop.yml"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -144,6 +146,7 @@ files:
 - lib/cli/kit/levenshtein.rb
 - lib/cli/kit/logger.rb
 - lib/cli/kit/opts.rb
+- lib/cli/kit/parse_args.rb
 - lib/cli/kit/resolver.rb
 - lib/cli/kit/sorbet_runtime_stub.rb
 - lib/cli/kit/support.rb
@@ -155,7 +158,6 @@ homepage: https://github.com/shopify/cli-kit
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -163,15 +165,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Terminal UI framework extensions
 test_files: []