bovem 3.0.5 → 4.0.0

data/lib/bovem/errors.rb

@@ -42,4 +42,4 @@ module Bovem
       end
     end
   end
-end
+end

data/lib/bovem/i18n.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+#
+# This file is part of the bovem gem. Copyright (C) 2013 and above Shogun <shogun@cowtech.it>.
+# Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
+#
+
+module Bovem
+  # Extension of Lazier::I18n to support method based access.
+  class I18n < ::Lazier::I18n
+    private
+
+    def method_missing(method, *args)
+      rv = send(:t, method)
+      rv = sprintf(rv, *args) if rv.index(/%([\d.]*)[sdf]/) && args.present?
+      rv
+    end
+  end
+end

data/lib/bovem/logger.rb

@@ -12,6 +12,9 @@ module Bovem
   class Logger < ::Logger
     attr_reader :device
 
+    # List of valid logger levels.
+    LEVEL_NAMES = {"DEBUG" => :cyan, "INFO" => :green, "WARN" => :yellow, "ERROR" => :red, "FATAL" => :magenta}.freeze
+
     # Creates a new logger.
     #
     # @see http://www.ruby-doc.org/stdlib-1.9.3/libdoc/logger/rdoc/Logger.html
@@ -19,7 +22,7 @@ module Bovem
     # @param logdev [String|IO] The log device. This is a filename (String) or IO object (typically STDOUT, STDERR, or an open file).
     # @param shift_age [Fixnum]  Number of old log files to keep, or frequency of rotation (daily, weekly or monthly).
     # @param shift_size [Fixnum] Maximum logfile size (only applies when shift_age is a number).
-    def initialize(logdev, shift_age = 0, shift_size = 1048576)
+    def initialize(logdev, shift_age = 0, shift_size = 1_048_576)
       @device = logdev
       super(logdev, shift_age, shift_size)
     end
@@ -30,15 +33,13 @@ module Bovem
     # @param level [Fixnum] The minimum severity to log. See http://www.ruby-doc.org/stdlib-1.9.3/libdoc/logger/rdoc/Logger.html for valid levels.
     # @param formatter [Proc] The formatter to use for logging.
     # @return [Logger] The new logger.
-    def self.create(file = nil, level = Logger::INFO, formatter = nil)
-      begin
-        rv = new(get_real_file(file || default_file))
-        rv.level = level.to_integer
-        rv.formatter = formatter || default_formatter
-        rv
-      rescue
-        raise Bovem::Errors::InvalidLogger
-      end
+    def self.create(file = nil, level: Logger::INFO, formatter: nil)
+      rv = new(get_real_file(file || default_file))
+      rv.level = level.to_integer
+      rv.formatter = formatter || default_formatter
+      rv
+    rescue
+      raise Bovem::Errors::InvalidLogger
     end
 
     # Translates a file to standard input or standard output in some special cases.
@@ -47,9 +48,9 @@ module Bovem
     # @return [String|IO] The translated file name.
     def self.get_real_file(file)
       case file
-        when "STDOUT" then $stdout
-        when "STDERR" then $stderr
-        else file
+      when "STDOUT" then $stdout
+      when "STDERR" then $stderr
+      else file
       end
     end
 
@@ -62,19 +63,18 @@ module Bovem
     # The default formatter for logging.
     # @return [Proc] The default formatter for logging.
     def self.default_formatter
-      @default_formatter ||= ::Proc.new {|severity, datetime, _, msg|
-        color = case severity
-          when "DEBUG" then :cyan
-          when "INFO" then :green
-          when "WARN" then :yellow
-          when "ERROR" then :red
-          when "FATAL" then :magenta
-          else :white
-        end
+      @default_formatter ||= ::Proc.new do |severity, datetime, _, msg|
+        color = LEVEL_NAMES.fetch(severity, :white)
 
-        header = Bovem::Console.replace_markers("{mark=bright-#{color}}[%s T+%0.5f] %s:{/mark}" %[datetime.strftime("%Y/%b/%d %H:%M:%S"), [datetime.to_f - start_time.to_f, 0].max, severity.rjust(5)])
-        "%s %s\n" % [header, msg]
-      }
+        header = Bovem::Console.replace_markers(
+          sprintf(
+            "{mark=bright-#{color}}[%s T+%0.5f] %s:{/mark}", datetime.strftime("%Y/%b/%d %H:%M:%S"),
+            [datetime.to_f - start_time.to_f, 0].max, severity.rjust(5)
+          )
+        )
+
+        sprintf("%s %s\n", header, msg)
+      end
     end
 
     # The log time of the first logger. This allows to show a `T+0.1234` information into the log.
@@ -83,4 +83,4 @@ module Bovem
       @start_time ||= ::Time.now
     end
   end
-end
+end

data/lib/bovem/option.rb

@@ -10,8 +10,7 @@ module Bovem
   # Values are the default values for that type.
   #
   # For any unknown type, the default value is `false`, it means that any unknown type is managed as a Boolean value with no argument.
-  OPTION_TYPES = {String => "", Integer => 0, Fixnum => 0, Bignum => 0, Float => 0.0, Array => []}
-  OPTION_TYPES.default = false
+  OPTION_TYPES = {String => "", Integer => 0, Fixnum => 0, Bignum => 0, Float => 0.0, Array => []}.freeze
 
   # This class represents an option for a command.
   #
@@ -71,7 +70,7 @@ module Bovem
     #
     # @param value [String] The short form of this option.
     def short=(value)
-      value = @name[0, 1] if !value.present?
+      value = @name[0, 1] unless value.present?
 
       # Clean value
       final_value = value.to_s.match(/^-{0,2}([a-z0-9])(.*)$/i)[1]
@@ -83,7 +82,7 @@ module Bovem
     #
     # @param value [String] The short form of this option.
     def long=(value)
-      value = @name if !value.present?
+      value = @name unless value.present?
 
       # Clean value
       final_value = value.to_s.match(/^-{0,2}(.+)$/)[1]
@@ -96,7 +95,7 @@ module Bovem
     # @param value [String] The validator of this option.
     def validator=(value)
       value = nil if value.blank? || (value.is_a?(Regexp) && value.source.blank?)
-      value = value.ensure_array(nil, true, true, true) if !value.nil? && !value.is_a?(Regexp) && !value.is_a?(Proc)
+      value = value.ensure_array(no_duplicates: true, compact: true, flatten: true) if !value.nil? && !value.is_a?(Regexp) && !value.is_a?(Proc)
       @validator = value
     end
 
@@ -123,22 +122,24 @@ module Bovem
 
     # Returns the meta argument for this option.
     #
-    # @return [String|NilClass] Returns the current meta argument for this option (the default value is the option name uppercased) or `nil`, if this option doesn't require a meta argument.
+    # @return [String|NilClass] Returns the current meta argument for this option (the default value is the option name uppercased) or `nil`,
+    #   if this option doesn't require a meta argument.
     def meta
-      requires_argument? ? (@meta.present? ? @meta : @name.upcase) : nil
+      return nil unless requires_argument?
+      @meta.present? ? @meta : @name.upcase
     end
 
     # Get the current default value for this option.
     #
     # @return [Object] The default value for this option.
     def default
-      @default || Bovem::OPTION_TYPES[@type]
+      @default || Bovem::OPTION_TYPES[@type] || false
     end
 
     # Check if the current option has a default value.
     #
     # @return [Boolean] If the current option has a default value.
-    def has_default?
+    def default?
       !@default.nil?
     end
 
@@ -151,7 +152,7 @@ module Bovem
       vs = get_validator_method(@validator)
       rv = vs ? @validator.send(vs, value) : true
 
-      if rv then
+      if rv
         @value = value
         @provided = true
       else # Validation failed
@@ -164,10 +165,9 @@ module Bovem
 
     # Executes the action associated to this option.
     def execute_action
-      if @action.present? then
-        @provided = true
-        @action.call(parent, self)
-      end
+      return nil unless @action.present?
+      @provided = true
+      @action.call(parent, self)
     end
 
     # Checks if this option requires an argument.
@@ -187,7 +187,7 @@ module Bovem
     # Check if this command has a help.
     #
     # @return [Boolean] `true` if this command has a help, `false` otherwise.
-    def has_help?
+    def help?
       @help.present?
     end
 
@@ -199,56 +199,47 @@ module Bovem
     end
 
     private
-      # Setups the forms of the this option.
-      #
-      # @param forms [Array] An array of short and long forms for this option. Missing forms will be inferred by the name.
-      def setup_forms(forms)
-        self.short = forms.length > 0 ? forms[0] : @name[0, 1]
-        self.long = forms.length == 2 ? forms[1] : @name
-      end
 
-      # Setups the settings of the this option.
-      #
-      # @param options [Hash] The settings for this option.
-      def setup_options(options)
-        (options.is_a?(::Hash) ? options : {}).each_pair do |option, value|
-          send("#{option}=", value) if respond_to?("#{option}=")
-        end
-      end
+    # :nodoc:
+    def setup_forms(forms)
+      self.short = !forms.empty? ? forms[0] : @name[0, 1]
+      self.long = forms.length == 2 ? forms[1] : @name
+    end
 
-      # Setups the action of the this option.
-      #
-      # @param action [Proc] The action of this option.
-      def setup_action(action)
-        @action = action if action.present? && action.respond_to?(:call) && action.try(:arity) == 2
+    # :nodoc:
+    def setup_options(options)
+      (options.is_a?(::Hash) ? options : {}).each_pair do |option, value|
+        send("#{option}=", value) if respond_to?("#{option}=")
       end
+    end
 
-      # Handle failure in setting an option.
-      #
-      # @param vs [Symbol] The type of validator.
-      def handle_set_failure(vs)
-        locale = @parent.i18n
+    # :nodoc:
+    def setup_action(action)
+      @action = action if action.present? && action.respond_to?(:call) && action.try(:arity) == 2
+    end
+
+    # :nodoc:
+    def handle_set_failure(vs)
+      locale = @parent.i18n
 
-        message = case vs
-          when "match" then locale.invalid_for_regexp(label, @validator.inspect)
-          when "call" then locale.invalid_for_proc(label)
-          else locale.invalid_value(label, Bovem::Parser.smart_join(@validator.ensure_array, ", ", locale.join_separator).html_safe)
+      message =
+        case vs
+        when "match" then locale.invalid_for_regexp(label, @validator.inspect)
+        when "call" then locale.invalid_for_proc(label)
+        else locale.invalid_value(label, Bovem::Parser.smart_join(@validator.ensure_array, separator: ", ", last_separator: locale.join_separator).html_safe)
         end
 
-        raise Bovem::Errors::Error.new(self, :validation_failed, message)
-      end
+      raise Bovem::Errors::Error.new(self, :validation_failed, message)
+    end
 
-      # Gets the method required to verify a validator.
-      #
-      # @param validator [Object] The type of the validator.
-      # @return [String] A method to call to verify the validator.
-      def get_validator_method(validator)
-        case validator.class.to_s
-          when "Array" then "include?"
-          when "Regexp" then "match"
-          when "Proc" then "call"
-          else false
-        end
+    # :nodoc:
+    def get_validator_method(validator)
+      case validator.class.to_s
+      when "Array" then "include?"
+      when "Regexp" then "match"
+      when "Proc" then "call"
+      else false
       end
+    end
   end
-end
+end

data/lib/bovem/parser.rb

@@ -20,11 +20,11 @@ module Bovem
         # @param last_separator [String] The separator to use for the last join.
         # @param quote [String] If not nil, elements are quoted with that element.
         # @return [String] The joined array.
-        def smart_join(array, separator = ", ", last_separator = " and ", quote = "\"")
+        def smart_join(array, separator: ", ", last_separator: " and ", quote: "\"")
           separator = separator.ensure_string
           last_separator = last_separator.ensure_string
