From feb57aca914b56f397c75ebd028f42f5a817b0b2 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 17 Dec 2019 01:45:16 +0000 Subject: [PATCH 1/7] updated the version from 2.4 - 2.5 --- .rubocop.yml | 2 +- .travis.yml | 3 ++- INSTALL.txt | 4 ++-- README.md | 2 +- beef | 6 +++--- install | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 5a4f5f826..96f648550 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -4,7 +4,7 @@ AllCops: - 'tmp/**/*' - 'tools/**/*' - 'doc/**/*' - TargetRubyVersion: 2.4 + TargetRubyVersion: 2.5 Metrics/AbcSize: Enabled: false diff --git a/.travis.yml b/.travis.yml index fdc65ee46..a0832bd4e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,9 @@ language: ruby rvm: - - 2.4.0 + - 2.5.0 - 2.5.3 - 2.6.0 + - 2.6.5 notifications: email: recipients: diff --git a/INSTALL.txt b/INSTALL.txt index 5fec4026d..edee536e7 100644 --- a/INSTALL.txt +++ b/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 diff --git a/README.md b/README.md index 7bb5370db..4c9b510ae 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ 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 diff --git a/beef b/beef index 15e62b422..2286c191b 100755 --- a/beef +++ b/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 diff --git a/install b/install index f35cf7bb2..10dc56294 100755 --- a/install +++ b/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") From 42bb1f2d1a863401c8b749c693477d10078967d6 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 17 Dec 2019 03:30:12 +0000 Subject: [PATCH 2/7] the travis.yml to what it was before the updage --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a0832bd4e..dfc4b1b4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: ruby rvm: - - 2.5.0 - 2.5.3 - 2.6.0 - 2.6.5 From ee242441cedd58b8258417d29e55c8b11361ef54 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 17 Dec 2019 04:09:09 +0000 Subject: [PATCH 3/7] ACTIVE RECORD --- Gemfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 2acb15ecb..1bc558daf 100644 --- a/Gemfile +++ b/Gemfile @@ -22,8 +22,9 @@ 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 'activerecord' ,'~> 5.2.4' +gem 'otr-activerecord' gem 'sqlite3' # Geolocation support From fdad5f459d6932ea7cacd99d1fe07094012bed65 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 17 Dec 2019 04:11:49 +0000 Subject: [PATCH 4/7] Added 2.4.0 back --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index dfc4b1b4a..aa77f18f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: ruby rvm: + -2.4.0 - 2.5.3 - 2.6.0 - 2.6.5 From 0bb5fc8bd4af744c2ba63774eac16a91e4bfab44 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 17 Dec 2019 04:15:04 +0000 Subject: [PATCH 5/7] mistake in the RVM --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index aa77f18f5..94b11f13d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: ruby rvm: - -2.4.0 + - 2.4.0 - 2.5.3 - 2.6.0 - 2.6.5 From bae6557b9c45050516d6c254dce0e241ede33c34 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 17 Dec 2019 04:19:55 +0000 Subject: [PATCH 6/7] the 2.4.0 fix doesnt work --- .travis.yml | 1 - Gemfile | 1 - 2 files changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 94b11f13d..dfc4b1b4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: ruby rvm: - - 2.4.0 - 2.5.3 - 2.6.0 - 2.6.5 diff --git a/Gemfile b/Gemfile index 1bc558daf..430d1d57a 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,6 @@ gem 'espeak-ruby', '>= 1.0.4' # Text-to-Voice gem 'nokogiri', '>= 1.10.4' gem 'rake' #ruby 2.4 isnt compatible with a higher version of active-record -gem 'activerecord' ,'~> 5.2.4' gem 'otr-activerecord' gem 'sqlite3' From 62f7e52b40f14dc54c528efc0f57f325fc040661 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 17 Dec 2019 04:28:27 +0000 Subject: [PATCH 7/7] update 2.4.0 readme --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 4c9b510ae..b5494e46e 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,12 @@ Requirements * 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 -----------