opt_parse_validator 0.0.13 → 0.0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07e2cf108f44ced6d598e64cc670a884ce7f07d3
-  data.tar.gz: 2df6f9b8762e49d5fc9ab23a43e1225e956cb9e3
+  metadata.gz: e5a2531d386b9187b5ca2c26cd56888d10aa4b99
+  data.tar.gz: 3cc67811d22d44505c9ef4028142f30ed4231f68
 SHA512:
-  metadata.gz: b272dba6c7e5cb56104d2fb361d76b9d792369707dcff1e53b9f21672a47c72664a5723a3e7c4fb602159608f59cddf718a7209081e17e5336b4a542c450d9db
-  data.tar.gz: 0210003389f1f445f1613c35a71565dc212e82a007661dc9b2e3c5e9e041f55a42eebbe204d39694eb9d25f8ab0855775226c94e50880fb1fb03aa4486d0a560
+  metadata.gz: ed3fbe7b90c8cd35f4c185b3cd1883adbde479d78eb7c98a7d6da5e2bb4283add0c3154abb30eb975692ee320e7f6160fc01f4a182751eaaf93bce8ef0d111ab
+  data.tar.gz: 423bbd205f6db1a201d224ce9723e2adc507335d293471fe0c94f5d88ce50cefb45623d687bf6174189fa8ce5367e5d0b94360b77b9a3d00c8c9cd15b5b21b8a

data/README.md

@@ -31,6 +31,7 @@ OptParseValidator
 - MultiChoices
   - choices (mandatory)
   - separator (default: ',')
+  - value_if_empty
   - incompatible
 - Positive Integer
 - Path

data/lib/opt_parse_validator/hacks.rb

@@ -4,7 +4,7 @@ class OptionParser
   # See https://github.com/wpscanteam/CMSScanner/issues/2
   module Completion
     class << self
-      alias_method :original_candidate, :candidate
+      alias original_candidate candidate
 
       def candidate(key, icase = false, pat = nil, &block)
         # Maybe also do this for -v/--version ?

data/lib/opt_parse_validator/options_file/json.rb

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

data/lib/opt_parse_validator/options_file/yml.rb

@@ -4,9 +4,9 @@ module OptParseValidator
   module OptionsFile
     # Yaml Implementation
     class YML < Base
-      # @return [ Hash ] a { key: value } hash
+      # @return [ Hash ] a { 'key' => value } hash
       def parse
-        Hash[YAML.load_file(path).map { |k, v| [k.to_sym, v] }]
+        YAML.load_file(path) || {}
       end
     end
   end

data/lib/opt_parse_validator/options_files.rb

@@ -32,12 +32,11 @@ module OptParseValidator
     def parse
       files_data = {}
 
-      each do |option_file|
-        data = option_file.parse
-        files_data.merge!(data) if data
-      end
+      each { |option_file| files_data.merge!(option_file.parse) }
 
-      files_data
+      # Convert string-full keys to symbol ones
+      # No need to go deeper than the first level as it's the max depth
+      Hash[files_data.map { |k, v| [k.to_sym, v] }]
     end
   end
 end

data/lib/opt_parse_validator/opts/base.rb

@@ -85,7 +85,7 @@ module OptParseValidator
 
         fail Error, "Could not find option symbol for #{option}" unless long_option
 
-        @symbol = long_option.gsub(/^--/, '').gsub(/-/, '_').to_sym
+        @symbol = long_option.gsub(/^--/, '').tr('-', '_').to_sym
       end
       @symbol
     end
@@ -95,7 +95,7 @@ module OptParseValidator
       option.each do |option_attr|
         if option_attr =~ /^--/
           return option_attr.gsub(/ .*$/, '')
-            .gsub(/\[[^\]]+\]/, '')
+                            .gsub(/\[[^\]]+\]/, '')
         end
       end
       nil

data/lib/opt_parse_validator/opts/boolean.rb

@@ -8,13 +8,10 @@ module OptParseValidator
     def validate(value)
       value = value.to_s
 
-      if value.match(TRUE_PATTERN)
-        return true
-      elsif value.match(FALSE_PATTERN)
-        return false
-      else
-        fail Error, 'Invalid boolean value, expected true|t|yes|y|1|false|f|no|n|0'
-      end
+      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'
     end
   end
 end

data/lib/opt_parse_validator/opts/multi_choices.rb

@@ -21,7 +21,7 @@ module OptParseValidator
       option << "Multiple choices can be supplied, use the '#{separator}' char as a separator"
       option << "If no choice is supplied, '#{value_if_empty}' will be used" if value_if_empty
 
-      append_incomptable_help_messages
+      append_incompatible_help_messages
     end
 
     def append_choices_help_messages
@@ -32,7 +32,7 @@ module OptParseValidator
         other_lines_prefix = ' ' * first_line_prefix.size
 
         opt_help_messages(opt).each_with_index do |message, index|
-          option << "#{index == 0 ? first_line_prefix : other_lines_prefix} #{message}"
+          option << "#{index.zero? ? first_line_prefix : other_lines_prefix} #{message}"
         end
       end
     end
@@ -44,7 +44,7 @@ module OptParseValidator
       opt.help_messages.empty? ? [opt.to_s.humanize] : opt.help_messages
     end
 
-    def append_incomptable_help_messages
+    def append_incompatible_help_messages
       return if incompatible.empty?
 
       option << 'Incompatible choices (only one of each group/s can be used):'
@@ -78,7 +78,7 @@ module OptParseValidator
     # @return [ Array ]
     def value_from_pattern(item)
       choices.each do |key, opt|
-        next unless item.match(/\A#{key.to_s}(.*)\z/)
+        next unless item =~ /\A#{key.to_s}(.*)\z/
 
         return [opt, Regexp.last_match[1]]
       end

data/lib/opt_parse_validator/opts/path.rb

@@ -20,7 +20,7 @@ module OptParseValidator
       path = Pathname.new(value)
       allowed_attrs.each do |key|
         method = "check_#{key}"
-        send(method, path) if self.respond_to?(method) && attrs[key]
+        send(method, path) if respond_to?(method) && attrs[key]
       end
 
       path.to_s

data/lib/opt_parse_validator/version.rb

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

data/lib/opt_parse_validator.rb

@@ -68,7 +68,7 @@ module OptParseValidator
     # @return [ Hash ]
     def results(argv = default_argv)
       load_options_files
-      self.parse!(argv)
+      parse!(argv)
       post_processing
 
       @results
@@ -84,7 +84,7 @@ 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]))
+        @results[opt.to_sym] = opt.normalize(opt.validate(files_data[opt.to_sym].to_s))
       end
     end
 

data/opt_parse_validator.gemspec

@@ -32,13 +32,13 @@ 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.3'
-  s.add_dependency 'activesupport', '~> 4.2'
+  s.add_dependency 'addressable', '~> 2.4.0'
+  s.add_dependency 'activesupport', '~> 5.0.0.0'
 
-  s.add_development_dependency 'rake', '~> 10.4'
-  s.add_development_dependency 'rspec',     '~> 3.3'
-  s.add_development_dependency 'rspec-its', '~> 1.2'
+  s.add_development_dependency 'rake', '~> 11.3.0'
+  s.add_development_dependency 'rspec',     '~> 3.5.0'
+  s.add_development_dependency 'rspec-its', '~> 1.2.0'
   s.add_development_dependency 'bundler',   '~> 1.6'
-  s.add_development_dependency 'rubocop',   '~> 0.32'
-  s.add_development_dependency 'simplecov', '~> 0.10'
+  s.add_development_dependency 'rubocop',   '~> 0.43.0'
+  s.add_development_dependency 'simplecov', '~> 0.12.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opt_parse_validator
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.13.2
 platform: ruby
 authors:
 - WPScanTeam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2016-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.0.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.0.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: 11.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: 11.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.32'
+        version: 0.43.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.32'
+        version: 0.43.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.12.0
 description: Implementation of validators for the ruby OptionParser lib. Mainly used
   in the CMSScanner gem to define the cli options available
 email:
@@ -185,4 +185,3 @@ signing_key:
 specification_version: 4
 summary: Ruby OptionParser Validators
 test_files: []
-has_rdoc: