opt_parse_validator 1.8.0 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e37a9c3438b53cfe9453653062ef294af7b37c99acfe77937bd9ee1d8bebaca8
-  data.tar.gz: 1defdfeb5e06c3f37742fb54f19d38f3f0399d8564fcc2ffbe965ca476ab8bc5
+  metadata.gz: c43f0910f92116c9ca579acf742f97a5332dbc3cdca9e1eb03b849d639fbece8
+  data.tar.gz: '09e75a1d637a901c41c31061e38c1fb98d62e0032f8acab291e123a1e140f426'
 SHA512:
-  metadata.gz: 7b6297d0b83ca482b02796dea0830b569adc28bdf226822091bd74649712ca08494347cf18fc1ec4f07126eb0819723858418be1d37c7e00b046860f644a9c8b
-  data.tar.gz: 61a03033ff7bf52add8ea3886936e79ae188149c9b01dbe24f75706f30a4d577bcc0a61f0e02830be13272c4c35bca09dfe743f5dded863627696353717acebe
+  metadata.gz: '019c6bd0baa66f1b60fdd11a21151aa0caa2cbb09f10e5dc1811d7e0d59d953f75bc17feca7ffef543a6bf933a8234a21c076576d3ac050404ac4ee58fef1203'
+  data.tar.gz: 5bf3da88e65c5ffece6b31e41d527186aba8de7596d288a9093ec0e41a07d4832052bd534469b259bbc1e9d9d231e790ef333692e13a18add70b54be0c3a19d6

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://travis-ci.org/wpscanteam/OptParseValidator.svg?branch=master)](https://travis-ci.org/wpscanteam/OptParseValidator)
+![Build](https://github.com/wpscanteam/OptParseValidator/workflows/Build/badge.svg)
 [![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.rb

@@ -108,18 +108,16 @@ module OptParseValidator
     # @return [ void ]
     def register_callback(opt)
       on(*opt.option) do |arg|
-        begin
-          if opt.alias?
-            parse!(opt.alias_for.split(' '))
-          else
-            @results[opt.to_sym] = opt.normalize(opt.validate(arg))
-          end
-        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}"
+        if opt.alias?
+          parse!(opt.alias_for.split(' '))
+        else
+          @results[opt.to_sym] = opt.normalize(opt.validate(arg))
         end
+      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
 
@@ -147,11 +145,11 @@ 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} 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}, --#{opt.required_unless.join(', --')}"
 
         raise NoRequiredOption, fail_msg unless opt.required_unless.any? do |sym|
           @results.key?(sym)

data/lib/opt_parse_validator/hacks.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class OptionParser
-  # Hack to suppress the completion (expect for the -h/--help) which was leading to
+  # Hack to suppress the completion (except for the -h/--help) which was leading to
   # unwanted behaviours
   # See https://github.com/wpscanteam/CMSScanner/issues/2
   module Completion

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)
@@ -107,7 +107,7 @@ module OptParseValidator
 
         raise Error, "Could not find option symbol for #{option}" unless long_option
 
-        @symbol = long_option.gsub(/^--/, '').tr('-', '_').to_sym
+        @symbol = long_option.delete_prefix('--').tr('-', '_').to_sym
       end
       @symbol
     end
@@ -115,7 +115,7 @@ module OptParseValidator
     # @return [ String ] The raw long option (e.g: --proxy)
     def to_long
       option.each do |option_attr|
-        if /^--/.match?(option_attr)
+        if option_attr.start_with?('--')
           return option_attr.gsub(/ .*$/, '')
                             .gsub(/\[[^\]]+\]/, '')
         end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opt_parse_validator
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.2
 platform: ruby
 authors:
 - WPScanTeam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-11 00:00:00.000000000 Z
+date: 2020-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: 6.1.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: 6.1.0
@@ -65,103 +65,103 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 0.88.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 0.88.0
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 0.18.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 0.18.2
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: simplecov-lcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.8.0
 description: Implementation of validators for the ruby OptionParser lib. Mainly used
   in the CMSScanner gem to define the cli options available
 email:
@@ -213,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="