opt_parse_validator 1.8.1 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 586dab37cd325eb2de116eeb45634de660057721145677f1231f59d31a7f259d
-  data.tar.gz: 3f302f8ddbeaef89b02efc5c4330d28f741ebab06acbbfeba8c412f138663bfe
+  metadata.gz: c53dffe78ba9cd4449e9eb13eadd1c322bed9e9bb49576436cafc38850662de5
+  data.tar.gz: db5ffda29561522244c2b85408581356f987d982304e193e3befe71b4c6d9085
 SHA512:
-  metadata.gz: 26bf966e30e4f5324061913247ed533b22272b0bf04a03b18321e345b17c990987df4a3fdad52fe392cd915323c6ec26fd9f0a356f4aae3fe21e6b3b8a09dedb
-  data.tar.gz: 2be116f86f8472f5f2b4deadc56c2e3942ce59bc9d978ae913178128608a4f389b57780de22c370d1aea1ee0c96e3e4453911a80dd9d3cd214cce13bdac7ae02
+  metadata.gz: e9318bb95835631324f8d95f6a179d771699faf6542d38b725ebb0a500fa9dec7f4047139b0e91144106981b40fc212a51b513a596665799745c2718a6fa8ced
+  data.tar.gz: b66fca4ecda2254ae42f8fec9d5875a0cdcaa2639bc58331998477872ec0768f516f8837c9e12f0796c1bec2e0e8d309182cde0b714c20347b519ff76249f97a

data/README.md

@@ -2,7 +2,7 @@ OptParseValidator
 =================
 
 [![Gem Version](https://badge.fury.io/rb/opt_parse_validator.svg)](https://badge.fury.io/rb/opt_parse_validator)
-[![Build Status](https://travis-ci.org/wpscanteam/OptParseValidator.svg?branch=master)](https://travis-ci.org/wpscanteam/OptParseValidator)
+![Build](https://github.com/wpscanteam/OptParseValidator/workflows/Build/badge.svg)
 [![Coverage Status](https://img.shields.io/coveralls/wpscanteam/OptParseValidator.svg)](https://coveralls.io/r/wpscanteam/OptParseValidator?branch=master)
 [![Code Climate](https://api.codeclimate.com/v1/badges/56f0307bbbda6d41b99a/maintainability)](https://codeclimate.com/github/wpscanteam/OptParseValidator/maintainability)
 

data/lib/opt_parse_validator.rb

@@ -108,18 +108,16 @@ module OptParseValidator
     # @return [ void ]
     def register_callback(opt)
       on(*opt.option) do |arg|
-        begin
-          if opt.alias?
-            parse!(opt.alias_for.split(' '))
-          else
-            @results[opt.to_sym] = opt.normalize(opt.validate(arg))
-          end
-        rescue StandardError => e
-          # Adds the long option name to the message
-          # And raises it as an OptParseValidator::Error if not already one
-          # e.g --proxy Invalid Scheme format.
-          raise e.is_a?(Error) ? e.class : Error, "#{opt.to_long} #{e}"
+        if opt.alias?
+          parse!(opt.alias_for.split)
+        else
+          @results[opt.to_sym] = opt.normalize(opt.validate(arg))
         end
+      rescue StandardError => e
+        # Adds the long option name to the message
+        # And raises it as an OptParseValidator::Error if not already one
+        # e.g --proxy Invalid Scheme format.
+        raise e.is_a?(Error) ? e.class : Error, "#{opt.to_long} #{e}"
       end
     end
 
@@ -147,11 +145,11 @@ module OptParseValidator
     # @return [ Void ]
     def post_processing
       @opts.each do |opt|
-        raise NoRequiredOption, "The option #{opt} is required" if opt.required? && !@results.key?(opt.to_sym)
+        raise NoRequiredOption, "The option --#{opt} is required" if opt.required? && !@results.key?(opt.to_sym)
 
         next if opt.required_unless.empty? || @results.key?(opt.to_sym)
 
-        fail_msg = "One of the following options is required: #{opt}, #{opt.required_unless.join(', ')}"
+        fail_msg = "One of the following options is required: --#{opt}, --#{opt.required_unless.join(', --')}"
 
         raise NoRequiredOption, fail_msg unless opt.required_unless.any? do |sym|
           @results.key?(sym)

data/lib/opt_parse_validator/config_files_loader_merger.rb

@@ -51,7 +51,7 @@ module OptParseValidator
 
       each { |config_file| result.deep_merge!(config_file.parse) }
 
-      result = result.dig(result_key) || {} if result_key
+      result = result[result_key] || {} if result_key
 
       result.deep_symbolize_keys
     end

data/lib/opt_parse_validator/hacks.rb

@@ -1,17 +1,19 @@
 # frozen_string_literal: true
 
 class OptionParser
-  # Hack to suppress the completion (expect for the -h/--help) which was leading to
+  # Hack to suppress the completion (except for the -h/--help) which was leading to
   # unwanted behaviours
   # See https://github.com/wpscanteam/CMSScanner/issues/2
   module Completion
     class << self
       alias original_candidate candidate
 
+      # rubocop:disable Style/OptionalBooleanParameter
       def candidate(key, icase = false, pat = nil, &block)
         # Maybe also do this for -v/--version ?
         key == 'h' ? original_candidate('help', icase, pat, &block) : []
       end
+      # rubocop:enable Style/OptionalBooleanParameter
     end
   end
 end

data/lib/opt_parse_validator/opts.rb

@@ -5,5 +5,5 @@
   path file_path directory_path array integer_range multi_choices regexp headers
   smart_list alias
 ].each do |opt|
-  require 'opt_parse_validator/opts/' + opt
+  require "opt_parse_validator/opts/#{opt}"
 end

data/lib/opt_parse_validator/opts/base.rb

@@ -43,7 +43,7 @@ module OptParseValidator
     end
 
     def required_unless
-      @required_unless ||= [*attrs[:required_unless]]
+      @required_unless ||= Array(attrs[:required_unless])
     end
 
     # @return [ Mixed ]
@@ -91,7 +91,7 @@ module OptParseValidator
     #
     # @return [ Mixed ]
     def normalize(value)
-      [*attrs[:normalize]].each do |method|
+      Array(attrs[:normalize]).each do |method|
         next unless method.is_a?(Symbol)
 
         value = value.send(method) if value.respond_to?(method)
@@ -107,7 +107,7 @@ module OptParseValidator
 
         raise Error, "Could not find option symbol for #{option}" unless long_option
 
-        @symbol = long_option.gsub(/^--/, '').tr('-', '_').to_sym
+        @symbol = long_option.delete_prefix('--').tr('-', '_').to_sym
       end
       @symbol
     end
@@ -115,7 +115,7 @@ module OptParseValidator
     # @return [ String ] The raw long option (e.g: --proxy)
     def to_long
       option.each do |option_attr|
-        if /^--/.match?(option_attr)
+        if option_attr.start_with?('--')
           return option_attr.gsub(/ .*$/, '')
                             .gsub(/\[[^\]]+\]/, '')
         end

data/lib/opt_parse_validator/opts/file_path.rb

@@ -26,7 +26,7 @@ module OptParseValidator
     end
 
     def check_extensions(path)
-      return if [*attrs[:extensions]].include?(path.extname.delete('.'))
+      return if Array(attrs[:extensions]).include?(path.extname.delete('.'))
 
       raise Error, "The extension of '#{path}' is not allowed"
     end

data/lib/opt_parse_validator/opts/multi_choices.rb

@@ -104,7 +104,7 @@ module OptParseValidator
 
     # @return [ Array<Array<Symbol>> ]
     def incompatible
-      [*attrs[:incompatible]]
+      Array(attrs[:incompatible])
     end
 
     # @param [ Hash ] values

data/lib/opt_parse_validator/opts/path.rb

@@ -39,22 +39,22 @@ module OptParseValidator
 
     # @param [ Pathname ] path
     def check_file(path)
-      raise Error, "'#{path}' is not a file" unless path.file? || attrs[:exists] == false
+      raise Error, "The path '#{path}' does not exist or is not a file" unless path.file? || attrs[:exists] == false
     end
 
     # @param [ Pathname ] path
     def check_directory(path)
-      raise Error, "'#{path}' is not a directory" unless path.directory? || attrs[:exists] == false
+      raise Error, "The path '#{path}' does not exist or is not a directory" unless path.directory? || attrs[:exists] == false
     end
 
     # @param [ Pathname ] path
     def check_executable(path)
-      raise Error, "'#{path}' is not executable" unless path.executable?
+      raise Error, "The path '#{path}' is not executable" unless path.executable?
     end
 
     # @param [ Pathname ] path
     def check_readable(path)
-      raise Error, "'#{path}' is not readable" unless path.readable?
+      raise Error, "The path '#{path}' is not readable" unless path.readable?
     end
 
     # If the path does not exist, it will check for the parent
@@ -62,7 +62,7 @@ module OptParseValidator
     #
     # @param [ Pathname ] path
     def check_writable(path)
-      raise Error, "'#{path}' is not writable" if path.exist? && !path.writable? || !path.parent.writable?
+      raise Error, "The path '#{path}' is not writable" if path.exist? && !path.writable? || !path.parent.writable?
     end
   end
 end

data/lib/opt_parse_validator/opts/uri.rb

@@ -13,7 +13,7 @@ module OptParseValidator
 
     # @return [ Array<String> ]
     def allowed_protocols
-      @allowed_protocols ||= [*attrs[:protocols]].map(&:downcase)
+      @allowed_protocols ||= Array(attrs[:protocols]).map(&:downcase)
     end
 
     # The default protocol (or scheme) to use if none was given

data/lib/opt_parse_validator/version.rb

@@ -2,5 +2,5 @@
 
 # Gem Version
 module OptParseValidator
-  VERSION = '1.8.1'
+  VERSION = '1.9.3'
 end

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: opt_parse_validator
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.9.3
 platform: ruby
 authors:
 - WPScanTeam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2021-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.2.0
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -65,103 +65,103 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.76.0
+        version: 1.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.76.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: simplecov-lcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.8.0
 description: Implementation of validators for the ruby OptionParser lib. Mainly used
   in the CMSScanner gem to define the cli options available
 email:
@@ -213,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="