Skip to content

Upgrade rails to 4.2.1 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
crmaxx wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Upgrade rails to 4.2.1 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f40cff
Upgrade rails to 4.2.1
crmaxx May 18, 2015
5b4e43c
Update net-ssh to 4.2.0
crmaxx Nov 8, 2017
adf6d08
Fix Fixnum deprecate warning
crmaxx Nov 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ source 'https://rubygems.org'
# spec.add_runtime_dependency '<name>', [<version requirements>]
gemspec name: 'metasploit-framework'

# Metasploit::Concern hooks
gem 'metasploit-concern', github: 'crmaxx/metasploit-concern', branch: 'staging/rails-4.2'
# Things that would normally be part of the database model, but which
# are needed when there's no database
gem 'metasploit-model', github: 'crmaxx/metasploit-model', branch: 'staging/rails-4.2'

# separate from test as simplecov is not run on travis-ci
group :coverage do
# code coverage for tests
Expand All @@ -13,6 +19,10 @@ end

group :db do
gemspec name: 'metasploit-framework-db'
# Metasploit::Credential database models
gem 'metasploit-credential', github: 'crmaxx/metasploit-credential', branch: 'staging/rails-4.2'
# Database models shared between framework and Pro.
gem 'metasploit_data_models', github: 'crmaxx/metasploit_data_models', branch: 'staging/rails-4.2'
end

group :development do
Expand Down Expand Up @@ -46,7 +56,7 @@ group :test do
# cucumber extension for testing command line applications, like msfconsole
gem 'aruba'
# cucumber + automatic database cleaning with database_cleaner
gem 'cucumber-rails', :require => false
gem 'cucumber-rails', require: false
gem 'shoulda-matchers'
# Manipulate Time.now in specs
gem 'timecop'
Expand Down
209 changes: 125 additions & 84 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,57 @@
GIT
remote: git://github.com/crmaxx/metasploit-concern.git
revision: ec59753e8c7034ab861551a121ae579e254a553b
branch: staging/rails-4.2
specs:
metasploit-concern (1.0.0.pre.rails.pre.4.2)
activerecord (>= 4.2.1)
activesupport (>= 4.2.1)
railties (>= 4.2.1)

GIT
remote: git://github.com/crmaxx/metasploit-credential.git
revision: 78d97624f33d53d99bf9531fd8eb365b75d99284
branch: staging/rails-4.2
specs:
metasploit-credential (1.0.0.pre.rails.pre.4.2)
pg
railties
rubyntlm
rubyzip (~> 1.1)

GIT
remote: git://github.com/crmaxx/metasploit-model.git
revision: f40715caf40583a4dd5af1afec358595862f7c62
branch: staging/rails-4.2
specs:
metasploit-model (1.0.0.pre.rails.pre.4.2)
activemodel (>= 4.2.1)
activesupport (>= 4.2.1)
railties (>= 4.2.1)

GIT
remote: git://github.com/crmaxx/metasploit_data_models.git
revision: 56879dc5f369debf260400cc235b4af14f820329
branch: staging/rails-4.2
specs:
metasploit_data_models (1.0.1.pre.rails.pre.4.2)
activerecord (>= 4.2.1)
activesupport (>= 4.2.1)
arel-helpers
pg
postgres_ext
railties (>= 4.2.1)
recog (~> 1.0)

PATH
remote: .
specs:
metasploit-framework (4.11.0.pre.dev)
actionpack (>= 4.0.9, < 4.1.0)
activesupport (>= 4.0.9, < 4.1.0)
actionpack (>= 4.2.1)
activesupport (>= 4.2.1)
bcrypt
jsobfu (~> 0.2.0)
json
metasploit-concern (~> 1.0)
metasploit-model (~> 1.0)
metasploit-payloads (= 0.0.7)
msgpack
nokogiri
Expand All @@ -21,10 +64,8 @@ PATH
sqlite3
tzinfo
metasploit-framework-db (4.11.0.pre.dev)
activerecord (>= 4.0.9, < 4.1.0)
metasploit-credential (~> 1.0)
activerecord (>= 4.2.1)
metasploit-framework (= 4.11.0.pre.dev)
metasploit_data_models (~> 1.0)
pg (>= 0.11)
metasploit-framework-pcap (4.11.0.pre.dev)
metasploit-framework (= 4.11.0.pre.dev)
Expand All @@ -34,46 +75,57 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.0.13)
actionpack (= 4.0.13)
actionmailer (4.2.1)
actionpack (= 4.2.1)
actionview (= 4.2.1)
activejob (= 4.2.1)
mail (~> 2.5, >= 2.5.4)
actionpack (4.0.13)
activesupport (= 4.0.13)
builder (~> 3.1.0)
erubis (~> 2.7.0)
rack (~> 1.5.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.1)
actionview (= 4.2.1)
activesupport (= 4.2.1)
rack (~> 1.6)
rack-test (~> 0.6.2)
activemodel (4.0.13)
activesupport (= 4.0.13)
builder (~> 3.1.0)
activerecord (4.0.13)
activemodel (= 4.0.13)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.13)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.4)
activesupport (4.0.13)
i18n (~> 0.6, >= 0.6.9)
minitest (~> 4.2)
multi_json (~> 1.3)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
arel (4.0.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionview (4.2.1)
activesupport (= 4.2.1)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
activejob (4.2.1)
activesupport (= 4.2.1)
globalid (>= 0.3.0)
activemodel (4.2.1)
activesupport (= 4.2.1)
builder (~> 3.1)
activerecord (4.2.1)
activemodel (= 4.2.1)
activesupport (= 4.2.1)
arel (~> 6.0)
activesupport (4.2.1)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
arel (6.0.0)
arel-helpers (2.1.0)
activerecord (>= 3.1.0, < 5)
aruba (0.6.2)
childprocess (>= 0.3.6)
cucumber (>= 1.1.1)
rspec-expectations (>= 2.7.0)
bcrypt (3.1.10)
builder (3.1.4)
builder (3.2.2)
capybara (2.4.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
childprocess (0.5.5)
childprocess (0.5.6)
ffi (~> 1.0, >= 1.0.11)
coderay (1.1.0)
cucumber (1.3.19)
Expand All @@ -100,44 +152,21 @@ GEM
fivemat (1.2.1)
gherkin (2.12.2)
multi_json (~> 1.3)
hike (1.2.3)
globalid (0.3.5)
activesupport (>= 4.1.0)
i18n (0.7.0)
jsobfu (0.2.1)
rkelly-remix (= 0.0.6)
json (1.8.2)
loofah (2.0.2)
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
metasploit-concern (1.0.0)
activerecord (>= 4.0.9, < 4.1.0)
activesupport (>= 4.0.9, < 4.1.0)
railties (>= 4.0.9, < 4.1.0)
metasploit-credential (1.0.0)
metasploit-concern (~> 1.0)
metasploit-model (~> 1.0)
metasploit_data_models (~> 1.0)
pg
railties
rubyntlm
rubyzip (~> 1.1)
metasploit-model (1.0.0)
activemodel (>= 4.0.9, < 4.1.0)
activesupport (>= 4.0.9, < 4.1.0)
railties (>= 4.0.9, < 4.1.0)
metasploit-payloads (0.0.7)
metasploit_data_models (1.0.1)
activerecord (>= 4.0.9, < 4.1.0)
activesupport (>= 4.0.9, < 4.1.0)
arel-helpers
metasploit-concern (~> 1.0)
metasploit-model (~> 1.0)
pg
postgres_ext
railties (>= 4.0.9, < 4.1.0)
recog (~> 1.0)
method_source (0.8.2)
mime-types (2.4.3)
mime-types (2.5)
mini_portile (0.6.2)
minitest (4.7.5)
minitest (5.6.1)
msgpack (0.5.11)
multi_json (1.11.0)
multi_test (0.1.2)
Expand All @@ -146,7 +175,7 @@ GEM
mini_portile (~> 0.6.0)
packetfu (1.1.9)
pcaprub (0.12.0)
pg (0.18.1)
pg (0.18.2)
pg_array_parser (0.0.9)
postgres_ext (2.4.1)
activerecord (>= 4.0.0)
Expand All @@ -156,20 +185,31 @@ GEM
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
rack (1.5.2)
rack (1.6.1)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.0.13)
actionmailer (= 4.0.13)
actionpack (= 4.0.13)
activerecord (= 4.0.13)
activesupport (= 4.0.13)
rails (4.2.1)
actionmailer (= 4.2.1)
actionpack (= 4.2.1)
actionview (= 4.2.1)
activejob (= 4.2.1)
activemodel (= 4.2.1)
activerecord (= 4.2.1)
activesupport (= 4.2.1)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.13)
sprockets-rails (~> 2.0)
railties (4.0.13)
actionpack (= 4.0.13)
activesupport (= 4.0.13)
railties (= 4.2.1)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.6)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.2)
loofah (~> 2.0)
railties (4.2.1)
actionpack (= 4.2.1)
activesupport (= 4.2.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
Expand Down Expand Up @@ -202,27 +242,24 @@ GEM
rubyzip (1.1.7)
shoulda-matchers (2.8.0)
activesupport (>= 3.0.0)
simplecov (0.9.2)
simplecov (0.10.0)
docile (~> 1.1.0)
multi_json (~> 1.0)
simplecov-html (~> 0.9.0)
simplecov-html (0.9.0)
json (~> 1.8)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slop (3.6.0)
sprockets (2.12.3)
hike (~> 1.2)
multi_json (~> 1.0)
sprockets (3.1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.4)
sprockets-rails (2.3.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.10)
thor (0.19.1)
thread_safe (0.3.5)
tilt (1.4.1)
timecop (0.7.3)
tzinfo (0.3.43)
tzinfo (1.2.2)
thread_safe (~> 0.1)
xpath (2.0.0)
nokogiri (~> 1.3)
yard (0.8.7.6)
Expand All @@ -235,9 +272,13 @@ DEPENDENCIES
cucumber-rails
factory_girl_rails (~> 4.5.0)
fivemat (= 1.2.1)
metasploit-concern!
metasploit-credential!
metasploit-framework!
metasploit-framework-db!
metasploit-framework-pcap!
metasploit-model!
metasploit_data_models!
pry
rake (>= 10.0.0)
redcarpet
Expand Down
Loading