metasploit_data_models 0.24.4 → 0.24.5

data/spec/spec_helper.rb

@@ -22,6 +22,7 @@ end
 
 require File.expand_path('../dummy/config/environment.rb',  __FILE__)
 require 'rspec/rails'
+require 'rspec/autorun'
 
 # full backtrace in logs so its easier to trace errors
 Rails.backtrace_cleaner.remove_silencers!
@@ -29,102 +30,27 @@ Rails.backtrace_cleaner.remove_silencers!
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
 
-# 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
-
-Dir[File.join(gem_specification.gem_dir, 'spec', 'support', '**', '*.rb')].each do |f|
-  require f
-end
-
-roots = [
-    gem_specification.gem_dir,
-    Metasploit::Concern::Engine.root,
-    Metasploit::Model::Engine.root,
-    MetasploitDataModels::Engine.root
+engines = [
+    Metasploit::Concern::Engine,
+    Metasploit::Model::Engine,
+    MetasploitDataModels::Engine
 ]
 
-roots.each do |root|
-  support_glob = File.join(root, 'spec', 'support', '**', '*.rb')
+engines.each do |engine|
+  support_glob = engine.root.join('spec', 'support', '**', '*.rb')
 
   Dir.glob(support_glob) do |path|
     require path
   end
 end
 
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  # rspec-expectations config goes here. You can use an alternate
-  # assertion/expectation library such as wrong or the stdlib/minitest
-  # assertions if you prefer.
-  config.expect_with :rspec do |expectations|
-    # This option will default to `true` in RSpec 4. It makes the `description`
-    # and `failure_message` of custom matchers include text for helper methods
-    # defined using `chain`, e.g.:
-    #     be_bigger_than(2).and_smaller_than(4).description
-    #     # => "be bigger than 2 and smaller than 4"
-    # ...rather than:
-    #     # => "be bigger than 2"
-    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
-  end
-
-  # rspec-mocks config goes here. You can use an alternate test double
-  # library (such as bogus or mocha) by changing the `mock_with` option here.
-  config.mock_with :rspec do |mocks|
-    # Prevents you from mocking or stubbing a method that does not exist on
-    # a real object. This is generally recommended, and will default to
-    # `true` in RSpec 4.
-    mocks.verify_partial_doubles = true
-  end
-
-  # These two settings work together to allow you to limit a spec run
-  # to individual examples or groups you care about by tagging them with
-  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
-  # get run.
-  config.filter_run :focus
-  config.run_all_when_everything_filtered = true
-
-  # Limits the available syntax to the non-monkey patched syntax that is
-  # recommended. For more details, see:
-  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
-  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
-  config.disable_monkey_patching!
-
-  # This setting enables warnings. It's recommended, but in some cases may
-  # be too noisy due to issues in dependencies.
-  config.warnings = true
-
-  # Many RSpec users commonly either run the entire suite or an individual
-  # file, and it's useful to allow more verbose output when running an
-  # individual spec file.
-  if config.files_to_run.one?
-    # Use the documentation formatter for detailed output,
-    # unless a formatter has already been configured
-    # (e.g. via a command-line flag).
-    config.default_formatter = 'doc'
-  end
-
-  # Print the 10 slowest examples and example groups at the
-  # end of the spec run, to help surface which specs are running
-  # particularly slow.
-  config.profile_examples = 10
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = :random
-
-  # Seed global randomization in this process using the `--seed` CLI option.
-  # Setting this allows you to use `--seed` to deterministically reproduce
-  # test failures related to randomization by passing the same `--seed` value
-  # as the one that triggered the failure.
-  Kernel.srand config.seed
-
-  config.use_transactional_fixtures = true
-
   config.before(:each) do
     # Rex is only available when testing with metasploit-framework or pro, so stub out the methods that require it
-    allow_any_instance_of(Mdm::Workspace).to receive(:valid_ip_or_range?).and_return(true)
+    Mdm::Workspace.any_instance.stub(:valid_ip_or_range? => true)
   end
+
+  config.mock_with :rspec
+  config.use_transactional_fixtures = true
+  config.order = :random
 end

data/spec/support/shared/examples/mdm/module/detail/does_not_support_stance_with_mtype.rb

@@ -6,7 +6,7 @@ shared_examples_for 'Mdm::Module::Detail does not support stance with mtype' do
     end
 
     it 'should return false for supports_stance?' do
-      expect(detail.supports_stance?).to eq(false)
+      detail.supports_stance?.should be_false
     end
 
     context 'with nil stance' do
@@ -14,7 +14,7 @@ shared_examples_for 'Mdm::Module::Detail does not support stance with mtype' do
         nil
       end
 
-      it { is_expected.to be_valid }
+      it { should be_valid }
     end
   end
 end

data/spec/support/shared/examples/mdm/module/detail/supports_stance_with_mtype.rb

@@ -6,7 +6,7 @@ shared_examples_for 'Mdm::Module::Detail supports stance with mtype' do |mtype|
     end
 
     it 'should return true for supports_stance?' do
-      expect(detail.supports_stance?).to eq(true)
+      detail.supports_stance?.should be_true
     end
 
     context 'with nil stance' do
@@ -14,7 +14,7 @@ shared_examples_for 'Mdm::Module::Detail supports stance with mtype' do |mtype|
         nil
       end
 
-      it { is_expected.to be_invalid }
+      it { should be_invalid }
     end
 
     context "with 'aggresive' stance" do
@@ -22,7 +22,7 @@ shared_examples_for 'Mdm::Module::Detail supports stance with mtype' do |mtype|
         'aggressive'
       end
 
-      it { is_expected.to be_valid }
+      it { should be_valid }
     end
 
     context "with 'passive' stance" do
@@ -30,7 +30,7 @@ shared_examples_for 'Mdm::Module::Detail supports stance with mtype' do |mtype|
         'passive'
       end
 
-      it { is_expected.to be_valid }
+      it { should be_valid }
     end
   end
 end

data/spec/support/shared/examples/metasploit_data_models/search/operation/ipaddress/match.rb

@@ -11,7 +11,7 @@ shared_examples_for 'MetasploitDataModels::Search::Operation::IPAddress::*.match
 
   shared_examples_for 'match' do |boolean|
     if boolean
-      it { is_expected.to be_a described_class }
+      it { should be_a described_class }
 
       it 'does not set #operator' do
         expect(match.operator).to be_nil
@@ -21,7 +21,7 @@ shared_examples_for 'MetasploitDataModels::Search::Operation::IPAddress::*.match
         expect(match.value).not_to be_nil
       end
     else
-      it { is_expected.to be_nil }
+      it { should be_nil }
     end
   end
 

data/spec/support/shared/examples/metasploit_data_models/search/visitor/includes/visit/with_children.rb

@@ -13,10 +13,10 @@ shared_examples_for 'MetasploitDataModels::Search::Visitor::Includes#visit with
 
   it 'should visit each child' do
     # needed for call to visit subject
-    expect(visitor).to receive(:visit).with(node).and_call_original
+    visitor.should_receive(:visit).with(node).and_call_original
 
     children.each do |child|
-      expect(visitor).to receive(:visit).with(child).and_return([])
+      visitor.should_receive(:visit).with(child).and_return([])
     end
 
     visit
@@ -25,14 +25,14 @@ shared_examples_for 'MetasploitDataModels::Search::Visitor::Includes#visit with
   it 'should return Array of all child visits' do
     child_visits = []
 
-    expect(visitor).to receive(:visit).with(node).and_call_original
+    visitor.should_receive(:visit).with(node).and_call_original
 
     children.each_with_index do |child, i|
       child_visit = ["Visited Child #{i}"]
-      allow(visitor).to receive(:visit).with(child).and_return(child_visit)
+      visitor.stub(:visit).with(child).and_return(child_visit)
       child_visits.concat(child_visit)
     end
 
-    expect(visit).to eq(child_visits)
+    visit.should == child_visits
   end
 end

data/spec/support/shared/examples/metasploit_data_models/search/visitor/includes/visit/with_metasploit_model_search_operation_base.rb

@@ -10,17 +10,17 @@ shared_examples_for 'MetasploitDataModels::Search::Visitor::Includes#visit with
   end
 
   it 'should visit operator' do
-    expect(visitor).to receive(:visit).with(node).and_call_original
-    expect(visitor).to receive(:visit).with(operator).and_return([])
+    visitor.should_receive(:visit).with(node).and_call_original
+    visitor.should_receive(:visit).with(operator).and_return([])
 
     visit
   end
 
   it 'should return operator visit' do
     operator_visit = ["Visited Operator"]
-    expect(visitor).to receive(:visit).with(node).and_call_original
-    allow(visitor).to receive(:visit).with(operator).and_return(operator_visit)
+    visitor.should_receive(:visit).with(node).and_call_original
+    visitor.stub(:visit).with(operator).and_return(operator_visit)
 
-    expect(visit).to eq(operator_visit)
+    visit.should == operator_visit
   end
 end

data/spec/support/shared/examples/metasploit_data_models/search/visitor/where/visit/with_equality.rb

@@ -18,16 +18,16 @@ shared_examples_for 'MetasploitDataModels::Search::Visitor::Where#visit with equ
   end
 
   it 'should visit operation.operator with attribute_visitor' do
-    expect(visitor.attribute_visitor).to receive(:visit).with(operator).and_call_original
+    visitor.attribute_visitor.should_receive(:visit).with(operator).and_call_original
 
     visit
   end
 
   it 'should call eq on Arel::Attributes::Attribute from attribute_visitor' do
     attribute = double('Visited Operator')
-    allow(visitor.attribute_visitor).to receive(:visit).with(operator).and_return(attribute)
+    visitor.attribute_visitor.stub(:visit).with(operator).and_return(attribute)
 
-    expect(attribute).to receive(:eq).with(value)
+    attribute.should_receive(:eq).with(value)
 
     visit
   end

data/spec/support/shared/examples/metasploit_data_models/search/visitor/where/visit/with_metasploit_model_search_group_base.rb

@@ -16,22 +16,22 @@ shared_examples_for 'MetasploitDataModels::Search::Visitor::Where#visit with Met
   end
 
   it 'should visit each child' do
-    expect(visitor).to receive(:visit).with(node).and_call_original
+    visitor.should_receive(:visit).with(node).and_call_original
 
     children.each do |child|
-      expect(visitor).to receive(:visit).with(child).and_return(Arel::Nodes::Equality.new(1, 1))
+      visitor.should_receive(:visit).with(child).and_return(Arel::Nodes::Equality.new(1, 1))
     end
 
     visit
   end
 
   it "should combine children AREL with #{arel_class}" do
-    allow(visitor).to receive(:visit).with(node).and_call_original
+    visitor.stub(:visit).with(node).and_call_original
     child_visits = []
 
     children.each_with_index do |child, i|
       child_visit = Arel::Nodes::Equality.new(i, i)
-      allow(visitor).to receive(:visit).with(child).and_return(child_visit)
+      visitor.stub(:visit).with(child).and_return(child_visit)
       child_visits << child_visit
     end
 
@@ -43,9 +43,8 @@ shared_examples_for 'MetasploitDataModels::Search::Visitor::Where#visit with Met
       arel_pair = root
     end
 
-    expect(arel_pair).to be_a arel_class
+    arel_pair.should be_a arel_class
 
-    expect(arel_pair.left).to eq(child_visits[0])
-    expect(arel_pair.right).to eq(child_visits[1])
+    expect([arel_pair.left, arel_pair.right]).to match_array(child_visits)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 0.24.4
+  version: 0.24.5
 platform: ruby
 authors:
 - Samuel Huckins
@@ -13,62 +13,6 @@ bindir: bin
 cert_chain: []
 date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
-- !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'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: yard-activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.14
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.14
-- !ruby/object:Gem::Dependency
-  name: yard-metasploit-erd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -165,28 +109,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: metasploit-model
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.29.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.29.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -261,14 +205,11 @@ files:
 - ".simplecov"
 - ".travis.yml"
 - ".yardopts"
-- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
-- RELEASING.md
 - Rakefile
-- UPGRADING.md
 - app/models/mdm/api_key.rb
 - app/models/mdm/client.rb
 - app/models/mdm/cred.rb
@@ -316,6 +257,7 @@ files:
 - app/models/mdm/wmap_request.rb
 - app/models/mdm/wmap_target.rb
 - app/models/mdm/workspace.rb
+- app/models/metasploit_data_models/automatic_exploitation.rb
 - app/models/metasploit_data_models/automatic_exploitation/match.rb
 - app/models/metasploit_data_models/automatic_exploitation/match_result.rb
 - app/models/metasploit_data_models/automatic_exploitation/match_set.rb
@@ -476,7 +418,6 @@ files:
 - lib/mdm/host/operating_system_normalization.rb
 - lib/mdm/module.rb
 - lib/metasploit_data_models.rb
-- lib/metasploit_data_models/automatic_exploitation.rb
 - lib/metasploit_data_models/base64_serializer.rb
 - lib/metasploit_data_models/change_required_columns_to_null_false.rb
 - lib/metasploit_data_models/engine.rb
@@ -497,6 +438,7 @@ files:
 - lib/metasploit_data_models/search/visitor.rb
 - lib/metasploit_data_models/serialized_prefs.rb
 - lib/metasploit_data_models/version.rb
+- lib/tasks/yard.rake
 - metasploit_data_models.gemspec
 - script/rails
 - spec/app/models/mdm/api_key_spec.rb
@@ -599,6 +541,7 @@ files:
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/routes.rb
+- spec/dummy/db/structure.sql
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/log/.gitkeep
 - spec/dummy/public/404.html
@@ -664,7 +607,6 @@ files:
 - spec/lib/metasploit_data_models/match/child_spec.rb
 - spec/lib/metasploit_data_models/match/parent_spec.rb
 - spec/lib/metasploit_data_models/version_spec.rb
-- spec/lib/metasploit_data_models_spec.rb
 - spec/spec_helper.rb
 - spec/support/matchers/match_regex_exactly.rb
 - spec/support/shared/contexts/rex/text.rb
@@ -804,6 +746,7 @@ test_files:
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/routes.rb
+- spec/dummy/db/structure.sql
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/log/.gitkeep
 - spec/dummy/public/404.html
@@ -869,7 +812,6 @@ test_files:
 - spec/lib/metasploit_data_models/match/child_spec.rb
 - spec/lib/metasploit_data_models/match/parent_spec.rb
 - spec/lib/metasploit_data_models/version_spec.rb
-- spec/lib/metasploit_data_models_spec.rb
 - spec/spec_helper.rb
 - spec/support/matchers/match_regex_exactly.rb
 - spec/support/shared/contexts/rex/text.rb