metasploit_data_models 0.17.3 → 0.18.0.pre.compatibility

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

@@ -30,12 +30,14 @@ describe MetasploitDataModels::Search::Visitor::Where do
 
     arel_class_by_group_class = {
         Metasploit::Model::Search::Group::Intersection => Arel::Nodes::And,
-        Metasploit::Model::Search::Group::Union => Arel::Nodes::Or
+        Metasploit::Model::Search::Group::Union => Arel::Nodes::Or,
+        Metasploit::Model::Search::Operation::Group::Intersection => Arel::Nodes::And,
+        Metasploit::Model::Search::Operation::Group::Union => Arel::Nodes::Or
     }
 
     arel_class_by_group_class.each do |group_class, arel_class|
       context "with #{group_class}" do
-        it_should_behave_like 'MetasploitDataModels::Search::Visitor::Where#visit with Metasploit::Model::Search::Group::Base',
+        it_should_behave_like 'MetasploitDataModels::Search::Visitor::Where#visit with Metasploit::Model::Search*::Group::Base',
                               :arel_class => arel_class do
           let(:node_class) do
             group_class
@@ -97,6 +99,44 @@ describe MetasploitDataModels::Search::Visitor::Where do
       end
     end
 
+    context 'with MetasploitDataModels::Search::Operation::Port::Range' do
+      let(:node) {
+        MetasploitDataModels::Search::Operation::Port::Range.new(
+            operator: operator,
+            value: value
+        )
+      }
+
+      let(:operator) {
+        MetasploitDataModels::Search::Operator::Port::List.new(
+            klass: Mdm::Service
+        )
+      }
+
+      let(:range) {
+        1..2
+      }
+
+      let(:value) {
+        "#{range.begin}-#{range.end}"
+      }
+
+      it 'should visit operation.operator with attribute_visitor' do
+        expect(visitor.attribute_visitor).to receive(:visit).with(operator).and_call_original
+
+        visit
+      end
+
+      it 'should call in on Arel::Attributes::Attribute from attribute_visitor' do
+        attribute = double('Visited Operator')
+        allow(visitor.attribute_visitor).to receive(:visit).with(operator).and_return(attribute)
+
+        expect(attribute).to receive(:in).with(range)
+
+        visit
+      end
+    end
+
     context 'with Metasploit::Model::Search::Query#tree' do
       let(:node) do
         query.tree

data/spec/factories/mdm/services.rb

@@ -9,14 +9,13 @@ FactoryGirl.define do
     # Attributes
     #
     name { generate :mdm_service_name }
-    port 4567
+    port { generate :port }
     proto 'snmp'
     state 'open'
 
     factory :web_service do
       proto 'tcp'
       name { FactoryGirl.generate(:web_service_name) }
-      port { FactoryGirl.generate(:port) }
     end
   end
 

data/spec/lib/metasploit_data_models/version_spec.rb

