consoler 1.0.3 → 1.3.0

data/lib/consoler/matcher.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
 module Consoler
-
   # Argument/Options matcher
   #
   # Given a list of arguments and a list option try to match them
   class Matcher
-
     # Create a matcher
     #
     # @param [Consoler::Arguments] arguments List of arguments
@@ -27,14 +25,14 @@ module Consoler
       parse_options = true
 
       _loop_args do |arg|
-        unless parse_options then
+        unless parse_options
           @argument_values.push arg
           next
         end
 
         # when "argument" is --, then stop parsing the rest of the arguments
         # and treat the rest as regular arguments
-        if arg == '--' then
+        if arg == '--'
           parse_options = false
           next
         end
@@ -49,12 +47,20 @@ module Consoler
       remaining = _match_arguments
       _fill_defaults
 
-      if @matched_options.size == @options.size then
+      if @matched_options.size == @options.size
         @matched_options['remaining'] = remaining
+
+        # make sure all aliases are also filled
+        @options.each do |option|
+          option.aliases.each do |alias_|
+            @matched_options[alias_.name] = @matched_options[option.name]
+          end
+        end
+
         return @matched_options
       end
 
-      return nil
+      nil
     end
 
     private
@@ -68,59 +74,58 @@ module Consoler
       is_short = false
       name = nil
 
-      if arg[0..1] == '--' then
+      if arg[0..1] == '--'
         is_long = true
         name = arg[2..-1]
-      elsif arg[0] == '-' then
+      elsif arg[0] == '-'
         is_short = true
         name = arg[1..-1]
       end
 
       # arg is not a long/short option, add to arguments values
-      unless is_long or is_short then
+      unless is_long || is_short
         @argument_values.push arg
         return true
       end
 
-      unless name.nil? then
+      unless name.nil?
         # get the name of the option, short options use the first character
-        option_name = if is_short then
+        option_name = if is_short
                         name[0]
                       else
                         name
                       end
 
-        option = @options.get option_name
+        option, matched = @options.get_with_alias option_name
 
         # no option by this name in options
         return nil if option.nil?
 
-        needs_short = option.is_short
-        needs_long = option.is_long
-
         # see if the type if right, short or long
-        if needs_long and not is_long then
+        if matched.is_long && !is_long
           return nil
-        elsif needs_short and not is_short then
+        elsif matched.is_short && !is_short
           return nil
         end
 
-        if is_long then
-          if option.is_value then
+        if is_long
+          if option.is_value
             # is_value needs a next argument for its value
             return nil if _peek_next.nil?
-            @matched_options[name] = _peek_next
+
+            @matched_options[option.name] = _peek_next
             _skip_next
           else
-            @matched_options[name] = true
+            option_value! option
           end
         end
 
-        if is_short then
-          if name.size == 1 and option.is_value then
+        if is_short
+          if name.size == 1 && option.is_value
             # is_value needs a next argument for its value
             return nil if _peek_next.nil?
-            @matched_options[name] = _peek_next
+
+            @matched_options[option.name] = _peek_next
             _skip_next
           else
             # for every character (short option) increment the option value
@@ -128,17 +133,30 @@ module Consoler
               short_option = @options.get n
               return nil if short_option.nil?
 
-              if @matched_options[n].nil? then
-                @matched_options[n] = 0
-              end
-
-              @matched_options[n] += 1
+              option_value! short_option
             end
           end
         end
       end
 
-      return true
+      true
+    end
+
+    # Set the value of an option
+    #
+    # Long or short option needed
+    #
+    # @param [Consoler::Option]
+    def option_value!(option)
+      if option.is_short
+        if @matched_options[option.name].nil?
+          @matched_options[option.name] = 0
+        end
+
+        @matched_options[option.name] += 1
+      else
+        @matched_options[option.name] = true
+      end
     end
 
     # Loop through the arguments
@@ -151,7 +169,7 @@ module Consoler
 
       # use an incrementing index, to be able to peek to the next in the list
       # and to skip an item
-      while @index < size do
+      while @index < size
         yield @arguments.args[@index]
 
         _skip_next
@@ -183,11 +201,13 @@ module Consoler
 
     # Match arguments to defined option arguments
     #
-    # @return [Array<String>] The remaining args
+    # @return [Array<String>, nil] The remaining args,
+    #                              or <tt>nil</tt> if there are not enough arguments
     def _match_arguments
       @optionals_before = {}
       @optionals_before_has_remaining = false
 
+      total_argument_values = @argument_values.size
       argument_values_index = 0
 
       _match_arguments_optionals_before
@@ -197,7 +217,9 @@ module Consoler
         # arguments supplied (info available from optionals map)
         optionals.each do |_, optional|
           optional.each do |before|
-            if before[:included] then
+            if before[:included]
+              return nil if argument_values_index >= total_argument_values
+
               @matched_options[before[:name]] = @argument_values[argument_values_index]
               argument_values_index += 1
             end
@@ -205,7 +227,9 @@ module Consoler
         end
 
         # only fill mandatory argument if its not the :REMAINING key
-        if mandatory_arg_name != :REMAINING then
+        if mandatory_arg_name != :REMAINING
+          return nil if argument_values_index >= total_argument_values
+
           @matched_options[mandatory_arg_name] = @argument_values[argument_values_index]
           argument_values_index += 1
         end
@@ -214,7 +238,7 @@ module Consoler
       remaining = []
 
       # left over arguments
-      while argument_values_index < @argument_values.size do
+      while argument_values_index < @argument_values.size
         remaining.push @argument_values[argument_values_index]
         argument_values_index += 1
       end
@@ -229,18 +253,18 @@ module Consoler
       @optionals_before = {}
       tracker = {}
 
-      @options.each do |option, key|
+      @options.each do |option, _key|
         next unless option.is_argument
 
-        if option.is_optional then
+        if option.is_optional
           # setup tracker for optional group
           tracker[option.is_optional] = [] if tracker[option.is_optional].nil?
 
           # mark all optionals as not-included
-          tracker[option.is_optional].push({
+          tracker[option.is_optional].push(
             included: false,
             name: option.name,
-          })
+          )
         else
           @optionals_before[option.name] = tracker
           tracker = {}
@@ -248,7 +272,7 @@ module Consoler
       end
 
       # make sure all optionals are accounted for in the map
-      if tracker != {} then
+      if tracker != {}
         # use a special key so we can handle it differently in the filling process
         @optionals_before[:REMAINING] = tracker
         @optionals_before_has_remaining = true
@@ -267,7 +291,7 @@ module Consoler
       mandatories_matched = @optionals_before.size
 
       # there are optionals at the end of the options, don't match the void
-      if @optionals_before_has_remaining then
+      if @optionals_before_has_remaining
         mandatories_matched -= 1
       end
 
@@ -276,11 +300,11 @@ module Consoler
       # loop through optional map
       _each_optional_before_sorted do |before|
         # are there enough arguments left to fill this optional group
-        if (total + before.size + mandatories_matched) <= @argument_values.size then
+        if (total + before.size + mandatories_matched) <= @argument_values.size
           total += before.size
 
           before.each do |val|
-            val[:included] = true;
+            val[:included] = true
           end
         end
       end
@@ -293,10 +317,10 @@ module Consoler
     # @return [Consoler::Matcher]
     def _fill_defaults
       @options.each do |option|
-        if option.is_optional then
-          unless @matched_options.has_key? option.name then
-            @matched_options[option.name] = option.default_value
-          end
+        next unless option.is_optional
+
+        unless @matched_options.key? option.name
+          @matched_options[option.name] = option.default_value
         end
       end
 
@@ -312,10 +336,10 @@ module Consoler
       @optionals_before.each do |_, optionals|
         tmp = []
         optionals.each do |optional_index, before|
-          tmp.push({
+          tmp.push(
             count: before.size,
             index: optional_index,
-          })
+          )
         end
 
         tmp.sort! { |a, b| b[:count] - a[:count] }.each do |item|

data/lib/consoler/option.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module Consoler
-
   # Represents an option
   #
   # @attr_reader [String] name Name of the options
@@ -10,6 +9,7 @@ module Consoler
   # @attr_reader [Boolean] is_argument Is the option an argument
   # @attr_reader [Boolean] is_value Does the option need a value (<tt>--option=</tt>)
   # @attr_reader [Integer] is_optional Is the option optional (> 0) (<tt>[option]</tt>)
+  # @attr_reader [Array] aliases List of aliases of option (<tt>-v|--verbose</tt>)
   class Option
     attr_reader :name
     attr_reader :is_long
@@ -17,6 +17,7 @@ module Consoler
     attr_reader :is_argument
     attr_reader :is_value
     attr_reader :is_optional
+    attr_reader :aliases
 
     # Create a option
     #
@@ -28,13 +29,13 @@ module Consoler
       option = Option.new option_def, tracker
 
       # split short options with more than 1 char in multiple options
-      if option.is_short and option.name.size > 1 then
+      if option.is_short && option.name.size > 1
         # remember state
         old_tracking = tracker.is_tracking
         old_is_value = option.is_value
 
         # if the complete option is optional, fake the tracker
-        if option.is_optional then
+        if option.is_optional
           tracker.is_tracking = true
         end
 
@@ -44,7 +45,7 @@ module Consoler
           new_name = "-#{name}"
 
           # if the short option should have a value, this only counts for the last option
-          if old_is_value and i == names.count - 1 then
+          if old_is_value && i == names.count - 1
             new_name = "#{new_name}="
           end
 
@@ -67,14 +68,20 @@ module Consoler
     def to_definition
       definition = name
 
-      if is_long then
+      if is_long
         definition = "--#{definition}"
-      elsif is_short then
+      elsif is_short
         definition = "-#{definition}"
       end
 
-      if is_value then
+      if is_value
         definition = "#{definition}="
+      elsif is_argument
+        definition = "<#{definition}>"
+      end
+
+      aliases.each do |alias_|
+        definition = "#{definition}|#{alias_.to_definition}"
       end
 
       definition
@@ -88,7 +95,7 @@ module Consoler
       return 0 if is_short
       return false if is_long
 
-      return nil
+      nil
     end
 
     protected
@@ -103,19 +110,33 @@ module Consoler
       # Check for multiple attributes in the option definition till we got the
       # final name and all of its attributes
 
-      option, @is_optional = _is_optional option_def, tracker
+      # make sure we don't wrongly process any alias
+      alias_defs = option_def.split '|'
+      option = alias_defs.shift || ''
+
+      option, @is_optional = _is_optional option, tracker
       option, @is_long = _is_long option
       option, @is_short = _is_short option
-      @is_argument = (not @is_long and not @is_short)
+      @is_argument = (!@is_long && !@is_short)
       option, @is_value = _value option, @is_argument
+      option, @aliases = _aliases option, alias_defs, tracker
+
+      if option[0] == '<'
+        raise 'Invalid <, missing >' if option[-1] != '>'
+        raise 'Only arguments support <, > around name' unless @is_argument
+
+        option = option[1..-2]
+      end
+
+      raise 'Missing starting <' if option[-1] == '>'
 
       @name = option
 
-      if @name.empty? then
+      if @name.empty?
         raise 'Option must have a name'
       end
 
-      if @is_long and @is_short
+      if @is_long && @is_short
         raise 'Option can not be a long and a short option'
       end
     end
@@ -135,8 +156,8 @@ module Consoler
     # @raise [RuntimeError] if you try to close an unopened optional
     # @return [(String, Integer|nil)] Remaining option definition, and, optional group if available
     def _is_optional(option, tracker)
-      if option[0] == '[' then
-        if !tracker.is_tracking then
+      if option[0] == '['
+        if !tracker.is_tracking
           # mark tracker as tracking
           tracker.is_tracking = true
           tracker.index += 1
@@ -147,14 +168,12 @@ module Consoler
       end
 
       # get optional group index from tracking, if tracking
-      optional = if tracker.is_tracking then
+      optional = if tracker.is_tracking
                    tracker.index
-                 else
-                   nil
                  end
 
-      if option[-1] == ']' then
-        if tracker.is_tracking then
+      if option[-1] == ']'
+        if tracker.is_tracking
           # mark tracker as non-tracking
           tracker.is_tracking = false
           option = option[0..-2]
@@ -163,7 +182,7 @@ module Consoler
         end
       end
 
-      return option, optional
+      [option, optional]
     end
 
     # Check long definition
@@ -171,14 +190,14 @@ module Consoler
     # @param [String] option Option definition
     # @return [(String, Boolean)]
     def _is_long(option)
-      if option[0..1] == '--' then
+      if option[0..1] == '--'
         long = true
         option = option[2..-1]
       else
         long = false
       end
 
-      return option, long
+      [option, long]
     end
 
     # Check short definition
@@ -186,14 +205,14 @@ module Consoler
     # @param [String] option Option definition
     # @return [(String, Boolean)]
     def _is_short(option)
-      if option[0] == '-' then
+      if option[0] == '-'
         short = true
         option = option[1..-1]
       else
         short = false
       end
 
-      return option, short
+      [option, short]
     end
 
     # Check value definition
