metasploit-concern 0.1.1 → 0.2.1.pre.dep.pre.railties

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGI4NmEzOGFiOTFlM2JhNDllYTcxNWJiZTRjMzkyYmNhMWMxOGYyOQ==
+    OGQ2NWJkNDk1ZWRlZmFkM2M3YzQxNmNhM2Q1NWM2NDY0YmFkNDg0Zg==
   data.tar.gz: !binary |-
-    OTM0NTJiZTVjMGMwZTIwZWYyNmQzNGEwMTQ5MTIyOTAyMGQ4ZjAwOQ==
+    MjY4YWJiNTg1MmYzZWFlN2U5YzdkOWRkOTQ4Y2MzYzhhNmU3NGJiOQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDU4NTJlYmQ3YjEyYmJjNWYyYzFjNDA1ZmZiZWM0MmNjM2VhMzJkNmY1ODdm
-    MjkxZmEzY2M0YmRlOTljZDc3NmRlZWZhMTRhNzA5YjRkNTYwYjAxMDA4M2I0
-    MDdmZDA0MjQ2Mzc5MTQ1NTU1NDQ1MGE3OWVmNDAxOWE3OGExZDA=
+    NTA2MmIyMjQ5MTBkZjU5NDlkMWQyYWU2OTcxMTM2NzYxNTVkYmQ0Yzc1YThk
+    NmJjZjI4YWE3MTliZDI4YWQ5NmQwMmRmZjE2ZTkyMDE0ODk4NDVmZmQxNGQy
+    YThhNGQyM2E1YzQ5MmM0MzMyZDg5YjQ5Y2I2NDU4NjA5MTNjZjM=
   data.tar.gz: !binary |-
-    YjJmYWJjZmMzN2EzMGEwZjVkMjVlODhmOGM0ZWUwOWZjNjY4MjBiYWY5YmE4
-    NjQ2YzJkM2VkMmUwZGFhOTBhMDU3MGIwMzQ1ZjlhNjRhNWZlMzI1YTI3OWU0
-    MmY5NzYxOGU5MDYyMjQ2MmExNDIwYjFjNmQzMjNmNzFmOGY5NTA=
+    YjAxNmU4NjY2YmY4YmI0Zjc5YmE1ZGY3NTQzNGZjZjc5MDE3M2U5MTdiYTQw
+    YjQ0NTAzMjczYWU0YjE4MzYwYjI1MTUwNmNhZTc4OWE5YzcwMGUzZmVmOGRl
+    N2Q5ZDAyZjQ5OTBjOWM0ZTFmYzk3ZGY1MDNhMmZkY2EwZmEwZDU=

data/lib/metasploit/concern.rb

@@ -11,10 +11,7 @@ require 'active_support/lazy_load_hooks'
 # Project
 #
 
-# Only include the Rails engine when using Rails.  This is for compatibility with metasploit-framework.
-if defined? Rails
-  require 'metasploit/concern/engine'
-end
+require 'metasploit/concern/engine'
 
 require 'metasploit/concern/version'
 

data/lib/metasploit/concern/engine.rb

@@ -1,53 +1,50 @@
-begin
-  require 'rails'
-rescue LoadError => error
-  warn "rails could not be loaded, so Metasploit::Concern::Engine will not be defined: #{error}"
-else
-  module Metasploit
-    module Concern
-      class Engine < ::Rails::Engine
-        #
-        # `config`
-        #
-
-        # @see http://viget.com/extend/rails-engine-testing-with-rspec-capybara-and-factorygirl
-        config.generators do |g|
-          g.assets false
-          g.helper false
-          g.test_framework :rspec, fixture: false
-        end
+require 'rails'
+module Metasploit
+  module Concern
+
+    class Engine < ::Rails::Engine
+      #
+      # `config`
+      #
+
+      # @see http://viget.com/extend/rails-engine-testing-with-rspec-capybara-and-factorygirl
+      config.generators do |g|
+        g.assets false
+        g.helper false
+        g.test_framework :rspec, fixture: false
+      end
 
-        #
-        # `initializer`s
-        #
+      #
+      # `initializer`s
+      #
 
-        initializer 'metasploit_concern.load_concerns' do
-          application = Rails.application
-          engines = application.railties.engines
+      initializer 'metasploit_concern.load_concerns' do
+        application = Rails.application
+        engines = application.railties.engines
 
-          # application is an engine
-          engines = [application, *engines]
+        # application is an engine
+        engines = [application, *engines]
 
-          engines.each do |engine|
-            concerns_path = engine.paths['app/concerns']
+        engines.each do |engine|
+          concerns_path = engine.paths['app/concerns']
 
-            if concerns_path
-              concerns_directories = concerns_path.existent_directories
-            else
-              # app/concerns is not set, so just derive it from root.  Cannot derive from app because it will glob app/models too
-              concerns_directories = [engine.root.join('app', 'concerns').to_path]
-            end
+          if concerns_path
+            concerns_directories = concerns_path.existent_directories
+          else
+            # app/concerns is not set, so just derive it from root.  Cannot
+            # derive from app because it will glob app/models too
+            concerns_directories = [engine.root.join('app', 'concerns').to_path]
+          end
 
-            concerns_directories.each do |concerns_directory|
-              concerns_pathname = Pathname.new(concerns_directory)
-              loader = Metasploit::Concern::Loader.new(root: concerns_pathname)
-              loader.register
-            end
+          concerns_directories.each do |concerns_directory|
+            concerns_pathname = Pathname.new(concerns_directory)
+            loader = Metasploit::Concern::Loader.new(root: concerns_pathname)
+            loader.register
           end
         end
-
-        isolate_namespace Metasploit::Concern
       end
+
+      isolate_namespace Metasploit::Concern
     end
   end
 end

data/lib/metasploit/concern/version.rb

@@ -5,9 +5,10 @@ module Metasploit
       # The major version number.
       MAJOR = 0
       # The minor version number, scoped to the {MAJOR} version number.
-      MINOR = 1
+      MINOR = 2
       # The patch number, scoped to the {MINOR} version number.
       PATCH = 1
+      PRERELEASE = 'dep-railties'
 
       # 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.
@@ -23,8 +24,20 @@ module Metasploit
 
         version
       end
+
+      # The full gem version string, including the {MAJOR}, {MINOR}, {PATCH}, and optionally, the {PRERELEASE} in the
+      # {http://guides.rubygems.org/specification-reference/#version RubyGems versioning} format.
+      #
+      # @return [String] '{MAJOR}.{MINOR}.{PATCH}' on master.  '{MAJOR}.{MINOR}.{PATCH}.{PRERELEASE}' on any branch
+      #   other than master.
+      def self.gem
+        full.gsub('-', '.pre.')
+      end
     end
 
+    # @see Version.gem
+    GEM_VERSION = Version.gem
+
     # @see Version.full
     VERSION = Version.full
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-concern
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1.pre.dep.pre.railties
 platform: ruby
 authors:
 - Luke Imhoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,6 +30,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  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.
@@ -64,9 +78,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