diff --git a/Gemfile b/Gemfile index 9a7b19a40f..0bf6b562eb 100755 --- a/Gemfile +++ b/Gemfile @@ -1,10 +1,13 @@ source 'http://rubygems.org' +# Need 3+ for ActiveSupport::Concern +gem 'activesupport', '>= 3.0.0' + group :development do - # running documention generation tasks + # running documentation generation tasks gem 'rake' - # Markdown formatting for yara + # Markdown formatting for yard gem 'redcarpet' - # generating documention + # generating documentation gem 'yard' end diff --git a/Gemfile.lock b/Gemfile.lock index 6a0bbe0f53..ac58c9b705 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,11 @@ GEM remote: http://rubygems.org/ specs: + activesupport (3.2.8) + i18n (~> 0.6) + multi_json (~> 1.0) + i18n (0.6.1) + multi_json (1.3.6) rake (0.9.2.2) redcarpet (2.1.1) yard (0.8.2.1) @@ -9,6 +14,7 @@ PLATFORMS ruby DEPENDENCIES + activesupport (>= 3.0.0) rake redcarpet yard diff --git a/lib/msf/core/module_manager/cache.rb b/lib/msf/core/module_manager/cache.rb index f9138e48a0..4800679042 100644 --- a/lib/msf/core/module_manager/cache.rb +++ b/lib/msf/core/module_manager/cache.rb @@ -1,3 +1,8 @@ +# +# Gems +# +require 'active_support/concern' + # Concerns the module cache maintained by the {Msf::ModuleManager}. module Msf::ModuleManager::Cache extend ActiveSupport::Concern diff --git a/lib/msf/core/module_manager/loading.rb b/lib/msf/core/module_manager/loading.rb index 8cb1b90c3b..3f69c32654 100644 --- a/lib/msf/core/module_manager/loading.rb +++ b/lib/msf/core/module_manager/loading.rb @@ -1,3 +1,11 @@ +# +# Gems +# +require 'active_support/concern' + +# +# Project +# require 'msf/core/modules/loader/archive' require 'msf/core/modules/loader/directory' diff --git a/lib/msf/core/module_manager/module_paths.rb b/lib/msf/core/module_manager/module_paths.rb index 455368afd8..83d91ec88d 100644 --- a/lib/msf/core/module_manager/module_paths.rb +++ b/lib/msf/core/module_manager/module_paths.rb @@ -1,3 +1,8 @@ +# +# Gems +# +require 'active_support/concern' + # Deals with module paths in the {Msf::ModuleManager} module Msf::ModuleManager::ModulePaths extend ActiveSupport::Concern diff --git a/lib/msf/core/module_manager/module_sets.rb b/lib/msf/core/module_manager/module_sets.rb index 028db8ed08..5d6da9301a 100644 --- a/lib/msf/core/module_manager/module_sets.rb +++ b/lib/msf/core/module_manager/module_sets.rb @@ -1,3 +1,12 @@ +# +# Gems +# +require 'active_support/concern' + +# +# Project +# + # Defines the MODULE_* constants require 'msf/core/constants'