metasploit-concern 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afa946a151fe77bfef1769ced349e00755df4128
-  data.tar.gz: f901fb2bb36b655df6fc34061866ff3bb6ea6566
+  metadata.gz: 242cbd2227b9c0bdc0ed60fa1244754dc59bc908
+  data.tar.gz: 6896650c9b36ca6d5295df49d92cc5c4d7eae07c
 SHA512:
-  metadata.gz: 98a4112031a622d22776d5031bf89d4026d9a9760e30cd451dc805481a811789dec45c89081255d3da2cc4944bdaf9d0aa4399ae7b5f66196428cd1e0e8ac382
-  data.tar.gz: 15916be82e26ce10aa44c2e5df501a4e48f9895e80192578e0536f42149cc460747c949eafbbf961c2524c2ddede4e586aca4e0ccc3550dba7dd790e56d9884a
+  metadata.gz: c14151e64bedb53cae8b56ae5f11366e21d1cabb57e905b9b0c9f833dcb751ac68b663b1ba7c2e0853dafde4bc88870fa66c599498fac5e3ff514adf6476b745
+  data.tar.gz: efbf7361210cb0e4e146f09e7cb8981b390edf9be6e4211355d1b3c5d22c113499e05ecd9328a79ad4cdb5481b7b7b308057a15c5b6c143fd7627a722db62ec4

data/lib/metasploit/concern/engine.rb

@@ -1,17 +1,12 @@
 require 'rails'
-require File.expand_path("../support_engines", __FILE__)
 
 # Refinement that returns engines method to Rails::Engine::Railties
 # so that we can access the engines deprecated in Rails 4.1
 
-
-
 module Metasploit
   module Concern
     # Rails engine for Metasploit::Concern that sets up an initializer to load the concerns from app/concerns in other
     # Rails engines.
-    using SupportEngines
-    # to apply the refinement
     class Engine < ::Rails::Engine
       #
       # `config`
@@ -30,14 +25,13 @@ module Metasploit
 
       initializer 'metasploit_concern.load_concerns' do
         application = Rails.application
-        engines = application.railties.engines
+        engines = application.railties._all.select{|rt| rt.is_a? Rails::Engine}
 
         # application is an engine
         engines = [application, *engines]
 
         engines.each do |engine|
           concerns_path = engine.paths['app/concerns']
-
           if concerns_path
             if concerns_path.eager_load?
               raise Metasploit::Concern::Error::EagerLoad, engine

data/lib/metasploit/concern/error/eager_load.rb

@@ -3,13 +3,13 @@ class Metasploit::Concern::Error::EagerLoad < Metasploit::Concern::Error::Base
   # @param engine [Rails::Engine] `Rails::Engine` where `engine.paths['app/concerns'].eager_load?` is `true`.
   def initialize(engine)
     @engine = engine
-
+    engine_name = engine.class.name
     super(
-        "#{engine}'s `app/concerns` is marked as `eager_load: true`.  This will cause circular dependency " \
+        "#{engine_name}'s `app/concerns` is marked as `eager_load: true`.  This will cause circular dependency " \
         "errors when the concerns are loaded.  Declare `app/concerns` to stop it from inheriting `eager_load: true` " \
         "from `app`: \n" \
         "\n" \
-        "  class #{engine} < Rails::Engine\n" \
+        "  class #{engine_name} < Rails::Engine\n" \
         "    config.paths.add 'app/concerns', autoload: true\n" \
         "  end\n"
     )

data/lib/metasploit/concern/error/skip_autoload.rb

@@ -3,11 +3,11 @@ class Metasploit::Concern::Error::SkipAutoload < Metasploit::Concern::Error::Bas
   # @param engine [Rails::Engine] `Rails::Engine` where `engine.paths['app/concerns'].autoload?` is `false`.
   def initialize(engine)
     @engine = engine
-
+    engine_name = engine.class.name
     super(
-        "#{engine}'s `app/concerns` is marked as `autoload: false`.  Declare `app/concerns` as autoloading:\n" \
+        "#{engine_name}'s `app/concerns` is marked as `autoload: false`.  Declare `app/concerns` as autoloading:\n" \
         "\n" \
-        "  class #{engine} < Rails::Engine\n" \
+        "  class #{engine_name} < Rails::Engine\n" \
         "    config.paths.add 'app/concerns', autoload: true\n" \
         "  end\n"
     )

data/lib/metasploit/concern/version.rb

@@ -1,7 +1,7 @@
 module Metasploit
   module Concern
     # VERSION is managed by GemRelease
-    VERSION = '2.0.4'
+    VERSION = '2.0.5'
   
     # @return [String]
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-concern
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Luke Imhoff
@@ -88,7 +88,7 @@ cert_chain:
   G+Hmcg1v810agasPdoydE0RTVZgEOOMoQ07qu7JFXVWZ9ZQpHT7qJATWL/b2csFG
   8mVuTXnyJOKRJA==
   -----END CERTIFICATE-----
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-yard
@@ -180,7 +180,6 @@ files:
 - lib/metasploit/concern/error/base.rb
 - lib/metasploit/concern/error/eager_load.rb
 - lib/metasploit/concern/error/skip_autoload.rb
-- lib/metasploit/concern/support_engines.rb
 - lib/metasploit/concern/version.rb
 - spec/support/shared/examples/metasploit/concern/run.rb
 homepage: https://github.com/rapid7/metasploit-concern

data/lib/metasploit/concern/support_engines.rb

@@ -1,11 +0,0 @@
-# Ruby refinement.
-module SupportEngines
-
-  refine Rails::Engine::Railties do
-    # Reimplementing ‘Rails::Application::Railties#Engines since it has been removed.
-    def engines
-      # method that returns all current engines
-      @engines ||= ::Rails::Engine.subclasses.map(&:instance)
-    end
-  end
-end