metasploit-model 0.26.1 → 0.27.0.pre.dep.pre.railties

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzE5ZmE5MjgxN2RlZjhlMDk1NTM1OTcwYjZiZWRjMmRiOWI5ZDQ1Ng==
-  data.tar.gz: !binary |-
-    NmJjYTg0NWIwZGIxNzUyZGMwYmUyOTVlMzdlMGNmNGU5MDNkNjJiMQ==
+SHA1:
+  metadata.gz: 7926985bb0bcac362243970eb42db559a1e2d1a1
+  data.tar.gz: 2d0c3a6b77fabd8a40285933f00bc0c4a43b0aaa
 SHA512:
-  metadata.gz: !binary |-
-    MTNhYzY1MWNiNTNkNWY0ODBkZGMzNDMxN2JiYjA4YTlkNzg4Mzg3ZTRiNWI2
-    YTVmOGY1YWI1ZTVkZDdkMDJkN2M1NzU0ZGUzMmVkNDBiMThlZGVhMTg3MmRh
-    ZmQwZDI0NGJlYWRhMTQ3YTg5MDFiNmVlNDNiYjZjMzAwZWI4MjM=
-  data.tar.gz: !binary |-
-    OWJmNTc3ZGM2MmJmZjUwNjJlZTUzZTI0NTY1ZjRjZWVhNWNkYWFiODQ4YjAz
-    OGJlZjM4ZDI5NjJkODI5MjdlOTEzZDVjYTI2YmRkMGJmMjNjMDUzOTM3NTVh
-    YTUyODRhMDViOWJiODg0Zjc5ZDI0NmQxYTg3M2VlNmEwNzdhNzA=
+  metadata.gz: 6846770b940b19e3d9ac67fa34d84341b132edee34ccd5aff39c9150bb229b5ed3c31b14522825e6566e1bf64a18a7a8cbd1be7c050059491df9b8f14eabab66
+  data.tar.gz: 143967683de5189b9090a81cef7bf19250b6b463f18422321b74f4acbd1a7a228f938ab5ee6a5a461ee052c878b5cf7d3bc1fe87aa5b38bba46386228eff07a8

data/lib/metasploit/model/engine.rb

@@ -1,32 +1,25 @@
-begin
-  require 'rails'
-# Metasploit::Model.configuration.autoload.eager_load! will load this file, but if rails is not available, it should not
-# break the caller of eager_load! (i.e. metasploit-framework)
-rescue LoadError => error
-  warn "rails could not be loaded, so Metasploit::Model::Engine will not be defined: #{error}"
-else
-  module Metasploit
-    module Model
-      # Rails engine for Metasploit::Model.  Will automatically be used if `Rails` is defined when
-      # 'metasploit/model' is required, as should be the case in any normal Rails application Gemfile where
-      # gem 'rails' is the first gem in the Gemfile.
-      class Engine < Rails::Engine
-        # @see http://viget.com/extend/rails-engine-testing-with-rspec-capybara-and-factorygirl
-        config.generators do |g|
-          g.assets false
-          g.fixture_replacement :factory_girl, :dir => 'spec/factories'
-          g.helper false
-          g.test_framework :rspec, :fixture => false
-        end
+require 'rails'
+module Metasploit
+  module Model
+    # Rails engine for Metasploit::Model.  Will automatically be used if `Rails` is defined when
+    # 'metasploit/model' is required, as should be the case in any normal Rails application Gemfile where
+    # gem 'rails' is the first gem in the Gemfile.
+    class Engine < Rails::Engine
+      # @see http://viget.com/extend/rails-engine-testing-with-rspec-capybara-and-factorygirl
+      config.generators do |g|
+        g.assets false
+        g.fixture_replacement :factory_girl, :dir => 'spec/factories'
+        g.helper false
+        g.test_framework :rspec, :fixture => false
+      end
 
-        initializer 'metasploit-model.prepend_factory_path', :after => 'factory_girl.set_factory_paths' do
-          if defined? FactoryGirl
-            relative_definition_file_path = config.generators.options[:factory_girl][:dir]
-            definition_file_path = root.join(relative_definition_file_path)
+      initializer 'metasploit-model.prepend_factory_path', :after => 'factory_girl.set_factory_paths' do
+        if defined? FactoryGirl
+          relative_definition_file_path = config.generators.options[:factory_girl][:dir]
+          definition_file_path = root.join(relative_definition_file_path)
 
-            # unshift so that dependent gems can modify metasploit-model's factories
-            FactoryGirl.definition_file_paths.unshift definition_file_path
-          end
+          # unshift so that dependent gems can modify metasploit-model's factories
+          FactoryGirl.definition_file_paths.unshift definition_file_path
         end
       end
     end

data/lib/metasploit/model/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 = 26
+      MINOR = 27
       # The patch number, scoped to the {MINOR} version number.
-      PATCH = 1
+      PATCH = 0
+      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.

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

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.pre.dep.pre.railties
 platform: ruby
 authors:
 - Luke Imhoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,14 +28,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -56,28 +56,42 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '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
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Common code, such as validators and mixins, that are shared between ActiveModels
@@ -491,14 +505,14 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       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