Merge pull request #3 from wpscanteam/master

update master

.gitignore

@@ -1,4 +1,4 @@
-cache/*
+cache
 coverage
 .bundle
 .DS_Store

cache/.gitignore

@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore

lib/common/cache_file_store.rb

@@ -24,7 +24,7 @@ class CacheFileStore
     # File.directory? for ruby <= 1.9 otherwise,
     # it makes more sense to do Dir.exist? :/
     unless File.directory?(@storage_path)
-      Dir.mkdir(@storage_path)
+      FileUtils.mkdir_p(@storage_path)
     end
   end
 

lib/common/common_helper.rb

@@ -39,6 +39,10 @@ $LOAD_PATH.unshift(LIB_DIR)
 $LOAD_PATH.unshift(WPSCAN_LIB_DIR)
 $LOAD_PATH.unshift(MODELS_LIB_DIR)
 
+def kali_linux?
+  %x{uname -a} =~ /kali/i
+end
+
 require 'environment'
 
 # TODO : add an exclude pattern ?

lib/environment.rb

@@ -13,7 +13,7 @@ Encoding.default_external = Encoding::UTF_8
 
 begin
   # Standard libs
-  require 'bundler/setup'
+  require 'bundler/setup' unless kali_linux?
   require 'getoptlong'
   require 'optparse' # Will replace getoptlong
   require 'uri'
@@ -27,6 +27,7 @@ begin
   require 'rbconfig'
   require 'pp'
   require 'shellwords'
+  require 'fileutils'
   # Third party libs
   require 'typhoeus'
   require 'json'