metasploit-model 0.26.1-java → 0.27.0-java

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

@@ -55,7 +55,11 @@ module Metasploit
       #
       # {include:Metasploit::Model::Search::Operator::Single}
       module Operator
+        extend ActiveSupport::Autoload
 
+        autoload :Deprecated
+        autoload :Group
+        autoload :Help
       end
     end
   end

data/lib/metasploit/model/search/operator/deprecated.rb

@@ -0,0 +1,6 @@
+require 'metasploit/model/search/operator'
+
+# Namespace for search operators that mimic behavior of the msfconsole search operators prior to the search operator
+# generalization introduced by {Metasploit::Model::Search}.
+module Metasploit::Model::Search::Operator::Deprecated
+end

data/lib/metasploit/model/search/operator/group.rb

@@ -0,0 +1,5 @@
+require 'metasploit/model/search/operator'
+
+# Namespace for operators that produce group operations.
+module Metasploit::Model::Search::Operator::Group
+end

data/lib/metasploit/model/spec.rb

@@ -4,11 +4,18 @@ module Metasploit
   module Model
     # Helper methods for running specs for metasploit-model.
     module Spec
+      require 'metasploit/model/spec/temporary_pathname'
+
+      extend ActiveSupport::Autoload
       extend Metasploit::Model::Spec::TemporaryPathname
       # without this, Module.shared_examples_for will be used and RSpec will count shared_examples created with
       # {shared_examples_for} to not be declared at the top-level.
       extend RSpec::Core::SharedExampleGroup::TopLevelDSL
 
+      autoload :Error
+      autoload :I18nExceptionHandler
+      autoload :PathnameCollision
+
       # Defines a shared examples for a `Module` under the {Metasploit::Model} namespace.  This `Module` is assumed to
       # be a mixin that can be mixed into an ActiveModel in metasploit-framework or an ActiveRecord in
       # metasploit_data_models.  Shared examples declared using this method get access to boiler plate methods used

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

@@ -1,3 +1,5 @@
+require 'metasploit/model/spec'
+
 # Raises all I18n errors as exceptions so that missing translations (or other errors) with en.yml are caught by the
 # specs.
 #

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

@@ -1,3 +1,5 @@
+require 'metasploit/model/spec/error'
+
 module Metasploit
   module Model
     module Spec

data/lib/metasploit/model/spec/template/write.rb

@@ -1,3 +1,5 @@
+require 'metasploit/model/spec/template'
+
 # Extend to add a class method to create a new template and write it only if valid.
 #
 # @example extend and write

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

@@ -1,3 +1,6 @@
+# to ensure Metasploit::Model::Spec::Error is setup for autoloading
+require 'metasploit/model/spec'
+
 module Metasploit
   module Model
     module Spec

data/lib/metasploit/model/translation.rb

@@ -1,3 +1,5 @@
+require 'metasploit/model'
+
 # ActiveRecord::Translation is a dirty bastard and overrides `ActiveModel::Translation#lookup_ancestors`, so that it
 # will only count superclasses, and not all ancestors.  Metasploit::Model needs the original behavior so that its
 # {Metasploit::Model::Module} modules can supply translations to both `ActiveRecord::Base` descendants in `Mdm` and

data/lib/metasploit/model/version.rb

@@ -5,9 +5,9 @@ module Metasploit
       # The major version number.
       MAJOR = 0
       # The minor version number, scoped to the {MAJOR} version number.
-      MINOR = 26
+      MINOR = 27
       # The patch number, scoped to the {MINOR} version number.
-      PATCH = 1
+      PATCH = 0
 
       # The full version string, including the {MAJOR}, {MINOR}, {PATCH}, and optionally, the {PRERELEASE} in the
       # {http://semver.org/spec/v2.0.0.html semantic versioning v2.0.0} format.

data/lib/metasploit/model/visitation.rb

@@ -3,7 +3,9 @@ module Metasploit
     # Namespace for `metasploit-model`'s implementation of the {http://en.wikipedia.org/wiki/Visitor_pattern visitor
     # pattern}.
     module Visitation
+      extend ActiveSupport::Autoload
 
+      autoload :Visit
     end
   end
 end

data/metasploit-model.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
 
   # Dependency loading
   spec.add_runtime_dependency 'activesupport'
+  spec.add_runtime_dependency 'railties', '< 4.0.0'
 
   if RUBY_PLATFORM =~ /java/
     # markdown formatting for yard

data/spec/app/models/metasploit/model/module/ancestor/spec/template_spec.rb

@@ -83,7 +83,7 @@ describe Metasploit::Model::Module::Ancestor::Spec::Template do
     end
   end
 
-  context '#metapsloit_module_relative_name' do
+  context '#metasploit_module_relative_name' do
     subject(:metasploit_module_relative_name) do
       template.metasploit_module_relative_name
     end

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

@@ -71,7 +71,7 @@ describe Metasploit::Model::Engine do
 
         context 'with FactoryGirl defined' do
           it 'should prepend full path to spec/factories to FactoryGirl.definition_file_paths' do
-            definition_file_path = Metasploit::Model.root.join('spec', 'factories')
+            definition_file_path = Metasploit::Model::Engine.root.join('spec', 'factories')
 
             FactoryGirl.definition_file_paths.should_receive(:unshift).with(definition_file_path)
 

data/spec/lib/metasploit/model/login/status_spec.rb

@@ -0,0 +1,83 @@
+require 'spec_helper'
+
+describe Metasploit::Model::Login::Status do
+  context 'CONSTANTS' do
+    context 'ALL' do
+      subject(:all) {
+        described_class::ALL
+      }
+
+      it { is_expected.to include('Denied Access') }
+      it { is_expected.to include('Disabled') }
+      it { is_expected.to include('Locked Out') }
+      it { is_expected.to include('No Auth Required') }
+      it { is_expected.to include('Successful') }
+      it { is_expected.to include('Unable to Connect') }
+      it { is_expected.to include('Untried') }
+    end
+
+    context 'DENIED_ACCESS' do
+      subject(:denied_access) {
+        described_class::DENIED_ACCESS
+      }
+
+      it { is_expected.to eq('Denied Access') }
+    end
+
+    context 'DISABLED' do
+      subject(:disabled) {
+        described_class::DISABLED
+      }
+
+      it { is_expected.to eq('Disabled') }
+    end
+
+    context 'INCORRECT' do
+      subject(:incorrect) {
+        described_class::INCORRECT
+      }
+
+      it { is_expected.to eq('Incorrect') }
+    end
+
+    context 'LOCKED_OUT' do
+      subject(:locked_out) {
+        described_class::LOCKED_OUT
+      }
+
+      it { is_expected.to eq('Locked Out') }
+    end
+
+    context 'NO_AUTH_REQUIRED' do
+      subject(:no_auth_required) {
+        described_class::NO_AUTH_REQUIRED
+      }
+
+      it { is_expected.to eq('No Auth Required') }
+    end
+
+    context 'SUCCESSFUL' do
+      subject(:successful) {
+        described_class::SUCCESSFUL
+      }
+
+      it { is_expected.to eq('Successful') }
+    end
+
+    context 'UNABLE_TO_CONNECT' do
+      subject(:unable_to_connect) {
+        described_class::UNABLE_TO_CONNECT
+      }
+
+      it { is_expected.to eq('Unable to Connect') }
+    end
+
+    context 'UNTRIED' do
+      subject(:untried) {
+        described_class::UNTRIED
+      }
+
+      it { is_expected.to eq('Untried') }
+    end
+  end
+end

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

@@ -15,7 +15,7 @@ describe Metasploit::Model::Spec do
     end
 
     let(:pathname) do
-      Metasploit::Model.root.join('spec', 'pathname')
+      Metasploit::Model::Engine.root.join('spec', 'pathname')
     end
 
     context 'with temporary_pathname set' do
@@ -68,7 +68,7 @@ describe Metasploit::Model::Spec do
 
     context 'with @temporary_pathname defined' do
       let(:pathname) do
-        Metasploit::Model.root.join('spec', 'pathname')
+        Metasploit::Model::Engine.root.join('spec', 'pathname')
       end
 
       before(:each) do
@@ -100,7 +100,7 @@ describe Metasploit::Model::Spec do
 
   context 'temporary_pathname=' do
     let(:temporary_pathname) do
-      Metasploit::Model.root.join('spec', 'temporary_pathname')
+      Metasploit::Model::Engine.root.join('spec', 'temporary_pathname')
     end
 
     it 'should set @temporary_pathname' do

data/spec/spec_helper.rb

@@ -19,19 +19,17 @@ require 'rspec/autorun'
 # full backtrace in logs so its easier to trace errors
 Rails.backtrace_cleaner.remove_silencers!
 
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
-support_glob = Metasploit::Model.root.join('spec', 'support', '**', '*.rb')
+spec_pathname = Metasploit::Model::Engine.root.join('spec')
 
-Dir.glob(support_glob) do |path|
-  require path
+Dir[spec_pathname.join('support', '**', '*.rb')].each do |f|
+  require f
 end
 
 RSpec.configure do |config|
   config.before(:suite) do
     # this must be explicitly set here because it should always be spec/tmp for w/e project is using
     # Metasploit::Model::Spec to handle file system clean up.
-    Metasploit::Model::Spec.temporary_pathname = Metasploit::Model.root.join('spec', 'tmp')
+    Metasploit::Model::Spec.temporary_pathname = spec_pathname.join('tmp')
     # Clean up any left over files from a previously aborted suite
     Metasploit::Model::Spec.remove_temporary_pathname
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-model
 version: !ruby/object:Gem::Version
-  version: 0.26.1
+  version: 0.27.0
 platform: java
 authors:
 - Luke Imhoff
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
         version: '0'
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: railties
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: kramdown
   version_requirements: !ruby/object:Gem::Requirement
@@ -160,13 +174,6 @@ files:
 - lib/metasploit/model/authority/waraxe.rb
 - lib/metasploit/model/authority/zdi.rb
 - lib/metasploit/model/base.rb
-- lib/metasploit/model/configuration.rb
-- lib/metasploit/model/configuration/autoload.rb
-- lib/metasploit/model/configuration/child.rb
-- lib/metasploit/model/configuration/error.rb
-- lib/metasploit/model/configuration/i18n.rb
-- lib/metasploit/model/configuration/parent.rb
-- lib/metasploit/model/configured.rb
 - lib/metasploit/model/derivation.rb
 - lib/metasploit/model/derivation/full_name.rb
 - lib/metasploit/model/email_address.rb
@@ -174,15 +181,19 @@ files:
 - lib/metasploit/model/error.rb
 - lib/metasploit/model/file.rb
 - lib/metasploit/model/invalid.rb
+- lib/metasploit/model/login.rb
 - lib/metasploit/model/login/status.rb
 - lib/metasploit/model/module.rb
 - lib/metasploit/model/module/action.rb
 - lib/metasploit/model/module/ancestor.rb
+- lib/metasploit/model/module/ancestor/spec.rb
 - lib/metasploit/model/module/architecture.rb
 - lib/metasploit/model/module/author.rb
 - lib/metasploit/model/module/class.rb
+- lib/metasploit/model/module/class/spec.rb
 - lib/metasploit/model/module/handler.rb
 - lib/metasploit/model/module/instance.rb
+- lib/metasploit/model/module/instance/spec.rb
 - lib/metasploit/model/module/path.rb
 - lib/metasploit/model/module/platform.rb
 - lib/metasploit/model/module/rank.rb
@@ -195,15 +206,20 @@ files:
 - lib/metasploit/model/nilify_blanks.rb
 - lib/metasploit/model/platform.rb
 - lib/metasploit/model/real_pathname.rb
+- lib/metasploit/model/realm.rb
 - lib/metasploit/model/realm/key.rb
 - lib/metasploit/model/reference.rb
 - lib/metasploit/model/search.rb
 - lib/metasploit/model/search/association.rb
 - lib/metasploit/model/search/attribute.rb
+- lib/metasploit/model/search/group.rb
 - lib/metasploit/model/search/operation.rb
+- lib/metasploit/model/search/operation/group.rb
 - lib/metasploit/model/search/operation/integer/value.rb
 - lib/metasploit/model/search/operation/string/value.rb
 - lib/metasploit/model/search/operator.rb
+- lib/metasploit/model/search/operator/deprecated.rb
+- lib/metasploit/model/search/operator/group.rb
 - lib/metasploit/model/search/operator/help.rb
 - lib/metasploit/model/search/with.rb
 - lib/metasploit/model/spec.rb
@@ -369,18 +385,13 @@ files:
 - spec/lib/metasploit/model/authority/zdi_spec.rb
 - spec/lib/metasploit/model/authority_spec.rb
 - spec/lib/metasploit/model/base_spec.rb
-- spec/lib/metasploit/model/configuration/autoload_spec.rb
-- spec/lib/metasploit/model/configuration/child_spec.rb
-- spec/lib/metasploit/model/configuration/error_spec.rb
-- spec/lib/metasploit/model/configuration/i18n_spec.rb
-- spec/lib/metasploit/model/configuration_spec.rb
-- spec/lib/metasploit/model/configured_spec.rb
 - spec/lib/metasploit/model/derivation/full_name_spec.rb
 - spec/lib/metasploit/model/derivation_spec.rb
 - spec/lib/metasploit/model/email_address_spec.rb
 - spec/lib/metasploit/model/engine_spec.rb
 - spec/lib/metasploit/model/file_spec.rb
 - spec/lib/metasploit/model/invalid_spec.rb
+- spec/lib/metasploit/model/login/status_spec.rb
 - spec/lib/metasploit/model/module/action_spec.rb
 - spec/lib/metasploit/model/module/ancestor_spec.rb
 - spec/lib/metasploit/model/module/architecture_spec.rb
@@ -417,9 +428,7 @@ files:
 - 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/spec_helper.rb
-- spec/support/shared/contexts/metasploit/model/configuration.rb
 - spec/support/shared/contexts/metasploit/model/module/ancestor/contents/metasploit_module.rb
 - spec/support/shared/contexts/metasploit/model/module/ancestor/factory/contents.rb
 - spec/support/shared/contexts/metasploit/model/module/ancestor/factory/contents/metasploit_module.rb
@@ -430,7 +439,6 @@ files:
 - spec/support/shared/examples/metasploit/model/author.rb
 - spec/support/shared/examples/metasploit/model/authority.rb
 - spec/support/shared/examples/metasploit/model/authority/seed.rb
-- spec/support/shared/examples/metasploit/model/configuration/parent/child.rb
 - spec/support/shared/examples/metasploit/model/email_address.rb
 - spec/support/shared/examples/metasploit/model/module/action.rb
 - spec/support/shared/examples/metasploit/model/module/ancestor.rb
@@ -500,7 +508,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: Metasploit Model Mixins and Validators
@@ -655,18 +663,13 @@ test_files:
 - spec/lib/metasploit/model/authority/zdi_spec.rb
 - spec/lib/metasploit/model/authority_spec.rb
 - spec/lib/metasploit/model/base_spec.rb
-- spec/lib/metasploit/model/configuration/autoload_spec.rb
-- spec/lib/metasploit/model/configuration/child_spec.rb
-- spec/lib/metasploit/model/configuration/error_spec.rb
-- spec/lib/metasploit/model/configuration/i18n_spec.rb
-- spec/lib/metasploit/model/configuration_spec.rb
-- spec/lib/metasploit/model/configured_spec.rb
 - spec/lib/metasploit/model/derivation/full_name_spec.rb
 - spec/lib/metasploit/model/derivation_spec.rb
 - spec/lib/metasploit/model/email_address_spec.rb
 - spec/lib/metasploit/model/engine_spec.rb
 - spec/lib/metasploit/model/file_spec.rb
 - spec/lib/metasploit/model/invalid_spec.rb
+- spec/lib/metasploit/model/login/status_spec.rb
 - spec/lib/metasploit/model/module/action_spec.rb
 - spec/lib/metasploit/model/module/ancestor_spec.rb
 - spec/lib/metasploit/model/module/architecture_spec.rb
@@ -703,9 +706,7 @@ test_files:
 - 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/spec_helper.rb
-- spec/support/shared/contexts/metasploit/model/configuration.rb
 - spec/support/shared/contexts/metasploit/model/module/ancestor/contents/metasploit_module.rb
 - spec/support/shared/contexts/metasploit/model/module/ancestor/factory/contents.rb
 - spec/support/shared/contexts/metasploit/model/module/ancestor/factory/contents/metasploit_module.rb
@@ -716,7 +717,6 @@ test_files:
 - spec/support/shared/examples/metasploit/model/author.rb
 - spec/support/shared/examples/metasploit/model/authority.rb
 - spec/support/shared/examples/metasploit/model/authority/seed.rb
-- spec/support/shared/examples/metasploit/model/configuration/parent/child.rb
 - spec/support/shared/examples/metasploit/model/email_address.rb
 - spec/support/shared/examples/metasploit/model/module/action.rb
 - spec/support/shared/examples/metasploit/model/module/ancestor.rb

data/lib/metasploit/model/configuration.rb

@@ -1,72 +0,0 @@
-# @note This can't be a model in app/models because it is used to setup the autoload_path to app/models.
-#
-# Configuration for a gem's autoload and i18n load paths that works outside of the railties or rails engines systems.
-class Metasploit::Model::Configuration
-  # no autoload paths yet, so have to explicitly require
-  require 'metasploit/model/configuration/parent'
-  extend Metasploit::Model::Configuration::Parent
-
-  #
-  # Attributes
-  #
-
-  # @!attribute [rw] root
-  #   The root of the gem.  All relative paths are resolved relative to {#root}.
-  #
-  #   @return [Pathname]
-
-  #
-  # Children
-  #
-
-  # @!macro [attach] child
-  #   @!attribute [rw] $1_class
-  #     The `Class` used to create {#$1}.
-  #
-  #     @return [Class]
-  #
-  #   @!method $1
-  #     The $1 configuration.
-  #
-  #     @return [Object] an instance of {#$1_class}
-  #
-  #   @!method $1_class
-  #     The `Class` used to create {#$1}.
-  #
-  #     @return [Class]
-  child :autoload
-  child :i18n
-
-  #
-  # Methods
-  #
-
-  # The root of the gem.
-  #
-  # @return [Pathname] root of gem
-  # @raise [Metasploit::Model::Configuration::Error] if {#root=} is not called prior to calling {#root}.
-  def root
-    unless instance_variable_defined?(:@root)
-      raise Metasploit::Model::Configuration::Error, "#{self.class}.root not set prior to use"
-    end
-
-    @root
-  end
-
-  # Sets root of this gem.
-  #
-  # @param root [Pathname, String]
-  # @return [String]
-  def root=(root)
-    @root = Pathname.new root
-  end
-
-  # Sets up {#autoload} and {#i18n}
-  #
-  # @return [void]
-  # @raise [Metasploit::Model::Invalid] if {#configuration} {Metasploit::Model::Configuration#root} is not set.
-  def setup
-    autoload.setup
-    i18n.setup
-  end
-end