Skip to content
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.

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

Update RELEASING.md to 1.0.0+ semantic versioning rules. #41

Closed
wants to merge 26 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
51b5ad7
Upgrading to Rails 4.0.9
darkbushido Aug 22, 2014
c6922f2
Changing how we are restricting rails
darkbushido Aug 25, 2014
be36b51
Updating the lock to >= 4.0.9
darkbushido Aug 25, 2014
122719c
locking the rails version to 4.0.9+
darkbushido Aug 25, 2014
c16bed3
commenting out the bundler version limit.
darkbushido Sep 4, 2014
9a76b06
Merge branch 'feature/MSP-11385/autoload' into feature/MSP-11385/rail…
limhoff-r7 Sep 24, 2014
e73333c
Merge branch 'feature/MSP-11385/autoload' into feature/MSP-11385/rail…
limhoff-r7 Sep 24, 2014
4ef57aa
Merge branch 'master' into staging/rails-4.0
darkbushido Sep 25, 2014
d18f3a5
Merge branch 'feature/MSP-11385/rails-4.0-autoload' into staging/rail…
darkbushido Sep 25, 2014
b9eb170
Merge branch 'master' into staging/rails-4.0
darkbushido Sep 25, 2014
aeb1b89
Merge branch 'master' into staging/rails-4.0
techpeace Oct 14, 2014
cc263a8
Merge branch 'master' into staging/rails-4.0
mbuck-r7 Jan 8, 2015
31f63df
Drop references to ActionDispatch::BestStandardsSupport
mbuck-r7 Jan 8, 2015
c64434a
Drop mass assignment protection at the model level
mbuck-r7 Jan 28, 2015
9fff11e
Disable attr_accessible security in favor of strong_params
mbuck-r7 Feb 4, 2015
0e684cb
Merge branch 'master' into staging/rails-4.0
mbuck-r7 Feb 13, 2015
6abeb5a
Switch deprecated ensure_inclusion_of to validate_inclusion_of
mbuck-r7 Feb 18, 2015
2dac547
Merge branch 'master' into staging/rails-4.0
mbuck-r7 Feb 19, 2015
0ee1b1f
Revert "Drop mass assignment protection at the model level"
farias-r7 Apr 6, 2015
4bb2a7a
Merge branch 'master' into staging/rails-4.0
mbuck-r7 Apr 6, 2015
e2743d6
Merge pull request #36 from rapid7/bug/MSP-12504/revert-mass-assignment
sgonzalez-r7 Apr 8, 2015
a7001eb
Dropping protected_attributes
darkbushido Apr 21, 2015
d975c8f
Merge branch 'master' into staging/rails-4.0
mbuck-r7 Apr 28, 2015
fd48044
fixing a minor version merge issue
darkbushido Apr 29, 2015
e78ef4f
Merge branch 'feature/MSP-11109/metasploit-version' into chore/MSP-12…
limhoff-r7 May 4, 2015
9027247
Update RELEASING for 1.0.0+
limhoff-r7 May 4, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ group :test do
# rails is not used because activerecord should not be included, but rails would normally coordinate the versions
# between its dependencies, which is now handled by this constraint.
rails_version_constraint = [
'>= 3.2.0',
'< 4.0.0'
'>= 4.0.9',
'< 4.1.0'
]

# Dummy app uses actionpack for ActionController, but not rails since it doesn't use activerecord.
Expand Down
19 changes: 11 additions & 8 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,21 @@ Complete these steps on DESTINATION

The entries in the [CHANGELOG.md](CHANGELOG.md) can be used to help determine how the `VERSION` should be bumped.

### Compatible changes
### Bug fixes

If the [CHANGELOG.md](CHANGELOG.md) contains only Enhancements, Bug Fixes, and/or Deprecations for the Next Release then
increment [`PATCH`](lib/metasploit/model/version.rb).
If the [CHANGELOG.md](CHANGELOG.md) contains only Bug Fixes for the Next Release, then increment
[`PATCH`](lib/metasploit/model/version.rb).

### Incompatible changes
### Compatible API changes

If the [CHANGELOG.md](CHANGELOG.md) contains any Incompatible Changes for the Next Release, then you can either (1)
decide to remain pre-1.0.0 or (2) advance to 1.0.0.
If the [CHANGELOG.md](CHANGELOG.md) contains any Enhancements or Deprecations, then increment
[`MINOR`](lib/metasploit/model/version.rb) and reset [`PATCH`](lib/metasploit/model/version.rb) to `0`.

1. To remain pre-1..0.0, then increment [`MINOR`](lib/metasploit/model/version.rb) and reset [`PATCH`](lib/metasploit/model/version.rb) to `0`.
2. To advance to 1.0.0, increment [`MAJOR`](lib/metasploit/model/version.rb) and reset [`MINOR`](lib/metasploit/model/version.rb and [`PATCH`](lib/metasploit/model/version.rb) to `0`.
### Incompatible API changes

If the [CHANGELOG.md](CHANGELOG.md) contains any Incompatible Change, then increment
[`MAJOR`](lib/metasploit/model/version.rb) and reset [`MINOR`](lib/metasploit/model/version.rb and
[`PATCH`](lib/metasploit/model/version.rb) to `0`.

## Setup [CHANGELOG.md](CHANGELOG.md) for next release

Expand Down
5 changes: 5 additions & 0 deletions lib/metasploit/model.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#
# Gems
#
# gems must load explicitly any gem declared in gemspec
# @see https://github.com/bundler/bundler/issues/2018#issuecomment-6819359
#
#

require 'active_model'
require 'active_support'

Expand Down
2 changes: 1 addition & 1 deletion lib/metasploit/model/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class Metasploit::Model::Engine < Rails::Engine

# Remove ActiveSupport::Dependencies loading paths to save time during constant resolution and to ensure that
# metasploit-model is properly declaring all autoloads and not falling back on ActiveSupport::Dependencies
config.paths.each_value do |path|
config.paths.values.each do |path|
path.skip_autoload!
path.skip_autoload_once!
path.skip_eager_load!
Expand Down
8 changes: 4 additions & 4 deletions lib/metasploit/model/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ module Version
#

# The major version number.
MAJOR = 0
MAJOR = 1
# The minor version number, scoped to the {MAJOR} version number.
MINOR = 30
MINOR = 0
# The patch version number, scoped to the {MAJOR} and {MINOR} version numbers.
PATCH = 2
PATCH = 0
# The prerelease version, scoped to the {MAJOR}, {MINOR}, and {PATCH} version numbers.
PRERELEASE = 'metasploit-version'
PRERELEASE = '1-0-0-plus'

#
# Module Methods
Expand Down
8 changes: 6 additions & 2 deletions metasploit-model.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,12 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'yard', '< 0.8.7.4'

# Dependency loading
spec.add_runtime_dependency 'activesupport'
spec.add_runtime_dependency 'railties', '< 4.0.0'
rails_version_constraints = ['>= 4.0.9', '< 4.1.0']

spec.add_runtime_dependency 'activemodel', *rails_version_constraints
spec.add_runtime_dependency 'activesupport', *rails_version_constraints

spec.add_runtime_dependency 'railties', *rails_version_constraints

if RUBY_PLATFORM =~ /java/
# markdown formatting for yard
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

context 'validations' do
it { is_expected.to validate_presence_of(:attribute) }
it { is_expected.to ensure_inclusion_of(:type).in_array(described_class::TYPES) }
it { is_expected.to validate_inclusion_of(:type).in_array(described_class::TYPES) }
end

context '#attribute_enumerable' do
Expand Down Expand Up @@ -99,4 +99,4 @@
expect(name).to eq(attribute)
end
end
end
end
4 changes: 3 additions & 1 deletion spec/dummy/config/application.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
require File.expand_path('../boot', __FILE__)

require 'rails/all'
# Pick the frameworks you want:
require 'active_model/railtie'
require "action_controller/railtie"

Bundler.require(*Rails.groups)

Expand Down
3 changes: 0 additions & 3 deletions spec/dummy/config/environments/development.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
# Print deprecation notices to the Rails logger
config.active_support.deprecation = :log

# Only use best-standards-support built into browsers
config.action_dispatch.best_standards_support = :builtin

# Do not compress assets
config.assets.compress = false

Expand Down