simple-cli-options 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb1ba82fcfd104b803bec7b4624c75416dc81322d33ee62732d19553a767b352
-  data.tar.gz: dafc46da869982bc190036b552b63a74feb11523621c94c2408ecb7c1794cbb9
+  metadata.gz: b3dc23fc107b31257b80f1152cea570f9908946c7374c015637d735c28609779
+  data.tar.gz: 13bb26bad01ba80f643b0d64fae26a19a7d6c6852ef034274809031c626b00a9
 SHA512:
-  metadata.gz: d7c549b1382a35a346f44da97ab71d0be5d3055c1ec140125a0e88fff4574e45e0cb473d342f9dcd5fd66b7542c4b21d2716f06e09e21427c69ed902261a428e
-  data.tar.gz: a5cf0f1a11646bdc84fd73ca02c6779375852cb62086501e7a485d677f0a4cf70a80dba797192c1cfcec805a9c1e3a7ef3bd1673dcfd54696a2d8892944ee8d1
+  metadata.gz: 98c31149080eef46edf5109578b988717fdd1e4e28a637f3b574e3ddc7af9203b44f99ea6c010d49ca012d2f0f58b1f8b7f37136212688a82222a5a8bd2a7416
+  data.tar.gz: 1aea1b272cb5e6aac5bb004222f187030b09eb66cfaa4dd358cc5d60e63173e6e34b064f4e1a5bb808e43a1cc7f15089d9af56969a8537e814f53fc69020f4dd

data/lib/option.rb

@@ -39,11 +39,31 @@ class Option
     validate_structure!
 
     # バリデーションは追加(Array)可能、変換は上書き
-    @validators = T.let([options[:validate]].compact, T::Array[T.proc.params(arg0: String).returns(T::Boolean)])
+    # 各バリデータは、成功時に nil、失敗時にエラーメッセージ(String)を返す想定
+    raw_validators = options[:validate]
+    validators = T.let(
+      [],
+      T::Array[T.proc.params(arg0: String).returns(T.nilable(String))]
+    )
+
+    unless raw_validators.nil?
+      case raw_validators
+      when Proc
+        validators << raw_validators
+      when Array
+        raw_validators.each do |v|
+          validators << v
+        end
+      else
+        raise ArgumentError, "validate must be a Proc or an Array of Procs"
+      end
+    end
+
+    @validators = validators
     @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 +78,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

@@ -51,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.1
+  version: 0.1.3
 platform: ruby
 authors:
 - HIROAKI SATOU