metasploit-model 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a7d4ad9d0c4946c6a0e8ebe5025c81bc41ad31a
-  data.tar.gz: cfd7b5e32b8e5f6d8713e06d077dbe2046062a2c
+  metadata.gz: 33abd16455058ed7a3e80b262aa179eb63f717e5
+  data.tar.gz: b06dd66e1b8fd11133e5c9807ce88a358a207ebc
 SHA512:
-  metadata.gz: 541adb6f543a08f68a6cf291dd0a653da704d03f71235deeb0016299feba9dbea8db24a774128978003e9950ee15588ec687d478a1496d26ff13d5719164c099
-  data.tar.gz: 2a98c0a6042143b1690353facf0ec62abec652970c20abd768072598031a37e253650900afeb90402e73ef386d049d7cb8951e1c03189db17f89961645f16949
+  metadata.gz: d12399ecf2492ba0f99338a34cb736096f475b7bddd1624420af2063d94ed2af3c7459d86cc5587525fc93908dce056949306315bc5871849f3cf61b9e3cfa2b
+  data.tar.gz: d3b4b50fa2668bd2c9c943c3e4777497f9eb851e6739908b06a5ae7803635170806c918e21e5457cc0c5394e275334c387dc7e37b6162aab3e0c36c6da187578

checksums.yaml.gz.sig

@@ -0,0 +1 @@
+t�1��!к�i��5	7_%�.N�HR`�_�ă�X1�i�Jl�7�{���@N����E+o3���F�����������1�
ƕ���S�F7���B]D��nҝ�N�EJ��q@g׮_Q�
O�}T���]l\|�0��9$�|�\�YJ:����@O��zH�Ge�y,NV�.xw�+��(�,�i��0&jB"ϵ�U��aGO�c/I�C��+��f�6IM��g��RV��v���~�ٗ�8U">���

data.tar.gz.sig

@@ -0,0 +1,3 @@
+!���d�p��r�K���𘸰���@̑��Y�5����l�2V�F�|�
c�v"͞Z,����@�/��J�޴�
���?�='������c�(\e�F��`e9�b<s]"˦:�c�lo���鼇��Xʸ^ğ�v&��W-+n{*�%�D���F����05��
+��]SiHR)�ojǍ?b|Cf��0�hP���(�X!�!,����*}���p�pC����;}(���0D�q���
+����aj��v���#`TD�

data/.travis.yml

@@ -1,13 +1,13 @@
 addons:
-  postgresql: '9.3'
+  postgresql: '9.5'
+group: stable
+sudo: false
 cache: bundler
+addons:
+  apt:
+    packages:
+      - graphviz
 language: ruby
 rvm:
-  - '2.1'
-  # JRuby failing for redcarpet and shoulda-matchers gems
-  # < 1.7.14
-  #- 'jruby-1.7.13'
-  # >= 1.7.14
-  #- 'jruby-1.7.14'
+  - 2.2.4
 script: bundle exec rake spec yard
-sudo: false

data/Gemfile

@@ -3,6 +3,9 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in metasploit-model.gemspec
 gemspec
 
+# gem 'metasploit-yard', github: 'rapid7/metasploit-yard', branch: 'staging/rails-upgrade'
+# gem 'metasploit-erd',  github: 'rapid7/metasploit-erd',  branch: 'staging/rails-upgrade'
+
 # used by dummy application
 group :development, :test do
   # supplies factories for producing model instance for specs

data/lib/metasploit/model/version.rb

@@ -1,57 +1,15 @@
 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 = 1
-      # The minor version number, scoped to the {MAJOR} version number.
-      MINOR = 0
-      # The patch version number, scoped to the {MAJOR} and {MINOR} version numbers.
-      PATCH = 2
-
-      #
-      # Module Methods
-      #
-
-      # 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
-      # {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.
-      def self.full
-        version = "#{MAJOR}.#{MINOR}.#{PATCH}"
-
-        if defined? PRERELEASE
-          version = "#{version}-#{PRERELEASE}"
-        end
-
-        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
-      # {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.
-      def self.gem
-        full.gsub('-', '.pre.')
-      end
+    # VERSION is managed by GemRelease
+    VERSION = '1.1.0'
+  
+    # @return [String]
+    #
+    # returns the VERSION
+    #
+  
+    def self.version
+      VERSION
     end
-
-    # (see Version.gem)
-    GEM_VERSION = Version.gem
-
-    # (see Version.full)
-    VERSION = Version.full
   end
 end

data/metasploit-model.gemspec

@@ -5,7 +5,7 @@ require 'metasploit/model/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'metasploit-model'
-  spec.version       = Metasploit::Model::GEM_VERSION
+  spec.version       = Metasploit::Model::VERSION
   spec.authors       = ['Luke Imhoff']
   spec.email         = ['luke_imhoff@rapid7.com']
   spec.description   = %q{Common code, such as validators and mixins, that are shared between ActiveModels in metasploit-framework and ActiveRecords in metasploit_data_models.}
@@ -19,8 +19,7 @@ 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 'metasploit-yard', '~> 1.1'
   spec.add_development_dependency 'rake'
 
   # documentation

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

@@ -35,7 +35,7 @@ RSpec.describe Metasploit::Model::Association::Reflection, type: :model do
       )
     end
 