@@ -202,8 +221,8 @@ module Consoler
     # @raise [RuntimeError] if you try to assign a value to an argument
     # @return [(String, Boolean)]
     def _value(option, argument)
-      if option[-1] == '=' then
-        if argument then
+      if option[-1] == '='
+        if argument
           raise 'Arguments can\'t have a value'
         end
 
@@ -213,7 +232,36 @@ module Consoler
         value = false
       end
 
-      return option, value
+      [option, value]
+    end
+
+    # Parse all possible aliases
+    #
+    # @param [String] option Option definition
+    # @param [Consoler::Tracker] tracker Optional tracker
+    # @raise [RuntimeError] On all kinds of occasions
+    # @return [(String, Array)] Remaining option definition, and, aliases if available
+    def _aliases(option, alias_defs, tracker)
+      return option, [] if alias_defs.empty?
+
+      raise 'Argument can\'t have aliases' if is_argument
+      raise 'Aliases are not allowed for multiple short options' if is_short && option.size > 1
+
+      aliases_ = []
+      alias_names = []
+
+      while (alias_def = alias_defs.shift)
+        Consoler::Option.create alias_def, tracker do |alias_|
+          raise "Duplicate alias name: #{alias_.name}" if alias_names.include? alias_.name
+          raise "Alias must have a value: #{alias_.name}" if is_value && !alias_.is_value
+          raise "Alias can't have a value: #{alias_.name}" if !is_value && alias_.is_value
+
+          aliases_.push alias_
+          alias_names.push alias_.name
+        end
+      end
+
+      [option, aliases_]
     end
   end
 end

data/lib/consoler/options.rb

@@ -3,7 +3,6 @@
 require_relative 'option'
 
 module Consoler
-
   # List of options
   #
   # @attr_reader [String] description Description of the options
@@ -21,7 +20,7 @@ module Consoler
       return if options_def.nil?
 
       # strip the description
-      if match = /(^|\s+)-- (?<description>.*)$/.match(options_def) then
+      if (match = /(^|\s+)-- (?<description>.*)$/.match(options_def))
         @description = match[:description]
         options_def = options_def[0...-match[0].size]
       end
@@ -31,28 +30,50 @@ module Consoler
 
       option_names = []
 
-      while option_def = options.shift do
+      while (option_def = options.shift)
         Consoler::Option.create option_def, tracker do |option|
           raise "Duplicate option name: #{option.name}" if option_names.include? option.name
 
-          @options.push option
           option_names.push option.name
+
+          option.aliases.each do |alias_|
+            raise "Duplicate alias name: #{alias_.name}" if option_names.include? alias_.name
+
+            option_names.push alias_.name
+          end
+
+          @options.push option
         end
       end
     end
 
-    # Get a options by its name
+    # Get a option by its name
+    #
+    # May be matched by one of its aliases
     #
     # @param name [String] Name of the option
     # @return [Consoler::Option, nil]
     def get(name)
+      option, = get_with_alias name
+      option
+    end
+
+    # Get a option by its name, with matched alias
+    #
+    # @param name [String] Name of the option
+    # @return [[(Consoler::Option, nil), (Consoler::Option, nil)]]
+    def get_with_alias(name)
       each do |option, _|
-        if option.name == name then
-          return option
+        if option.name == name
+          return option, option
+        end
+
+        option.aliases.each do |alias_|
+          return option, alias_ if alias_.name == name
         end
       end
 
-      return nil
+      [nil, nil]
     end
 
     # Loop through all options
@@ -84,19 +105,17 @@ module Consoler
       each do |option, i|
         definition += ' '
 
-        if optional.nil? and option.is_optional then
+        if optional.nil? && option.is_optional
           definition += '['
           optional = option.is_optional
         end
 
         definition += option.to_definition
 
-        if option.is_optional then
-          # only close when the next option is not optional, or another optional group
-          if @options[i + 1].nil? or optional != @options[i + 1].is_optional then
-            definition += ']'
-            optional = nil
-          end
+        # only close when the next option is not optional, or another optional group
+        if option.is_optional && (@options[i + 1].nil? || optional != @options[i + 1].is_optional)
+          definition += ']'
+          optional = nil
         end
       end
 
@@ -104,8 +123,6 @@ module Consoler
     end
   end
 
-  private
-
   # Optionals tracker
   #
   # @attr [Boolean] is_tracking Is inside optional options

data/lib/consoler/version.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module Consoler
-
   # Current version number
-  VERSION = '1.0.3'
+  VERSION = '1.3.0'.freeze
 end