metasploit-concern 0.3.0 → 0.3.1.pre.autoload.pre.compatibility

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: 8df0797f09f99a58246f8715fdc70113fa09741c
-  data.tar.gz: 1cf06def2723c884b0fe81902f75d2d255f8bbd2
-SHA512: 
-  metadata.gz: c2f00dc8ad58b4c20549a95ea5c4adda80f12509b90762823e0d64ad0c5bc6989d9fd809f5a44954e2637d4b35619296df7c893b0f77aa57fa37bc66dfc28c8f
-  data.tar.gz: 7a2fa0b378422d5d6e9f013d3dd0481c1745e511cb816a3ba75c171094ad3148329a5292fbf59846952a9b4ee6dba98398e801c9e9b572a97b49e63ffd18bf3c
+---
+SHA1:
+  metadata.gz: 017a7fc1d13a3b124f775b749720d67838082476
+  data.tar.gz: 75025bd466c12c546998f4e1138ed22202c630d5
+SHA512:
+  metadata.gz: ad9abfc720058eaa4be0d285ea012c39372c5858a0cc190ada8d640011f96c0e78141b77954c0ba78ba841ebab30434e8ca9acd4e2542ad37092264efde1301c
+  data.tar.gz: 27d08e1d509e2677818f88f4b3121d508ecbea809b664b4e8e98bbc2e4e1ce04a712e7deaee11cdaf76d02532096ba1d5e7cc171f52e84904df431cd7cc2c6b2

data/CONTRIBUTING.md

@@ -139,7 +139,7 @@ If your changes are incompatible with the previous branch's API, then increment
 - [ ] Following the rules for [semantic versioning 2.0](http://semver.org/spec/v2.0.0.html), update [`MINOR`](lib/metasploit/concern/version.rb) and [`PATCH`](lib/metasploit/concern/version.rb) and commit the changes.
 
 ## MRI Ruby
-- [ ] `rvm use ruby-1.9.3@metasploit-concern`
+- [ ] `rvm use ruby-2.1@metasploit-concern`
 - [ ] `rm Gemfile.lock`
 - [ ] `bundle install`
 - [ ] `rake release`
@@ -154,4 +154,4 @@ When releasing new versions, the following projects may need to be updated:
 * [metasploit-framework](https://github.com/rapid7/metasploit-framework)
 * [metasploit-pro-ui](https://github.com/rapid7/pro/tree/master/ui)
 * [metasploit-pro-engine](https://github.com/rapid7/pro/tree/master/engine)
-* [firewall_egress](https://github.com/rapid7/pro/tree/master/metamodules/firewall_egress)
+* [firewall_egress](https://github.com/rapid7/pro/tree/master/metamodules/firewall_egress)

data/app/models/metasploit/concern/loader.rb

@@ -25,14 +25,19 @@ class Metasploit::Concern::Loader
 
   # Yields each constant under `parent_pathname`.
   #
+  # @param mechanism [:constantize, :require] `:require` if child pathname should be required so that the constant
+  #   cannot be unloaded by `ActiveSupport::Dependencies.clear`.
   # @param parent_pathname [Pathname]
   # @yield [constant]
   # @yieldparam constant [Module] constant declared under `parent_pathname`.
   # @yieldreturn [void]
   # @return [void]
-  def each_pathname_constant(parent_pathname)
+  def each_pathname_constant(mechanism:, parent_pathname:)
     parent_pathname.each_child do |child_pathname|
-      constant = constantize_pathname(child_pathname)
+      constant = constantize_pathname(
+          mechanism: mechanism,
+          pathname: child_pathname
+      )
 
       if constant
         yield constant
@@ -82,12 +87,14 @@ class Metasploit::Concern::Loader
       loader = self
 
       ActiveSupport.on_load(on_load_name) do
-        loader.each_pathname_constant(module_pathname) do |concern|
-          include concern
+        if ActiveSupport::Dependencies.autoloaded? self
+          mechanism = :constantize
+        else
+          mechanism = :require
         end
 
-        if defined?(Rails) && Rails.env.development?
-          unloadable
+        loader.each_pathname_constant(mechanism: mechanism, parent_pathname: module_pathname) do |concern|
+          include concern
         end
       end
     end
@@ -97,15 +104,23 @@ class Metasploit::Concern::Loader
 
   # Converts `descendant_pathname`, which should be under {#root}, into a constant.
   #
-  # @param descendant_pathname [Pathname] a Pathname under {#root}.
+  # @param mechanism [:constantize, :require] `:require` if pathname should be required so that the constant cannot be
+  #   unloaded by `ActiveSupport::Dependencies.clear`.
+  # @param pathname [Pathname] a Pathname under {#root}.
   # @return [Object] if {#pathname_to_constant_name} returns a constant name
   # @return [nil] otherwise
-  def constantize_pathname(descendant_pathname)
-    constant_name = pathname_to_constant_name(descendant_pathname)
+  def constantize_pathname(mechanism:, pathname:)
+    constant_name = pathname_to_constant_name(pathname)
 
     constant = nil
 
     if constant_name
+      # require before calling constantize so that the constant isn't recorded as unloadable.
+      if mechanism == :require
+        require pathname
+      end
+
+      # constantize either way as the the constant_name still needs to be converted to Module
       constant = constant_name.constantize
     end
 

data/lib/metasploit/concern/version.rb

@@ -6,8 +6,10 @@ module Metasploit
       MAJOR = 0
       # The minor version number, scoped to the {MAJOR} version number.
       MINOR = 3
-      # The patch number, scoped to the {MINOR} version number.
-      PATCH = 0
+      # The patch number, scoped to the {MAJOR} and {MINOR} version numbers.
+      PATCH = 1
+      # The prerelease version, scoped to the {MAJOR}, {MINOR}, and {PATCH} version numbers.
+      PRERELEASE = 'autoload-compatibility'
 
       # 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.

metadata

@@ -1,49 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: metasploit-concern
-version: !ruby/object:Gem::Version 
-  version: 0.3.0
+version: !ruby/object:Gem::Version
+  version: 0.3.1.pre.autoload.pre.compatibility
 platform: ruby
-authors: 
+authors:
 - Luke Imhoff
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-10-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-04-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
   name: railties
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - <
-      - !ruby/object:Gem::Version 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-description: Automatically includes Modules from app/concerns/<module_with_concerns>/<concern>.rb into <module_with_concerns> to ease monkey-patching associations and validations on ActiveRecord::Base descendents from other gems when layering schemas.
-email: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+description: Automatically includes Modules from app/concerns/<module_with_concerns>/<concern>.rb
+  into <module_with_concerns> to ease monkey-patching associations and validations
+  on ActiveRecord::Base descendents from other gems when layering schemas.
+email:
 - luke_imhoff@rapid7.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - CONTRIBUTING.md
 - LICENSE
 - README.md
@@ -55,31 +64,28 @@ files:
 - lib/tasks/yard.rake
 - spec/support/shared/examples/metasploit/concern/run.rb
 homepage: https://github.com/rapid7/metasploit-concern
-licenses: 
+licenses:
 - BSD-3-clause
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - &id003 
-    - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id003
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '2.1'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">"
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Automatically include Modules from app/concerns
 test_files: []
-
 has_rdoc: