opt_parse_validator 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f71cf9bbecec6b8c33d14c3cab01c0af1112735
-  data.tar.gz: d033f1ef4649cd628d415657c2375d014616a3b2
+  metadata.gz: f77666c01d6e2405f194bb9571c77ffb90945dd0
+  data.tar.gz: 006b7e8a8f1497da7c30d32537c579669630b9ad
 SHA512:
-  metadata.gz: 63b1f0f830f821e9639b5a6c239c20a472ba9fef16850fb7c37eabf54d589ca463bd30f087a7da906d9ee458a12a23f7162976a0d033a32c06aaec9531f9645a
-  data.tar.gz: 66311acd02e0b17a87d653e5b12609d94a5138e7a1a915e63a401c23004e9c00499c236cf376bf33603f3135f15c38f4e40af229dcb0a4552f1131d3bed98aff
+  metadata.gz: 5f088679e26508b674b9bcc70c8fc036d29f9c501939df67cd6838aa341673af287e026117e5b23133fe24715ad29155d49d08a90e435b45a346106acb97a6bc
+  data.tar.gz: ad09a370941caa0b52d3ec7f74b2de5a9122cb5b31cff987e9e645fead9519f3550fb47ca8f1b43c74faf2729c1529c87151eefea5fbed13e9a5d2cbf2a84122

data/README.md

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

data/lib/opt_parse_validator/opts/multi_choices.rb

@@ -4,6 +4,7 @@ module OptParseValidator
     # @param [ Array ] option See OptBase#new
     # @param [ Hash ] attrs
     # @option attrs [ Hash ] :choices
+    # @option attrs [ Array<Array> ] :incompatible
     # @options attrs [ String ] :separator See OptArray#new
     def initialize(option, attrs = {})
       fail 'The :choices attribute is mandatory' unless attrs.key?(:choices)
@@ -30,7 +31,7 @@ module OptParseValidator
         results[opt.to_sym] = opt.normalize(opt.validate(opt_value))
       end
 
-      results
+      verify_compatibility(results)
     end
 
     # @return [ Array ]
@@ -44,6 +45,26 @@ module OptParseValidator
       fail "Unknown choice: #{item}"
     end
 
+    # @param [ Hash ] values
+    #
+    # @return [ Hash ]
+    def verify_compatibility(values)
+      [*attrs[:incompatible]].each do |a|
+        last_match = ''
+
+        a.each do |sym|
+          next unless values.key?(sym)
+
+          if last_match.empty?
+            last_match = sym
+          else
+            fail "Incompatible choices detected: #{last_match}, #{sym}"
+          end
+        end
+      end
+      values
+    end
+
     # No normalization
     def normalize(value)
       value

data/lib/opt_parse_validator/version.rb

@@ -1,4 +1,4 @@
 # Gem Version
 module OptParseValidator
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

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

@@ -5,8 +5,15 @@ describe OptParseValidator::OptMultiChoices do
   let(:attrs) do
     {
       choices: {
-        vp: OptParseValidator::OptBoolean.new(['--vulenrable-plugins']),
-        u:  OptParseValidator::OptIntegerRange.new(['--users'], value_if_empty: '1-10')
+        vp: OptParseValidator::OptBoolean.new(['--vulnerable-plugins']),
+        ap: OptParseValidator::OptBoolean.new(['--all-plugins']),
+        p:  OptParseValidator::OptBoolean.new(['--plugins']),
+        vt: OptParseValidator::OptBoolean.new(['--vulnerable-themes']),
+        at: OptParseValidator::OptBoolean.new(['--all-themes']),
+        t:  OptParseValidator::OptBoolean.new(['--themes']),
+        tt: OptParseValidator::OptBoolean.new(['--timthumbs']),
+        u:  OptParseValidator::OptIntegerRange.new(['--users'], value_if_empty: '1-10'),
+        m:  OptParseValidator::OptIntegerRange.new(['--media'], value_if_empty: '1-100')
       }
     }
   end
@@ -58,16 +65,35 @@ describe OptParseValidator::OptMultiChoices do
 
         it 'returns the expected hash' do
           [nil, ''].each do |value|
-            expect(opt.validate(value)).to eql(vulenrable_plugins: true, users: (1..10))
+            expect(opt.validate(value)).to eql(vulnerable_plugins: true, users: (1..10))
           end
         end
       end
     end
 
     context 'when value' do
+      let(:attrs) do
+        super().merge(incompatible: [
+          [:vulnerable_plugins, :all_plugins, :plugins],
+          [:vulnerable_themes, :all_themes, :themes]
+        ])
+      end
+
       it 'returns the expected hash' do
         expect(opt.validate('u2-5')).to eql(users: (2..5))
       end
+
+      context 'when incompatible choices given' do
+        it 'raises an error' do
+          {
+            'ap,p,t' => 'all_plugins, plugins',
+            'ap,t,vp' => 'vulnerable_plugins, all_plugins',
+            'ap,at,t' => 'all_themes, themes'
+          }.each do |value, msg|
+            expect { opt.validate(value) }.to raise_error "Incompatible choices detected: #{msg}"
+          end
+        end
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opt_parse_validator
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - WPScanTeam - Erwan le Rousseau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-14 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable