metasploit-model 0.30.2 → 1.0.0.pre.rails.pre.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60f37721241e221207091b15449175cb958c986f
-  data.tar.gz: 3bcd0d59f452ea8fbf20cb4cad0b68ff3ffe1d69
+  metadata.gz: 49d17e528f023038bfa676b470ca076cddbdeea1
+  data.tar.gz: 2282f543d74c31809dd7a18d71db49c5183d9eb6
 SHA512:
-  metadata.gz: a9c5cff62b39bacf185687c321400e1a8bcd25df6f66483503a90967b66d070522357908b9b5e38f3ee1b213767537c14cb915869b31b94d946789573f60a24e
-  data.tar.gz: 53f1a31cb92c3b5f477dea709ca1802a7797b5d943583c5dbf4d2f621cd4119242c729d8c2e4e8f8f42008642bd7d8c204b0f2fd07b120f4f14977949ff2c17e
+  metadata.gz: 671800659174b03d7e2d3b34ed15b108ea9ef8a2a52a4b6c7fa4d3e6a759b64553ef9ed4a82f3dae3055894544ea8c7c6b35ddbd56698edb708ec9f902259824
+  data.tar.gz: c8eb303164a1984ef76df9a9cf6c392e76af10ba256272e1d0586f3b5820b707caab1f8b23dcf3f641aac00fee046d5808df9212445f20547f6d9b35da0acfa8

data/.rspec

@@ -1,2 +1,4 @@
---color
---require spec_helper
+--backtrace
+--colour
+--drb
+--format documentation

data/CONTRIBUTING.md

@@ -25,18 +25,19 @@ issue tracking software.
 
 ### `PRERELEASE`
 
-1. Update `PRERELEASE` to match the `SUMMARY` in the branch name.  If you branched from `master`, and [version.rb](lib/metasploit/model/version.rb) does not have `PRERELEASE` defined, then adding the following lines after `PATCH`:
+1. Update `PRERELEASE` to match the `SUMMARY` in the branch name.  If you branched from `master`, and [version.rb](lib/metasploit/model/version.rb) does not have `PRERELEASE` defined, then adding the following lines after `PATCH`: 
 ```
-# The prerelease version, scoped to the {MAJOR}, {MINOR}, and {PATCH} version number.
+# The prerelease version, scoped to the {PATCH} version number.
 PRERELEASE = '<SUMMARY>'
 ```
 2. `rake spec`
 3.  Verify the specs pass, which indicates that `PRERELEASE` was updated correctly.
 4. Commit the change `git commit -a`
 
+
 ### Your changes
 
-Make your changes or however many commits you like, committing each with `git commit`.
+Make your changes or however many commits you like, commiting each with `git commit`.
 
 ### Pre-Pull Request Testing
 
@@ -45,12 +46,12 @@ Make your changes or however many commits you like, committing each with `git co
 
 ### Push
 
-Push your branch to your fork on github: `git push TYPE/ISSUE/SUMMARY`
+Push your branch to your fork on gitub: `git push push TYPE/ISSUE/SUMMARY`
 
 ### Pull Request
 
 * [Create new Pull Request](https://github.com/rapid7/metasploit-model/compare/)
-* Add a Verification Steps to the description comment
+* Add a Verification Steps comment
 
 ```
 # Verification Steps
@@ -61,7 +62,6 @@ Push your branch to your fork on github: `git push TYPE/ISSUE/SUMMARY`
 - [ ] `rake spec`
 - [ ] VERIFY no failures
 ```
-
 You should also include at least one scenario to manually check the changes outside of specs.
 
 * Add a Post-merge Steps comment
@@ -106,7 +106,7 @@ Perform these steps prior to pushing to DESTINATION or the build will be broke o
 - [ ] Change `PRERELEASE` from `SOURCE_SUMMARY` to `DESTINATION_SUMMARY` to match the branch (DESTINATION) summary (DESTINATION_SUMMARY)
 
 ## Gem build
-- [ ] gem build metasploit-model.gemspec
+- [ ] gem build *.gemspec
 - [ ] VERIFY the prerelease suffix has change on the gem.
 
 ## RSpec
@@ -118,5 +118,45 @@ Perform these steps prior to pushing to DESTINATION or the build will be broke o
 - [ ] `git push origin DESTINATION`
 ```
 
-To update the [CHANGELOG.md](CHANGELOG.md) with the merged changes or release the merged code see
-[RELEASING.md](RELEASING.md)
+* Add a 'Release Steps' comment
+
+The 'Release Steps' are a reminder to the reviewer of the Pull Request of how to release the gem.
+
+```
+# Release
+
+Complete these steps on DESTINATION
+
+## Version
+
+### Compatible changes
+
+If the change are compatible with the previous branch's API, then increment [`PATCH`](lib/metasploit/model/version.rb).
+
+### Incompatible changes
+
+If your changes are incompatible with the previous branch's API, then increment
+[`MINOR`](lib/metasploit/model/version.rb) and reset [`PATCH`](lib/metasploit/model/version.rb) to `0`.
+
+- [ ] Following the rules for [semantic versioning 2.0](http://semver.org/spec/v2.0.0.html), update
+[`MINOR`](lib/metasploit/model/version.rb) and [`PATCH`](lib/metasploit/model/version.rb) and commit the changes.
+
+## JRuby
+- [ ] `rvm use jruby@metasploit-model`
+- [ ] `rm Gemfile.lock`
+- [ ] `bundle install`
+- [ ] `rake release`
+
+## MRI Ruby
+- [ ] `rvm use ruby-2.1@metasploit-model`
+- [ ] `rm Gemfile.lock`
+- [ ] `bundle install`
+- [ ] `rake release`
+```
+
+### Downstream dependencies
+
+When releasing new versions, the following projects may need to be updated:
+
+* [metasploit_data_models](https://github.com/rapid7/metasploit_data_models)
+* [metasploit-credential](https://github.com/rapid7/metasploit-credential)

data/Gemfile

@@ -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.
@@ -26,7 +26,12 @@ group :test do
   gem 'coveralls', require: false
   # Engine tasks are loaded using railtie
   gem 'railties', *rails_version_constraint
-  gem 'rspec-rails', '~> 3.1'
+  gem 'rspec'
+  # need rspec-core >= 2.14.0 because 2.14.0 introduced RSpec::Core::SharedExampleGroup::TopLevel
+  gem 'rspec-core', '>= 2.14.0', '< 3.0.0'
+  # need rspec-rails >= 2.12.0 as 2.12.0 adds support for redefining named subject in nested context that uses the
+  # named subject from the outer context without causing a stack overflow.
+  gem 'rspec-rails', '>= 2.12.0'
   # In a full rails project, factory_girl_rails would be in both the :development, and :test group, but since we only
   # want rails in :test, factory_girl_rails must also only be in :test.
   # add matchers from shoulda, such as validates_presence_of, which are useful for testing validations

data/lib/metasploit/model.rb

@@ -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'
 

data/lib/metasploit/model/engine.rb

@@ -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!

data/lib/metasploit/model/version.rb

@@ -2,29 +2,20 @@ module Metasploit
   module Model
     # Holds components of {VERSION} as defined by {http://semver.org/spec/v2.0.0.html semantic versioning v2.0.0}.
     module Version
-      #
-      # CONSTANTS
-      #
-
       # The major version number.
-      MAJOR = 0
+      MAJOR = 1
       # The minor version number, scoped to the {MAJOR} version number.
-      MINOR = 30
-      # The patch version number, scoped to the {MAJOR} and {MINOR} version numbers.
-      PATCH = 2
-
-      #
-      # Module Methods
-      #
+      MINOR = 0
+      # The patch number, scoped to the {MINOR} version number.
+      PATCH = 0
+      # the prerelease identifier
+      PRERELEASE = 'rails-4.0'
 
-      # The full version string, including the {Metasploit::Model::Version::MAJOR},
-      # {Metasploit::Model::Version::MINOR}, {Metasploit::Model::Version::PATCH}, and optionally, the
-      # `Metasploit::Model::Version::PRERELEASE` in the
+      # The full version string, including the {MAJOR}, {MINOR}, {PATCH}, and optionally, the {PRERELEASE} in the
       # {http://semver.org/spec/v2.0.0.html semantic versioning v2.0.0} format.
       #
-      # @return [String] '{Metasploit::Model::Version::MAJOR}.{Metasploit::Model::Version::MINOR}.{Metasploit::Model::Version::PATCH}'
-      #   on master. '{Metasploit::Model::Version::MAJOR}.{Metasploit::Model::Version::MINOR}.{Metasploit::Model::Version::PATCH}-PRERELEASE'
-      #   on any branch other than master.
+      # @return [String] '{MAJOR}.{MINOR}.{PATCH}' on master.  '{MAJOR}.{MINOR}.{PATCH}-{PRERELEASE}' on any branch
+      #   other than master.
       def self.full
         version = "#{MAJOR}.#{MINOR}.#{PATCH}"
 
@@ -35,23 +26,20 @@ module Metasploit
         version
       end
 
-      # The full gem version string, including the {Metasploit::Model::Version::MAJOR},
-      # {Metasploit::Model::Version::MINOR}, {Metasploit::Model::Version::PATCH}, and optionally, the
-      # `Metasploit::Model::Version::PRERELEASE` in the
+      # The full gem version string, including the {MAJOR}, {MINOR}, {PATCH}, and optionally, the {PRERELEASE} in the
       # {http://guides.rubygems.org/specification-reference/#version RubyGems versioning} format.
       #
-      # @return [String] '{Metasploit::Model::Version::MAJOR}.{Metasploit::Model::Version::MINOR}.{Metasploit::Model::Version::PATCH}'
-      #   on master.  '{Metasploit::Model::Version::MAJOR}.{Metasploit::Model::Version::MINOR}.{Metasploit::Model::Version::PATCH}.PRERELEASE'
-      #   on any branch other than master.
+      # @return [String] '{MAJOR}.{MINOR}.{PATCH}' on master.  '{MAJOR}.{MINOR}.{PATCH}.{PRERELEASE}' on any branch
+      #   other than master.
       def self.gem
         full.gsub('-', '.pre.')
       end
     end
 
-    # (see Version.gem)
+    # @see Version.gem
     GEM_VERSION = Version.gem
 
-    # (see Version.full)
+    # @see Version.full
     VERSION = Version.full
   end
 end

data/metasploit-model.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.1'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'metasploit-version', '~> 0.1.3'
   spec.add_development_dependency 'metasploit-yard', '~> 1.0'
   spec.add_development_dependency 'rake'
 
@@ -28,8 +27,11 @@ 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 'activesupport', *rails_version_constraints
+
+  spec.add_runtime_dependency 'railties', *rails_version_constraints
 
   if RUBY_PLATFORM =~ /java/
     # markdown formatting for yard

data/spec/app/models/metasploit/model/association/reflection_spec.rb

@@ -1,8 +1,10 @@
-RSpec.describe Metasploit::Model::Association::Reflection, type: :model do
+require 'spec_helper'
+
+describe Metasploit::Model::Association::Reflection do
   context 'validations' do
-    it { is_expected.to validate_presence_of :model }
-    it { is_expected.to validate_presence_of :name }
-    it { is_expected.to validate_presence_of :class_name }
+    it { should validate_presence_of :model }
+    it { should validate_presence_of :name }
+    it { should validate_presence_of :class_name }
   end
 
   context '#klass' do
@@ -40,7 +42,7 @@ RSpec.describe Metasploit::Model::Association::Reflection, type: :model do
     end
 
     it 'should return Class with Class#name #class_name' do
-      expect(klass).to eq(class_name_class)
+      klass.should == class_name_class
     end
   end
 end

data/spec/app/models/metasploit/model/search/group/base_spec.rb

@@ -1,3 +1,5 @@
-RSpec.describe Metasploit::Model::Search::Group::Base, type: :model do
-  it { is_expected.to ensure_length_of(:children).is_at_least(1) }
+require 'spec_helper'
+
+describe Metasploit::Model::Search::Group::Base do
+  it { should ensure_length_of(:children).is_at_least(1) }
 end

data/spec/app/models/metasploit/model/search/group/intersection_spec.rb

@@ -1,3 +1,5 @@
-RSpec.describe Metasploit::Model::Search::Group::Intersection, type: :model do
-  it { is_expected.to be_a Metasploit::Model::Search::Group::Base }
+require 'spec_helper'
+
+describe Metasploit::Model::Search::Group::Intersection do
+  it { should be_a Metasploit::Model::Search::Group::Base }
 end

data/spec/app/models/metasploit/model/search/group/union_spec.rb

@@ -1,3 +1,5 @@
-RSpec.describe Metasploit::Model::Search::Group::Union, type: :model do
-  it { is_expected.to be_a Metasploit::Model::Search::Group::Base }
+require 'spec_helper'
+
+describe Metasploit::Model::Search::Group::Union do
+  it { should be_a Metasploit::Model::Search::Group::Base }
 end

data/spec/app/models/metasploit/model/search/operation/association_spec.rb

@@ -1,4 +1,6 @@
-RSpec.describe Metasploit::Model::Search::Operation::Association, type: :model do
+require 'spec_helper'
+
+describe Metasploit::Model::Search::Operation::Association do
   subject(:operation) {
     described_class.new(
         source_operation: source_operation
@@ -33,7 +35,7 @@ RSpec.describe Metasploit::Model::Search::Operation::Association, type: :model d
             true
           }
 
-          it { is_expected.not_to include(invalid_error) }
+          it { should_not include(invalid_error) }
         end
 
         context 'without valid' do
@@ -41,7 +43,7 @@ RSpec.describe Metasploit::Model::Search::Operation::Association, type: :model d
             false
           }
 
-          it { is_expected.to include(invalid_error) }
+          it { should include(invalid_error) }
         end
       end
 
@@ -54,12 +56,12 @@ RSpec.describe Metasploit::Model::Search::Operation::Association, type: :model d
           nil
         }
 
-        it { is_expected.to include(blank_error) }
-        it { is_expected.not_to include(invalid_error) }
+        it { should include(blank_error) }
+        it { should_not include(invalid_error) }
       end
     end
   end
 
-  it { is_expected.not_to respond_to :value }
-  it { is_expected.not_to respond_to :value= }
+  it { should_not respond_to :value }
+  it { should_not respond_to :value= }
 end

data/spec/app/models/metasploit/model/search/operation/base_spec.rb

@@ -1,11 +1,13 @@
-RSpec.describe Metasploit::Model::Search::Operation::Base, type: :model do
+require 'spec_helper'
+
+describe Metasploit::Model::Search::Operation::Base do
   subject(:operation) do
     described_class.new
   end
 
   context 'validations' do
     context 'operator' do
-      it { is_expected.to validate_presence_of(:operator) }
+      it { should validate_presence_of(:operator) }
 
       context 'valid' do
         let(:errors) do
@@ -38,7 +40,7 @@ RSpec.describe Metasploit::Model::Search::Operation::Base, type: :model do
             end
 
             it 'should not record error on operator' do
-              expect(errors).not_to include(error)
+              errors.should_not include(error)
             end
           end
 
@@ -48,7 +50,7 @@ RSpec.describe Metasploit::Model::Search::Operation::Base, type: :model do
             end
 
             it 'should record error on operator' do
-              expect(errors).to include(error)
+              errors.should include(error)
             end
           end
         end
@@ -59,7 +61,7 @@ RSpec.describe Metasploit::Model::Search::Operation::Base, type: :model do
           end
 
           it 'should not record error on operator' do
-            expect(errors).not_to include(error)
+            errors.should_not include(error)
           end
         end
       end

data/spec/app/models/metasploit/model/search/operation/boolean_spec.rb

@@ -1,24 +1,21 @@
-RSpec.describe Metasploit::Model::Search::Operation::Boolean, type: :model do
+require 'spec_helper'
+
+describe Metasploit::Model::Search::Operation::Boolean do
   context 'CONSTANTS' do
     context 'FORMATTED_VALUE_TO_VALUE' do
       subject(:formatted_value_to_value) do
         described_class::FORMATTED_VALUE_TO_VALUE
       end
 
-      it "maps 'false' to false" do
-        expect(formatted_value_to_value['false']).to eq(false)
-      end
-
-      it "maps 'true' to true" do
-        expect(formatted_value_to_value['true']).to eq(true)
-      end
+      its(['false']) { should be_false }
+      its(['true']) { should be_true }
     end
   end
 
   context 'validations' do
-    it { is_expected.to allow_value(false).for(:value) }
-    it { is_expected.to allow_value(true).for(:value) }
-    it { is_expected.not_to allow_value(nil).for(:value) }
+    it { should allow_value(false).for(:value) }
+    it { should allow_value(true).for(:value) }
+    it { should_not allow_value(nil).for(:value) }
   end
 
   context '#value' do
@@ -35,7 +32,7 @@ RSpec.describe Metasploit::Model::Search::Operation::Boolean, type: :model do
         'false'
       end
 
-      it { is_expected.to eq(false) }
+      it { should be_false }
     end
 
     context "with 'true'" do
@@ -43,7 +40,7 @@ RSpec.describe Metasploit::Model::Search::Operation::Boolean, type: :model do
         'true'
       end
 
-      it { is_expected.to eq(true) }
+      it { should be_true }
     end
 
     context 'with other' do
@@ -52,7 +49,7 @@ RSpec.describe Metasploit::Model::Search::Operation::Boolean, type: :model do
       end
 
       it 'should return value unparsed' do
-        expect(value).to eq(formatted_value)
+        value.should == formatted_value
       end
     end
   end