cmd.rb 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae504e219feb435833aab29f7f826cb9f06ed900332b10e49d747d5dc490c8be
-  data.tar.gz: cb5ab27233e327950f636f645caf75dae18cf84892b3f18c6fa838df87ba65e1
+  metadata.gz: 34d12924cba02103e5b13c1581d948f3fc862a588b452aef90b9797ab7bd605b
+  data.tar.gz: c7a4aa7d0266f6c2ed91c6268189310462135b465d4d6a8cfcbb5b170b360480
 SHA512:
-  metadata.gz: 90bbfee00e503bad9280a5c4ed0b7f361e6d99b6586c4c9663a1bd690a31dba1314c3507fa432c95a00212ee5ce5bbb6aef6bee9c3b0531c16eed51512de086b
-  data.tar.gz: f88b71a7c4a3eb4f0b8f30f23e32f76a067036967692860853fe93b02798fa3135d63135d2965d3e0753b4cac746c54d4fa83892db5cc53e5594db283d739d59
+  metadata.gz: d98a6f7bcd51310076ec57fc8947f7d6922b5402a5e0aac5432174fb2db6cfc44e19e07b7e5f11f87eaffb31eb050774891f9f46cd1ab70a9102e36407c5abea
+  data.tar.gz: 7b4620b67fd778a0f01d61dffb5b5dfde52aa10e92fdf15feb655f132638a3a26d0339840543d50665ec128c8a4a28c5d50508c672d59dfb636ef738175a37fe

data/README.md

@@ -12,7 +12,8 @@ option parsing implementation is delegated to
 
 The following example demonstrates a simple command that is
 implemented with `Dir.entries`. The command accepts two options
-that have fallback default values set:
+that have fallback default values set for when an option is not
+given:
 
 **Definition**
 
@@ -80,7 +81,7 @@ are available as sources.
 
 ```ruby
 # Gemfile
-gem "cmd.rb", github: "0x1eef/cmd.rb", tag: "v0.4.0"
+gem "cmd.rb", github: "0x1eef/cmd.rb"
 ```
 
 **Rubygems.org**

data/VERSION

@@ -1 +1 @@
-v0.4.0
+v0.4.1

data/lib/cmd/mixin/option_parser.rb

@@ -49,8 +49,15 @@ module Cmd::Mixin::OptionParser
     #
     # @return [void]
     def set_option(short, long, desc, as: String, default: nil)
-      option_parser.on(short, long, desc, as) { _1 || true }
-      set_default({ short => default, long => default })
+      option_parser.on(short, long, desc, as) do |v|
+        switch = __switch_search(short, long)
+        v || __optional_switches.any? { _1 === switch } ? v : true
+      end
+      switch = option_parser.top.list[-1]
+      set_default({
+        switch.short[0][1..] => default,
+        switch.long[0][2..] => default
+      })
     end
 
     ##
@@ -60,7 +67,11 @@ module Cmd::Mixin::OptionParser
     #
     # @return [void]
     def set_default(defaults)
-      @defaults = Ryo.from(defaults)
+      if @defaults
+        Ryo.assign(@defaults, defaults)
+      else
+        @defaults = Ryo.from(defaults)
+      end
     end
 
     ##
@@ -83,6 +94,24 @@ 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/test/cmd_test.rb

@@ -3,30 +3,64 @@ require_relative "setup"
 class CmdTest < Test::Unit::TestCase
   class Command < Cmd
     set_banner usage: "test [OPTIONS]",
-               description: "..."
-    set_option '-f', '--foo', 'An option without an argument'
-    set_option '-b=ARG', '--bar=ARG', 'An option with an argument'
+               description: "A test program"
+    set_option '-x', '--xarg', 'An option without an argument'
+    set_option '-y ARG', '--yarg ARG', 'An option with a required argument'
+    set_option '-z [ARG]', '--zarg [ARG]', 'An option with an optional argument'
 
     def run
       parse_options(argv)
     end
   end
 
-  def test_foo_yes
-    options = Command.new(['-f']).run
-    assert_equal true, options.f
-    assert_equal true, options.foo
+  def test_none_given
+    options = Command.new([]).run
+    [options.x, options.xarg,
+     options.y, options.yarg,
+     options.z, options.zarg].each do
+      assert_equal nil, _1
+    end
   end
 
-  def test_foo_no
-    options = Command.new([]).run
-    assert_equal nil, options.f
-    assert_equal nil, options.foo
+  ##
+  # No argument option
+  # -x, --xarg
+
+  def test_xarg_given
+    options = Command.new(['-x']).run
+    assert_equal true, options.x
+    assert_equal true, options.xarg
+  end
+
+  ##
+  # Required argument option
+  # -y ARG, --yarg ARG
+
+  def test_yarg_given
+    options = Command.new(['-y', 'required-argument']).run
+    assert_equal 'required-argument', options.y
+    assert_equal 'required-argument', options.yarg
+  end
+
+  def test_yarg_missing_argument
+    assert_raises(CLI::OptionParser::MissingArgument) do
+      Command.new(['-y']).run
+    end
+  end
+
+  ##
+  # Optional argument option
+  # -z [ARG], --zarg [ARG]
+
+  def test_zarg_given
+    options = Command.new(['-z', 'optional-argument']).run
+    assert_equal 'optional-argument', options.z
+    assert_equal 'optional-argument', options.zarg
   end
 
-  def test_bar
-    options = Command.new(['-b', 'foobar']).run
-    assert_equal 'foobar', options.b
-    assert_equal 'foobar', options.bar
+  def test_zarg_missing_argument
+    options = Command.new(['-z']).run
+    assert_equal nil, options.z
+    assert_equal nil, options.zarg
   end
 end

data/test/readme_examples_test.rb

@@ -3,8 +3,6 @@
 require_relative "setup"
 
 class READMETest < Test::Unit::TestCase
-  include Test::Cmd
-
   def test_ls_command
     assert_equal "dev\netc\nhome\n",
                  run_example("ls --directory test/fakefs/ --grep [^.gitkeep]").stdout

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmd.rb
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - '0x1eef'
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-30 00:00:00.000000000 Z
+date: 2024-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ryo.rb