-    before(:each) do
+    before(:example) do
       stub_const(class_name, class_name_class)
     end
 

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

@@ -10,7 +10,7 @@ RSpec.describe Metasploit::Model::Search::Operation::Association, type: :model d
   }
 
   context 'validation' do
-    before(:each) do
+    before(:example) do
       operation.valid?
     end
 

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

@@ -23,7 +23,7 @@ RSpec.describe Metasploit::Model::Search::Operation::Base, type: :model do
           )
         end
 
-        before(:each) do
+        before(:example) do
           operation.valid?
         end
 

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

@@ -1,7 +1,7 @@
 RSpec.describe Metasploit::Model::Search::Operation::Date, type: :model do
   context 'validation' do
     context 'value' do
-      before(:each) do
+      before(:example) do
         operation.valid?
       end
 

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

@@ -44,7 +44,7 @@ RSpec.describe Metasploit::Model::Search::Operation::Group::Base, type: :model d
           #
 
           context 'with all valid' do
-            before(:each) do
+            before(:example) do
               children.each do |child|
                 allow(child).to receive(:valid?).and_return(true)
               end
@@ -58,7 +58,7 @@ RSpec.describe Metasploit::Model::Search::Operation::Group::Base, type: :model d
           end
 
           context 'with later valid' do
-            before(:each) do
+            before(:example) do
               allow(children.first).to receive(:valid?).and_return(false)
               allow(children.second).to receive(:valid?).and_return(true)
             end

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

@@ -29,7 +29,7 @@ RSpec.describe Metasploit::Model::Search::Operation::Null, type: :model do
           )
         end
 
-        before(:each) do
+        before(:example) do
           operation.valid?
         end
 

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

@@ -12,7 +12,7 @@ RSpec.describe Metasploit::Model::Search::Operation::Set, type: :model do
         set.errors[:value]
       end
 
-      before(:each) do
+      before(:example) do
         set.valid?
       end
 

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

@@ -8,7 +8,7 @@ RSpec.describe Metasploit::Model::Search::Operator::Base, type: :model do
       described_class.new(klass: klass)
     end
 
-    before(:each) do
+    before(:example) do
       # have to stub since it's not implemented on base
       allow(operator).to receive(:name).and_return(name)
     end

data/spec/app/models/metasploit/model/search/operator/delegation_spec.rb

@@ -25,7 +25,7 @@ RSpec.describe Metasploit::Model::Search::Operator::Delegation, type: :model do
         'Demodulized'
       end
 
-      before(:each) do
+      before(:example) do
         stub_const("Namespace::#{base_name}", subclass)
       end
 
@@ -35,7 +35,7 @@ RSpec.describe Metasploit::Model::Search::Operator::Delegation, type: :model do
     end
 
     context 'with Camelized' do
-      before(:each) do
+      before(:example) do
         stub_const("CamelCase", subclass)
       end
 
@@ -64,7 +64,7 @@ RSpec.describe Metasploit::Model::Search::Operator::Delegation, type: :model do
       }
     end
 
-    before(:each) do
+    before(:example) do
       outer_search_operator_by_name = search_operator_by_name
 
       klass.send(:define_singleton_method, :search_operator_by_name) do

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

@@ -47,7 +47,7 @@ RSpec.describe Metasploit::Model::Search::Operator::Group::Base, type: :model do
     # Callbacks
     #
 
-    before(:each) do
+    before(:example) do
       allow(operator).to receive(:children).and_return(children)
     end
 

data/spec/app/models/metasploit/model/search/operator/null_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe Metasploit::Model::Search::Operator::Null, type: :model do
         I18n.translate('metasploit.model.errors.models.metasploit/model/search/operator/null.attributes.name.unknown')
       end
 
