diff --git a/Gemfile b/Gemfile index 5316b28b..a6db3c5c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem "typhoeus", "~>0.6.1" +gem "typhoeus", :git => "https://github.com/typhoeus/typhoeus.git" gem "nokogiri" gem "json" diff --git a/lib/environment.rb b/lib/environment.rb index dd9c209f..a4453599 100644 --- a/lib/environment.rb +++ b/lib/environment.rb @@ -20,6 +20,7 @@ begin # Standard libs require 'rubygems' + require 'bundler/setup' require 'getoptlong' require 'optparse' # Will replace getoptlong require 'uri' @@ -33,6 +34,7 @@ begin require 'rbconfig' require 'pp' # Third party libs + #gem 'typhoeus', :git => "https://github.com/typhoeus/typhoeus.git" require 'typhoeus' require 'json' require 'nokogiri' diff --git a/lib/wpscan/wp_enumerator.rb b/lib/wpscan/wp_enumerator.rb index 4dd6b117..db151b5c 100644 --- a/lib/wpscan/wp_enumerator.rb +++ b/lib/wpscan/wp_enumerator.rb @@ -55,7 +55,7 @@ class WpEnumerator targets.each do |target| url = target.get_full_url - request = enum_browser.forge_request(url, { cache_ttl: 0, followlocation: true }) + request = enum_browser.forge_request(url, cache_ttl: 0, followlocation: true) request_count += 1 request.on_complete do |response| diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index e8a18644..1dec7eb3 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -20,15 +20,11 @@ # https://github.com/bblimke/webmock # https://github.com/colszowka/simplecov -# Code Coverage (only works with ruby >= 1.9) -if RUBY_VERSION >= '1.9' - require 'simplecov' -end - require File.expand_path(File.dirname(__FILE__) + '/../lib/common/common_helper') -#gem 'webmock', '=1.8.11' require 'webmock/rspec' +# Code Coverage (only works with ruby >= 1.9) +require 'simplecov' if RUBY_VERSION >= '1.9' SPEC_DIR = ROOT_DIR + '/spec' SPEC_LIB_DIR = SPEC_DIR + '/lib'