Use the prerelease versions of the gems

MSP-11412
bug/bundler_fix
Matt Buck 2014-10-03 10:29:10 -05:00
parent 04dbfb9ad6
commit f748256e47
No known key found for this signature in database
GPG Key ID: 42134E0C9C4E94BB
3 changed files with 31 additions and 52 deletions

View File

@ -8,16 +8,13 @@ group :db do
gem 'activerecord', '>= 3.0.0', '< 4.0.0'
# Metasploit::Credential database models
gem 'metasploit-credential', '~> 0.11.0'
gem 'metasploit-credential', '~> 0.11.0.pre.engine.pre.requires'
# Database models shared between framework and Pro.
gem 'metasploit_data_models', '~> 0.21.0'
gem 'metasploit_data_models', '~> 0.21.0.pre.engine.pre.requires'
# Needed for module caching in Mdm::ModuleDetails
gem 'pg', '>= 0.11'
end
gem 'metasploit-concern', path: '/Users/techpeace/rapid7/metasploit-concern'
gem 'metasploit-model', path: '/Users/techpeace/rapid7/metasploit-model'
group :development do
# Markdown formatting for yard
gem 'redcarpet'

View File

@ -7,8 +7,8 @@ PATH
bcrypt
jsobfu (~> 0.2.0)
json
metasploit-concern (~> 0.2.1)
metasploit-model (~> 0.27.1)
metasploit-concern (~> 0.3.0.pre.engine.pre.requires)
metasploit-model (~> 0.28.0.pre.engine.pre.requires)
meterpreter_bins (= 0.0.7)
msgpack
nokogiri
@ -19,44 +19,6 @@ PATH
sqlite3
tzinfo
PATH
remote: /Users/techpeace/rapid7/metasploit-concern
specs:
metasploit-concern (0.2.1)
activesupport (~> 3.0, >= 3.0.0)
railties (< 4.0.0)
PATH
remote: /Users/techpeace/rapid7/metasploit-credential
specs:
metasploit-credential (0.10.2)
metasploit-concern (~> 0.2.1)
metasploit-model (~> 0.27.0)
metasploit_data_models (~> 0.20.0)
pg
railties (< 4.0.0)
rubyntlm
rubyzip (~> 1.1)
PATH
remote: /Users/techpeace/rapid7/metasploit-model
specs:
metasploit-model (0.27.4)
activesupport
railties (< 4.0.0)
PATH
remote: /Users/techpeace/rapid7/metasploit_data_models
specs:
metasploit_data_models (0.20.1)
activerecord (>= 3.2.13, < 4.0.0)
activesupport
arel-helpers
metasploit-concern (~> 0.2.1)
metasploit-model (~> 0.27.0)
pg
railties (< 4.0.0)
GEM
remote: https://rubygems.org/
specs:
@ -129,12 +91,34 @@ GEM
hike (1.2.3)
i18n (0.6.11)
journey (1.0.4)
jsobfu (0.2.0)
jsobfu (0.2.1)
rkelly-remix (= 0.0.6)
json (1.8.1)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metasploit-concern (0.3.0.pre.engine.pre.requires)
activesupport (~> 3.0, >= 3.0.0)
railties (< 4.0.0)
metasploit-credential (0.11.0.pre.engine.pre.requires)
metasploit-concern
metasploit-model
metasploit_data_models
pg
railties (< 4.0.0)
rubyntlm
rubyzip (~> 1.1)
metasploit-model (0.28.0.pre.engine.pre.requires)
activesupport
railties (< 4.0.0)
metasploit_data_models (0.21.0.pre.engine.pre.requires)
activerecord (>= 3.2.13, < 4.0.0)
activesupport
arel-helpers
metasploit-concern
metasploit-model
pg
railties (< 4.0.0)
meterpreter_bins (0.0.7)
method_source (0.8.2)
mime-types (1.25.1)
@ -234,11 +218,9 @@ DEPENDENCIES
factory_girl (>= 4.1.0)
factory_girl_rails
fivemat (= 1.2.1)
metasploit-concern!
metasploit-credential!
metasploit-credential (~> 0.11.0.pre.engine.pre.requires)
metasploit-framework!
metasploit-model!
metasploit_data_models!
metasploit_data_models (~> 0.21.0.pre.engine.pre.requires)
network_interface (~> 0.0.1)
pcaprub
pg (>= 0.11)

View File

@ -60,10 +60,10 @@ Gem::Specification.new do |spec|
# Needed for some admin modules (scrutinizer_add_user.rb)
spec.add_runtime_dependency 'json'
# Metasploit::Concern hooks
spec.add_runtime_dependency 'metasploit-concern', '~> 0.3.0'
spec.add_runtime_dependency 'metasploit-concern', '~> 0.3.0.pre.engine.pre.requires'
# Things that would normally be part of the database model, but which
# are needed when there's no database
spec.add_runtime_dependency 'metasploit-model', '~> 0.28.0'
spec.add_runtime_dependency 'metasploit-model', '~> 0.28.0.pre.engine.pre.requires'
# Needed for Meterpreter on Windows, soon others.
spec.add_runtime_dependency 'meterpreter_bins', '0.0.7'
# Needed by msfgui and other rpc components