opt_parse_validator 0.0.16.6 → 0.0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: f8c4d178693b59eec288e32b8499476cebdb92f2c51781b80f5ce3abefe43c68
-  data.tar.gz: e48fdc7d0cf5485c6812bc955e87f1348f4aa079448014d835ed0e9c1ed961d8
+SHA1:
+  metadata.gz: 315b683b0c51adbc5afc6087639680d8fdd7af7c
+  data.tar.gz: 015f3118b80dbf817fafbbfd2f96479a05fa8223
 SHA512:
-  metadata.gz: 45bd2b0dfce053981b6fb477d37c5bead11e1dc62d789299bfdc97d80ef95c1e87f9c50dde8579e536c68bd3972e595c62ab4ed78ff5c590b16c99e3417a5c0d
-  data.tar.gz: ce7a7523d9112dfd4aa6072c64c6b1eaffe155a5a16aa5094b72a8d8ddc7c5d5f9d825151f5c10b5d919908356a67b41550779e52f96e6a76848de10285174f7
+  metadata.gz: 6dbf1eaf46c391923531d1eab92d0090c0ac574e617b2499c38ae5d5c55578621fd75bd2f9b62602d9c53eadf0c36588041c38d039896218b7b71002312f95be
+  data.tar.gz: 8a6b2b370acc963c084e356edef00f64197d3ffa51263a3780898adb449202e789c299197f5259a629e9014747b52b19d30e5a19d3f5c5946b361cb4644d310a

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://img.shields.io/travis/wpscanteam/OptParseValidator.svg)](https://travis-ci.org/wpscanteam/OptParseValidator)
+[![Build Status](https://travis-ci.org/wpscanteam/OptParseValidator.svg?branch=master)](https://travis-ci.org/wpscanteam/OptParseValidator)
 [![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/config_files_loader_merger/base.rb

@@ -0,0 +1,25 @@
+module OptParseValidator
+  class ConfigFilesLoaderMerger < Array
+    module ConfigFile
+      # Base class, #parse should be implemented in child classes
+      class Base
+        attr_reader :path
+
+        # @param [ String ] path The file path of the option file
+        def initialize(path)
+          @path = path
+        end
+
+        # @params [ Hash ] opts
+        # @return [ Hash ] a { 'key' => value } hash
+        def parse(_opts = {})
+          raise NotImplementedError
+        end
+
+        def ==(other)
+          path == other.path
+        end
+      end
+    end
+  end
+end

data/lib/opt_parse_validator/config_files_loader_merger/json.rb

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

data/lib/opt_parse_validator/config_files_loader_merger/yml.rb

@@ -0,0 +1,18 @@
+require 'yaml'
+
+module OptParseValidator
+  class ConfigFilesLoaderMerger < Array
+    module ConfigFile
+      # 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
+        #
+        # @return [ Hash ] a { 'key' => value } hash
+        def parse(opts = {})
+          YAML.safe_load(File.read(path), *opts[:yaml_arguments]) || {}
+        end
+      end
+    end
+  end
+end

data/lib/opt_parse_validator/config_files_loader_merger.rb

@@ -0,0 +1,44 @@
+require_relative 'config_files_loader_merger/base'
+require_relative 'config_files_loader_merger/json'
+require_relative 'config_files_loader_merger/yml'
+
+module OptParseValidator
+  # Options Files container
+  class ConfigFilesLoaderMerger < Array
+    # @return [ Array<String> ] The downcased supported extensions list
+    def self.supported_extensions
+      extensions = ConfigFile.constants.select do |const|
+        name = ConfigFile.const_get(const)
+        name.is_a?(Class) && name != ConfigFile::Base
+      end
+
+      extensions.map { |sym| sym.to_s.downcase }
+    end
+
+    # @param [ String ] file_path
+    #
+    # @return [ Self ]
+    def <<(file_path)
+      return self unless File.exist?(file_path)
+
+      ext = File.extname(file_path).delete('.')
+
+      raise Error, "The option file's extension '#{ext}' is not supported" unless self.class.supported_extensions.include?(ext)
+
+      super(ConfigFile.const_get(ext.upcase).new(file_path))
+    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 = {})
+      result = {}
+
+      each { |option_file| result.deep_merge!(option_file.parse(opts)) }
+
+      opts[:symbolize_keys] ? result.deep_symbolize_keys : result
+    end
+  end
+end

data/lib/opt_parse_validator/version.rb

@@ -1,4 +1,4 @@
 # Gem Version
 module OptParseValidator
-  VERSION = '0.0.16.6'.freeze
+  VERSION = '0.0.17.0'.freeze
 end

data/lib/opt_parse_validator.rb

@@ -10,7 +10,7 @@ require 'opt_parse_validator/errors'
 require 'opt_parse_validator/hacks'
 require 'opt_parse_validator/opts'
 require 'opt_parse_validator/version'
-require 'opt_parse_validator/options_files'
+require 'opt_parse_validator/config_files_loader_merger' # Could even create a gem out of it, as completely independent
 
 # Gem namespace
 module OptParseValidator
@@ -26,9 +26,9 @@ module OptParseValidator
       super(banner, width, indent)
     end
 
-    # @return [ OptParseValidator::OptionsFiles ]
+    # @return [ OptParseValidator::ConfigFilesLoaderMerger ]
     def options_files
-      @options_files ||= OptionsFiles.new
+      @options_files ||= ConfigFilesLoaderMerger.new
     end
 
     # @param [ Array<OptBase> ] options
@@ -123,7 +123,7 @@ module OptParseValidator
 
     # @return [ Void ]
     def load_options_files
-      files_data = options_files.parse(true)
+      files_data = options_files.parse(symbolize_keys: true)
 
       @opts.each do |opt|
         next unless files_data.key?(opt.to_sym)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opt_parse_validator
 version: !ruby/object:Gem::Version
-  version: 0.0.16.6
+  version: 0.0.17.0
 platform: ruby
 authors:
 - WPScanTeam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-11 00:00:00.000000000 Z
+date: 2019-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -34,16 +34,22 @@ dependencies:
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.5'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.5'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -120,14 +126,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.62.0
+        version: 0.65.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.62.0
+        version: 0.65.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -153,12 +159,12 @@ files:
 - LICENSE
 - README.md
 - lib/opt_parse_validator.rb
+- lib/opt_parse_validator/config_files_loader_merger.rb
+- lib/opt_parse_validator/config_files_loader_merger/base.rb
+- lib/opt_parse_validator/config_files_loader_merger/json.rb
+- lib/opt_parse_validator/config_files_loader_merger/yml.rb
 - lib/opt_parse_validator/errors.rb
 - lib/opt_parse_validator/hacks.rb
-- lib/opt_parse_validator/options_file/base.rb
-- lib/opt_parse_validator/options_file/json.rb
-- lib/opt_parse_validator/options_file/yml.rb
-- lib/opt_parse_validator/options_files.rb
 - lib/opt_parse_validator/opts.rb
 - lib/opt_parse_validator/opts/alias.rb
 - lib/opt_parse_validator/opts/array.rb
@@ -201,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Ruby OptionParser Validators

data/lib/opt_parse_validator/options_file/base.rb

@@ -1,22 +0,0 @@
-module OptParseValidator
-  module OptionsFile
-    # Base class, #parse should be implemented in child classes
-    class Base
-      attr_reader :path
-
-      # @param [ String ] path The file path of the option file
-      def initialize(path)
-        @path = path
-      end
-
-      # @return [ Hash ] a { key: value } hash
-      def parse
-        raise NotImplementedError
-      end
-
-      def ==(other)
-        path == other.path
-      end
-    end
-  end
-end

data/lib/opt_parse_validator/options_file/json.rb

@@ -1,13 +0,0 @@
-require 'json'
-
-module OptParseValidator
-  module OptionsFile
-    # Json Implementation
-    class JSON < Base
-      # @return [ Hash ] a { 'key' => value } hash
-      def parse
-        ::JSON.parse(File.read(path))
-      end
-    end
-  end
-end

data/lib/opt_parse_validator/options_file/yml.rb

@@ -1,13 +0,0 @@
-require 'yaml'
-
-module OptParseValidator
-  module OptionsFile
-    # Yaml Implementation
-    class YML < Base
-      # @return [ Hash ] a { 'key' => value } hash
-      def parse
-        YAML.safe_load(File.read(path)) || {}
-      end
-    end
-  end
-end

data/lib/opt_parse_validator/options_files.rb

@@ -1,42 +0,0 @@
-require 'opt_parse_validator/options_file/base'
-require 'opt_parse_validator/options_file/json'
-require 'opt_parse_validator/options_file/yml'
-
-module OptParseValidator
-  # Options Files container
-  class OptionsFiles < Array
-    # @return [ Array<String> ] The downcased supported extensions list
-    def supported_extensions
-      extensions = OptionsFile.constants.select do |const|
-        name = OptionsFile.const_get(const)
-        name.is_a?(Class) && name != OptionsFile::Base
-      end
-
-      extensions.map { |sym| sym.to_s.downcase }
-    end
-
-    # @param [ String ] file_path
-    #
-    # @return [ Self ]
-    def <<(file_path)
-      return self unless File.exist?(file_path)
-
-      ext = File.extname(file_path).delete('.')
-
-      raise Error, "The option file's extension '#{ext}' is not supported" unless supported_extensions.include?(ext)
-
-      super(OptionsFile.const_get(ext.upcase).new(file_path))
-    end
-
-    # @params [ Boolean ] symbolize_keys Whether or not to symbolize keys in the returned hash
-    #
-    # @return [ Hash ]
-    def parse(symbolize_keys = false)
-      result = {}
-
-      each { |option_file| result.deep_merge!(option_file.parse) }
-
-      symbolize_keys ? result.deep_symbolize_keys : result
-    end
-  end
-end