check for directory regardless of wraith mode

bbc · Apr 25, 2016 · fe519eb · fe519eb
1 parent 252eb23
commit fe519eb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/lib/wraith/validate.rb b/lib/wraith/validate.rb
@@ -19,12 +19,12 @@ def validate(mode = false)
  end
 
  def validate_basic_properties
- if wraith.engine.nil?
- fail MissingRequiredPropertyError, "You must specify a browser engine! #{docs_prompt}"
- end
- unless wraith.domains
-  fail MissingRequiredPropertyError, "You must specify at least one domain for Wraith to do anything! #{docs_prompt}"
- end
+ fail MissingRequiredPropertyError, "You must specify a browser engine! #{docs_prompt}" if wraith.engine.nil?
+
+ fail MissingRequiredPropertyError, "You must specify at least one domain for Wraith to do anything! #{docs_prompt}" unless wraith.domains
+
+ fail MissingRequiredPropertyError, "You must specify a directory for capture! #{docs_prompt}" if wraith.directory.nil?
+
  # @TODO validate fuzz is not nil, etc
  end
 
@@ -45,8 +45,6 @@ def validate_mode_properties(mode)
  def validate_capture_mode
  fail InvalidDomainsError, "`wraith capture` requires exactly two domains. #{docs_prompt}" if wraith.domains.length != 2
 
- fail MissingRequiredPropertyError, "You must specify a directory for capture! #{docs_prompt}" if wraith.directory.nil?
-
  logger.warn "You have specified a `history_dir` in your config, but this is"\
  " used in `history` mode, NOT `capture` mode. #{docs_prompt}" if wraith.history_dir
  end

diff --git a/lib/wraith/version.rb b/lib/wraith/version.rb
@@ -1,3 +1,3 @@
 module Wraith
- VERSION = "3.1.5"
+ VERSION = "3.1.6"
 end