opt_parse_validator 1.7.3 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae0d41c70e9cc074f903928dac214865c73e6aaed27bb25eeba8d503eedfc04b
-  data.tar.gz: 8e8a26c56dfbd87be9cd0bccff5dbad22063bcd773bd0c83d8af707dc3f8e51a
+  metadata.gz: bfcde1ed88a3d3b41836d151c76a25e1f5c6f36e5e62a2910878d9463dc8bddd
+  data.tar.gz: 6d07487070338fb64622883ed0c7d5cc70cc90e50d0c32ef56e48ebab47bdb07
 SHA512:
-  metadata.gz: 571e52865cb5cb5ddafc9fb32547e07843ce8bd24a6dc5c6a3fd0aba6b3555e71a48215a05db62a01ba146015e931f37a3cf9c73218c782e3c990b68fc413ef0
-  data.tar.gz: a002c206b49f4cf5dad2591dcd5133a6140463a64a07a03f9d5cdb84056874bdecc3ab4fdb1310e468d97dd8b61a267a0724b6304363b32cd920250c40cc53f7
+  metadata.gz: efc33f8e0cc1522c8d7b22d1bff81227f26bf67693c3ea14800d34e361bcf0a76d7b04aa656bfc5ce19c10b6a78a37d03b146ff75ac141b1db629ce90e95699d
+  data.tar.gz: 5dba47501b4d609120a4033e1531ffe7af505e4bbd72aaea5a5725b1d00d61eddde009aa94096656a1fab9346c98e433a74be58dda68d67ea1cbe2ebd1032cf4

data/lib/opt_parse_validator.rb

@@ -130,7 +130,14 @@ module OptParseValidator
       @opts.each do |opt|
         next unless files_data.key?(opt.to_sym)
 
-        @results[opt.to_sym] = opt.normalize(opt.validate(files_data[opt.to_sym].to_s))
+        begin
+          @results[opt.to_sym] = opt.normalize(opt.validate(files_data[opt.to_sym].to_s))
+        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
     end
 

data/lib/opt_parse_validator/config_files_loader_merger.rb

@@ -4,6 +4,18 @@ require_relative 'config_files_loader_merger/base'
 require_relative 'config_files_loader_merger/json'
 require_relative 'config_files_loader_merger/yml'
 
+# :nocov:
+# @param [ String ] path The path of the file to load
+# @param [ Hash ] opts See https://ruby-doc.org/stdlib-2.6.3/libdoc/psych/rdoc/Psych.html#method-c-safe_load
+def yaml_safe_load(path, opts = {})
+  if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1') # Ruby 2.6
+    YAML.safe_load(File.read(path), opts) || {}
+  else
+    YAML.safe_load(File.read(path), opts[:permitted_classes] || [], opts[:permitted_symbols] || [], opts[:aliases]) || {}
+  end
+end
+# :nocov:
+
 module OptParseValidator
   # Options Files container
   class ConfigFilesLoaderMerger < Array

data/lib/opt_parse_validator/config_files_loader_merger/yml.rb

@@ -8,11 +8,11 @@ module OptParseValidator
       # Yaml Implementation
       class YML < Base
         # @params [ Hash ] opts
-        # @option opts [ Array ] :yaml_arguments See https://ruby-doc.org/stdlib-2.3.1/libdoc/psych/rdoc/Psych.html#method-c-safe_load
+        # @option opts [ Hash ] :yaml_options See https://ruby-doc.org/stdlib-2.6.3/libdoc/psych/rdoc/Psych.html#method-c-safe_load
         #
         # @return [ Hash ] a { 'key' => value } hash
         def parse(opts = {})
-          YAML.safe_load(File.read(path), *opts[:yaml_arguments]) || {}
+          yaml_safe_load(path, opts[:yaml_options] || {})
         end
       end
     end

data/lib/opt_parse_validator/version.rb

@@ -2,5 +2,5 @@
 
 # Gem Version
 module OptParseValidator
-  VERSION = '1.7.3'
+  VERSION = '1.7.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opt_parse_validator
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.4
 platform: ruby
 authors:
 - WPScanTeam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-17 00:00:00.000000000 Z
+date: 2019-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -126,28 +126,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.71.0
+        version: 0.73.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.71.0
+        version: 0.73.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement