opt_parse_validator 1.7.4 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfcde1ed88a3d3b41836d151c76a25e1f5c6f36e5e62a2910878d9463dc8bddd
-  data.tar.gz: 6d07487070338fb64622883ed0c7d5cc70cc90e50d0c32ef56e48ebab47bdb07
+  metadata.gz: e37a9c3438b53cfe9453653062ef294af7b37c99acfe77937bd9ee1d8bebaca8
+  data.tar.gz: 1defdfeb5e06c3f37742fb54f19d38f3f0399d8564fcc2ffbe965ca476ab8bc5
 SHA512:
-  metadata.gz: efc33f8e0cc1522c8d7b22d1bff81227f26bf67693c3ea14800d34e361bcf0a76d7b04aa656bfc5ce19c10b6a78a37d03b146ff75ac141b1db629ce90e95699d
-  data.tar.gz: 5dba47501b4d609120a4033e1531ffe7af505e4bbd72aaea5a5725b1d00d61eddde009aa94096656a1fab9346c98e433a74be58dda68d67ea1cbe2ebd1032cf4
+  metadata.gz: 7b6297d0b83ca482b02796dea0830b569adc28bdf226822091bd74649712ca08494347cf18fc1ec4f07126eb0819723858418be1d37c7e00b046860f644a9c8b
+  data.tar.gz: 61a03033ff7bf52add8ea3886936e79ae188149c9b01dbe24f75706f30a4d577bcc0a61f0e02830be13272c4c35bca09dfe743f5dded863627696353717acebe

data/lib/opt_parse_validator.rb

@@ -29,8 +29,8 @@ module OptParseValidator
     end
 
     # @return [ OptParseValidator::ConfigFilesLoaderMerger ]
-    def options_files
-      @options_files ||= ConfigFilesLoaderMerger.new
+    def config_files
+      @config_files ||= ConfigFilesLoaderMerger.new
     end
 
     # @param [ Array<OptBase> ] options
@@ -56,7 +56,7 @@ module OptParseValidator
 
     # @return [ Hash ]
     def results(argv = default_argv)
-      load_options_files
+      load_config_files
       parse!(argv)
       post_processing
 
@@ -124,8 +124,8 @@ module OptParseValidator
     end
 
     # @return [ Void ]
-    def load_options_files
-      files_data = options_files.parse(symbolize_keys: true)
+    def load_config_files
+      files_data = config_files.parse
 
       @opts.each do |opt|
         next unless files_data.key?(opt.to_sym)

data/lib/opt_parse_validator/config_files_loader_merger.rb

@@ -6,12 +6,11 @@ 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 = {})
+def yaml_safe_load(path)
   if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1') # Ruby 2.6
-    YAML.safe_load(File.read(path), opts) || {}
+    YAML.safe_load(File.read(path), permitted_classes: [Regexp]) || {}
   else
-    YAML.safe_load(File.read(path), opts[:permitted_classes] || [], opts[:permitted_symbols] || [], opts[:aliases]) || {}
+    YAML.safe_load(File.read(path), [Regexp]) || {}
   end
 end
 # :nocov:
@@ -29,6 +28,8 @@ module OptParseValidator
       extensions.map { |sym| sym.to_s.downcase }
     end
 
+    attr_accessor :result_key
+
     # @param [ String ] file_path
     #
     # @return [ Self ]
@@ -43,16 +44,16 @@ module OptParseValidator
     end
 
     # @params [ Hash ] opts
-    # @option opts [ Boolean ] :symbolize_keys Whether or not to symbolize keys in the returned hash
-    # @option opts [ Array ] :yaml_arguments See https://ruby-doc.org/stdlib-2.3.1/libdoc/psych/rdoc/Psych.html#method-c-safe_load
     #
     # @return [ Hash ]
-    def parse(opts = {})
+    def parse
       result = {}
 
-      each { |option_file| result.deep_merge!(option_file.parse(opts)) }
+      each { |config_file| result.deep_merge!(config_file.parse) }
+
+      result = result.dig(result_key) || {} if result_key
 
-      opts[:symbolize_keys] ? result.deep_symbolize_keys : result
+      result.deep_symbolize_keys
     end
   end
 end

data/lib/opt_parse_validator/config_files_loader_merger/base.rb

@@ -12,9 +12,8 @@ module OptParseValidator
           @path = path
         end
 
-        # @params [ Hash ] opts
         # @return [ Hash ] a { 'key' => value } hash
-        def parse(_opts = {})
+        def parse
           raise NotImplementedError
         end
 

data/lib/opt_parse_validator/config_files_loader_merger/json.rb

@@ -7,9 +7,8 @@ module OptParseValidator
     module ConfigFile
       # Json Implementation
       class JSON < Base
-        # @params [ Hash ] opts
         # @return [ Hash ] a { 'key' => value } hash
-        def parse(_opts = {})
+        def parse
           ::JSON.parse(File.read(path))
         end
       end

data/lib/opt_parse_validator/config_files_loader_merger/yml.rb

@@ -7,12 +7,9 @@ module OptParseValidator
     module ConfigFile
       # Yaml Implementation
       class YML < Base
-        # @params [ Hash ] opts
-        # @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(path, opts[:yaml_options] || {})
+        def parse
+          yaml_safe_load(path)
         end
       end
     end

data/lib/opt_parse_validator/opts/multi_choices.rb

@@ -94,7 +94,7 @@ module OptParseValidator
     # @return [ Array ]
     def value_from_pattern(item)
       choices.each do |key, opt|
-        next unless item =~ /\A#{key.to_s}(.*)\z/
+        next unless item =~ /\A#{key}(.*)\z/
 
         return [opt, Regexp.last_match[1]]
       end

data/lib/opt_parse_validator/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opt_parse_validator
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.8.0
 platform: ruby
 authors:
 - WPScanTeam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-31 00:00:00.000000000 Z
+date: 2019-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +19,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.3.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.3.0
+        version: 6.1.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.7'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '2.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -126,14 +126,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.73.0
+        version: 0.74.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.73.0
+        version: 0.74.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement