Merge branch 'staging/rails-4.0' of github.com:rapid7/metasploit-framework into staging/rails-4.0

Conflicts:
	Gemfile.lock
	metasploit-framework.gemspec

Author: farias-r7

Gemfile

@@ -3,16 +3,25 @@ source 'https://rubygems.org'
 #   spec.add_runtime_dependency '<name>', [<version requirements>]
 gemspec name: 'metasploit-framework'
 
+# TODO: Rails 4
+# move these back into the root gemspec
+gem 'metasploit-concern', :github => 'rapid7/metasploit-concern', :branch => 'staging/rails-4.0'
+gem 'metasploit-model', :github => 'rapid7/metasploit-model', :branch => 'staging/rails-4.0'
+
 # separate from test as simplecov is not run on travis-ci
 group :coverage do
   # code coverage for tests
   # any version newer than 0.5.4 gives an Encoding error when trying to read the source files.
   # see: https://github.com/colszowka/simplecov/issues/127 (hopefully fixed in 0.8.0)
-  gem 'simplecov', '0.5.4', :require => false
+  gem 'simplecov'
 end
 
 group :db do
   gemspec name: 'metasploit-framework-db'
+  # TODO: Rails 4
+  # move these back into the metasploit-framework-db gemspec
+  gem 'metasploit-credential', :github => 'rapid7/metasploit-credential', :branch => 'staging/rails-4.0'
+  gem 'metasploit_data_models', :github => 'rapid7/metasploit_data_models', :branch => 'staging/rails-4.0'
 end
 
 group :development do
@@ -25,12 +34,8 @@ group :development do
 end
 
 group :development, :test do
-  # supplies factories for producing model instance for specs
-  # Version 4.1.0 or newer is needed to support generate calls without the
-  # 'FactoryGirl.' in factory definitions syntax.
-  gem 'factory_girl', '>= 4.1.0'
   # automatically include factories from spec/factories
-  gem 'factory_girl_rails'
+  gem 'factory_girl_rails', '~> 4.5.0'
   # Make rspec output shorter and more useful
   gem 'fivemat', '1.2.1'
   # running documentation generation tasks and rspec tasks