-      before(:each) do
+      before(:example) do
         operator.valid?
       end
 

data/spec/app/models/metasploit/model/search/operator/single_spec.rb

@@ -121,7 +121,7 @@ RSpec.describe Metasploit::Model::Search::Operator::Single, type: :model do
       double('Operation Class')
     end
 
-    before(:each) do
+    before(:example) do
       allow(operator).to receive(:operation_class).and_return(operation_class)
     end
 
@@ -144,7 +144,7 @@ RSpec.describe Metasploit::Model::Search::Operator::Single, type: :model do
       operator.send(:operation_class)
     end
 
-    before(:each) do
+    before(:example) do
       allow(operator).to receive(:type).and_return(type)
     end
 
@@ -210,7 +210,7 @@ RSpec.describe Metasploit::Model::Search::Operator::Single, type: :model do
           nil
         end
 
-        before(:each) do
+        before(:example) do
           allow(operator).to receive(:name).and_return(name)
         end
 
@@ -230,7 +230,7 @@ RSpec.describe Metasploit::Model::Search::Operator::Single, type: :model do
       operator.send(:operation_class_name)
     end
 
-    before(:each) do
+    before(:example) do
       allow(operator).to receive(:type).and_return(type)
     end
 
@@ -296,7 +296,7 @@ RSpec.describe Metasploit::Model::Search::Operator::Single, type: :model do
           nil
         end
 
-        before(:each) do
+        before(:example) do
           allow(operator).to receive(:name).and_return(name)
         end
 

data/spec/app/models/metasploit/model/search/query_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe Metasploit::Model::Search::Query, type: :model do
         )
       end
 
-      before(:each) do
+      before(:example) do
         stub_const('Queried', klass)
 
         # include after stubbing constant so that Class#name can be used for search_i18n_scope
@@ -33,7 +33,7 @@ RSpec.describe Metasploit::Model::Search::Query, type: :model do
           )
         end
 
-        before(:each) do
+        before(:example) do
           query.valid?
         end
 
@@ -71,7 +71,7 @@ RSpec.describe Metasploit::Model::Search::Query, type: :model do
           described_class.new
         end
 
-        before(:each) do
+        before(:example) do
           operation = double('Invalid Operation', :valid? => valid)
           allow(query).to receive(:operations).and_return([operation])
         end
@@ -198,7 +198,7 @@ RSpec.describe Metasploit::Model::Search::Query, type: :model do
         )
       end
 
-      before(:each) do
+      before(:example) do
         stub_const('QueriedClass', klass)
 
         # include after stubbing const so that search_i18n_scope can use Class#name
@@ -262,7 +262,7 @@ RSpec.describe Metasploit::Model::Search::Query, type: :model do
         )
       end
 
-      before(:each) do
+      before(:example) do
         stub_const('QueriedClass', klass)
 
         # include after stubbing const so that search_i18n_scope can use Class#name
@@ -288,7 +288,7 @@ RSpec.describe Metasploit::Model::Search::Query, type: :model do
           ''
         end
 
-        before(:each) do
+        before(:example) do
           @operator = klass.search_attribute attribute, :type => type
         end
 
@@ -441,7 +441,7 @@ RSpec.describe Metasploit::Model::Search::Query, type: :model do
       )
     end
 
-    before(:each) do
+    before(:example) do
       stub_const('Queried', klass)
 
       klass.send(:include, Metasploit::Model::Search)
@@ -525,7 +525,7 @@ RSpec.describe Metasploit::Model::Search::Query, type: :model do
       )
     end
 
-    before(:each) do
+    before(:example) do
       stub_const('QueriedClass', klass)
 
       # include after stubbing const so that search_i18n_scope can use Class#name
@@ -584,7 +584,7 @@ RSpec.describe Metasploit::Model::Search::Query, type: :model do
       )
     end
 
-    before(:each) do
+    before(:example) do
       stub_const('Queried', klass)
 
       klass.send(:include, Metasploit::Model::Search)
@@ -685,7 +685,7 @@ RSpec.describe Metasploit::Model::Search::Query, type: :model do
     # Callbacks
     #
 
-    before(:each) do
+    before(:example) do
       stub_const('Queried', klass)
 
       klass.send(:include, Metasploit::Model::Search)

data/spec/app/validators/parameters_validator_spec.rb

@@ -320,7 +320,7 @@ RSpec.describe ParametersValidator do
         ''
       end
 
-      before(:each) do
+      before(:example) do
         validate_each
       end
 

data/spec/app/validators/password_is_strong_validator_spec.rb

@@ -192,7 +192,7 @@ RSpec.describe PasswordIsStrongValidator do
             username
           end
 
-          before(:each) do
+          before(:example) do
             record.username = username
           end
 

data/spec/dummy/config/application.rb

@@ -33,7 +33,10 @@ module Dummy
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
-
+    
+    # Raise deprecations as errors
+    config.active_support.deprecation = :raise
+    
     # Enable escaping HTML in JSON.
     config.active_support.escape_html_entities_in_json = true
 

data/spec/dummy/config/environments/development.rb

@@ -13,9 +13,6 @@ Dummy::Application.configure do
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Print deprecation notices to the Rails logger
-  config.active_support.deprecation = :log
-
   # Do not compress assets
   config.assets.compress = false
 

data/spec/dummy/config/environments/production.rb

@@ -59,7 +59,4 @@ Dummy::Application.configure do
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation can not be found)
   config.i18n.fallbacks = true
-
-  # Send deprecation notices to registered listeners
-  config.active_support.deprecation = :notify
 end

data/spec/dummy/config/environments/test.rb

@@ -23,7 +23,4 @@ Dummy::Application.configure do
 
   # Disable request forgery protection in test environment
   config.action_controller.allow_forgery_protection    = false
-
-  # Print deprecation notices to the stderr
-  config.active_support.deprecation = :stderr
 end

data/spec/lib/metasploit/model/association/error_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe Metasploit::Model::Association::Error do
     end
 
     context 'without :model' do
-      before(:each) do
+      before(:example) do
         attributes.delete(:model)
       end
 
@@ -24,7 +24,7 @@ RSpec.describe Metasploit::Model::Association::Error do
     end
 
     context 'without :name' do
-      before(:each) do
+      before(:example) do
         attributes.delete(:name)
       end
 

data/spec/lib/metasploit/model/association_spec.rb

@@ -102,7 +102,7 @@ RSpec.describe Metasploit::Model::Association do
       :associated_things
     end
 
-    before(:each) do
+    before(:example) do
       base_class.association name, :class_name => class_name
     end
 

data/spec/lib/metasploit/model/base_spec.rb

@@ -25,7 +25,7 @@ RSpec.describe Metasploit::Model::Base do
       base_class.new
     end
 
-    before(:each) do
+    before(:example) do
       allow(base_instance).to receive(:valid?).and_return(valid)
     end
 

data/spec/lib/metasploit/model/file_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe Metasploit::Model::File do
       Metasploit::Model::Spec.temporary_pathname.join(symlink_basename)
     end
 
-    before(:each) do
+    before(:example) do
       real_pathname.mkpath
 
       Dir.chdir(Metasploit::Model::Spec.temporary_pathname.to_path) do

data/spec/lib/metasploit/model/nilify_blanks_spec.rb

@@ -67,7 +67,7 @@ RSpec.describe Metasploit::Model::NilifyBlanks do
       'value'
     end
 
-    before(:each) do
+    before(:example) do
       base_class.class_eval do
         #
         # Attributes
@@ -130,7 +130,7 @@ RSpec.describe Metasploit::Model::NilifyBlanks do
         double('Value')
       end
 
-      before(:each) do
+      before(:example) do
         allow(value).to receive(:respond_to?).with(:blank?).and_return(false)
       end
 

data/spec/lib/metasploit/model/search/association_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe Metasploit::Model::Search::Association do
     }
 
     context 'with previous call to search_association with same association' do
-      before(:each) do
+      before(:example) do
         base_class.search_association association
       end
 
@@ -29,7 +29,7 @@ RSpec.describe Metasploit::Model::Search::Association do
     end
 
     context 'with association tree rooted on association' do
-      before(:each) do
+      before(:example) do
         base_class.search_associations association => :child_association
       end
 

data/spec/lib/metasploit/model/search/operation_spec.rb

@@ -45,7 +45,7 @@ RSpec.describe Metasploit::Model::Search::Operation do
         end
 
         context "with at least one ':' in :formatted_operation" do
-          before(:each) do
+          before(:example) do
             allow(query).to receive(:parse_operator).with(formatted_operator).and_return(operator)
             allow(operator).to receive(:operate_on).with(formatted_value).and_return(operation)
           end

data/spec/lib/metasploit/model/search/operator/help_spec.rb

@@ -31,7 +31,7 @@ RSpec.describe Metasploit::Model::Search::Operator::Help do
       end
     end
 
-    before(:each) do
+    before(:example) do
       # operator needs to be named or mode_name will fail.
       stub_const('OperatorClass', operator_class)
     end

data/spec/lib/metasploit/model/search_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe Metasploit::Model::Search do
     Class.new
   end
 
-  before(:each) do
+  before(:example) do
     # class needs to be named or search_i18n_scope will error
     stub_const('Searched', base_class)
 
@@ -28,7 +28,7 @@ RSpec.describe Metasploit::Model::Search do
         :searched_attribute
       end
 
-      before(:each) do
+      before(:example) do
         base_class.search_attribute attribute, :type => :string
       end
 
@@ -66,7 +66,7 @@ RSpec.describe Metasploit::Model::Search do
         'AssociatedThing'
       end
 
-      before(:each) do
+      before(:example) do
         base_class.search_association association
         base_class.send(:include, Metasploit::Model::Association)
 
@@ -143,7 +143,7 @@ RSpec.describe Metasploit::Model::Search do
         double('Operator Class', :new => operator)
       end
 
-      before(:each) do
+      before(:example) do
         base_class.search_with operator_class
       end
 

data/spec/lib/metasploit/model/spec/pathname_collision_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe Metasploit::Model::Spec::PathnameCollision do
     end
 
     context 'with existing Pathname' do
-      before(:each) do
+      before(:example) do
         pathname.mkpath
       end
 

data/spec/lib/metasploit/model/spec_spec.rb

@@ -1,9 +1,9 @@
 RSpec.describe Metasploit::Model::Spec do
-  before(:each) do
+  before(:example) do
     @before_temporary_pathname = described_class.send(:remove_instance_variable, :@temporary_pathname)
   end
 
-  after(:each) do
+  after(:example) do
     described_class.instance_variable_set(:@temporary_pathname, @before_temporary_pathname)
   end
 
@@ -17,12 +17,12 @@ RSpec.describe Metasploit::Model::Spec do
     end
 
     context 'with temporary_pathname set' do
-      before(:each) do
+      before(:example) do
         described_class.temporary_pathname = pathname
       end
 
       context 'that exists' do
-        before(:each) do
+        before(:example) do
           pathname.mkpath
 
           child_pathname = pathname.join('child')
@@ -69,7 +69,7 @@ RSpec.describe Metasploit::Model::Spec do
         Metasploit::Model::Engine.root.join('spec', 'pathname')
       end
 
-      before(:each) do
+      before(:example) do
         described_class.temporary_pathname = pathname
       end
 

data/spec/lib/metasploit/model/visitation/visit_spec.rb

@@ -46,7 +46,7 @@ RSpec.describe Metasploit::Model::Visitation::Visit do
           Module.new
         end
 
-        before(:each) do
+        before(:example) do
           # give mod a Module#name for use in options
           stub_const('Visited', mod)
         end
@@ -80,7 +80,7 @@ RSpec.describe Metasploit::Model::Visitation::Visit do
           Module.new
         end
 
-        before(:each) do
+        before(:example) do
           stub_const('Visited::First', first_module)
           stub_const('Visited::Second', second_module)
         end
@@ -150,12 +150,12 @@ RSpec.describe Metasploit::Model::Visitation::Visit do
       Class.new
     end
 
-    before(:each) do
+    before(:example) do
       stub_const('Visited::Class', klass)
     end
 
     context 'with klass in visitor_by_module' do
-      before(:each) do
+      before(:example) do
         base_class.visitor_by_module[klass] = klass_visitor
       end
 
@@ -177,14 +177,14 @@ RSpec.describe Metasploit::Model::Visitation::Visit do
         )
       end
 
-      before(:each) do
+      before(:example) do
         stub_const('Visited::Ancestor', ancestor)
 
         klass.send(:include, ancestor)
       end
 
       context 'with ancestor in visitor_by_module' do
-        before(:each) do
+        before(:example) do
           base_class.visitor_by_module[ancestor] = ancestor_visitor
         end
 
@@ -200,7 +200,7 @@ RSpec.describe Metasploit::Model::Visitation::Visit do
       end
 
       context "with ancestor Module#name in visitor_by_module_name" do
-        before(:each) do
+        before(:example) do
           base_class.visitor_by_module_name[ancestor.name] = ancestor_visitor
         end
 
@@ -268,7 +268,7 @@ RSpec.describe Metasploit::Model::Visitation::Visit do
       Class.new
     end
 
-    before(:each) do
+    before(:example) do
       stub_const('Visited::Class', node_class)
 
       visitors = base_class.visit node.class.name, &block
