Skip to content

Commit

Permalink
Upgrade to Rails 4.1
Browse files Browse the repository at this point in the history
MSP-12847

* point to metasploit-erd to github staging/rails-4.1 branch
* Bump Rails version to 4.1 in the Gemfile
* Remove metasploit-erd version from yard-metasploit-erd gemspec
  • Loading branch information
sgonzalez-r7 committed Jul 15, 2015
1 parent 3352115 commit e84c82e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
9 changes: 5 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ source 'https://rubygems.org'
# Specify your gem's dependencies in yard-metasploit-erd.gemspec
gemspec

gem 'metasploit-erd',
github: 'rapid7/metasploit-erd',
branch: 'staging/rails-4.1'

group :development, :test do
# markdown formatting for yard
gem 'kramdown', platforms: :jruby
Expand All @@ -14,10 +18,7 @@ group :development, :test do
end

group :test do
rails_version_constraint = [
'~> 4.0',
'< 4.1.0'
]
rails_version_constraint = ['~> 4.1.0']
# blank?
gem 'activesupport', *rails_version_constraint
# Upload coverage reports to coveralls.io
Expand Down
2 changes: 2 additions & 0 deletions lib/yard/metasploit/erd/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ module Version
MINOR = 0
# The patch version number, scoped to the {MAJOR} and {MINOR} version numbers.
PATCH = 0
# The prerelease version, scoped to the {MAJOR}, {MINOR}, and {PATCH} version numbers.
PRERELEASE = 'rails-4.1'

# The full version string, including the {YARD::Metasploit::ERD::Version::MAJOR},
# {YARD::Metasploit::ERD::Version::MINOR}, {YARD::Metasploit::ERD::Version::PATCH}, and optionally, the
Expand Down
2 changes: 1 addition & 1 deletion yard-metasploit-erd.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'rspec', '~> 3.1'

# Generates namespace Module and Class<ActiveRecord::Base> specific ERDs for use in templates
spec.add_runtime_dependency 'metasploit-erd', '~> 1.0'
spec.add_runtime_dependency 'metasploit-erd'
# RailsERD::Domain is used directly to generate the _index.html ERD.
spec.add_runtime_dependency 'rails-erd'
spec.add_runtime_dependency 'yard'
Expand Down

0 comments on commit e84c82e

Please sign in to comment.