From 704e675edf0adfba37a4aeb82ae5e7842da76589 Mon Sep 17 00:00:00 2001 From: Ben Passmore Date: Tue, 8 Oct 2019 16:10:00 +1000 Subject: [PATCH] Removed datamapper for otr-activerecord --- Gemfile | 20 ++------------------ Rakefile | 10 ++++++++-- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/Gemfile b/Gemfile index a521b0166..3f931914e 100644 --- a/Gemfile +++ b/Gemfile @@ -17,29 +17,14 @@ gem 'mime-types' gem 'execjs' gem 'ansi' gem 'term-ansicolor', :require => 'term/ansicolor' -gem 'dm-core' gem 'json' -gem 'data_objects' gem 'rubyzip', '>= 1.2.2' gem 'espeak-ruby', '>= 1.0.4' # Text-to-Voice gem 'nokogiri', '>= 1.10.4' gem 'rake' gem 'therubyracer' - -# SQLite support -group :sqlite do - gem 'dm-sqlite-adapter' -end - -# PostgreSQL support -group :postgres do - #gem dm-postgres-adapter -end - -# MySQL support -group :mysql do - #gem dm-mysql-adapter -end +gem 'otr-activerecord' +gem 'sqlite3' # Geolocation support group :geoip do @@ -48,7 +33,6 @@ end gem 'parseconfig' gem 'erubis' -gem 'dm-migrations' # Metasploit Integration extension group :ext_msf do diff --git a/Rakefile b/Rakefile index 1ed8fcc45..7a07c5b1a 100644 --- a/Rakefile +++ b/Rakefile @@ -4,6 +4,8 @@ # See the file 'doc/COPYING' for copying permission # require 'yaml' +require 'bundler/setup' +load 'tasks/otr-activerecord.rake' #require 'pry-byebug' @@ -236,6 +238,10 @@ task :cde_beef_start => 'beef' do puts '.' end - ################################ - +# ActiveRecord +namespace :db do + task :environment do + require_relative "beef" + end +end