opt_parse_validator 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e79a03f62b4755570f5b2639381b31b9900c92f4
-  data.tar.gz: 2f35d0102777f6ba8d069d01a52850ee7e8d2209
+  metadata.gz: b9f84ae1d23fed8ad36be7b431234657f5c9cbc3
+  data.tar.gz: b813aa3f972db1171b96ac7442d7aa14597296b5
 SHA512:
-  metadata.gz: e8e2380fe532f69f49df35aa7f38112118a47f97fc70304eb32b2c0a668f002317c6444afde1dd9f0f0a15def4a3e888468093a4fea86515e7082e051ae2ac0a
-  data.tar.gz: bfbd27858ac145c2e80979639e5356fefb53ae4f989ee23a30f4316315effa653f096bb99bc4997b97d899df17f0df7b2bd542dcc40389ff10ec2ecf2f6279c9
+  metadata.gz: e92ff979aa85b9020e5044512451d4d291a548f49e69d6aa51d1487444609cd25fabe346ef111912532aa88b8a775f90bc2e276dc6f2f74c31ca12f23e06b6d6
+  data.tar.gz: 07f1cb36452e4f4ed87c3263744afa32185f0bd8f05c03312eccca0deb6698c2ba1cdb30033d2f16a4331e688e21a58f5c0217e6bf228b4a56df569cc9e580cb

data/README.md

@@ -43,6 +43,8 @@ OptParseValidator
 - Proxy
   - :protocols
   - :default_protocol
+- Regexp:
+  - :options (See http://ruby-doc.org/core-2.2.1/Regexp.html#method-c-new)
 - String
 - URI
   - :protocols

data/lib/opt_parse_validator/opts/regexp.rb

@@ -0,0 +1,12 @@
+module OptParseValidator
+  # Implementation of the Regexp Option
+  # See http://ruby-doc.org/core-2.2.1/Regexp.html#method-c-new for expected values in :options
+  class OptRegexp < OptBase
+    # @param [ String ] value
+    #
+    # @return [ Regexp ]
+    def validate(value)
+      Regexp.new(super(value), attrs[:options])
+    end
+  end
+end

data/lib/opt_parse_validator/opts.rb

@@ -1,6 +1,6 @@
 %w(
   base string integer positive_integer choice boolean uri url proxy credentials
-  path file_path directory_path array integer_range multi_choices
+  path file_path directory_path array integer_range multi_choices regexp
 ).each do |opt|
   require 'opt_parse_validator/opts/' + opt
 end

data/lib/opt_parse_validator/version.rb

@@ -1,4 +1,4 @@
 # Gem Version
 module OptParseValidator
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

data/lib/opt_parse_validator.rb

@@ -37,7 +37,7 @@ module OptParseValidator
       fail "The option is not an OptBase, #{opt.class} supplied" unless opt.is_a?(OptBase)
       fail "The option #{opt.to_sym} is already used !" if @symbols_used.include?(opt.to_sym)
 
-      @opts         << opt
+      @opts << opt
       @symbols_used << opt.to_sym
       # Set the default option value if it exists
       @results[opt.to_sym] = opt.default unless opt.default.nil?

data/opt_parse_validator.gemspec

@@ -16,9 +16,19 @@ Gem::Specification.new do |s|
   s.homepage              = 'https://github.com/wpscanteam/OptParseValidator'
   s.license               = 'MIT'
 
-  s.files                 = `git ls-files -z`.split("\x0")
-  s.executables           = s.files.grep(/^bin\//) { |f| File.basename(f) }
-  s.test_files            = s.files.grep(/^(test|spec|features)\//)
+  s.files                 = `git ls-files -z`.split("\x0").reject do |file|
+    file =~ %r{^(?:
+      spec\/.*
+      |Gemfile
+      |Rakefile
+      |\.rspec
+      |\.gitignore
+      |\.rubocop.yml
+      |\.travis.yml
+    )$}x
+  end
+  s.test_files            = []
+  s.executables           = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.require_paths         = ['lib']
 
   s.add_dependency 'addressable', '~> 2.3'
@@ -27,6 +37,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec',     '~> 3.2'
   s.add_development_dependency 'rspec-its', '~> 1.1'
   s.add_development_dependency 'bundler',   '~> 1.6'
-  s.add_development_dependency 'rubocop',   '~> 0.29'
+  s.add_development_dependency 'rubocop',   '~> 0.30'
   s.add_development_dependency 'simplecov', '~> 0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opt_parse_validator
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - WPScanTeam - Erwan le Rousseau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0.30'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0.30'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -115,15 +115,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
 - ".simplecov"
-- ".travis.yml"
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - lib/opt_parse_validator.rb
 - lib/opt_parse_validator/hacks.rb
 - lib/opt_parse_validator/options_file.rb
@@ -141,36 +135,12 @@ files:
 - lib/opt_parse_validator/opts/path.rb
 - lib/opt_parse_validator/opts/positive_integer.rb
 - lib/opt_parse_validator/opts/proxy.rb
+- lib/opt_parse_validator/opts/regexp.rb
 - lib/opt_parse_validator/opts/string.rb
 - lib/opt_parse_validator/opts/uri.rb
 - lib/opt_parse_validator/opts/url.rb
 - lib/opt_parse_validator/version.rb
 - opt_parse_validator.gemspec
-- spec/fixtures/options_file/default.json
-- spec/fixtures/options_file/malformed.json
-- spec/fixtures/options_file/override.yml
-- spec/fixtures/options_file/unsupported.ext
-- spec/fixtures/r.txt
-- spec/fixtures/rwx.txt
-- spec/lib/opt_parse_validator/options_file_spec.rb
-- spec/lib/opt_parse_validator/opts/array_spec.rb
-- spec/lib/opt_parse_validator/opts/base_spec.rb
-- spec/lib/opt_parse_validator/opts/boolean_spec.rb
-- spec/lib/opt_parse_validator/opts/choice_spec.rb
-- spec/lib/opt_parse_validator/opts/credentials_spec.rb
-- spec/lib/opt_parse_validator/opts/direcyory_path_spec.rb
-- spec/lib/opt_parse_validator/opts/file_path_spec.rb
-- spec/lib/opt_parse_validator/opts/integer_range_spec.rb
-- spec/lib/opt_parse_validator/opts/integer_spec.rb
-- spec/lib/opt_parse_validator/opts/multi_choices_spec.rb
-- spec/lib/opt_parse_validator/opts/path_spec.rb
-- spec/lib/opt_parse_validator/opts/positive_integer_spec.rb
-- spec/lib/opt_parse_validator/opts/proxy_spec.rb
-- spec/lib/opt_parse_validator/opts/uri_spec.rb
-- spec/lib/opt_parse_validator/opts/url_spec.rb
-- spec/lib/opt_parse_validator/version_spec.rb
-- spec/lib/opt_parse_validator_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/wpscanteam/OptParseValidator
 licenses:
 - MIT
@@ -191,33 +161,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Testing Gem
-test_files:
-- spec/fixtures/options_file/default.json
-- spec/fixtures/options_file/malformed.json
-- spec/fixtures/options_file/override.yml
-- spec/fixtures/options_file/unsupported.ext
-- spec/fixtures/r.txt
-- spec/fixtures/rwx.txt
-- spec/lib/opt_parse_validator/options_file_spec.rb
-- spec/lib/opt_parse_validator/opts/array_spec.rb
-- spec/lib/opt_parse_validator/opts/base_spec.rb
-- spec/lib/opt_parse_validator/opts/boolean_spec.rb
-- spec/lib/opt_parse_validator/opts/choice_spec.rb
-- spec/lib/opt_parse_validator/opts/credentials_spec.rb
-- spec/lib/opt_parse_validator/opts/direcyory_path_spec.rb
-- spec/lib/opt_parse_validator/opts/file_path_spec.rb
-- spec/lib/opt_parse_validator/opts/integer_range_spec.rb
-- spec/lib/opt_parse_validator/opts/integer_spec.rb
-- spec/lib/opt_parse_validator/opts/multi_choices_spec.rb
-- spec/lib/opt_parse_validator/opts/path_spec.rb
-- spec/lib/opt_parse_validator/opts/positive_integer_spec.rb
-- spec/lib/opt_parse_validator/opts/proxy_spec.rb
-- spec/lib/opt_parse_validator/opts/uri_spec.rb
-- spec/lib/opt_parse_validator/opts/url_spec.rb
-- spec/lib/opt_parse_validator/version_spec.rb
-- spec/lib/opt_parse_validator_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/.gitignore

@@ -1,4 +0,0 @@
-coverage
-pkg
-Gemfile.lock
-*.gem

data/.rspec

@@ -1,2 +0,0 @@
---color
---fail-fast

data/.rubocop.yml

@@ -1,6 +0,0 @@
-LineLength:
-  Enabled: false
-MethodLength:
-  Max: 20
-Metrics/AbcSize:
-  Enabled: false

data/.travis.yml

@@ -1,19 +0,0 @@
-language: ruby
-rvm:
-  - 2.0.0
-  - 2.1.0
-  - 2.1.1
-  - 2.1.2
-  - 2.1.3
-  - 2.1.4
-  - 2.1.5
-  - 2.2.0
-  - ruby-head
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-before_script:
-  - chmod 0400 spec/fixtures/r.txt
-script:
-  - bundle exec rspec
-  - bundle exec rubocop

data/Gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-group :test do
-  gem 'coveralls', '~> 0.7', require: false
-end

data/Rakefile

@@ -1,9 +0,0 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-require 'rubocop/rake_task'
-
-RuboCop::RakeTask.new
-RSpec::Core::RakeTask.new(:spec)
-
-# Run rubocop & rspec before the build
-task build: [:rubocop, :spec]

data/spec/fixtures/options_file/default.json

@@ -1,4 +0,0 @@
-{
-  "verbose": true,
-  "override_me": "I should be overriden"
-}

data/spec/fixtures/options_file/malformed.json

@@ -1,4 +0,0 @@
-{
-  "verbose": true,
-  "":,
-}

data/spec/fixtures/options_file/override.yml

@@ -1 +0,0 @@
-override_me: "Yeaa"

data/spec/fixtures/options_file/unsupported.ext

@@ -1 +0,0 @@
-Unsupported file format

data/spec/fixtures/r.txt

@@ -1 +0,0 @@
-This file is a chmod 400

data/spec/fixtures/rwx.txt

@@ -1 +0,0 @@
-This file is a chmod 777

data/spec/lib/opt_parse_validator/options_file_spec.rb

@@ -1,48 +0,0 @@
-require 'spec_helper'
-
-describe OptParseValidator::OptParser do
-  subject(:parser)     { described_class.new }
-  let(:fixtures)       { File.join(FIXTURES, 'options_file') }
-  let(:default_file)   { File.join(fixtures, 'default.json') }
-  let(:override_file)  { File.join(fixtures, 'override.yml') }
-
-  describe '#load_options_files' do
-    context 'when error' do
-      before { parser.options_files << config_file }
-
-      context 'when the format is not supported' do
-        let(:config_file) { File.join(fixtures, 'unsupported.ext') }
-        let(:exception)   { "The format #{File.extname(config_file).delete('.')} is not supported" }
-
-        it 'raises an error' do
-          expect { parser.load_options_files }.to raise_error(exception)
-        end
-      end
-
-      context 'when file content is malformed' do
-        let(:config_file) { File.join(fixtures, 'malformed.json') }
-        let(:exception)   { "Parse Error, #{config_file} seems to be malformed" }
-
-        it 'raises an error' do
-          expect { parser.load_options_files }.to raise_error(exception)
-        end
-      end
-    end
-
-    context 'otherwise' do
-      let(:verbose_opt) { OptParseValidator::OptBoolean.new(%w(-v --verbose)) }
-      let(:override_opt) { OptParseValidator::OptString.new(['--override-me VALUE'], normalize: :to_sym) }
-
-      let(:opts) { [verbose_opt, override_opt] }
-
-      let(:expected) { { verbose: true, override_me: :Yeaa } }
-
-      it 'sets everything correctly and get the right results' do
-        parser.options_files << default_file << override_file
-        parser.add(*opts)
-
-        expect(parser.results([])).to eq expected
-      end
-    end
-  end
-end

data/spec/lib/opt_parse_validator/opts/array_spec.rb

@@ -1,74 +0,0 @@
-require 'spec_helper'
-
-describe OptParseValidator::OptArray do
-  subject(:opt) { described_class.new(['-a', '--array VALUES'], attrs) }
-  let(:attrs)   { {} }
-
-  describe '#validate' do
-    context 'when an empty or nil value is given' do
-      context 'when no value_if_empty attribute' do
-        it 'raises an error' do
-          [nil, ''].each do |value|
-            expect { opt.validate(value) }.to raise_error('Empty option value supplied')
-          end
-        end
-      end
-
-      context 'when value_if_empty attribute' do
-        let(:attrs) { super().merge(value_if_empty: 'a,b') }
-
-        it 'returns the expected array' do
-          [nil, ''].each do |value|
-            expect(opt.validate(value)).to eql %w(a b)
-          end
-        end
-      end
-    end
-
-    context 'when the separator is not supplied' do
-      context 'when not present in the argument' do
-        it 'returns an array with the correct value' do
-          expect(opt.validate('rspec')).to eql %w(rspec)
-        end
-      end
-
-      context 'when present' do
-        it 'returns the expected array' do
-          expect(opt.validate('r1,r2,r3')).to eql %w(r1 r2 r3)
-        end
-      end
-    end
-
-    context 'when separator supplied' do
-      subject(:opt) { described_class.new(['-a', '--array VALUES'], separator: '-') }
-
-      it 'returns an array with the correct value' do
-        expect(opt.validate('r1,r2,r3')).to eql %w(r1,r2,r3)
-      end
-
-      it 'returns the expected array' do
-        expect(opt.validate('r1-r2-r3')).to eql %w(r1 r2 r3)
-      end
-    end
-  end
-
-  describe '#normalize' do
-    after { expect(opt.normalize(@value)).to eql @expected }
-
-    context 'when no :normalize attribute' do
-      it 'returns the value' do
-        @value    = %w(t1 t2)
-        @expected = @value
-      end
-    end
-
-    context 'when a single normalization' do
-      let(:attrs) { { normalize: :to_sym } }
-
-      it 'returns the expected value' do
-        @value    = [1.0, 'test']
-        @expected = [1.0, :test]
-      end
-    end
-  end
-end

data/spec/lib/opt_parse_validator/opts/base_spec.rb

@@ -1,188 +0,0 @@
-require 'spec_helper'
-
-describe OptParseValidator::OptBase do
-  subject(:opt) { described_class.new(option, attrs) }
-  let(:option)  { %w(-v --verbose) }
-  let(:attrs)   { {} }
-
-  describe '#to_long' do
-    after { expect(described_class.new(@option).to_long).to eql @expected }
-
-    context 'when not found' do
-      it 'returns nil' do
-        @option = %w(-v)
-        @expected = nil
-      end
-    end
-
-    context 'when found' do
-      it 'returns the long name' do
-        @option = ['-v', '--[no-]verbose VALUE [OPT]', 'Verbose Mode']
-        @expected = '--verbose'
-      end
-    end
-  end
-
-  describe '#to_sym' do
-    after :each do
-      if @exception
-        expect { described_class.new(@option).to_sym }.to raise_error(@exception)
-      else
-        expect(described_class.new(@option).to_sym).to eql(@expected)
-      end
-    end
-
-    context 'without REQUIRED or OPTIONAL arguments' do
-      context 'with short option' do
-        it 'returns :test' do
-          @option   = %w(-t --test Testing)
-          @expected = :test
-        end
-
-        it 'returns :its_a_long_option' do
-          @option   = ['-l', '--its-a-long-option', "Testing '-' replacement"]
-          @expected = :its_a_long_option
-        end
-      end
-
-      context 'without short option' do
-        it 'returns :long' do
-          @option   = ['--long']
-          @expected = :long
-        end
-
-        it 'returns :long_option' do
-          @option   = ['--long-option', 'No short !']
-          @expected = :long_option
-        end
-      end
-
-      context 'without long option' do
-        it 'raises an error' do
-          @option    = ['-v', 'long option missing']
-          @exception = 'Could not find option symbol for ["-v", "long option missing"]'
-        end
-
-        it 'raises an error' do
-          @option    = ['long option missing']
-          @exception = 'Could not find option symbol for ["long option missing"]'
-        end
-      end
-
-      context 'with multiple long option names (like alias)' do
-        it 'returns the first long option found' do
-          @option   = %w(--check-long --cl)
-          @expected = :check_long
-        end
-      end
-    end
-
-    context 'when negative prefix name' do
-      it 'returns the positive option symbol' do
-        @option   = %w(-v --[no-]verbose)
-        @expected = :verbose
-      end
-    end
-
-    context 'with REQUIRED or OPTIONAL arguments' do
-      it 'should removed the OPTIONAL argument' do
-        @option   = ['-p', '--page [PAGE_NUMBER]']
-        @expected = :page
-      end
-
-      it 'should removed the REQUIRED argument' do
-        @option   = ['--url TARGET_URL']
-        @expected = :url
-      end
-    end
-  end
-
-  describe '#new, #required?' do
-    context 'when no :required' do
-      its(:option)    { should eq(option) }
-      its(:required?) { should be_falsey }
-      its(:to_sym)    { should eq(:verbose) }
-    end
-
-    context 'when :required' do
-      let(:attrs) { { required: true } }
-
-      its(:required?) { should be true }
-    end
-  end
-
-  describe '#normalize' do
-    after { expect(opt.normalize(@value)).to eql @expected }
-
-    context 'when no :normalize attribute' do
-      it 'returns the value' do
-        @value    = 'test'
-        @expected = @value
-      end
-    end
-
-    context 'when a single normalization' do
-      let(:attrs) { { normalize: :to_sym } }
-
-      context 'when the value does not have a to_sym method' do
-        it 'returns the value' do
-          @value    = 1.0
-          @expected = @value
-        end
-      end
-
-      context 'when a to_sym method' do
-        it 'returns the symbol' do
-          @value    = 'test'
-          @expected = :test
-        end
-      end
-    end
-
-    context 'when multiple normalization' do
-      let(:attrs) { { normalize: [:to_sym, 2.0, :upcase] } }
-
-      it 'apply each of them (if possible)' do
-        @value    = 'test'
-        @expected = :TEST
-      end
-    end
-  end
-
-  describe '#validate' do
-    context 'when no value_if_empty attribute' do
-      context 'when an empty or nil value' do
-        it 'raises an error' do
-          [nil, ''].each do |value|
-            expect { opt.validate(value) }
-              .to raise_error('Empty option value supplied')
-          end
-        end
-      end
-
-      context 'when a valid value' do
-        it 'returns it' do
-          expect(opt.validate('testing')).to eql 'testing'
-        end
-      end
-    end
-
-    context 'when value_if_empty attribute' do
-      let(:attrs) { super().merge(value_if_empty: 'it works') }
-
-      context 'when nil or empty value' do
-        it 'returns the value from the value_if_empty attribute' do
-          [nil, ''].each do |value|
-            expect(opt.validate(value)).to eql attrs[:value_if_empty]
-          end
-        end
-      end
-
-      context 'when a valid value' do
-        it 'returns it' do
-          expect(opt.validate('tt')).to eql 'tt'
-        end
-      end
-    end
-  end
-end

data/spec/lib/opt_parse_validator/opts/boolean_spec.rb

@@ -1,34 +0,0 @@
-require 'spec_helper'
-
-describe OptParseValidator::OptBoolean do
-  subject(:opt) { described_class.new(['-b', '--bool BOOL']) }
-
-  describe '#validate' do
-    context 'when does not match TRUE_PATTERN and FALSE_PATTERN' do
-      it 'raises an error' do
-        expect { opt.validate("true\nfalse") }
-          .to raise_error('Invalid boolean value, expected true|t|yes|y|1|false|f|no|n|0')
-      end
-    end
-
-    context 'when matches TRUE_PATTERN' do
-      after { expect(opt.validate(@argument)).to be true }
-
-      %w(true t yes y 1).each do |arg|
-        it 'returns true' do
-          @argument = arg
-        end
-      end
-    end
-
-    context 'when matches FALSE_PATTERN' do
-      after { expect(opt.validate(@argument)).to be false }
-
-      %w(false f no n 0).each do |arg|
-        it 'returns false' do
-          @argument = arg
-        end
-      end
-    end
-  end
-end