opt_parse_validator 1.8.2 → 1.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 074c52870b535dd45db280f251fc994f845bb6e00264409203f6d026021a21ee
-  data.tar.gz: 77499d9429f56e45d1f6ecaf78d79b020d83a93bbc51caa03953d718d1d9a3c1
+  metadata.gz: c9286b871685cbc3d1053587dc31ccf2d01d35cc6efc138607be2fbf04416de8
+  data.tar.gz: b562e1c8e5faadf362f2d14997ebb7237604afd5dc53d6584a83697139c7b696
 SHA512:
-  metadata.gz: 68146dc2fa5d882f4a2a1f53507401644fb9d77423d26bf0ddb42d28ee67165cea30769a30782bc2d4c085a7066ab6873b0d48ec5bf096940b0207aed91abb2c
-  data.tar.gz: 617b4abef3ddcd0c0ac08a75f4a8d34b70a1dafe7fa6e30f7ddd2b831d4bfc416cf3c497ecb9e4f0ca7de917a08bfbc03e57b43fdbb130c481e2f6cb72b9428e
+  metadata.gz: 33eed0e8bdd867b45e2b7276cf7d47061f47b1bbcce72cc29abfc61530713a413d2bd10663d9bc9130f5666a386b3718c4e1a0ada33eb366a744eb84952bb346
+  data.tar.gz: 83511499d313425a027a6c444e347a6342040419420076ff0d6b5523c039e21841d135ecda353c727a59ff67f25a8ea8c8f6c73ae633384325116905f98e30c0

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,12 @@ 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.to_long} 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.to_long}, --#{opt.required_unless.join(', --').tr('_', '-')}"
 
         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

@@ -8,10 +8,12 @@ class OptionParser
     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.2'
+  VERSION = '1.9.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opt_parse_validator
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.9.4
 platform: ruby
 authors:
 - WPScanTeam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-13 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +19,7 @@ dependencies:
         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
@@ -29,7 +29,7 @@ dependencies:
         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
@@ -84,14 +84,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -112,42 +112,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.80.0
+        version: 1.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.80.0
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.2
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.2
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: simplecov-lcov
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +165,7 @@ dependencies:
 description: Implementation of validators for the ruby OptionParser lib. Mainly used
   in the CMSScanner gem to define the cli options available
 email:
-- team@wpscan.org
+- contact@wpscan.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -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:
   - - ">="