optsparser_generator 2.6 → 4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dc1cb64554d69901c4cd9a2e70495f188c9f486
-  data.tar.gz: 44b4d8c5c8d5999edf292ce4ddfdc8971b757361
+  metadata.gz: 5121915ca357fd8dfa3d8bfb7c292bc435e46fce
+  data.tar.gz: 218b5d132ab436ae1595b510f51e96d07d261ebf
 SHA512:
-  metadata.gz: 9a0ea186c5015ec27fc9101bad09a1f4cde26935258ece98bedc75cd00f3996da57f23641defe5066e5c2f9b33937a115d3fe66be7cfcc03e4c65b0e9c51a693
-  data.tar.gz: 4d488ecf57e3e7fadf6739f836942b2a8b781dea76a37be36270523ab81ee1bca9401699d327e56feb6071953e58f330968a4c862deb67c80244732a15d6625d
+  metadata.gz: 2ee9faa906c0d85efc1f83f03ba58067869c17f3750bf268900724f57888fe4438b2c9a6c44c3ec24446cd8833e47ddb994aa47f21ed185cc2873fe6eefb55b1
+  data.tar.gz: e9835ec3a8e9a6fb1fcbad12b25b392b2968a6ef1a91198b76f89accf80343ef3d6a3055e6ee7098d824e605cfa0ca884f5796048095d27cd0bfba36be0af726

data/README.md

@@ -1,6 +1,7 @@
 # OptionParser Generator
-[![Inline docs](http://inch-ci.org/github/madblobfish/optionparser-generator.svg?branch=master)](http://inch-ci.org/github/madblobfish/optionparser-generator)
 [![Build Status](https://travis-ci.org/madblobfish/optionparser-generator.svg?branch=master)](https://travis-ci.org/madblobfish/optionparser-generator)
+[![Dependency Status](https://gemnasium.com/badges/github.com/madblobfish/optionparser-generator.svg)](https://gemnasium.com/github.com/madblobfish/optionparser-generator)
+[![Inline docs](http://inch-ci.org/github/madblobfish/optionparser-generator.svg?branch=master)](http://inch-ci.org/github/madblobfish/optionparser-generator)
 
 Small gem which generates an OptionParser object from an OpenStruct.
 
@@ -10,7 +11,7 @@ Small gem which generates an OptionParser object from an OpenStruct.
 # Usage
 ```ruby
 require 'optsparser_generator'
-# step one define OpenStruct with default values
+# step one define OpenStruct with default and special values
 os = OpenStruct.new
 os.default = 'value'
 os.val = 123
@@ -19,11 +20,19 @@ os.val__class = Numeric
 os.bool = true
 os.bool__help = 'description of argument'
 os.bool__short = 'b'
+os.test = "don't know"
+os.test_proc = Proc.new do |value|
+	puts value
+	"some-#{value}-conversion"
+end
 os.freeze
 
 # step two generate OptionParser
 opt_parser = OptParseGen(os)
 opt_parser = OptionParserGenerator(os)
+opt_parser.parse!(ARGV)
+# or parse options directly
+OptParseGen.parse(os) # takes ARGV or an array
 ```
 
 ## Special values
@@ -31,11 +40,11 @@ opt_parser = OptionParserGenerator(os)
 * __values	defines possible values in an Array
 * __short 	defines the short trigger
 * __class 	defines the Class which OptionParser then tries to coerce to
+* __proc 	a Proc which will be executed to compute the value
 
 # Version numbers
 I choose two digit version numbers.
 The first digit indicates breaking changes.
 Second digit increases per release.
 
-
 Enjoy

data/lib/optsparser_generator.rb

@@ -3,6 +3,15 @@ require 'optparse'
 
 # Small lib for generating an OptionParser from an OpenStruct
 module OptionParserGenerator
+  # Special postfixes for Hash keys
+  SPECIAL_POSTFIXES = [
+    '--help',
+    '--values',
+    '--short',
+    '--class',
+    '--proc'
+  ].freeze
+
   # Raised when not given an OpenStruct
   class WrongArgumentType < ArgumentError
   end
@@ -13,6 +22,16 @@ module OptionParserGenerator
   class OptionCollision < ArgumentError
   end
 
+  # utility methods
+  # @api private
+  module OpenStructExtension
+    # extracts a special value from the openstruct
+    def special_value(key, string)
+      self["#{key}__#{string}"]
+    end
+  end
+  private_constant :OpenStructExtension
+
   # Does some sanity checks and prepares the OpenStruct
   # @todo preprocess data here instead of doing it adhoc
   # @todo raise more exceptions
@@ -21,8 +40,11 @@ module OptionParserGenerator
     unless ostruct.is_a?(OpenStruct)
       raise WrongArgumentType, 'needs an OpenStruct'
     end
-    ostruct.dup.freeze # not needed but makes development easier
+    ostruct = ostruct.dup
+    ostruct.extend(OpenStructExtension)
+    ostruct.freeze # freeze is not needed but makes development easier
   end
+  private_class_method :handle_arguments
 
   # Does the magic
   #
@@ -30,60 +52,91 @@ module OptionParserGenerator
   # @todo split this up
   # @param ostruct [OpenStruct] Default values with special values
   # @param options [Hash]
-  # @option options [Boolean] :ignore_collisions ignore bool key collisions see OptionCollision
+  # @option options [Boolean]
+  #   :ignore_collisions ignore bool key collisions see OptionCollision
+  #   :generate_no_help when set to true donesn't generates help command
   def self.[](ostruct, **options)
     defaults = handle_arguments(ostruct)
 
     optparser = OptionParser.new do |opts|
       defaults.each_pair do |key, val|
         trigger = key.to_s.tr('_', '-')
-        next if trigger.end_with?('--help', '--values', '--short', '--class')
-
-        help = "#{defaults["#{key}__help"]} (Default: #{val})"
-        values = defaults["#{key}__values"] || []
-        short = defaults["#{key}__short"] || ''
-        arguments = []
-        arguments << help
-        arguments << "-#{short}" unless short.empty?
+        next if trigger.end_with?(*SPECIAL_POSTFIXES)
+
+        arguments = generate_arguments(defaults, key, val)
         case val
         when FalseClass, TrueClass
+          uneven_no = /\Ano(-no-no)*-(?!no)/ =~ trigger
           if trigger.start_with?('no-')
-            trigger[0..2] = ''
-            if defaults.each_pair.map { |v| v.first.to_s }.include?(trigger) && !options[:ignore_collisions]
-              raise OptionCollision, "on #{key}"
-            end
+            trigger.gsub!(/\A(no-)+/, '') # removes no- prefixes
+            check_collisions(trigger, key, defaults) unless options[:ignore_collisions]
           end
-          opts.on("--[no-]#{trigger}", *arguments) do |b|
-            out = opts.instance_variable_get(:@out)
-            out[key] =
-              if key.to_s.start_with?('no_')
-                !b
-              else
-                b
-              end
+          arguments.unshift "--[no-]#{trigger}"
+          block = lambda do |bool|
+            # inverted when it starts with no_
+            bool ^ uneven_no
           end
         else
-          arguments.push defaults["#{key}__class"] || (val.class.equal?(Fixnum) ? Integer : val.class)
-          arguments << values if values.any?
-          opts.on("--#{trigger}=ARG", *arguments) do |str|
-            out = opts.instance_variable_get(:@out)
-            out[key] = str
+          klass = val.class
+          klass = klass.equal?(Fixnum) ? Integer : klass
+          klass = defaults.special_value(key, 'class') || klass
+          arguments.push klass
+
+          values = defaults.special_value(key, 'values')
+          arguments.push values if values
+          arguments.unshift "--#{trigger}=ARG"
+          block = lambda do |str|
+            str
           end
         end
+        if (proc = defaults.special_value(key, 'proc'))
+          block = proc
+        end
+        opts.on(*arguments) do |arg|
+          opts.instance_variable_get(:@out)[key] = block.call(arg)
+        end
       end
 
-      opts.on('-h', '--help') do
-        puts opts
-        exit
+      unless options[:generate_no_help]
+        opts.on('-h', '--help') do
+          puts opts
+          exit
+        end
       end
     end
 
     # add default values
     optparser.instance_variable_set(:@defaults, defaults)
     optparser.extend(OptParsePatch)
-    optparser
   end
 
+  # returns an array of helptext and
+  # if set the short version of trigger
+  # @api private
+  def self.generate_arguments(defaults, key, val)
+    short = defaults.special_value(key, 'short') || ''
+    if short.length > 1
+      raise ArgumentError, 'short is too long, it has to be only one character'
+    end
+
+    help = "#{defaults.special_value(key, 'help')} (Default: #{val})"
+
+    if short.empty?
+      [help]
+    else
+      [help, "-#{short}"]
+    end
+  end
+  private_class_method :generate_arguments
+
+  # @api private
+  def self.check_collisions(trigger, key, defaults)
+    if defaults.each_pair.map{ |v| v.first.to_s }.include?(trigger)
+      raise OptionCollision, "on #{key}"
+    end
+  end
+  private_class_method :check_collisions
+
   # patch for OptionParser redefines parse and parse!
   # @api private
   module OptParsePatch
@@ -101,13 +154,14 @@ module OptionParserGenerator
       @out
     end
   end
+  private_constant :OptParsePatch
 
   # Shorthand when parsing is only needed once.
   #
   # Generates an OptionParser and calls parse on it
   # @see OptionParserGenerator#[]
   # @return [OpenStruct]
-  def self.parse(ostruct, argv = nil, **opt)
+  def self.parse(ostruct, argv, **opt)
     self[ostruct, opt].parse(argv)
   end
 

metadata

@@ -1,85 +1,109 @@
 --- !ruby/object:Gem::Specification
 name: optsparser_generator
 version: !ruby/object:Gem::Version
-  version: '2.6'
+  version: '4.0'
 platform: ruby
 authors:
 - Marvin Zerulla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2016-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 11.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 11.2.0
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.2.0
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.2.0
+        version: '0.8'
 description: 
 email: 
 executables: []
@@ -111,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Generates OptionParser using an OpenStruct