metasploit_data_models 0.17.2-java → 0.17.3-java

data/spec/app/models/mdm/module/ref_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe Mdm::Module::Ref do
+
+  it_should_behave_like 'Metasploit::Concern.run'
+
   context 'associations' do
     it { should belong_to(:detail).class_name('Mdm::Module::Detail') }
 

data/spec/app/models/mdm/module/target_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe Mdm::Module::Target do
+
+  it_should_behave_like 'Metasploit::Concern.run'
+
   context 'associations' do
     it { should belong_to(:detail).class_name('Mdm::Module::Detail') }
   end

data/spec/app/models/mdm/nexpose_console_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mdm::NexposeConsole do
+  it_should_behave_like 'Metasploit::Concern.run'
 
   context 'factory' do
     it 'should be valid' do

data/spec/app/models/mdm/note_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mdm::Note do
+  it_should_behave_like 'Metasploit::Concern.run'
 
   context 'factory' do
     it 'should be valid' do

data/spec/app/models/mdm/profile_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Mdm::Profile do
+  it_should_behave_like 'Metasploit::Concern.run'
+end

data/spec/app/models/mdm/ref_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Mdm::Ref do
+  it_should_behave_like 'Metasploit::Concern.run'
+
   context 'associations' do
     # shoulda matchers don't have support for :primary_key option, so need to
     # test this association manually

data/spec/app/models/mdm/route_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mdm::Route do
+  it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
     it { should belong_to(:session).class_name('Mdm::Session') }

data/spec/app/models/mdm/service_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mdm::Service do
+  it_should_behave_like 'Metasploit::Concern.run'
 
   context "Associations" do
 

data/spec/app/models/mdm/session_event_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Mdm::SessionEvent do
+  it_should_behave_like 'Metasploit::Concern.run'
+
   context 'associations' do
     it { should belong_to(:session).class_name('Mdm::Session') }
   end

data/spec/app/models/mdm/session_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mdm::Session do
+  it_should_behave_like 'Metasploit::Concern.run'
 
   context 'factory' do
     it 'should be valid' do

data/spec/app/models/mdm/tag_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 require 'securerandom'
 
 describe Mdm::Tag do
+  it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
     it { should have_many(:hosts_tags).class_name('Mdm::HostTag') }

data/spec/app/models/mdm/{task_creds_spec.rb → task_cred_spec.rb}

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mdm::TaskCred do
+  it_should_behave_like 'Metasploit::Concern.run'
 
   context 'factory' do
     it 'should be valid' do

data/spec/app/models/mdm/task_host_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mdm::TaskHost do
+  it_should_behave_like 'Metasploit::Concern.run'
 
   context 'factory' do
     it 'should be valid' do

data/spec/app/models/mdm/task_service_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mdm::TaskService do
+  it_should_behave_like 'Metasploit::Concern.run'
 
   context 'factory' do
     it 'should be valid' do

data/spec/app/models/mdm/{task_sessions_spec.rb → task_session_spec.rb}

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mdm::TaskSession do
+  it_should_behave_like 'Metasploit::Concern.run'
 
   context 'factory' do
     it 'should be valid' do

data/spec/app/models/mdm/task_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mdm::Task do
+  it_should_behave_like 'Metasploit::Concern.run'
 
   context 'factory' do
     it 'should be valid' do

data/spec/app/models/mdm/user_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mdm::User do
+  it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
     it { should have_many(:owned_workspaces).class_name('Mdm::Workspace') }

data/spec/app/models/mdm/vuln_attempt_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mdm::VulnAttempt do
+  it_should_behave_like 'Metasploit::Concern.run'
 
   context 'association' do
     it { should belong_to(:vuln).class_name('Mdm::Vuln') }

data/spec/app/models/mdm/{vuln_details_spec.rb → vuln_detail_spec.rb}

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mdm::VulnDetail do
+  it_should_behave_like 'Metasploit::Concern.run'
 
   context 'association' do
     it { should belong_to(:vuln).class_name('Mdm::Vuln') }

data/spec/app/models/mdm/vuln_ref_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Mdm::VulnRef do
+  it_should_behave_like 'Metasploit::Concern.run'
+
   context 'factories' do
     context 'mdm_vuln_ref' do
       subject(:mdm_vuln_ref) do

data/spec/app/models/mdm/vuln_spec.rb

@@ -5,6 +5,8 @@ describe Mdm::Vuln do
     FactoryGirl.build(:mdm_vuln)
   end
 
+  it_should_behave_like 'Metasploit::Concern.run'
+
   context '#destroy' do
     it 'should successfully destroy the object and dependent objects' do
       vuln = FactoryGirl.create(:mdm_vuln)

data/spec/app/models/mdm/web_form_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mdm::WebForm do
+  it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
     it { should belong_to(:web_site).class_name('Mdm::WebSite') }

data/spec/app/models/mdm/web_page_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mdm::WebPage do
+  it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
     it { should belong_to(:web_site).class_name('Mdm::WebSite') }

data/spec/app/models/mdm/web_site_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mdm::WebSite do
+  it_should_behave_like 'Metasploit::Concern.run'
 
   context 'factory' do
     it 'should be valid' do

data/spec/app/models/mdm/web_vuln_spec.rb

@@ -26,6 +26,8 @@ describe Mdm::WebVuln do
     described_class.new
   end
 
+  it_should_behave_like 'Metasploit::Concern.run'
+
   context 'associations' do
     it { should belong_to(:web_site).class_name('Mdm::WebSite') }
   end

data/spec/app/models/mdm/wmap_request_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Mdm::WmapRequest do
+  it_should_behave_like 'Metasploit::Concern.run'
+end

data/spec/app/models/mdm/wmap_target_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Mdm::WmapTarget do
+  it_should_behave_like 'Metasploit::Concern.run'
+end

data/spec/app/models/mdm/workspace_spec.rb

@@ -9,6 +9,8 @@ describe Mdm::Workspace do
     'default'
   end
 
+  it_should_behave_like 'Metasploit::Concern.run'
+
   context 'factory' do
     it 'should be valid' do
       workspace = FactoryGirl.build(:mdm_workspace)

data/spec/app/models/metasploit_data_models/search/visitor/attribute_spec.rb

@@ -5,6 +5,8 @@ describe MetasploitDataModels::Search::Visitor::Attribute do
     described_class.new
   end
 
+  it_should_behave_like 'Metasploit::Concern.run'
+
   context '#visit' do
     subject(:visit) do
       visitor.visit(node)

data/spec/app/models/metasploit_data_models/search/visitor/includes_spec.rb

@@ -5,6 +5,8 @@ describe MetasploitDataModels::Search::Visitor::Includes do
     described_class.new
   end
 
+  it_should_behave_like 'Metasploit::Concern.run'
+
   context '#visit' do
     subject(:visit) do
       visitor.visit(node)

data/spec/app/models/metasploit_data_models/search/visitor/joins_spec.rb

@@ -5,6 +5,8 @@ describe MetasploitDataModels::Search::Visitor::Joins do
     described_class.new
   end
 
+  it_should_behave_like 'Metasploit::Concern.run'
+
   context '#visit' do
     subject(:visit) do
       visitor.visit(node)

data/spec/app/models/metasploit_data_models/search/visitor/method_spec.rb

@@ -5,6 +5,8 @@ describe MetasploitDataModels::Search::Visitor::Method do
     described_class.new
   end
 
+  it_should_behave_like 'Metasploit::Concern.run'
+
   context '#visit' do
     subject(:visit) do
       visitor.visit(node)

data/spec/app/models/metasploit_data_models/search/visitor/relation_spec.rb

@@ -23,6 +23,8 @@ describe MetasploitDataModels::Search::Visitor::Relation do
     FactoryGirl.generate :mdm_host_name
   }
 
+  it_should_behave_like 'Metasploit::Concern.run'
+
   context 'validations' do
     context 'query' do
       it { should validate_presence_of(:query) }

data/spec/app/models/metasploit_data_models/search/visitor/where_spec.rb

@@ -5,6 +5,8 @@ describe MetasploitDataModels::Search::Visitor::Where do
     described_class.new
   end
 
+  it_should_behave_like 'Metasploit::Concern.run'
+
   context '#attribute_visitor' do
     subject(:attribute_visitor) do
       visitor.attribute_visitor

data/spec/spec_helper.rb

@@ -29,10 +29,18 @@ Rails.backtrace_cleaner.remove_silencers!
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-support_glob = MetasploitDataModels.root.join('spec', 'support', '**', '*.rb')
 
-Dir.glob(support_glob) do |path|
-  require path
+engines = [
+    Metasploit::Concern::Engine,
+    MetasploitDataModels::Engine
+]
+
+engines.each do |engine|
+  support_glob = engine.root.join('spec', 'support', '**', '*.rb')
+
+  Dir.glob(support_glob) do |path|
+    require path
+  end
 end
 
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.17.3
 platform: java
 authors:
 - Samuel Huckins
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -89,13 +89,27 @@ dependencies:
         version: '0'
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: metasploit-concern
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: metasploit-model
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.24.1.pre.semantic.pre.versioning.pre.2.pre.0
+        version: 0.24.1
     - - <
       - !ruby/object:Gem::Version
         version: '0.25'
@@ -103,7 +117,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.24.1.pre.semantic.pre.versioning.pre.2.pre.0
+        version: 0.24.1
     - - <
       - !ruby/object:Gem::Version
         version: '0.25'
@@ -354,9 +368,10 @@ files:
 - lib/tasks/yard.rake
 - metasploit_data_models.gemspec
 - script/rails
+- spec/app/models/mdm/api_key_spec.rb
 - spec/app/models/mdm/client_spec.rb
 - spec/app/models/mdm/cred_spec.rb
-- spec/app/models/mdm/events_spec.rb
+- spec/app/models/mdm/event_spec.rb
 - spec/app/models/mdm/exploit_attempt_spec.rb
 - spec/app/models/mdm/exploited_host_spec.rb
 - spec/app/models/mdm/host_detail_spec.rb
@@ -364,6 +379,8 @@ files:
 - spec/app/models/mdm/host_tag_spec.rb
 - spec/app/models/mdm/listener_spec.rb
 - spec/app/models/mdm/loot_spec.rb
+- spec/app/models/mdm/macro_spec.rb
+- spec/app/models/mdm/mod_ref_spec.rb
 - spec/app/models/mdm/module/action_spec.rb
 - spec/app/models/mdm/module/arch_spec.rb
 - spec/app/models/mdm/module/author_spec.rb
@@ -374,26 +391,29 @@ files:
 - spec/app/models/mdm/module/target_spec.rb
 - spec/app/models/mdm/nexpose_console_spec.rb
 - spec/app/models/mdm/note_spec.rb
+- spec/app/models/mdm/profile_spec.rb
 - spec/app/models/mdm/ref_spec.rb
 - spec/app/models/mdm/route_spec.rb
 - spec/app/models/mdm/service_spec.rb
 - spec/app/models/mdm/session_event_spec.rb
 - spec/app/models/mdm/session_spec.rb
 - spec/app/models/mdm/tag_spec.rb
-- spec/app/models/mdm/task_creds_spec.rb
+- spec/app/models/mdm/task_cred_spec.rb
 - spec/app/models/mdm/task_host_spec.rb
 - spec/app/models/mdm/task_service_spec.rb
-- spec/app/models/mdm/task_sessions_spec.rb
+- spec/app/models/mdm/task_session_spec.rb
 - spec/app/models/mdm/task_spec.rb
 - spec/app/models/mdm/user_spec.rb
 - spec/app/models/mdm/vuln_attempt_spec.rb
-- spec/app/models/mdm/vuln_details_spec.rb
+- spec/app/models/mdm/vuln_detail_spec.rb
 - spec/app/models/mdm/vuln_ref_spec.rb
 - spec/app/models/mdm/vuln_spec.rb
 - spec/app/models/mdm/web_form_spec.rb
 - spec/app/models/mdm/web_page_spec.rb
 - spec/app/models/mdm/web_site_spec.rb
 - spec/app/models/mdm/web_vuln_spec.rb
+- spec/app/models/mdm/wmap_request_spec.rb
+- spec/app/models/mdm/wmap_target_spec.rb
 - spec/app/models/mdm/workspace_spec.rb
 - spec/app/models/metasploit_data_models/search/visitor/attribute_spec.rb
 - spec/app/models/metasploit_data_models/search/visitor/includes_spec.rb
@@ -518,9 +538,10 @@ signing_key:
 specification_version: 4
 summary: Database code for MSF and Metasploit Pro
 test_files:
+- spec/app/models/mdm/api_key_spec.rb
 - spec/app/models/mdm/client_spec.rb
 - spec/app/models/mdm/cred_spec.rb
-- spec/app/models/mdm/events_spec.rb
+- spec/app/models/mdm/event_spec.rb
 - spec/app/models/mdm/exploit_attempt_spec.rb
 - spec/app/models/mdm/exploited_host_spec.rb
 - spec/app/models/mdm/host_detail_spec.rb
@@ -528,6 +549,8 @@ test_files:
 - spec/app/models/mdm/host_tag_spec.rb
 - spec/app/models/mdm/listener_spec.rb
 - spec/app/models/mdm/loot_spec.rb
+- spec/app/models/mdm/macro_spec.rb
+- spec/app/models/mdm/mod_ref_spec.rb
 - spec/app/models/mdm/module/action_spec.rb
 - spec/app/models/mdm/module/arch_spec.rb
 - spec/app/models/mdm/module/author_spec.rb
@@ -538,26 +561,29 @@ test_files:
 - spec/app/models/mdm/module/target_spec.rb
 - spec/app/models/mdm/nexpose_console_spec.rb
 - spec/app/models/mdm/note_spec.rb
+- spec/app/models/mdm/profile_spec.rb
 - spec/app/models/mdm/ref_spec.rb
 - spec/app/models/mdm/route_spec.rb
 - spec/app/models/mdm/service_spec.rb
 - spec/app/models/mdm/session_event_spec.rb
 - spec/app/models/mdm/session_spec.rb
 - spec/app/models/mdm/tag_spec.rb
-- spec/app/models/mdm/task_creds_spec.rb
+- spec/app/models/mdm/task_cred_spec.rb
 - spec/app/models/mdm/task_host_spec.rb
 - spec/app/models/mdm/task_service_spec.rb
-- spec/app/models/mdm/task_sessions_spec.rb
+- spec/app/models/mdm/task_session_spec.rb
 - spec/app/models/mdm/task_spec.rb
 - spec/app/models/mdm/user_spec.rb
 - spec/app/models/mdm/vuln_attempt_spec.rb
-- spec/app/models/mdm/vuln_details_spec.rb
+- spec/app/models/mdm/vuln_detail_spec.rb
 - spec/app/models/mdm/vuln_ref_spec.rb
 - spec/app/models/mdm/vuln_spec.rb
 - spec/app/models/mdm/web_form_spec.rb
 - spec/app/models/mdm/web_page_spec.rb
 - spec/app/models/mdm/web_site_spec.rb
 - spec/app/models/mdm/web_vuln_spec.rb
+- spec/app/models/mdm/wmap_request_spec.rb
+- spec/app/models/mdm/wmap_target_spec.rb
 - spec/app/models/mdm/workspace_spec.rb
 - spec/app/models/metasploit_data_models/search/visitor/attribute_spec.rb
 - spec/app/models/metasploit_data_models/search/visitor/includes_spec.rb