Merge pull request #1806 from beefproject/ruby_version_upgrade

updated the version from 2.4 - 2.5

.rubocop.yml

@@ -4,7 +4,7 @@ AllCops:
     - 'tmp/**/*'
     - 'tools/**/*'
     - 'doc/**/*'
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
 
 Metrics/AbcSize:
   Enabled: false

.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-  - 2.4.0
   - 2.5.3
   - 2.6.0
+  - 2.6.5
 notifications:
   email:
     recipients:

Gemfile

@@ -22,8 +22,8 @@ gem 'rubyzip', '>= 1.2.2'
 gem 'espeak-ruby', '>= 1.0.4' # Text-to-Voice
 gem 'nokogiri', '>= 1.10.4'
 gem 'rake'
-
-gem 'otr-activerecord'
+#ruby 2.4 isnt compatible with a higher version of active-record
+gem 'otr-activerecord' 
 gem 'sqlite3'
 
 # Geolocation support

INSTALL.txt

@@ -21,9 +21,9 @@ Or cloning the Git repository from Github:
 Prerequisites
 --------------
 
-BeEF requires Ruby 2.4+.
+BeEF requires Ruby 2.5+.
 
-If your operating system package manager does not support Ruby version 2.4,
+If your operating system package manager does not support Ruby version 2.5,
 you can add the brightbox ppa repository for the latest version of Ruby:
 
   $ sudo apt-add-repository -y ppa:brightbox/ruby-ng

README.md

@@ -37,13 +37,19 @@ Requirements
 ------------
 
 * Operating System: Mac OSX 10.5.0 or higher / modern Linux. Note: Windows is not supported.
-* [Ruby](http://ruby-lang.org): 2.4 or newer
+* [Ruby](http://ruby-lang.org): 2.5 or newer
 * [SQLite](http://sqlite.org): 3.x
 * [Node.js](https://nodejs.org): 6 or newer
 * The gems listed in the Gemfile: https://github.com/beefproject/beef/blob/master/Gemfile
 * Selenium is required on OSX: brew install selenium-server-standalone (See https://github.com/shvets/selenium)
 
 
+ActiveRecord
+-----------
+ActiveRecord was used to replace DataMapper, and now ruby 2.4 is no longer supported.
+If you're using ruby 2.4 please update your BeEF version, otherwise master-0.4.7.3 has the beef branch before the ActiveRecord Merge.
+
+
 Quick Start
 -----------
 

beef

@@ -12,11 +12,11 @@
 $VERBOSE = nil
 
 #
-# @note Version check to ensure BeEF is running Ruby 2.4+
+# @note Version check to ensure BeEF is running Ruby 2.5+
 #
-if RUBY_VERSION < '2.4'
+if RUBY_VERSION < '2.5'
   puts
-  puts "Ruby version #{RUBY_VERSION} is no longer supported. Please upgrade to Ruby version 2.4 or later."
+  puts "Ruby version #{RUBY_VERSION} is no longer supported. Please upgrade to Ruby version 2.5 or later."
   puts
   exit 1
 end

install

@@ -156,7 +156,7 @@ check_ruby_version () {
 
   info 'Detecting Ruby environment...'
 
-  MIN_RUBY_VER='2.4'
+  MIN_RUBY_VER='2.5'
   if command_exists ruby${RUBYSUFFIX}
   then
     RUBY_VERSION=$(ruby${RUBYSUFFIX} -e "puts RUBY_VERSION")