cmd.rb 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34d12924cba02103e5b13c1581d948f3fc862a588b452aef90b9797ab7bd605b
-  data.tar.gz: c7a4aa7d0266f6c2ed91c6268189310462135b465d4d6a8cfcbb5b170b360480
+  metadata.gz: f520a73aaf3d0510069fb97555c4ec0510924906f7371bc205843ae27cdcdd27
+  data.tar.gz: 3e7b0ed7b8b0452ea9a1bab642aacd927fc1bfb3698e905b201020883ca3e364
 SHA512:
-  metadata.gz: d98a6f7bcd51310076ec57fc8947f7d6922b5402a5e0aac5432174fb2db6cfc44e19e07b7e5f11f87eaffb31eb050774891f9f46cd1ab70a9102e36407c5abea
-  data.tar.gz: 7b4620b67fd778a0f01d61dffb5b5dfde52aa10e92fdf15feb655f132638a3a26d0339840543d50665ec128c8a4a28c5d50508c672d59dfb636ef738175a37fe
+  metadata.gz: ca15e636c297e708d37a669f5508014915295a9aabccbc9d383916fc2534f8b209e12f0530c502a2c4732fc3caebe8a92722c7f4771ce960b64385fe48ae797d
+  data.tar.gz: df656157cf58c6bbc2b2a1abb65b1b9ca73641db17a70c25506b4a36c1e47062d86aaf73f5a1116075ee7ac994da09a9f2c031da1c430ac92e865c5586975034

data/README.md

@@ -29,7 +29,7 @@ class Ls < Cmd
 
   def run
     options = parse_options(argv)
-    options.help ? show_help : run_command(options)
+    run_command(options)
   end
 
   private

data/VERSION

@@ -1 +1 @@
-v0.4.1
+v0.5.0

data/cmd.rb.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.summary = "A library for building command-line applications, in Ruby."
   gem.description = gem.summary
   gem.add_runtime_dependency "ryo.rb", "~> 0.4"
-  gem.add_runtime_dependency "cli-option_parser.rb", "~> 0.5"
+  gem.add_runtime_dependency "cli-option_parser.rb", "~> 0.6"
   gem.add_development_dependency "test-unit", "~> 3.5.7"
   gem.add_development_dependency "yard", "~> 0.9"
   gem.add_development_dependency "redcarpet", "~> 3.5"

data/lib/cmd/mixin/option_parser/finder.rb

@@ -0,0 +1,23 @@
+module Cmd::Mixin::OptionParser
+  module Finder
+    extend self
+    ##
+    # @param [CLI::OptionParser] option_parser
+    #  An instance of CLI::OptionParser.
+    #
+    # @param [String] short
+    #  Short option.
+    #
+    # @param [String] long
+    #  Long option.
+    #
+    # @return [CLI::OptionParser::Switch, nil]
+    #  Returns a Switch, or nil.
+    def find(option_parser, short:, long:)
+      option_parser.top.list.find do |s|
+        s.short[0] == short[/[^\s]*/] &&
+        s.long[0] == long[/[^\s*]*/]
+      end
+    end
+  end
+end

data/lib/cmd/mixin/option_parser.rb

@@ -6,6 +6,7 @@
 # [OptionParser](https://docs.ruby-lang.org/en/3.2/OptionParser.html)
 # class.
 module Cmd::Mixin::OptionParser
+  require_relative "option_parser/finder"
   require "cli-option_parser"
   require "ryo"
 
@@ -50,8 +51,9 @@ module Cmd::Mixin::OptionParser
     # @return [void]
     def set_option(short, long, desc, as: String, default: nil)
       option_parser.on(short, long, desc, as) do |v|
-        switch = __switch_search(short, long)
-        v || __optional_switches.any? { _1 === switch } ? v : true
+        switch = Finder.find(option_parser, short:, long:)
+        is_optional = option_parser.optional_switches.any? { _1 === switch }
+        v || is_optional ? v : true
       end
       switch = option_parser.top.list[-1]
       set_default({
@@ -94,24 +96,6 @@ module Cmd::Mixin::OptionParser
     def defaults
       @defaults ||= Ryo({})
     end
-
-    ##
-    # @private
-    def __switch_search(short, long)
-      option_parser.top.list.find do |s|
-        s.short[0] == short[/[^\s]*/] &&
-        s.long[0] == long[/[^\s*]*/]
-      end
-    end
-
-    ##
-    # @private
-    def __optional_switches
-      [
-        CLI::OptionParser::Switch::PlacedArgument,
-        CLI::OptionParser::Switch::OptionalArgument
-      ]
-    end
   end
 
   ##

data/lib/cmd.rb

@@ -7,6 +7,14 @@ class Cmd
   include Mixin::Help
 
   def self.inherited(klass)
-    klass.class_eval { include(Mixin::OptionParser) }
+    klass.class_eval do
+      include Mixin::OptionParser
+      prepend Module.new {
+        def run(...)
+          options = parse_options(argv)
+          options.help ? show_help : super(...)
+        end
+      }
+    end
   end
 end

data/share/examples/cmd.rb/ls

@@ -11,7 +11,7 @@ class Ls < Cmd
 
   def run
     options = parse_options(argv)
-    options.help ? show_help : run_command(options)
+    run_command(options)
   end
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmd.rb
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - '0x1eef'
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-16 00:00:00.000000000 Z
+date: 2024-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ryo.rb
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +146,7 @@ files:
 - lib/cmd/mixin/argv.rb
 - lib/cmd/mixin/help.rb
 - lib/cmd/mixin/option_parser.rb
+- lib/cmd/mixin/option_parser/finder.rb
 - share/examples/cmd.rb/ls
 - share/examples/cmd.rb/setup.rb
 - test/cmd_test.rb