simple-cli-options 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8ff6ff3ffba56b65402a9c002d311a0bfa969924de39c043b68835b83983d6c
-  data.tar.gz: 2916c0ea3b668b499a5a0d22fa7e7a3e0a2de753f856d2fd2529ca284dcee920
+  metadata.gz: a20b6b59fed0e7c00325c3df20d25fdd3e860bfb8e4635e824abf29ad413348a
+  data.tar.gz: 4e1dde6d25abb317503dd35eee37199886163c37d3b79f2a250b3b6c09749e49
 SHA512:
-  metadata.gz: b7313860656b22a3498b6b6ba606e00c2490957f3531b4528654c2130e3595f763a729a5833c887ef00327a672410b1f20dd6736d2e43a8719601eac1475f4dd
-  data.tar.gz: 41420744ead523fa5b942e59987928a5013dc08305d725a4aeabce726c9e7c45738a470a9d413cbe80c3b8b202aefdda41d317a8ed1be7416306e951bdbd0814
+  metadata.gz: eea0745fe1eb1a4616f70e90f9d8f5397fc4ebea94018c1e99d97310a949c28656f46a32ecdba211189dba58689edb54bc5b022aea7a9502442cabc006923e62
+  data.tar.gz: 299417202d0fe3f9bdb7cc0ce4db4c92a6ab02843dc23fb9485f59ac10c41a4463efc689ffe421c8c1df38611455ff2b161829870b871b13a69c6ba9a7d64a7f

data/lib/option.rb

@@ -39,11 +39,15 @@ class Option
     validate_structure!
 
     # バリデーションは追加(Array)可能、変換は上書き
-    @validators = T.let([options[:validate]].compact, T::Array[T.proc.params(arg0: String).returns(T::Boolean)])
+    # 各バリデータは、成功時に nil、失敗時にエラーメッセージ(String)を返す想定
+    @validators = T.let(
+      [options[:validate]].compact,
+      T::Array[T.proc.params(arg0: String).returns(T.nilable(String))]
+    )
     @converter  = T.let(options[:convert] || ->(v) { v }, T.proc.params(arg0: String).returns(T.untyped))
   end
 
-  sig { params(block: T.proc.params(arg0: String).returns(T::Boolean)).returns(T.self_type) }
+  sig { params(block: T.proc.params(arg0: String).returns(T.nilable(String))).returns(T.self_type) }
   def validate(&block)
     @validators << block
     self
@@ -58,8 +62,20 @@ class Option
   sig { params(value: String).returns(T.untyped) }
   def process(value)
     @validators.each do |v|
-      raise "Validation failed for option '#{@name}' with value: #{value}" unless v.call(value)
+      msg = v.call(value)
+      next if msg.nil?
+
+      flags = [@short, @long].reject(&:empty?)
+      flags_part =
+        if flags.empty?
+          "option '#{@name}'"
+        else
+          "#{flags.join(' or ')} option"
+        end
+
+      raise ArgumentError, "#{msg} for #{flags_part}"
     end
+
     @converter.call(value)
   end
 

data/lib/options.rb

@@ -37,8 +37,10 @@ class Options
     end
   end
 
-  sig { params(argv: T::Array[String]).void }
-  def parse!(argv)
+  sig { params(argv: T.nilable(T::Array[String])).void }
+  def parse!(argv = nil)
+    argv = T.let(argv || ARGV, T::Array[String])
+
     if argv.include?('-h') || argv.include?('--help')
       show_help
       exit 0
@@ -49,7 +51,12 @@ class Options
       idx = argv.find_index { |arg| arg == opt.short || arg == opt.long }
 
       if idx && argv[idx + 1]
-        @values[opt.name] = opt.process(T.must(argv[idx + 1]))
+        begin
+          @values[opt.name] = opt.process(T.must(argv[idx + 1]))
+        rescue ArgumentError => e
+          warn "Error: #{e.message}"
+          exit 1
+        end
       elsif opt.required_flag
         warn "Error: Missing required option: #{opt.long.empty? ? opt.short : opt.long}"
         exit 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-cli-options
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - HIROAKI SATOU