From d67ae503bf547f33564b2547d924e8b925ac3c6c Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Mon, 26 Mar 2018 02:52:52 -0500
Subject: [PATCH] Update base to Ruby 2.5

mask metasploit-aggregator and dependencies on Ruby 2.5
---
 .ruby-version |  2 +-
 Gemfile       |  9 ++++++---
 Gemfile.lock  | 34 ----------------------------------
 3 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index 35cee72dcbf4..437459cd94c9 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.4.3
+2.5.0
diff --git a/Gemfile b/Gemfile
index 2b48e2087f09..b7231479e02f 100755
--- a/Gemfile
+++ b/Gemfile
@@ -22,15 +22,18 @@ group :development do
   gem 'metasploit-aggregator' if [
     'x86-mingw32', 'x64-mingw32',
     'x86_64-linux', 'x86-linux',
-    'darwin'].include?(RUBY_PLATFORM.gsub(/.*darwin.*/, 'darwin'))
+    'darwin'].include?(RUBY_PLATFORM.gsub(/.*darwin.*/, 'darwin')) && \
+      Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.5.0')
   gem 'google-protobuf', "3.5.1" if [
     'x86-mingw32', 'x64-mingw32',
     'x86_64-linux', 'x86-linux',
-    'darwin'].include?(RUBY_PLATFORM.gsub(/.*darwin.*/, 'darwin'))
+    'darwin'].include?(RUBY_PLATFORM.gsub(/.*darwin.*/, 'darwin')) && \
+      Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.5.0')
   gem 'grpc', "1.8.3" if [
     'x86-mingw32', 'x64-mingw32',
     'x86_64-linux', 'x86-linux',
-    'darwin'].include?(RUBY_PLATFORM.gsub(/.*darwin.*/, 'darwin'))
+    'darwin'].include?(RUBY_PLATFORM.gsub(/.*darwin.*/, 'darwin')) && \
+      Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.5.0')
 end
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index b47d67012412..66e9aba0f8f3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -133,40 +133,16 @@ GEM
       multipart-post (>= 1.2, < 3)
     filesize (0.1.1)
     fivemat (1.3.6)
-    google-protobuf (3.5.1)
-    googleapis-common-protos-types (1.0.1)
-      google-protobuf (~> 3.0)
-    googleauth (0.6.2)
-      faraday (~> 0.12)
-      jwt (>= 1.4, < 3.0)
-      logging (~> 2.0)
-      memoist (~> 0.12)
-      multi_json (~> 1.11)
-      os (~> 0.9)
-      signet (~> 0.7)
-    grpc (1.8.3)
-      google-protobuf (~> 3.1)
-      googleapis-common-protos-types (~> 1.0.0)
-      googleauth (>= 0.5.1, < 0.7)
     hashery (2.1.2)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     jsobfu (0.4.2)
       rkelly-remix
     json (2.1.0)
-    jwt (2.1.0)
-    little-plugger (1.1.4)
-    logging (2.2.2)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.10)
     loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    memoist (0.16.0)
     metasm (1.0.3)
-    metasploit-aggregator (1.0.0)
-      grpc
-      rex-arch
     metasploit-concern (2.0.5)
       activemodel (~> 4.2.6)
       activesupport (~> 4.2.6)
@@ -201,7 +177,6 @@ GEM
     minitest (5.11.3)
     mqtt (0.5.0)
     msgpack (1.2.4)
-    multi_json (1.13.1)
     multipart-post (2.0.0)
     nessus_rest (0.1.6)
     net-ssh (4.2.0)
@@ -213,7 +188,6 @@ GEM
       sawyer (~> 0.8.0, >= 0.5.3)
     openssl-ccm (1.2.1)
     openvas-omp (0.0.4)
-    os (0.9.6)
     packetfu (1.1.13)
       pcaprub
     patch_finder (1.0.2)
@@ -338,11 +312,6 @@ GEM
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
-    signet (0.8.1)
-      addressable (~> 2.3)
-      faraday (~> 0.9)
-      jwt (>= 1.5, < 3.0)
-      multi_json (~> 1.10)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -380,9 +349,6 @@ PLATFORMS
 DEPENDENCIES
   factory_girl_rails
   fivemat
-  google-protobuf (= 3.5.1)
-  grpc (= 1.8.3)
-  metasploit-aggregator
   metasploit-framework!
   octokit
   pry