Merge master and resolve conflict

.travis.yml

@@ -4,9 +4,10 @@ cache: bundler
 language: ruby
 rvm:
   - '2.1'
+  # JRuby failing for redcarpet and shoulda-matchers gems
   # < 1.7.14
-  - 'jruby-1.7.13'
+  #- 'jruby-1.7.13'
   # >= 1.7.14
-  - 'jruby-1.7.14'
+  #- 'jruby-1.7.14'
 script: bundle exec rake spec yard
 sudo: false

lib/metasploit/model/version.rb

@@ -11,7 +11,7 @@ module Version
       # The minor version number, scoped to the {MAJOR} version number.
       MINOR = 0
       # The patch version number, scoped to the {MAJOR} and {MINOR} version numbers.
-      PATCH = 0
+      PATCH = 1
       PRERELEASE = 'rsync-gather-realm'
 
       #

spec/app/models/metasploit/model/search/group/base_spec.rb

@@ -1,3 +1,3 @@
 RSpec.describe Metasploit::Model::Search::Group::Base, type: :model do
-  it { is_expected.to ensure_length_of(:children).is_at_least(1) }
+  it { is_expected.to validate_length_of(:children).is_at_least(1) }
 end

spec/app/models/metasploit/model/search/operation/group/base_spec.rb

@@ -7,7 +7,7 @@
 
   context 'validations' do
     context 'children' do
-      it { is_expected.to ensure_length_of(:children).is_at_least(1).with_short_message('is too short (minimum is 1 child)') }
+      it { is_expected.to validate_length_of(:children).is_at_least(1).with_short_message('is too short (minimum is 1 child)') }
 
       context '#children_valid' do
         subject(:children_valid) do

spec/spec_helper.rb

@@ -114,3 +114,12 @@
     Metasploit::Model::Spec.remove_temporary_pathname
   end
 end
+
+Shoulda::Matchers.configure do |config|
+  config.integrate do |with|
+    with.library :active_record
+    with.library :active_model
+
+    with.test_framework :rspec
+  end
+end