@@ -0,0 +1,141 @@
+require 'spec_helper'
+
+describe MetasploitDataModels::Version do
+  context 'CONSTANTS' do
+    context 'MAJOR' do
+      subject(:major) do
+        described_class::MAJOR
+      end
+
+      it 'is 0 because the API is not locked yet' do
+        expect(major).to eq(0)
+      end
+    end
+
+    context 'MINOR' do
+      subject(:minor) do
+        described_class::MINOR
+      end
+
+      it { should be_a Integer }
+    end
+
+    context 'PATCH' do
+      subject(:patch) do
+        described_class::PATCH
+      end
+
+      it { should be_a Integer }
+    end
+
+    pull_request = ENV['TRAVIS_PULL_REQUEST']
+
+    # a pull request cannot check PRERELEASE because it will be tested in the target branch, but the source itself
+    # is from the source branch and so has the source branch PRERELEASE.
+    #
+    # PRERELEASE can only be set appropriately for a merge by merging to the target branch and then updating PRERELEASE
+    # on the target branch before committing and/or pushing to github and travis-ci.
+    if pull_request.nil? || pull_request == 'false'
+      context 'PREPRELEASE' do
+        subject(:prerelease) do
+          described_class::PRERELEASE
+        end
+
+        branch = ENV['TRAVIS_BRANCH']
+
+        if branch.blank?
+          branch = `git rev-parse --abbrev-ref HEAD`.strip
+        end
+
+        if branch == 'master'
+          it 'does not have a PRERELEASE' do
+            expect(defined? described_class::PRERELEASE).to be_nil
+          end
+        else
+          branch_regex = /\A(?<type>bug|chore|feature|staging)(\/(?<story>[^\/]+))?\/(?<prerelease>[^\/]+)\z/
+          match = branch.match(branch_regex)
+
+          if match
+            it 'matches the branch relative name' do
+              expect(prerelease).to eq(match[:prerelease])
+            end
+          else
+            tag_regex = /\Av(?<major>\d+).(?<minor>\d+).(?<patch>\d+)(\.pre\.(?<prerelease>.*))?\z/
+            # travis-ci sets TRAVIS_BRANCH to the tag name for tag builds
+            match = branch.match(tag_regex)
+
+            if match
+              tag_prerelease = match[:prerelease]
+
+              if tag_prerelease
+                it 'matches the tag prerelease converted from a gem version to a VERSION' do
+                  expect(prerelease).to eq(tag_prerelease.gsub('.pre.', '-'))
+                end
+              else
+                it 'does not have a PRERELEASE' do
+                  expect(defined? described_class::PRERELEASE).to be_nil
+                end
+              end
+            else
+              it 'has a abbreviated reference that can be parsed for prerelease' do
+                fail "Do not know how to parse #{branch.inspect} for PRERELEASE"
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+
+  context 'full' do
+    subject(:full) do
+      described_class.full
+    end
+
+    #
+    # lets
+    #
+
+    let(:major) do
+      1
+    end
+
+    let(:minor) do
+      2
+    end
+
+    let(:patch) do
+      3
+    end
+
+    before(:each) do
+      stub_const("#{described_class}::MAJOR", major)
+      stub_const("#{described_class}::MINOR", minor)
+      stub_const("#{described_class}::PATCH", patch)
+    end
+
+    context 'with PRERELEASE' do
+      let(:prerelease) do
+        'prerelease'
+      end
+
+      before(:each) do
+        stub_const("#{described_class}::PRERELEASE", prerelease)
+      end
+
+      it 'is <major>.<minor>.<patch>-<prerelease>' do
+        expect(full).to eq("#{major}.#{minor}.#{patch}-#{prerelease}")
+      end
+    end
+
+    context 'without PRERELEASE' do
+      before(:each) do
+        hide_const("#{described_class}::PRERELEASE")
+      end
+
+      it 'is <major>.<minor>.<patch>' do
+        expect(full).to eq("#{major}.#{minor}.#{patch}")
+      end
+    end
+  end
+end

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

@@ -1,4 +1,4 @@
-shared_examples_for 'MetasploitDataModels::Search::Visitor::Where#visit with Metasploit::Model::Search::Group::Base' do |options={}|
+shared_examples_for 'MetasploitDataModels::Search::Visitor::Where#visit with Metasploit::Model::Search*::Group::Base' do |options={}|
   options.assert_valid_keys(:arel_class)
 
   arel_class = options.fetch(:arel_class)

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 0.17.3
+  version: 0.18.0.pre.compatibility
 platform: ruby
 authors:
 - Samuel Huckins
 - Luke Imhoff
 - David 'thelightcosine' Maloney
-- Trevor Rosen
+- Trevor 'burlyscudd' Rosen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -109,20 +109,20 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.25.1
     - - <
       - !ruby/object:Gem::Version
-        version: '0.25'
+        version: '0.26'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.25.1
     - - <
       - !ruby/object:Gem::Version
-        version: '0.25'
+        version: '0.26'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -169,6 +169,7 @@ files:
 - .simplecov
 - .travis.yml
 - .yardopts
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
@@ -220,6 +221,11 @@ files:
 - app/models/mdm/wmap_request.rb
 - app/models/mdm/wmap_target.rb
 - app/models/mdm/workspace.rb
+- app/models/metasploit_data_models/search/operation/port/number.rb
+- app/models/metasploit_data_models/search/operation/port/range.rb
+- app/models/metasploit_data_models/search/operation/range.rb
+- app/models/metasploit_data_models/search/operator/multitext.rb
+- app/models/metasploit_data_models/search/operator/port/list.rb
 - app/models/metasploit_data_models/search/visitor/attribute.rb
 - app/models/metasploit_data_models/search/visitor/includes.rb
 - app/models/metasploit_data_models/search/visitor/joins.rb
@@ -346,11 +352,9 @@ files:
 - lib/metasploit_data_models/base64_serializer.rb
 - lib/metasploit_data_models/change_required_columns_to_null_false.rb
 - lib/metasploit_data_models/engine.rb
-- lib/metasploit_data_models/models.rb
 - lib/metasploit_data_models/search.rb
 - lib/metasploit_data_models/search/visitor.rb
 - lib/metasploit_data_models/serialized_prefs.rb
-- lib/metasploit_data_models/validators.rb
 - lib/metasploit_data_models/version.rb
 - lib/tasks/yard.rake
 - metasploit_data_models.gemspec
@@ -402,6 +406,11 @@ files:
 - 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/operation/port/number_spec.rb
+- spec/app/models/metasploit_data_models/search/operation/port/range_spec.rb
+- spec/app/models/metasploit_data_models/search/operation/range_spec.rb
+- spec/app/models/metasploit_data_models/search/operator/multitext_spec.rb
+- spec/app/models/metasploit_data_models/search/operator/port/list_spec.rb
 - spec/app/models/metasploit_data_models/search/visitor/attribute_spec.rb
 - spec/app/models/metasploit_data_models/search/visitor/includes_spec.rb
 - spec/app/models/metasploit_data_models/search/visitor/joins_spec.rb
@@ -491,6 +500,7 @@ files:
 - spec/factories/mdm/web_vulns.rb
 - spec/factories/mdm/workspaces.rb
 - spec/lib/base64_serializer_spec.rb
+- spec/lib/metasploit_data_models/version_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared/examples/mdm/module/detail/does_not_support_stance_with_mtype.rb
 - spec/support/shared/examples/mdm/module/detail/supports_stance_with_mtype.rb
@@ -515,9 +525,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -572,6 +582,11 @@ test_files:
 - 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/operation/port/number_spec.rb
+- spec/app/models/metasploit_data_models/search/operation/port/range_spec.rb
+- spec/app/models/metasploit_data_models/search/operation/range_spec.rb
+- spec/app/models/metasploit_data_models/search/operator/multitext_spec.rb
+- spec/app/models/metasploit_data_models/search/operator/port/list_spec.rb
 - spec/app/models/metasploit_data_models/search/visitor/attribute_spec.rb
 - spec/app/models/metasploit_data_models/search/visitor/includes_spec.rb
 - spec/app/models/metasploit_data_models/search/visitor/joins_spec.rb
@@ -661,6 +676,7 @@ test_files:
 - spec/factories/mdm/web_vulns.rb
 - spec/factories/mdm/workspaces.rb
 - spec/lib/base64_serializer_spec.rb
+- spec/lib/metasploit_data_models/version_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared/examples/mdm/module/detail/does_not_support_stance_with_mtype.rb
 - spec/support/shared/examples/mdm/module/detail/supports_stance_with_mtype.rb

data/lib/metasploit_data_models/models.rb

@@ -1,21 +0,0 @@
-require 'metasploit_data_models/validators'
-
-module MetasploitDataModels
-  module Models
-    include MetasploitDataModels::Validators
-
-    def models_pathname
-      app_pathname.join('models')
-    end
-
-    def require_models
-      autoload_validators
-
-      models_globs = models_pathname.join('**', '*.rb')
-
-      Dir.glob(models_globs) do |model_path|
-        require model_path
-      end
-    end
-  end
-end

data/lib/metasploit_data_models/validators.rb

@@ -1,19 +0,0 @@
-module MetasploitDataModels
-  module Validators
-    # Mimics behavior of `app/validators` in Rails projects by adding it to
-    # `ActiveSupport::Dependencies.autoload_paths` if it is not already in the Array.
-    #
-    # @return [void]
-    def autoload_validators
-      validators_path = validators_pathname.to_s
-
-      unless ActiveSupport::Dependencies.autoload_paths.include? validators_path
-        ActiveSupport::Dependencies.autoload_paths << validators_path
-      end
-    end
-
-    def validators_pathname
-      app_pathname.join('validators')
-    end
-  end
-end