@@ -302,7 +302,7 @@ RSpec.describe Metasploit::Model::Visitation::Visit do
         node_class.new
       end
 
-      before(:each) do
+      before(:example) do
         node_class.class_eval do
           attr_accessor :child
         end

data/spec/lib/metasploit/model_spec.rb

@@ -1,4 +1,13 @@
 RSpec.describe Metasploit::Model do
-  it_should_behave_like 'Metasploit::Version GEM_VERSION constant'
-  it_should_behave_like 'Metasploit::Version VERSION constant'
+  context 'CONSTANTS' do
+    context 'VERSION' do
+      subject(:version) {
+        described_class::VERSION
+      }
+
+      it 'is Metasploit::ERD::Version.full' do
+        expect(version).to eq(Metasploit::Model::VERSION)
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -15,19 +15,8 @@ SimpleCov.formatter = Coveralls::SimpleCov::Formatter
 require File.expand_path('../dummy/config/environment.rb',  __FILE__)
 require 'rspec/rails'
 
-# Use find_all_by_name instead of find_by_name as find_all_by_name will return pre-release versions
-gem_specification = Gem::Specification.find_all_by_name('metasploit-version').first
-
-roots = [
-    Metasploit::Model::Engine.root.to_path,
-    gem_specification.gem_dir
-]
-
-roots.each do |root|
-  Dir[File.join(root, 'spec', 'support', '**', '*.rb')].each do |f|
-    require f
-  end
-end
+# Requiring all support/**/*.rb files
+Dir["./spec/support/**/*.rb"].sort.each { |f| require f}
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
@@ -110,9 +99,29 @@ RSpec.configure do |config|
     I18n.exception_handler = Metasploit::Model::Spec::I18nExceptionHandler.new
   end
 
-  config.after(:each) do
+  config.after(:example) do
     Metasploit::Model::Spec.remove_temporary_pathname
   end
+
+  # rspec-rails 3 will no longer automatically infer an example group's spec type
+  # from the file location. You can explicitly opt-in to the feature using this
+  # config option.
+  # To explicitly tag specs without using automatic inference, set the `:type`
+  # metadata manually:
+  #
+  #     describe ThingsController, :type => :controller do
+  #       # Equivalent to being in spec/controllers
+  #     end
+  config.infer_spec_type_from_file_location!
+
+  # Setting this config option `false` removes rspec-core's monkey patching of the
+  # top level methods like `describe`, `shared_examples_for` and `shared_context`
+  # on `main` and `Module`. The methods are always available through the `RSpec`
+  # module like `RSpec.describe` regardless of this setting.
+  # For backwards compatibility this defaults to `true`.
+  #
+  # https://relishapp.com/rspec/rspec-core/v/3-0/docs/configuration/global-namespace-dsl
+  config.expose_dsl_globally = false
 end
 
 Shoulda::Matchers.configure do |config|

data/spec/support/matchers/allow_attribute.rb

@@ -3,11 +3,11 @@ RSpec::Matchers.define :allow_attribute do |attribute|
     "allow zero or more items for #{attribute}"
   end
 
-  failure_message_for_should do |module_instance|
+  failure_message do |module_instance|
     "expected that #{module_instance} with #{module_instance.module_type} #module_type would allow #{attribute} zero or more items"
   end
 
-  failure_message_for_should_not do |module_instance|
+  failure_message_when_negated do |module_instance|
     "expected that #{module_instance} with #{module_instance.module_type} would not allow #{attribute} zero or more items"
   end
 

data/spec/support/shared/examples/metasploit/model/search/operator/help.rb

@@ -20,7 +20,7 @@ RSpec.shared_examples_for 'Metasploit::Model::Search::Operator::Help' do
       'operator_name'
     end
 
-    before(:each) do
+    before(:example) do
       # klass needs to be named or model_name will fail.
       stub_const('Klass', klass)
       # since missing translations raise exceptions, and there is no translation for klass, have to stub out.
@@ -54,7 +54,7 @@ RSpec.shared_examples_for 'Metasploit::Model::Search::Operator::Help' do
       }
     end
 
-    after(:each) do
+    after(:example) do
       @metasploit_model_translations.delete(:ancestors)
     end
 

data/spec/support/shared/examples/search_with.rb

@@ -23,7 +23,7 @@ RSpec.shared_examples_for 'search_with' do |operation_class, options={}|
       end
 
       context 'with en locale' do
-        around(:each) do |example|
+        around(:example) do |example|
           I18n.with_locale(:en) do
             example.run
           end

metadata

@@ -1,14 +1,91 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-model
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Luke Imhoff
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG
+  A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
+  b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw
+  MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
+  YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT
+  aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ
+  jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp
+  xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp
+  1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG
+  snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ
+  U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8
+  9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E
+  BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B
+  AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz
+  yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE
+  38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP
+  AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad
+  DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME
+  HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
+  -----END CERTIFICATE-----
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEKDCCAxCgAwIBAgILBAAAAAABL07hNVwwDQYJKoZIhvcNAQEFBQAwVzELMAkG
+  A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
+  b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw0xMTA0MTMxMDAw
+  MDBaFw0xOTA0MTMxMDAwMDBaMFExCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
+  YWxTaWduIG52LXNhMScwJQYDVQQDEx5HbG9iYWxTaWduIENvZGVTaWduaW5nIENB
+  IC0gRzIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyTxTnEL7XJnKr
+  NpfvU79ChF5Y0Yoo/ENGb34oRFALdV0A1zwKRJ4gaqT3RUo3YKNuPxL6bfq2RsNq
+  o7gMJygCVyjRUPdhOVW4w+ElhlI8vwUd17Oa+JokMUnVoqni05GrPjxz7/Yp8cg1
+  0DB7f06SpQaPh+LO9cFjZqwYaSrBXrta6G6V/zuAYp2Zx8cvZtX9YhqCVVrG+kB3
+  jskwPBvw8jW4bFmc/enWyrRAHvcEytFnqXTjpQhU2YM1O46MIwx1tt6GSp4aPgpQ
+  STic0qiQv5j6yIwrJxF+KvvO3qmuOJMi+qbs+1xhdsNE1swMfi9tBoCidEC7tx/0
+  O9dzVB/zAgMBAAGjgfowgfcwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
+  Af8CAQAwHQYDVR0OBBYEFAhu2Lacir/tPtfDdF3MgB+oL1B6MEcGA1UdIARAMD4w
+  PAYEVR0gADA0MDIGCCsGAQUFBwIBFiZodHRwczovL3d3dy5nbG9iYWxzaWduLmNv
+  bS9yZXBvc2l0b3J5LzAzBgNVHR8ELDAqMCigJqAkhiJodHRwOi8vY3JsLmdsb2Jh
+  bHNpZ24ubmV0L3Jvb3QuY3JsMBMGA1UdJQQMMAoGCCsGAQUFBwMDMB8GA1UdIwQY
+  MBaAFGB7ZhpFDZfKiVAvfQTNNKj//P1LMA0GCSqGSIb3DQEBBQUAA4IBAQAiXMXd
+  PfQLcNjj9efFjgkBu7GWNlxaB63HqERJUSV6rg2kGTuSnM+5Qia7O2yX58fOEW1o
+  kdqNbfFTTVQ4jGHzyIJ2ab6BMgsxw2zJniAKWC/wSP5+SAeq10NYlHNUBDGpeA07
+  jLBwwT1+170vKsPi9Y8MkNxrpci+aF5dbfh40r5JlR4VeAiR+zTIvoStvODG3Rjb
+  88rwe8IUPBi4A7qVPiEeP2Bpen9qA56NSvnwKCwwhF7sJnJCsW3LZMMSjNaES2dB
+  fLEDF3gJ462otpYtpH6AA0+I98FrWkYVzSwZi9hwnOUtSYhgcqikGVJwQ17a1kYD
+  sGgOJO9K9gslJO8k
+  -----END CERTIFICATE-----
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEyjCCA7KgAwIBAgISESEyE8rNriS4+1dc8jOHEUL8MA0GCSqGSIb3DQEBBQUA
+  MFExCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMScwJQYD
+  VQQDEx5HbG9iYWxTaWduIENvZGVTaWduaW5nIENBIC0gRzIwHhcNMTMxMDExMTUx
+  NTM4WhcNMTYxMDExMTUxNTM4WjBgMQswCQYDVQQGEwJVUzEWMBQGA1UECBMNTWFz
+  c2FjaHVzZXR0czEPMA0GA1UEBxMGQm9zdG9uMRMwEQYDVQQKEwpSYXBpZDcgTExD
+  MRMwEQYDVQQDEwpSYXBpZDcgTExDMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+  CgKCAQEAhD//7+739c69hssg0mD6CXgf2JkuWTcU81dgD7aKcoEPqU8e1FseBvDW
+  /Q5fNK2H2NgHV/Msn18zXuK0PkaJXqj/vDsuKB3Hq0BiR2AwyDdEw8K5MK5bgQc2
+  tmcVtEAejRoy1Uv5UyfaAYAxG6zsma3buV1fjnEAC3VouRg4+EX/f65H/a6srntK
+  5Etp3D71k2f0oUl8dOqOmSsRJQQ5zSs4ktDvpjAmsvzoA+1svceLYU95mvQsIw2T
+  edpmibGMwGw/HmgV+YWBgF5UGvax6zbC2i6DF2YHnDfkNb8/1MEIaxOTAbJTazTK
+  8laCQOyay6L1BNPQKjZBgOge8LZq1wIDAQABo4IBizCCAYcwDgYDVR0PAQH/BAQD
+  AgeAMEwGA1UdIARFMEMwQQYJKwYBBAGgMgEyMDQwMgYIKwYBBQUHAgEWJmh0dHBz
+  Oi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMAkGA1UdEwQCMAAwEwYD
+  VR0lBAwwCgYIKwYBBQUHAwMwPgYDVR0fBDcwNTAzoDGgL4YtaHR0cDovL2NybC5n
+  bG9iYWxzaWduLmNvbS9ncy9nc2NvZGVzaWduZzIuY3JsMIGGBggrBgEFBQcBAQR6
+  MHgwQAYIKwYBBQUHMAKGNGh0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5jb20vY2Fj
+  ZXJ0L2dzY29kZXNpZ25nMi5jcnQwNAYIKwYBBQUHMAGGKGh0dHA6Ly9vY3NwMi5n
+  bG9iYWxzaWduLmNvbS9nc2NvZGVzaWduZzIwHQYDVR0OBBYEFE536JwFx9SpaEi3
+  w8pcq2GRFA5BMB8GA1UdIwQYMBaAFAhu2Lacir/tPtfDdF3MgB+oL1B6MA0GCSqG
+  SIb3DQEBBQUAA4IBAQAGpGXHtFLjTTivV+xQPwtZhfPuJ7f+VGTMSAAYWmfzyHXM
+  YMFYUWJzSFcuVR2YfxtbS45P7U5Qopd7jBQ0Ygk5h2a+B5nE4+UlhHj665d0zpYM
+  1eWndMaO6WBOYnqtNyi8Dqqc1foKZDNHEDggYhGso7OIBunup+N4sPL9PwQ3eYe6
+  mUu8z0E4GXYViaMPOFkqaYnoYgf2L+7L5zKYT4h/NE/P7kj7EbduHgy/v/aAIrNl
+  2SpuQH+SWteq3NXkAmFEEqvLJQ4sbptZt8OP8ghL3pVAvZNFmww/YVszSkShSzcg
+  QdihYCSEL2drS2cFd50jBeq71sxUtxbv82DUa2b+
+  -----END CERTIFICATE-----
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,34 +101,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: metasploit-version
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: metasploit-yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -345,7 +408,6 @@ files:
 - spec/lib/metasploit/model/spec/pathname_collision_spec.rb
 - spec/lib/metasploit/model/spec_spec.rb
 - spec/lib/metasploit/model/translation_spec.rb
-- spec/lib/metasploit/model/version_spec.rb
 - spec/lib/metasploit/model/visitation/visit_spec.rb
 - spec/lib/metasploit/model_spec.rb
 - spec/matchers/validate_nilness_of_spec.rb
@@ -477,7 +539,6 @@ test_files:
 - spec/lib/metasploit/model/spec/pathname_collision_spec.rb
 - spec/lib/metasploit/model/spec_spec.rb
 - spec/lib/metasploit/model/translation_spec.rb
-- spec/lib/metasploit/model/version_spec.rb
 - spec/lib/metasploit/model/visitation/visit_spec.rb
 - spec/lib/metasploit/model_spec.rb
 - spec/matchers/validate_nilness_of_spec.rb

metadata.gz.sig

@@ -0,0 +1 @@
+&ď���c�����Rx���W��@+O\Ğ����Ήn����+��|vH+��S�[H3��N�n��'��3��߅g��9�/�#l�����CG�ЃL�,i5���V���Js�#@Ӯ��s�&�b��+ǕE����.2�o�|�ƕ��[�	B�#/<��O�e�:�oS�r�ܽ*��>���w$�~58T���3��z&o���}�K��K�g(7�$�L u.���t�B�����8Lk�oǪ�Iz0|����

data/spec/lib/metasploit/model/version_spec.rb

@@ -1,3 +0,0 @@
-RSpec.describe Metasploit::Model::Version do
-  it_should_behave_like 'Metasploit::Version Version Module'
-end