-          array = array.ensure_array {|a| quote.present? ? "#{quote}#{a}#{quote}" : a.ensure_string }
-          array.length < 2 ? (array[0] || "") : (array[0, array.length - 1].join(separator) + last_separator + array[-1])
+          array = array.ensure_array { |a| quote.present? ? "#{quote}#{a}#{quote}" : a.ensure_string }
+          perform_smart_join(array, last_separator, separator)
         end
 
         # Finds a command which corresponds to an argument.
@@ -34,18 +34,16 @@ module Bovem
         # @param args [String] The complete list of arguments passed.
         # @param separator [String] The separator for joined syntax commands.
         # @return [Hash|NilClass] An hash with `name` and `args` keys if a valid subcommand is found, `nil` otherwise.
-        def find_command(arg, command, args, separator = ":")
-          if command.commands.present? then
-            arg, args = adjust_command(arg, args, separator)
-
-            matching = match_subcommands(arg, command)
-            if matching.length == 1 # Found a command
-              {name: matching[0], args: args}
-            elsif matching.length > 1 # Ambiguous match
-              raise Bovem::Errors::Error.new(command, :ambiguous_command, command.i18n.ambigous_command(arg, format_alternatives(matching, command)))
-            end
-          else
-            nil
+        def find_command(arg, command, args: {}, separator: ":")
+          return nil unless command.commands.present?
+
+          arg, args = adjust_command(arg, args, separator)
+
+          matching = match_subcommands(arg, command)
+          if matching.length == 1 # Found a command
+            {name: matching[0], args: args}
+          elsif matching.length > 1 # Ambiguous match
+            raise Bovem::Errors::Error.new(command, :ambiguous_command, command.i18n.ambigous_command(arg, format_alternatives(matching, command)))
           end
         end
 
@@ -59,41 +57,34 @@ module Bovem
         end
 
         private
-          # Adjusts a command so that it only specify a single command.
-          #
-          # @param arg [String] The string to match.
-          # @param args [String] The complete list of arguments passed.
-          # @param separator [String] The separator for joined syntax commands.
-          # @return [Array] Adjust command and arguments.
-          def adjust_command(arg, args, separator)
-            args = args.ensure_array.dup
-
-            if arg.index(separator) then
-              tokens = arg.split(separator, 2)
-              arg = tokens[0]
-              args.insert(0, tokens[1])
-            end
-
-            [arg, args]
-          end
 
-          # Matches a string against a command's subcommands.
-          #
-          # @param arg [String] The string to match.
-          # @param command [Command] The command to search subcommand in.
-          # @return [Array] The matching subcommands.
-          def match_subcommands(arg, command)
-            command.commands.keys.select {|c| c =~ /^(#{Regexp.quote(arg)})/ }.compact
-          end
+        # :nodoc:
+        def adjust_command(arg, args, separator)
+          args = args.ensure_array.dup
 
-          # Formats alternatives for printing.
-          #
-          # @param matching [Array] The alternatives to format.
-          # @param command [Command] The command which alternatives refers to.
-          # @return [String] The formatted alternatives.
-          def format_alternatives(matching, command)
-            Bovem::Parser.smart_join(matching, ", ", command.i18n.join_separator).html_safe
+          if arg.index(separator)
+            tokens = arg.split(separator, 2)
+            arg = tokens[0]
+            args.insert(0, tokens[1])
           end
+
+          [arg, args]
+        end
+
+        # :nodoc:
+        def match_subcommands(arg, command)
+          command.commands.keys.select { |c| c =~ /^(#{Regexp.quote(arg)})/ }.compact
+        end
+
+        # :nodoc:
+        def format_alternatives(matching, command)
+          Bovem::Parser.smart_join(matching, separator: ", ", last_separator: command.i18n.join_separator).html_safe
+        end
+
+        # :nodoc:
+        def perform_smart_join(array, last_separator, separator)
+          array.length < 2 ? (array[0] || "") : (array[0, array.length - 1].join(separator) + last_separator + array[-1])
+        end
       end
     end
   end
@@ -114,213 +105,174 @@ module Bovem
     end
 
     private
-      # Creates a new option parser.
-      #
-      # @param command [Command] The command or application to parse.
-      # @return [OptionParser] The new parser
-      def create_parser(command)
-        forms = {}
-        parser = OptionParser.new do |opts|
-          # Add every option
-          command.options.each_pair do |_, option|
-            check_unique(command, forms, option)
-            setup_option(command, opts, option)
-          end
-        end
 
-        [forms, parser]
+    # :nodoc:
+    def create_parser(command)
+      forms = {}
+      parser = OptionParser.new do |opts|
+        # Add every option
+        command.options.each_pair do |_, option|
+          check_unique(command, forms, option)
+          setup_option(command, opts, option)
+        end
       end
 
-      # Perform the parsing
-      #
-      # @param parser [OptionParser] The option parser.
-      # @param command [Command] The command or application to parse.
-      # @param args [Array] The arguments to parse.
-      # @param forms [Hash] The current forms.
-      def perform_parsing(parser, command, args, forms)
-        rv = nil
-
-        begin
-          rv = execute_parsing(parser, command, args)
-        rescue OptionParser::NeedlessArgument, OptionParser::MissingArgument, OptionParser::InvalidOption => oe
-          type = oe.class.to_s.gsub("OptionParser::", "").underscore.to_sym
-          opt = oe.args.first
-          raise Bovem::Errors::Error.new(forms[opt], type, command.i18n.send(type, opt))
-        rescue => e
-          raise e
-        end
+      [forms, parser]
+    end
+
+    # :nodoc:
+    def perform_parsing(parser, command, args, forms)
+      rv = nil
 
-        rv
+      begin
+        rv = execute_parsing(parser, command, args)
+      rescue OptionParser::NeedlessArgument, OptionParser::MissingArgument, OptionParser::InvalidOption => e
+        fail_invalid_option(command, forms, e)
+      rescue => e
+        raise e
       end
 
-      # Executes the parsing.
-      #
-      # @param parser [OptionParser] The option parser.
-      # @param command [Command] The command or application to parse.
-      # @param args [Array] The arguments to parse.
-      # @return [Command|nil] A command to execute or `nil` if no valid command was found.
-      def execute_parsing(parser, command, args)
-        rv = nil
-
-        if command.options.present? then
-          rv = parse_options(parser, command, args)
-          check_required_options(command)
-        elsif args.present? then
-          rv = find_command_to_execute(command, args)
-        end
+      rv
+    end
 
-        rv
-      end
+    # :nodoc:
+    def fail_invalid_option(command, forms, oe)
+      type = oe.class.to_s.gsub("OptionParser::", "").underscore.to_sym
+      opt = oe.args.first
+      raise Bovem::Errors::Error.new(forms[opt], type, command.i18n.send(type, opt))
+    end
 
-      # Setups an option for a command.
-      #
-      # @param command [Command] The command or application to parse.
-      # @param opts [Object] The current set options.
-      # @param option [Option] The option to set.
-      def setup_option(command, opts, option)
-        case option.type.to_s
-          when "String" then parse_string(command, opts, option)
-          when "Integer", "Fixnum", "Bignum" then parse_number(command, opts, option, :is_integer?, :to_integer, command.i18n.invalid_integer(option.label))
-          when "Float" then parse_number(command, opts, option, :is_float?, :to_float, command.i18n.invalid_float(option.label))
-          when "Array" then parse_array(command, opts, option)
-          else option.action.present? ? parse_action(opts, option) : parse_boolean(opts, option)
-        end
-      end
+    # :nodoc:
+    def execute_parsing(parser, command, args)
+      rv = nil
 
-      # Checks if a option is unique.
-      #
-      # @param command [Command] The command or application to parse.
-      # @param forms [Hash] The current forms.
-      # @param option [Option] The option to set.
-      def check_unique(command, forms, option)
-        if forms[option.complete_short] || forms[option.complete_long] then
-          raise Bovem::Errors::Error.new(command, :ambiguous_form, command.i18n.conflicting_options(option.label, forms[option.complete_short].label))
-        else
-          forms[option.complete_short] = option.dup
-          forms[option.complete_long] = option.dup
-        end
+      if command.options.present?
+        rv = parse_options(parser, command, args)
+        check_required_options(command)
+      elsif args.present?
+        rv = find_command_to_execute(command, args)
       end
 
-      # Parses an action option. A block must be provided to deal with the value.
-      #
-      # @param command [Command] The command or application to parse.
-      # @param opts [Object] The current set options.
-      # @param option [Option] The option to set.
-      def parse_option(command, opts, option)
-        opts.on("#{option.complete_short} #{option.meta || command.i18n.help_arg}", "#{option.complete_long} #{option.meta || command.i18n.help_arg}") do |value|
-          yield(value)
-        end
-      end
+      rv
+    end
 
-      # Parses an action option.
-      #
-      # @param opts [Object] The current set options.
-      # @param option [Option] The option to set.
-      def parse_action(opts, option)
-        opts.on("-#{option.short}", "--#{option.long}") do |_|
-          option.execute_action
-        end
+    # :nodoc:
+    def setup_option(command, opts, option)
+      case option.type.to_s
+      when "String" then parse_string(command, opts, option)
+      when "Integer", "Fixnum", "Bignum" then setup_int_option(command, option, opts)
+      when "Float" then parse_number(command, opts, option, :float?, :to_float, command.i18n.invalid_float(option.label))
+      when "Array" then parse_array(command, opts, option)
+      else option.action.present? ? parse_action(opts, option) : parse_boolean(opts, option)
       end
+    end
+
+    # :nodoc:
+    def setup_int_option(command, option, opts)
+      parse_number(command, opts, option, :integer?, :to_integer, command.i18n.invalid_integer(option.label))
+    end
 
-      # Parses a string option.
-      #
-      # @param command [Command] The command or application to parse.
-      # @param opts [Object] The current set options.
-      # @param option [Option] The option to set.
-      def parse_string(command, opts, option)
-        parse_option(command, opts, option) { |value| option.set(value) }
+    # :nodoc:
+    def check_unique(command, forms, option)
+      if forms[option.complete_short] || forms[option.complete_long]
+        fail_non_unique_option(command, forms, option)
+      else
+        forms[option.complete_short] = option.dup
+        forms[option.complete_long] = option.dup
       end
+    end
 
-      # Parses a number option.
-      #
-      # @param command [Command] The command or application to parse.
-      # @param opts [Object] The current set options.
-      # @param option [Option] The option to set.
-      # @param check_method [Symbol] The method to execute to check option validity. Must return a boolean.
-      # @param convert_method [Symbol] The method to execute to convert option.
-      # @param invalid_message [String] The string to send in case of invalid arguments.
-      def parse_number(command, opts, option, check_method, convert_method, invalid_message)
-        parse_option(command, opts, option) do |value|
-          raise Bovem::Errors::Error.new(option, :invalid_argument, invalid_message) if !value.send(check_method)
-          option.set(value.send(convert_method))
-        end
+    # :nodoc:
+    def fail_non_unique_option(command, forms, option)
+      raise Bovem::Errors::Error.new(command, :ambiguous_form, command.i18n.conflicting_options(option.label, forms[option.complete_short].label))
+    end
+
+    # :nodoc:
+    def parse_option(command, opts, option)
+      opts.on("#{option.complete_short} #{option.meta || command.i18n.help_arg}", "#{option.complete_long} #{option.meta || command.i18n.help_arg}") do |value|
+        yield(value)
       end
+    end
 
-      # Parses an array option.
-      #
-      # @param command [Command] The command or application to parse.
-      # @param opts [Object] The current set options.
-      # @param option [Option] The option to set.
-      def parse_array(command, opts, option)
-        opts.on("#{option.complete_short} #{option.meta || command.i18n.help_arg}", "#{option.complete_long} #{option.meta || command.i18n.help_arg}", Array) do |value|
-          option.set(value.ensure_array)
-        end
+    # :nodoc:
+    def parse_action(opts, option)
+      opts.on("-#{option.short}", "--#{option.long}") do |_|
+        option.execute_action
       end
+    end
 
-      # Parses an action option.
-      #
-      # @param opts [Object] The current set options.
-      # @param option [Option] The option to set.
-      def parse_boolean(opts, option)
-        opts.on("-#{option.short}", "--#{option.long}") do |value|
-          option.set(value.to_boolean)
-        end
+    # :nodoc:
+    def parse_string(command, opts, option)
+      parse_option(command, opts, option) { |value| option.set(value) }
+    end
+
+    # :nodoc:
+    def parse_number(command, opts, option, check_method, convert_method, invalid_message)
+      parse_option(command, opts, option) do |value|
+        raise Bovem::Errors::Error.new(option, :invalid_argument, invalid_message) unless value.send(check_method)
+        option.set(value.send(convert_method))
       end
+    end
 
-      # Parses options of a command.
-      #
-      # @param parser [OptionParser] The option parser.
-      # @param command [Command] The command or application to parse.
-      # @param args [Array] The arguments to parse.
-      # @return [Command|nil] A command to execute or `nil` if no command was found.
-      def parse_options(parser, command, args)
-        rv = nil
-
-        # Parse options
-        parser.order!(args) do |arg|
-          fc = Bovem::Parser.find_command(arg, command, args)
-
-          if fc.present? then
-            rv = fc
-            parser.terminate
-          else
-            command.argument(arg)
-          end
-        end
+    # :nodoc:
+    def parse_array(command, opts, option)
+      meta = option.meta || command.i18n.help_arg
 
-        rv
+      opts.on("#{option.complete_short} #{meta}", "#{option.complete_long} #{meta}", Array) do |value|
+        option.set(value.ensure_array)
       end
+    end
 
-      # Checks if all options of a command are present.
-      #
-      # @param command [Command] The command or application to parse.
-      def check_required_options(command)
-        # Check if any required option is missing.
-        command.options.each_pair  do |name, option|
-          raise Bovem::Errors::Error.new(option, :missing_option, command.i18n.missing_option(option.label)) if option.required && !option.provided?
-        end
+    # :nodoc:
+    def parse_boolean(opts, option)
+      opts.on("-#{option.short}", "--#{option.long}") do |value|
+        option.set(value.to_boolean)
       end
+    end
 
-      # Finds a command to execute
-      #
-      # @param command [Command] The command or application to parse.
-      # @param args [Array] The arguments to parse.
-      # @return [Command|nil] A command to execute or `nil` if no command was found.
-      def find_command_to_execute(command, args)
-        rv = nil
+    # :nodoc:
+    def parse_options(parser, command, args)
+      rv = nil
 
-        # Try to find a command into the first argument
-        fc = Bovem::Parser.find_command(args[0], command, args[1, args.length - 1])
+      # Parse options
+      parser.order!(args) do |arg|
+        fc = Bovem::Parser.find_command(arg, command, args: args)
 
-        if fc.present? then
+        if fc.present?
           rv = fc
+          parser.terminate
         else
-          args.each do |arg|
-            command.argument(arg)
-          end
+          command.argument(arg)
         end
+      end
+
+      rv
+    end
 
-        rv
+    # :nodoc:
+    def check_required_options(command)
+      # Check if any required option is missing.
+      command.options.each_pair do |_, option|
+        raise Bovem::Errors::Error.new(option, :missing_option, command.i18n.missing_option(option.label)) if option.required && !option.provided?
       end
+    end
+
+    # :nodoc:
+    def find_command_to_execute(command, args)
+      rv = nil
+
+      # Try to find a command into the first argument
+      fc = Bovem::Parser.find_command(args[0], command, args: args[1, args.length - 1])
+
+      if fc.present?
+        rv = fc
+      else
+        args.each do |arg|
+          command.argument(arg)
+        end
+      end
+
+      rv
+    end
   end
-end
+end