opt_parse_validator 0.0.13.11 → 0.0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a90744747bab0639f4bcbb7f50f7303f1d1bd06
-  data.tar.gz: 968a77bee71151631058bf5028a22dfe984a06ec
+  metadata.gz: 9a34dacc55d16b62f89bd6f1d2abda599a3876b3
+  data.tar.gz: c23a8feb575ecfead935c4e163dcd95d8ce27d3d
 SHA512:
-  metadata.gz: 71e52af14ca0a516aa77163ba216ac1491a321b0c5e3d076f76669a564b77e88afad004efb0d08193d8c9d4734ce06a7ff683c8f179883222cf64e5a502b6977
-  data.tar.gz: ce2da38c2d6b20869a702d91b7aecc6783baaca9b5951444852b1a0bdcd090717c0a8d372bf35dc4f32fe3e2cbb1afbd6c799bf58eb091cfc73d77d3dafd60d4
+  metadata.gz: 357e580715074b73a6cc639f2f32e1fa52ee9ce116ce82181350c0d08457f76846e1dce9a0d3a567fa4788a2c2730f588050e673b61f43d21e0279d717721161
+  data.tar.gz: 849d98dd225c8a6e17378f8e59ba6f75f9a665e06968636f089747069eda70d2b71e9a7464fd03f3dd7c9cfab4b6d35f6a56d3a6f8585163506c4058db44b186

data/lib/opt_parse_validator/options_file/base.rb

@@ -11,7 +11,7 @@ module OptParseValidator
 
       # @return [ Hash ] a { key: value } hash
       def parse
-        fail NotImplementedError
+        raise NotImplementedError
       end
 
       def ==(other)

data/lib/opt_parse_validator/options_file/yml.rb

@@ -6,7 +6,7 @@ module OptParseValidator
     class YML < Base
       # @return [ Hash ] a { 'key' => value } hash
       def parse
-        YAML.load_file(path) || {}
+        YAML.safe_load(File.read(path)) || {}
       end
     end
   end

data/lib/opt_parse_validator/options_files.rb

@@ -23,7 +23,7 @@ module OptParseValidator
 
       ext = File.extname(file_path).delete('.')
 
-      fail Error, "The option file's extension '#{ext}' is not supported" unless supported_extensions.include?(ext)
+      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

data/lib/opt_parse_validator/opts/base.rb

@@ -58,7 +58,7 @@ module OptParseValidator
     # @param [ String ] value
     def validate(value)
       if value.nil? || value.to_s.empty?
-        fail Error, 'Empty option value supplied' if value_if_empty.nil?
+        raise Error, 'Empty option value supplied' if value_if_empty.nil?
         return value_if_empty
       end
       value
@@ -88,7 +88,7 @@ module OptParseValidator
       unless @symbol
         long_option = to_long
 
-        fail Error, "Could not find option symbol for #{option}" unless long_option
+        raise Error, "Could not find option symbol for #{option}" unless long_option
 
         @symbol = long_option.gsub(/^--/, '').tr('-', '_').to_sym
       end

data/lib/opt_parse_validator/opts/boolean.rb

@@ -11,7 +11,7 @@ module OptParseValidator
       return true if value.match(TRUE_PATTERN)
       return false if value.match(FALSE_PATTERN)
 
-      fail Error, 'Invalid boolean value, expected true|t|yes|y|1|false|f|no|n|0'
+      raise Error, 'Invalid boolean value, expected true|t|yes|y|1|false|f|no|n|0'
     end
   end
 end

data/lib/opt_parse_validator/opts/choice.rb

@@ -6,8 +6,8 @@ module OptParseValidator
     #   :choices [ Array ] The available choices (mandatory)
     #   :case_sensitive [ Boolean ] Default: false
     def initialize(option, attrs = {})
-      fail Error, 'The :choices attribute is mandatory' unless attrs.key?(:choices)
-      fail Error, 'The :choices attribute must be an array' unless attrs[:choices].is_a?(Array)
+      raise Error, 'The :choices attribute is mandatory' unless attrs.key?(:choices)
+      raise Error, 'The :choices attribute must be an array' unless attrs[:choices].is_a?(Array)
 
       super(option, attrs)
     end
@@ -31,7 +31,7 @@ module OptParseValidator
       end
 
       unless choices.include?(value)
-        fail Error, "'#{value}' is not a valid choice, expected one " \
+        raise Error, "'#{value}' is not a valid choice, expected one " \
           "of the followings: #{choices.join(',')}"
       end
 

data/lib/opt_parse_validator/opts/credentials.rb

@@ -4,7 +4,7 @@ module OptParseValidator
     # @return [ Hash ] A hash containing the :username and :password
     def validate(value)
       unless value.index(':')
-        fail Error, 'Incorrect credentials format, username:password expected'
+        raise Error, 'Incorrect credentials format, username:password expected'
       end
       creds = value.split(':', 2)
 

data/lib/opt_parse_validator/opts/file_path.rb

@@ -26,7 +26,7 @@ module OptParseValidator
     def check_extensions(path)
       return if [*attrs[:extensions]].include?(path.extname.delete('.'))
 
-      fail Error, "The extension of '#{path}' is not allowed"
+      raise Error, "The extension of '#{path}' is not allowed"
     end
   end
 end

data/lib/opt_parse_validator/opts/headers.rb

@@ -18,7 +18,7 @@ module OptParseValidator
       headers = {}
 
       values.each do |header|
-        fail Error, "Malformed header: '#{header}'" unless header.index(':')
+        raise Error, "Malformed header: '#{header}'" unless header.index(':')
 
         val = header.split(':', 2)
 

data/lib/opt_parse_validator/opts/integer.rb

@@ -5,7 +5,7 @@ module OptParseValidator
     #
     # @return [ Integer ]
     def validate(value)
-      fail Error, "#{value} is not an integer" if value.to_i.to_s != value
+      raise Error, "#{value} is not an integer" if value.to_i.to_s != value
       value.to_i
     end
   end

data/lib/opt_parse_validator/opts/integer_range.rb

@@ -14,12 +14,12 @@ module OptParseValidator
     def validate(value)
       a = super(value).split(separator)
 
-      fail Error, "Incorrect number of ranges found: #{a.size}, should be 2" unless a.size == 2
+      raise Error, "Incorrect number of ranges found: #{a.size}, should be 2" unless a.size == 2
 
       first_integer = a.first.to_i
       last_integer  = a.last.to_i
 
-      fail Error, 'Argument is not a valid integer range' unless first_integer.to_s == a.first && last_integer.to_s == a.last
+      raise Error, 'Argument is not a valid integer range' unless first_integer.to_s == a.first && last_integer.to_s == a.last
 
       (first_integer..last_integer)
     end

data/lib/opt_parse_validator/opts/multi_choices.rb

@@ -7,8 +7,8 @@ module OptParseValidator
     # @option attrs [ Array<Array> ] :incompatible
     # @options attrs [ String ] :separator See OptArray#new
     def initialize(option, attrs = {})
-      fail Error, 'The :choices attribute is mandatory' unless attrs.key?(:choices)
-      fail Error, 'The :choices attribute must be a hash' unless attrs[:choices].is_a?(Hash)
+      raise Error, 'The :choices attribute is mandatory' unless attrs.key?(:choices)
+      raise Error, 'The :choices attribute must be a hash' unless attrs[:choices].is_a?(Hash)
 
       super(option, attrs)
     end
@@ -82,7 +82,7 @@ module OptParseValidator
         return [opt, Regexp.last_match[1]]
       end
 
-      fail Error, "Unknown choice: #{item}"
+      raise Error, "Unknown choice: #{item}"
     end
 
     # @return [ Array<Array<Symbol>> ]
@@ -102,7 +102,7 @@ module OptParseValidator
 
           next unless values.key?(sym)
 
-          fail Error, "Incompatible choices detected: #{last_match}, #{key}" unless last_match.empty?
+          raise Error, "Incompatible choices detected: #{last_match}, #{key}" unless last_match.empty?
 
           last_match = key
         end

data/lib/opt_parse_validator/opts/path.rb

@@ -37,22 +37,22 @@ module OptParseValidator
 
     # @param [ Pathname ] path
     def check_file(path)
-      fail Error, "'#{path}' is not a file" unless path.file? || attrs[:exists] == false
+      raise Error, "'#{path}' is not a file" unless path.file? || attrs[:exists] == false
     end
 
     # @param [ Pathname ] path
     def check_directory(path)
-      fail Error, "'#{path}' is not a directory" unless path.directory? || attrs[:exists] == false
+      raise Error, "'#{path}' is not a directory" unless path.directory? || attrs[:exists] == false
     end
 
     # @param [ Pathname ] path
     def check_executable(path)
-      fail Error, "'#{path}' is not executable" unless path.executable?
+      raise Error, "'#{path}' is not executable" unless path.executable?
     end
 
     # @param [ Pathname ] path
     def check_readable(path)
-      fail Error, "'#{path}' is not readable" unless path.readable?
+      raise Error, "'#{path}' is not readable" unless path.readable?
     end
 
     # If the path does not exist, it will check for the parent
@@ -60,7 +60,7 @@ module OptParseValidator
     #
     # @param [ Pathname ] path
     def check_writable(path)
-      fail Error, "'#{path}' is not writable" if path.exist? && !path.writable? || !path.parent.writable?
+      raise Error, "'#{path}' is not writable" if path.exist? && !path.writable? || !path.parent.writable?
     end
   end
 end

data/lib/opt_parse_validator/opts/positive_integer.rb

@@ -6,7 +6,7 @@ module OptParseValidator
     # @return [ Integer ]
     def validate(value)
       i = super(value)
-      fail Error, "#{i} is not > 0" unless i > 0
+      raise Error, "#{i} is not > 0" unless i.positive?
       i
     end
   end

data/lib/opt_parse_validator/opts/uri.rb

@@ -32,7 +32,7 @@ module OptParseValidator
       unless allowed_protocols.empty? || allowed_protocols.include?(uri.scheme)
         # For future refs: will have to check if the uri.scheme exists,
         # otherwise it means that the value was empty
-        fail Addressable::URI::InvalidURIError
+        raise Addressable::URI::InvalidURIError
       end
 
       uri.to_s

data/lib/opt_parse_validator/version.rb

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

data/lib/opt_parse_validator.rb

@@ -61,8 +61,8 @@ module OptParseValidator
     #
     # @return [ void ]
     def check_option(opt)
-      fail Error, "The option is not an OptBase, #{opt.class} supplied" unless opt.is_a?(OptBase)
-      fail Error, "The option #{opt.to_sym} is already used !" if @symbols_used.include?(opt.to_sym)
+      raise Error, "The option is not an OptBase, #{opt.class} supplied" unless opt.is_a?(OptBase)
+      raise Error, "The option #{opt.to_sym} is already used !" if @symbols_used.include?(opt.to_sym)
     end
 
     # @return [ Hash ]
@@ -100,7 +100,7 @@ module OptParseValidator
     def post_processing
       @opts.each do |opt|
         if opt.required?
-          fail NoRequiredOption, "The option #{opt} is required" unless @results.key?(opt.to_sym)
+          raise NoRequiredOption, "The option #{opt} is required" unless @results.key?(opt.to_sym)
         end
 
         next if opt.required_unless.empty?
@@ -108,7 +108,7 @@ module OptParseValidator
 
         fail_msg = "One of the following options is required: #{opt}, #{opt.required_unless.join(', ')}"
 
-        fail NoRequiredOption, fail_msg unless opt.required_unless.any? do |sym|
+        raise NoRequiredOption, fail_msg unless opt.required_unless.any? do |sym|
           @results.key?(sym)
         end
       end

data/opt_parse_validator.gemspec

@@ -33,14 +33,14 @@ Gem::Specification.new do |s|
   s.executables           = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.require_paths         = ['lib']
 
-  s.add_dependency 'addressable', '~> 2.5.0'
   s.add_dependency 'activesupport', '~> 5.1.0'
+  s.add_dependency 'addressable', '~> 2.5.0'
 
+  s.add_development_dependency 'bundler',   '~> 1.6'
+  s.add_development_dependency 'coveralls', '~> 0.8.0'
   s.add_development_dependency 'rake', '~> 12.0'
   s.add_development_dependency 'rspec',     '~> 3.7.0'
   s.add_development_dependency 'rspec-its', '~> 1.2.0'
-  s.add_development_dependency 'bundler',   '~> 1.6'
-  s.add_development_dependency 'rubocop',   '~> 0.50.0'
+  s.add_development_dependency 'rubocop',   '~> 0.51.0'
   s.add_development_dependency 'simplecov', '~> 0.14.0' # Can't update to 0.15 as it breaks coveralls dep
-  s.add_development_dependency 'coveralls', '~> 0.8.0'
 end

metadata

@@ -1,141 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: opt_parse_validator
 version: !ruby/object:Gem::Version
-  version: 0.0.13.11
+  version: 0.0.14.0
 platform: ruby
 authors:
 - WPScanTeam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-28 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.51.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.51.0
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.14.0
 description: Implementation of validators for the ruby OptionParser lib. Mainly used
   in the CMSScanner gem to define the cli options available
 email: