opt_parse_validator 1.9.1 → 1.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ccb947d9079bcc004e16bdfea47a5e5207c26e871da1a1cf0c01f2bbeca5b65
-  data.tar.gz: 87139c6bbe1664ff3c70374a81d3e6940193b5d46cd0d07c5905cc22ab468cfb
+  metadata.gz: 24a508e92f221f7b26c0ca9e539ab3272538215166d58de297fd03a1ee8d6cfe
+  data.tar.gz: 4f0541a2877f01224d964c2d259a665c81c91000da1a91229810e2cf98d156d5
 SHA512:
-  metadata.gz: dd7dd0aa734ad3ad63bd1644b8ab05213d96a0d3c223de20d2152581c22c04b7f68df65ea52fbe4b189e46d44b32d005b855da92e12c5e336b31eb42553d5c00
-  data.tar.gz: 50bca2d9e0f17c6c1f9662b3d3e6a9d9b1d8ed5352b6e35c4847ac373ff91b64a50adfe53ffd73f993575e90a9cae67cfe7bcd52fafe702cefb30ec44d718dce
+  metadata.gz: 77b216809c7fc8d31fcf37953fba5fefa56e6a290c8844283e34fc2108e3883ae09357f4b3ac46386880a7713749c706ded2733d1e089ac62797ab13f3cfb59a
+  data.tar.gz: 6d944517f3b33ac2cffa6a7b31f45d9d53c9db0254638ee8aee074a475e04840572deb2902a289c9bca09e66b1229b7e6bb4448a317e1b2a463eaa5e9ecdd09f

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/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)

data/lib/opt_parse_validator/opts/choice.rb

@@ -34,7 +34,7 @@ module OptParseValidator
 
       unless choices.include?(value)
         raise Error, "'#{value}' is not a valid choice, expected one " \
-          "of the followings: #{choices.join(',')}"
+                     "of the followings: #{choices.join(',')}"
       end
 
       value

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/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/version.rb

@@ -2,5 +2,5 @@
 
 # Gem Version
 module OptParseValidator
-  VERSION = '1.9.1'
+  VERSION = '1.9.5'
 end

data/lib/opt_parse_validator.rb

@@ -109,7 +109,7 @@ module OptParseValidator
     def register_callback(opt)
       on(*opt.option) do |arg|
         if opt.alias?
-          parse!(opt.alias_for.split(' '))
+          parse!(opt.alias_for.split)
         else
           @results[opt.to_sym] = opt.normalize(opt.validate(arg))
         end
@@ -145,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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opt_parse_validator
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.5
 platform: ruby
 authors:
 - WPScanTeam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-25 00:00:00.000000000 Z
+date: 2021-09-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
@@ -39,7 +39,7 @@ dependencies:
         version: '2.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '2.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   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.84.0
+        version: 1.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.84.0
+        version: 1.21.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.11.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: []
@@ -220,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Ruby OptionParser Validators