options_by_example 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98c16609314706667d2b776fa71de92ca874b2fcc803ea8f80387fe4f0245d9a
-  data.tar.gz: 8cc7023f98016edaa5521d6184985fb4133135e902f0380f81e233b6f52bfb97
+  metadata.gz: f90dee5b19415bddb809efe80e4fc2c6f39daf7b82259a0c247caa789d21ff23
+  data.tar.gz: b74ece7699aee6f785e9a2fa5149f2a2ee6f2c7f5a4365a429e958d676e9aaf1
 SHA512:
-  metadata.gz: a4e54eeb9f5beef88733ac4c70055570eeff930ccacd287f88b80905bd1760b6b1ec3513c5ea144d1c7cdc259af7d4991f81c5be82249cecb2f939d291d29032
-  data.tar.gz: 9126c11cba93c504fd41939dfa24c62578889b8546b9f472091a9463eed4cc6e3f409ff7e40a8219ce9a70913ae63872486745629431290e8f87dec6edf351be
+  metadata.gz: c4e235ad68624c57e3efe1915a31c006128351f6c870fa5aefa8f6b2856ec0bab33c24107c1d99b308d9b5fa54cabdff901d3669413e4021c839d7778ecb9cb7
+  data.tar.gz: a5c7213462bc16e1b88411b92c28c9be5b71cf9838bcad217316586b28318398441e1cc69acf56e223812c7c0fb51dcf381403158a35283f58ea2b0ce6f777bc

data/lib/options_by_example/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class OptionsByExample
-  VERSION = '3.0.0'
+  VERSION = '3.1.0'
 end
 
 
@@ -11,12 +11,19 @@ __END__
 # Minor version bump when backward-compatible changes or enhancements
 # Patch version bump when backward-compatible bug fixes, security updates etc
 
+3.1.0
+
+  - Support dash in argument and option names
+  - Method #if_present passes argument to block if present
+  - Method #include? return true if option is present
+
 3.0.0
 
   - Support options with default values
   - Improved support for one-line usage messages
   - Expand combined shorthand options into their separate components
   - Shorthand options must be single letter only
+  - Support options with typed arguments
 
 2.0.0
 

data/lib/options_by_example.rb

@@ -25,8 +25,8 @@ class OptionsByExample
 
     text =~ /Usage: (\$0|\w+)(?: \[options\])?((?: \[\w+\])*)((?: \w+)*)/
     raise RuntimeError, "Expected usage string, got none" unless $1
-    @argument_names_optional = $2.to_s.split.map { |match| match.tr('[]', '').downcase }
-    @argument_names_required = $3.to_s.split.map(&:downcase)
+    @argument_names_optional = $2.to_s.split.map { |match| sanitize match.tr('[]', '') }
+    @argument_names_required = $3.to_s.split.map { |match| sanitize match }
 
     # --- 2) Parse option names ---------------------------------------
     #
@@ -41,10 +41,10 @@ class OptionsByExample
 
     @option_names = {}
     @default_values = {}
-    text.scan(/(?:(-\w), ?)?(--(\w+))(?: (\w+))?(?:.*\(default:? (\w+)\))?/) do
+    text.scan(/(?:(-\w), ?)?(--([\w-]+))(?: (\w+))?(?:.*\(default:? (\w+)\))?/) do
       flags = [$1, $2].compact
-      flags.each { |each| @option_names[each] = [$3, $4] }
-      @default_values[$3] = $5 if $5
+      flags.each { |each| @option_names[each] = [(sanitize $3), $4] }
+      @default_values[sanitize $3] = $5 if $5
     end
 
     initialize_argument_accessors
@@ -76,6 +76,17 @@ class OptionsByExample
     return self
   end
 
+  def if_present(name)
+    raise ArgumentError, 'block missing' unless block_given?
+
+    value = @arguments[name]
+    value.nil? ? value : (yield value)
+  end
+
+  def include?(name)
+    @options.include?(name)
+  end
+
   private
 
   def initialize_argument_accessors
@@ -86,7 +97,7 @@ class OptionsByExample
     ].each do |argument_name|
       instance_eval %{
         def argument_#{argument_name}
-          val = @arguments["#{argument_name}"]
+          val = @arguments[:#{argument_name}]
           val && block_given? ? (yield val) : val
         end
       }
@@ -97,10 +108,14 @@ class OptionsByExample
     @option_names.each_value do |option_name, _|
       instance_eval %{
         def include_#{option_name}?
-          @options.include? "#{option_name}"
+          @options.include? :#{option_name}
         end
       }
     end
   end
+
+  def sanitize(string)
+    string.tr('^a-zA-Z0-9', '_').downcase.to_sym
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: options_by_example
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Adrian Kuhn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-17 00:00:00.000000000 Z
+date: 2023-05-25 00:00:00.000000000 Z
 dependencies: []
 description:
 email: