opt_parse_validator 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f77666c01d6e2405f194bb9571c77ffb90945dd0
-  data.tar.gz: 006b7e8a8f1497da7c30d32537c579669630b9ad
+  metadata.gz: e79a03f62b4755570f5b2639381b31b9900c92f4
+  data.tar.gz: 2f35d0102777f6ba8d069d01a52850ee7e8d2209
 SHA512:
-  metadata.gz: 5f088679e26508b674b9bcc70c8fc036d29f9c501939df67cd6838aa341673af287e026117e5b23133fe24715ad29155d49d08a90e435b45a346106acb97a6bc
-  data.tar.gz: ad09a370941caa0b52d3ec7f74b2de5a9122cb5b31cff987e9e645fead9519f3550fb47ca8f1b43c74faf2729c1529c87151eefea5fbed13e9a5d2cbf2a84122
+  metadata.gz: e8e2380fe532f69f49df35aa7f38112118a47f97fc70304eb32b2c0a668f002317c6444afde1dd9f0f0a15def4a3e888468093a4fea86515e7082e051ae2ac0a
+  data.tar.gz: bfbd27858ac145c2e80979639e5356fefb53ae4f989ee23a30f4316315effa653f096bb99bc4997b97d899df17f0df7b2bd542dcc40389ff10ec2ecf2f6279c9

data/lib/opt_parse_validator/opts/base.rb

@@ -8,6 +8,7 @@ module OptParseValidator
     # @param [ Array ] option See OptionParser#on
     # @param [ Hash ] attrs
     # @option attrs [ Boolean ] :required
+    # @options attrs [ Array<Symbol>, Symbol ] :required_unless
     # @option attrs [ Mixed ] :default The default value to use if the option is not supplied
     # @option attrs [ Mixed ] :value_if_empty The value to use if no arguments have been supplied
     # @option attrs [ Array<Symbol> ] :normalize See #normalize
@@ -23,6 +24,10 @@ module OptParseValidator
       @required ||= attrs[:required]
     end
 
+    def required_unless
+      @required_unless ||= [*attrs[:required_unless]]
+    end
+
     # @return [ Mixed ]
     def default
       attrs[:default]
@@ -88,5 +93,10 @@ module OptParseValidator
       end
       nil
     end
+
+    # @return [ String ]
+    def to_s
+      to_sym.to_s
+    end
   end
 end

data/lib/opt_parse_validator/version.rb

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

data/lib/opt_parse_validator.rb

@@ -68,9 +68,18 @@ module OptParseValidator
     # @return [ Void ]
     def post_processing
       @opts.each do |opt|
-        next unless opt.required? && !@results.key?(opt.to_sym)
+        if opt.required?
+          fail "The option #{opt} is required" unless @results.key?(opt.to_sym)
+        end
+
+        next if opt.required_unless.empty?
+        next if @results.key?(opt.to_sym)
 
-        fail "The option #{opt.to_sym} is required"
+        fail_msg = "One of the following options is required: #{opt}, #{opt.required_unless.join(', ')}"
+
+        fail fail_msg unless opt.required_unless.any? do |sym|
+          @results.key?(sym)
+        end
       end
     end
   end

data/spec/lib/opt_parse_validator_spec.rb

@@ -97,6 +97,40 @@ describe OptParseValidator::OptParser do
       end
     end
 
+    context 'when :requied_unless' do
+      let(:url_opt)    { OptParseValidator::OptURL.new(['--url URL'], required_unless: :update) }
+      let(:update_opt) { OptParseValidator::OptBoolean.new(['--update'], required_unless: [:url]) }
+      let(:options)    { [url_opt, update_opt, verbose_opt] }
+
+      context 'when none supplied' do
+        it 'raises an error' do
+          @exception = 'One of the following options is required: url, update'
+          @argv      = %w(-v)
+        end
+      end
+
+      context 'when --url' do
+        it 'returns the expected value' do
+          @expected = { url: 'http://www.g.com' }
+          @argv     = %w(--url http://www.g.com)
+        end
+      end
+
+      context 'when --update' do
+        it 'returns the expected value' do
+          @expected = { update: true }
+          @argv     = %w(--update)
+        end
+      end
+
+      context 'when --url and --update' do
+        it 'returns the expected values' do
+          @expected = { url: 'http://www.g.com', update: true, verbose: true }
+          @argv     = %w(--url http://www.g.com --update -v)
+        end
+      end
+    end
+
     context 'when the default attribute is used' do
       let(:options)     { [verbose_opt, default_opt] }
       let(:default_opt) { OptParseValidator::OptBase.new(['--default VALUE'], default: false) }

metadata

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