metasploit_data_models 1.0.0.pre.rails.pre.4.0b → 1.0.0

data/spec/lib/metasploit_data_models_spec.rb

@@ -0,0 +1,4 @@
+RSpec.describe MetasploitDataModels do
+  it_should_behave_like 'Metasploit::Version GEM_VERSION constant'
+  it_should_behave_like 'Metasploit::Version VERSION constant'
+end

data/spec/spec_helper.rb

@@ -22,7 +22,6 @@ 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!
@@ -30,27 +29,102 @@ Rails.backtrace_cleaner.remove_silencers!
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
 
-engines = [
-    Metasploit::Concern::Engine,
-    Metasploit::Model::Engine,
-    MetasploitDataModels::Engine
+# 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.each do |engine|
-  support_glob = engine.root.join('spec', 'support', '**', '*.rb')
+roots.each do |root|
+  support_glob = File.join(root, '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|
-  config.before(:each) do
-    # Rex is only available when testing with metasploit-framework or pro, so stub out the methods that require it
-    Mdm::Workspace.any_instance.stub(:valid_ip_or_range? => true)
+  # 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
 
-  config.mock_with :rspec
-  config.use_transactional_fixtures = true
+  # 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)
+  end
 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
-      detail.supports_stance?.should be_false
+      expect(detail.supports_stance?).to eq(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 { should be_valid }
+      it { is_expected.to 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
-      detail.supports_stance?.should be_true
+      expect(detail.supports_stance?).to eq(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 { should be_invalid }
+      it { is_expected.to 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 { should be_valid }
+      it { is_expected.to 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 { should be_valid }
+      it { is_expected.to 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 { should be_a described_class }
+      it { is_expected.to 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 { should be_nil }
+      it { is_expected.to 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
-    visitor.should_receive(:visit).with(node).and_call_original
+    expect(visitor).to receive(:visit).with(node).and_call_original
 
     children.each do |child|
-      visitor.should_receive(:visit).with(child).and_return([])
+      expect(visitor).to 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 = []
 
-    visitor.should_receive(:visit).with(node).and_call_original
+    expect(visitor).to receive(:visit).with(node).and_call_original
 
     children.each_with_index do |child, i|
       child_visit = ["Visited Child #{i}"]
-      visitor.stub(:visit).with(child).and_return(child_visit)
+      allow(visitor).to receive(:visit).with(child).and_return(child_visit)
       child_visits.concat(child_visit)
     end
 
-    visit.should == child_visits
+    expect(visit).to eq(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
-    visitor.should_receive(:visit).with(node).and_call_original
-    visitor.should_receive(:visit).with(operator).and_return([])
+    expect(visitor).to receive(:visit).with(node).and_call_original
+    expect(visitor).to receive(:visit).with(operator).and_return([])
 
     visit
   end
 
   it 'should return operator visit' do
     operator_visit = ["Visited Operator"]
-    visitor.should_receive(:visit).with(node).and_call_original
-    visitor.stub(:visit).with(operator).and_return(operator_visit)
+    expect(visitor).to receive(:visit).with(node).and_call_original
+    allow(visitor).to receive(:visit).with(operator).and_return(operator_visit)
 
-    visit.should == operator_visit
+    expect(visit).to eq(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
-    visitor.attribute_visitor.should_receive(:visit).with(operator).and_call_original
+    expect(visitor.attribute_visitor).to 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')
-    visitor.attribute_visitor.stub(:visit).with(operator).and_return(attribute)
+    allow(visitor.attribute_visitor).to receive(:visit).with(operator).and_return(attribute)
 
-    attribute.should_receive(:eq).with(value)
+    expect(attribute).to 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
-    visitor.should_receive(:visit).with(node).and_call_original
+    expect(visitor).to receive(:visit).with(node).and_call_original
 
     children.each do |child|
-      visitor.should_receive(:visit).with(child).and_return(Arel::Nodes::Equality.new(1, 1))
+      expect(visitor).to receive(:visit).with(child).and_return(Arel::Nodes::Equality.new(1, 1))
     end
 
     visit
   end
 
   it "should combine children AREL with #{arel_class}" do
-    visitor.stub(:visit).with(node).and_call_original
+    allow(visitor).to receive(:visit).with(node).and_call_original
     child_visits = []
 
     children.each_with_index do |child, i|
       child_visit = Arel::Nodes::Equality.new(i, i)
-      visitor.stub(:visit).with(child).and_return(child_visit)
+      allow(visitor).to receive(:visit).with(child).and_return(child_visit)
       child_visits << child_visit
     end
 
@@ -43,8 +43,9 @@ shared_examples_for 'MetasploitDataModels::Search::Visitor::Where#visit with Met
       arel_pair = root
     end
 
-    arel_pair.should be_a arel_class
+    expect(arel_pair).to be_a arel_class
 
-    expect([arel_pair.left, arel_pair.right]).to match_array(child_visits)
+    expect(arel_pair.left).to eq(child_visits[0])
+    expect(arel_pair.right).to eq(child_visits[1])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.rails.pre.4.0b
+  version: 1.0.0
 platform: ruby
 authors:
 - Samuel Huckins
@@ -11,8 +11,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-05-11 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
@@ -99,30 +155,30 @@ dependencies:
   name: metasploit-concern
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre.rails.pre.4.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre.rails.pre.4.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: metasploit-model
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre.rails.pre.4.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre.rails.pre.4.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -231,11 +287,14 @@ 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
@@ -283,7 +342,6 @@ 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
@@ -447,6 +505,7 @@ 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
@@ -467,7 +526,6 @@ 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
@@ -638,6 +696,7 @@ 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
@@ -666,9 +725,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.3
@@ -844,6 +903,7 @@ 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