metasploit-model 0.30.0-java → 0.30.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4570e3936093f4399b4c5e4076c40393d936dd6b
-  data.tar.gz: a879e61ad6fe1a357260e0704878555038fc0571
+  metadata.gz: 11a2997b51e66fb84f748536e612342a3306b6f3
+  data.tar.gz: 08731750d71bc4b661cc30947c963cee82264576
 SHA512:
-  metadata.gz: 5d9bd46453342e7d0abc58b78613a150c1f4b18502b861e3e35082993c43b80fe8a9cefe64c603347c6846424cba39c601dacceab9cef2848db55cbdfa587771
-  data.tar.gz: e9c25dcddefe8b864d603da307f56def939e82efef9e2b4b20c825cdfdf05b5a86049f7024bca0379f8bc3f8f1ec9b0d67796f0604a602490f2fa65eba60b003
+  metadata.gz: afbab2bd870f0468a376afc36634d5da4c3de86b836d1d7ea4fa1d3bc9e841dfe062c90f5c49f3483975263d6dd5710cc16592ba42cbf2ae99f66bd3cf7aa0f1
+  data.tar.gz: 7ffb17ef74e9832b31aede6a6e70a78fd7ffd010d0af8123e887b65e1d3f6df0264de69089456754c4c88f7be58887df5d8cca8171a4c40e34c323f20f9cd977

data/.rspec

@@ -1,4 +1,2 @@
---backtrace
---colour
---drb
---format documentation
+--color
+--require spec_helper

data/Gemfile

@@ -26,12 +26,7 @@ group :test do
   gem 'coveralls', require: false
   # Engine tasks are loaded using railtie
   gem 'railties', *rails_version_constraint
-  gem 'rspec'
-  # need rspec-core >= 2.14.0 because 2.14.0 introduced RSpec::Core::SharedExampleGroup::TopLevel
-  gem 'rspec-core', '>= 2.14.0', '< 3.0.0'
-  # need rspec-rails >= 2.12.0 as 2.12.0 adds support for redefining named subject in nested context that uses the
-  # named subject from the outer context without causing a stack overflow.
-  gem 'rspec-rails', '>= 2.12.0'
+  gem 'rspec-rails', '~> 3.1'
   # In a full rails project, factory_girl_rails would be in both the :development, and :test group, but since we only
   # want rails in :test, factory_girl_rails must also only be in :test.
   # add matchers from shoulda, such as validates_presence_of, which are useful for testing validations

data/lib/metasploit/model/version.rb

@@ -7,7 +7,7 @@ module Metasploit
       # The minor version number, scoped to the {MAJOR} version number.
       MINOR = 30
       # The patch number, scoped to the {MAJOR} and {MINOR} version numbers.
-      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.

data/spec/app/models/metasploit/model/association/reflection_spec.rb

@@ -1,10 +1,8 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Association::Reflection do
+RSpec.describe Metasploit::Model::Association::Reflection, type: :model do
   context 'validations' do
-    it { should validate_presence_of :model }
-    it { should validate_presence_of :name }
-    it { should validate_presence_of :class_name }
+    it { is_expected.to validate_presence_of :model }
+    it { is_expected.to validate_presence_of :name }
+    it { is_expected.to validate_presence_of :class_name }
   end
 
   context '#klass' do
@@ -42,7 +40,7 @@ describe Metasploit::Model::Association::Reflection do
     end
 
     it 'should return Class with Class#name #class_name' do
-      klass.should == class_name_class
+      expect(klass).to eq(class_name_class)
     end
   end
 end

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

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

data/spec/app/models/metasploit/model/search/group/intersection_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Group::Intersection do
-  it { should be_a Metasploit::Model::Search::Group::Base }
+RSpec.describe Metasploit::Model::Search::Group::Intersection, type: :model do
+  it { is_expected.to be_a Metasploit::Model::Search::Group::Base }
 end

data/spec/app/models/metasploit/model/search/group/union_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Group::Union do
-  it { should be_a Metasploit::Model::Search::Group::Base }
+RSpec.describe Metasploit::Model::Search::Group::Union, type: :model do
+  it { is_expected.to be_a Metasploit::Model::Search::Group::Base }
 end

data/spec/app/models/metasploit/model/search/operation/association_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operation::Association do
+RSpec.describe Metasploit::Model::Search::Operation::Association, type: :model do
   subject(:operation) {
     described_class.new(
         source_operation: source_operation
@@ -35,7 +33,7 @@ describe Metasploit::Model::Search::Operation::Association do
             true
           }
 
-          it { should_not include(invalid_error) }
+          it { is_expected.not_to include(invalid_error) }
         end
 
         context 'without valid' do
@@ -43,7 +41,7 @@ describe Metasploit::Model::Search::Operation::Association do
             false
           }
 
-          it { should include(invalid_error) }
+          it { is_expected.to include(invalid_error) }
         end
       end
 
@@ -56,12 +54,12 @@ describe Metasploit::Model::Search::Operation::Association do
           nil
         }
 
-        it { should include(blank_error) }
-        it { should_not include(invalid_error) }
+        it { is_expected.to include(blank_error) }
+        it { is_expected.not_to include(invalid_error) }
       end
     end
   end
 
-  it { should_not respond_to :value }
-  it { should_not respond_to :value= }
+  it { is_expected.not_to respond_to :value }
+  it { is_expected.not_to respond_to :value= }
 end

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

@@ -1,13 +1,11 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operation::Base do
+RSpec.describe Metasploit::Model::Search::Operation::Base, type: :model do
   subject(:operation) do
     described_class.new
   end
 
   context 'validations' do
     context 'operator' do
-      it { should validate_presence_of(:operator) }
+      it { is_expected.to validate_presence_of(:operator) }
 
       context 'valid' do
         let(:errors) do
@@ -40,7 +38,7 @@ describe Metasploit::Model::Search::Operation::Base do
             end
 
             it 'should not record error on operator' do
-              errors.should_not include(error)
+              expect(errors).not_to include(error)
             end
           end
 
@@ -50,7 +48,7 @@ describe Metasploit::Model::Search::Operation::Base do
             end
 
             it 'should record error on operator' do
-              errors.should include(error)
+              expect(errors).to include(error)
             end
           end
         end
@@ -61,7 +59,7 @@ describe Metasploit::Model::Search::Operation::Base do
           end
 
           it 'should not record error on operator' do
-            errors.should_not include(error)
+            expect(errors).not_to include(error)
           end
         end
       end

data/spec/app/models/metasploit/model/search/operation/boolean_spec.rb

@@ -1,21 +1,24 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operation::Boolean do
+RSpec.describe Metasploit::Model::Search::Operation::Boolean, type: :model do
   context 'CONSTANTS' do
     context 'FORMATTED_VALUE_TO_VALUE' do
       subject(:formatted_value_to_value) do
         described_class::FORMATTED_VALUE_TO_VALUE
       end
 
-      its(['false']) { should be_false }
-      its(['true']) { should be_true }
+      it "maps 'false' to false" do
+        expect(formatted_value_to_value['false']).to eq(false)
+      end
+
+      it "maps 'true' to true" do
+        expect(formatted_value_to_value['true']).to eq(true)
+      end
     end
   end
 
   context 'validations' do
-    it { should allow_value(false).for(:value) }
-    it { should allow_value(true).for(:value) }
-    it { should_not allow_value(nil).for(:value) }
+    it { is_expected.to allow_value(false).for(:value) }
+    it { is_expected.to allow_value(true).for(:value) }
+    it { is_expected.not_to allow_value(nil).for(:value) }
   end
 
   context '#value' do
@@ -32,7 +35,7 @@ describe Metasploit::Model::Search::Operation::Boolean do
         'false'
       end
 
-      it { should be_false }
+      it { is_expected.to eq(false) }
     end
 
     context "with 'true'" do
@@ -40,7 +43,7 @@ describe Metasploit::Model::Search::Operation::Boolean do
         'true'
       end
 
-      it { should be_true }
+      it { is_expected.to eq(true) }
     end
 
     context 'with other' do
@@ -49,7 +52,7 @@ describe Metasploit::Model::Search::Operation::Boolean do
       end
 
       it 'should return value unparsed' do
-        value.should == formatted_value
+        expect(value).to eq(formatted_value)
       end
     end
   end

data/spec/app/models/metasploit/model/search/operation/date_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operation::Date do
+RSpec.describe Metasploit::Model::Search::Operation::Date, type: :model do
   context 'validation' do
     context 'value' do
       before(:each) do
@@ -25,7 +23,7 @@ describe Metasploit::Model::Search::Operation::Date do
         end
 
         it 'should not record error' do
-          errors.should_not include(error)
+          expect(errors).not_to include(error)
         end
       end
 
@@ -35,7 +33,7 @@ describe Metasploit::Model::Search::Operation::Date do
         end
 
         it 'should record error' do
-          errors.should include(error)
+          expect(errors).to include(error)
         end
       end
     end
@@ -56,7 +54,7 @@ describe Metasploit::Model::Search::Operation::Date do
       end
 
       it 'should be passed in Date' do
-        value.should == formatted_value
+        expect(value).to eq(formatted_value)
       end
     end
 
@@ -71,7 +69,7 @@ describe Metasploit::Model::Search::Operation::Date do
         end
 
         it 'should be parsed Date' do
-          value.should == date
+          expect(value).to eq(date)
         end
       end
 
@@ -81,7 +79,7 @@ describe Metasploit::Model::Search::Operation::Date do
         end
 
         it 'should pass through value' do
-          value.should be formatted_value
+          expect(value).to be formatted_value
         end
       end
     end

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

@@ -1,15 +1,13 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operation::Group::Base do
+RSpec.describe Metasploit::Model::Search::Operation::Group::Base, type: :model do
   subject(:group) do
     described_class.new
   end
 
-  it { should be_a Metasploit::Model::Search::Operation::Base }
+  it { is_expected.to be_a Metasploit::Model::Search::Operation::Base }
 
   context 'validations' do
     context 'children' do
-      it { should ensure_length_of(:children).is_at_least(1).with_short_message('is too short (minimum is 1 child)') }
+      it { is_expected.to ensure_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
@@ -48,25 +46,25 @@ describe Metasploit::Model::Search::Operation::Group::Base do
           context 'with all valid' do
             before(:each) do
               children.each do |child|
-                child.stub(valid?: true)
+                allow(child).to receive(:valid?).and_return(true)
               end
             end
 
             it 'does not add error on :children' do
               group.valid?
 
-              group.errors[:children].should_not include(error)
+              expect(group.errors[:children]).not_to include(error)
             end
           end
 
           context 'with later valid' do
             before(:each) do
-              children.first.stub(valid?: false)
-              children.second.stub(valid?: true)
+              allow(children.first).to receive(:valid?).and_return(false)
+              allow(children.second).to receive(:valid?).and_return(true)
             end
 
             it 'does not short-circuit and validates all children' do
-              children.second.should_receive(:valid?).and_return(true)
+              expect(children.second).to receive(:valid?).and_return(true)
 
               children_valid
             end
@@ -74,7 +72,7 @@ describe Metasploit::Model::Search::Operation::Group::Base do
             it 'should add error on :children' do
               group.valid?
 
-              group.errors[:children].should include(error)
+              expect(group.errors[:children]).to include(error)
             end
           end
         end
@@ -87,7 +85,7 @@ describe Metasploit::Model::Search::Operation::Group::Base do
           it 'does not add error on :children' do
             group.valid?
 
-            group.errors[:children].should_not include(error)
+            expect(group.errors[:children]).not_to include(error)
           end
         end
       end
@@ -100,7 +98,7 @@ describe Metasploit::Model::Search::Operation::Group::Base do
     end
 
     context 'default' do
-      it { should == [] }
+      it { is_expected.to eq([]) }
     end
 
     context 'with attribute' do
@@ -117,7 +115,7 @@ describe Metasploit::Model::Search::Operation::Group::Base do
       end
 
       it 'is the value passed with :children to #new' do
-        children.should == expected_children
+        expect(children).to eq(expected_children)
       end
     end
   end

data/spec/app/models/metasploit/model/search/operation/group/intersection_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operation::Group::Intersection do
-  it { should be_a Metasploit::Model::Search::Operation::Group::Base }
+RSpec.describe Metasploit::Model::Search::Operation::Group::Intersection, type: :model do
+  it { is_expected.to be_a Metasploit::Model::Search::Operation::Group::Base }
 end

data/spec/app/models/metasploit/model/search/operation/group/union_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operation::Group::Union do
-  it { should be_a Metasploit::Model::Search::Operation::Group::Base }
+RSpec.describe Metasploit::Model::Search::Operation::Group::Union, type: :model do
+  it { is_expected.to be_a Metasploit::Model::Search::Operation::Group::Base }
 end

data/spec/app/models/metasploit/model/search/operation/integer_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operation::Integer do
+RSpec.describe Metasploit::Model::Search::Operation::Integer, type: :model do
   context 'validation' do
-    it { should validate_numericality_of(:value).only_integer }
+    it { is_expected.to validate_numericality_of(:value).only_integer }
   end
 
   it_should_behave_like 'Metasploit::Model::Search::Operation::Value::Integer'

data/spec/app/models/metasploit/model/search/operation/null_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operation::Null do
+RSpec.describe Metasploit::Model::Search::Operation::Null, type: :model do
   context 'validation' do
     context 'operator' do
       context 'null' do
@@ -41,7 +39,7 @@ describe Metasploit::Model::Search::Operation::Null do
           end
 
           it 'should not record error' do
-            errors.should_not include(error)
+            expect(errors).not_to include(error)
           end
         end
 
@@ -51,11 +49,11 @@ describe Metasploit::Model::Search::Operation::Null do
           end
 
           it 'should record error' do
-            errors.should include(error)
+            expect(errors).to include(error)
           end
 
           it 'should have no other errors, so that it would be valid without this type check on operator' do
-            operation.errors.size.should == 1
+            expect(operation.errors.size).to eq(1)
           end
         end
       end

data/spec/app/models/metasploit/model/search/operation/set/integer_spec.rb

@@ -1,7 +1,5 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operation::Set::Integer do
-  it { should be_a Metasploit::Model::Search::Operation::Set }
+RSpec.describe Metasploit::Model::Search::Operation::Set::Integer, type: :model do
+  it { is_expected.to be_a Metasploit::Model::Search::Operation::Set }
 
   it_should_behave_like 'Metasploit::Model::Search::Operation::Value::Integer'
 end

data/spec/app/models/metasploit/model/search/operation/set/string_spec.rb

@@ -1,7 +1,5 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operation::Set::String do
-  it { should be_a Metasploit::Model::Search::Operation::Set }
+RSpec.describe Metasploit::Model::Search::Operation::Set::String, type: :model do
+  it { is_expected.to be_a Metasploit::Model::Search::Operation::Set }
 
   it_should_behave_like 'Metasploit::Model::Search::Operation::Value::String'
 end