options_by_example 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26769b40ccdbee8bcb810e85755f7e3774145dda2ea8860edda1c99a65e168a5
-  data.tar.gz: 5d11ede203262af12bb65613ea5d153bb699188443453d82f8fb5bccb13068a1
+  metadata.gz: eb87e6b0c01a7f99d70d600c6adc142d96cae3fc18b122c2259c926504fb198b
+  data.tar.gz: e21e7dd4f0a4a77fb7e2a84b4edc77293023730388e0fcbf4abe2d0e5344d5c5
 SHA512:
-  metadata.gz: 1cb7a3d1732b19543557ed113094204451f9d24e2fae91029aa19d3f2985482e5536cc8c185e1dbef15fd77d330dd7ea76e7d0a6c596f7e198278f4afdf3bc74
-  data.tar.gz: 61a4d2a408fbe795040f7963e6d9cdb82076872bf7118c7fbb633b940684bd5eed9884f2d4a3f73cc4f321eb4e976d9ff5b252a17694a6316c4849314a5aa586
+  metadata.gz: 7e5b59dc4a4b9ad41edeaadaf98fa3ee23abe4f262cfbb9ba93752dba66ff5868b704024a3d534b43386977caefe6a4eecea4a5e80c22f5c351f679ec2488bc3
+  data.tar.gz: 7ecce96f859a83e3dc702740c3d5e72c957d44a42387dff4a70db249bc54fc1df45484bf5ff099e9bbd66d9dae06a548d179f107aa5f6cb87395a36a54551bc0

data/lib/options_by_example/parser.rb

@@ -2,6 +2,10 @@
 
 
 class OptionsByExample
+
+  class PrintUsageMessage < StandardError
+  end
+
   class Parser
 
     attr_reader :options
@@ -46,7 +50,7 @@ class OptionsByExample
       @chunks.each do |option, *args|
         case option
         when '-h', '--help'
-          raise "puts @usage_message"
+          raise PrintUsageMessage
         end
       end
     end

data/lib/options_by_example/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class OptionsByExample
-  VERSION = '1.3.0'
+  VERSION = '2.0.0'
 end
 
 
@@ -11,9 +11,14 @@ __END__
 # Minor version bump when backward-compatible changes or enhancements
 # Patch version bump when backward-compatible bug fixes, security updates etc
 
+2.0.0
+
+  - Replaced dynamic methods with explicit methods for options and arguments
+  - Removed ability to call dynamic methods with undeclared names
+
 1.3.0
 
-  - Extract parsing functionality into class
+  - Extracted parsing functionality into class
   - Better error messages
 
 1.2.0

data/lib/options_by_example.rb

@@ -6,20 +6,14 @@ require 'options_by_example/parser'
 
 class OptionsByExample
 
-  attr_reader :argument_names_optional
-  attr_reader :argument_names_required
-  attr_reader :option_names
-
   attr_reader :arguments
   attr_reader :options
 
-
   def self.read(data)
     return new data.read
   end
 
   def initialize(text)
-    @settings = {exit_on_error: true}
     @usage_message = text.gsub('$0', File.basename($0)).gsub(/\n+\Z/, "\n\n")
 
     # --- 1) Parse argument names -------------------------------------
@@ -50,15 +44,22 @@ class OptionsByExample
       opts = $1.split(", ")
       opts.each { |each| @option_names[each] = [opts.last.tr('-', ''), $4] }
     end
-  end
 
-  def use(settings)
-    @settings.update settings
-
-    return self
+    initialize_argument_accessors
+    initialize_option_accessors
   end
 
   def parse(argv)
+    parse_without_exit argv
+  rescue PrintUsageMessage
+    puts @usage_message
+    exit 0
+  rescue RuntimeError => err
+    puts "ERROR: #{err.message}"
+    exit 1
+  end
+
+  def parse_without_exit(argv)
     parser = Parser.new(
       @argument_names_required,
       @argument_names_optional,
@@ -66,33 +67,36 @@ class OptionsByExample
     )
 
     parser.parse argv
-
-    @options = parser.options
     @arguments = parser.arguments
+    @options = parser.options
 
     return self
-  rescue RuntimeError => err
-    raise unless @settings[:exit_on_error]
+  end
 
-    if err.message == "puts @usage_message"
-      puts @usage_message
-    else
-      puts "ERROR: #{err.message}"
+  private
+
+  def initialize_argument_accessors
+    [
+      *@argument_names_required,
+      *@argument_names_optional,
+      *@option_names.values.select(&:last).map(&:first),
+    ].each do |argument_name|
+      instance_eval %{
+        def argument_#{argument_name}
+          val = @arguments["#{argument_name}"]
+          val && block_given? ? (yield val) : val
+        end
+      }
     end
-
-    exit 1
   end
 
-
-  def method_missing(sym, *args, &block)
-    case sym
-    when /^argument_(\w+)$/
-      val = @arguments[$1]
-      block && val ? block.call(val) : val
-    when /^include_(\w+)\?$/
-      @options[$1]
-    else
-      super
+  def initialize_option_accessors
+    @option_names.each_value do |option_name, _|
+      instance_eval %{
+        def include_#{option_name}?
+          @options.include? "#{option_name}"
+        end
+      }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: options_by_example
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Adrian Kuhn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-29 00:00:00.000000000 Z
+date: 2023-04-30 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -27,6 +27,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/akuhn/options_by_example
   source_code_uri: https://github.com/akuhn/options_by_example
+  changelog_uri: https://github.com/akuhn/options_by_example/blob/master/lib/options_by_example/version.rb
 post_install_message:
 rdoc_options: []
 require_paths: