metasploit_data_models 0.18.0-java → 0.18.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4ccf2e0ce2690f807d0c5b2b95e2dbfd039fc23
-  data.tar.gz: a01eefba6e078ba1e0eee5e571886c4c61529b71
+  metadata.gz: b7be5dc8c400b0c4e171151e3791f9d5d2151398
+  data.tar.gz: 5ebfc43baa37dca8de4022cf1ed924143e96d44b
 SHA512:
-  metadata.gz: e9e9160aa91a069d43aca5701ea24e8198f49cc3701c091da3828b3386421d9dfacb9904495b7b4f1704f5f267fc415d718b78a89bd2e74c1d1388dff7da2dff
-  data.tar.gz: 1fcc31a57f2c3fd741f1927782b62f11691a7ea1e68691eb4ea2eed38b40f8d4ab67657d57a165dea4b502f4343737785b02f9080ef2bfdfee622ba3c5d7b7c5
+  metadata.gz: 877b157502eb0805f7bda613cf4457ab1108fec4dc09a12f627a0be6d898ca97f7f7b2105288c0ab94980bf9e6750a0bf0458dcc060992ee4ab0b7150e0c3847
+  data.tar.gz: 41ae62017bbe000b4fdd461082dcc90e19f54e63da9e7e619e50473d9eb633d1edd3e49c4a9bce960d9bceb0997b8e99ba218245abdce77bd3e47592168e1578

data/config/initializers/arel_helper.rb

@@ -0,0 +1,5 @@
+# Including arel-helpers in all active record models.
+# https://github.com/camertron/arel-helpers
+
+ActiveRecord::Base.send(:include, ArelHelpers::ArelTable)
+ActiveRecord::Base.send(:include, ArelHelpers::JoinAssociation)

data/lib/metasploit_data_models.rb

@@ -6,12 +6,17 @@ require 'shellwords'
 #
 # Gems
 #
+# gems must load explicitly any gem declared in gemspec
+# @see https://github.com/bundler/bundler/issues/2018#issuecomment-6819359
+#
+#
 require 'active_record'
 require 'active_support'
 require 'active_support/all'
 require 'active_support/dependencies'
 require 'metasploit/concern'
 require 'metasploit/model'
+require 'arel-helpers'
 
 #
 # Project

data/lib/metasploit_data_models/version.rb

@@ -6,7 +6,7 @@ module MetasploitDataModels
     # The minor version number, scoped to the {MAJOR} version number.
     MINOR = 18
     # The patch number, scoped to the {MINOR} version number.
-    PATCH = 0
+    PATCH = 1
 
     # 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.
@@ -22,8 +22,20 @@ module MetasploitDataModels
 
       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

data/metasploit_data_models.gemspec

@@ -4,7 +4,7 @@ require 'metasploit_data_models/version'
 
 Gem::Specification.new do |s|
   s.name        = 'metasploit_data_models'
-  s.version     = MetasploitDataModels::VERSION
+  s.version     = MetasploitDataModels::GEM_VERSION
   s.authors     = [
       'Samuel Huckins',
       'Luke Imhoff',
@@ -41,6 +41,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'metasploit-concern', '~> 0.1.0'
   s.add_runtime_dependency 'metasploit-model', '>= 0.25.1', '< 0.26'
   
+  # arel-helpers: Useful tools to help construct database queries with ActiveRecord and Arel.
+  s.add_runtime_dependency 'arel-helpers'
+  
   if RUBY_PLATFORM =~ /java/
     # markdown formatting for yard
     s.add_development_dependency 'kramdown'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.1
 platform: java
 authors:
 - Samuel Huckins
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -123,6 +123,20 @@ dependencies:
         version: '0.26'
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: arel-helpers
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: kramdown
   version_requirements: !ruby/object:Gem::Requirement
@@ -249,6 +263,7 @@ files:
 - app/validators/parameters_validator.rb
 - app/validators/password_is_strong_validator.rb
 - bin/mdm_console
+- config/initializers/arel_helper.rb
 - config/locales/en.yml
 - console_db.yml
 - db/migrate/000_create_tables.rb