metasploit-model 4.0.1 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f7ba3d443d54f67d1579a8b44ac363dc64f3fcbbbba909bf33f487fda1c4f0c
-  data.tar.gz: 451e8c25b13297b56912b302d9373b2eead874f7c195af0019903fa96b85196c
+  metadata.gz: 7a2b762eaa1f1b2130087f1be07ba839cd8acba7c9567c7e55f4595ab36f0926
+  data.tar.gz: c3338003885b9040014a78c7ab2c42d5f18e6f5feb92bfa2eefb59132c714bf6
 SHA512:
-  metadata.gz: e0bf5c78e23cb8055030d15fb63913bce916b83099868c753fbd886152dfe3083676a1f4328e57fadf9039d04979093703085456bc70de9a4ba6a6dd1d51462b
-  data.tar.gz: 97f5e74df4e54df3d2185e87433f159ed227b91478a4bd6c4e9160a26e033f0aa471e0823dddfe513d4ef10d4d6adda796e1784dc1a62f4510f94f892f4721fc
+  metadata.gz: 21206e3fe9a36035dd0d24b3b927966f5f8bb80ea44f4685db952fe40f0269b8387bd47107188b2aacc739cda8e545af6cbdf6027b4e3b113427d36334d161b1
+  data.tar.gz: 674b77564b3b4705776e89394db9a660bcf766052b1998e0e9d74b8009d18fed4ec938b56236e58fdd644b7a1a53351a512ac8f83f8e85f4be0f9be24027703c

data/.github/workflows/verify.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
     timeout-minutes: 40
 
     services:
@@ -30,9 +30,10 @@ jobs:
       fail-fast: true
       matrix:
         ruby:
-          - 2.5
           - 2.6
           - 2.7
+          - 3.0
+          - 3.1
 
     env:
       RAILS_ENV: test
@@ -45,24 +46,15 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - uses: actions/setup-ruby@v1
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-
-      - name: Setup bundler
-        run: |
-          gem install bundler
-
-      - name: Bundle install
-        run: |
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
+          bundler-cache: true
 
       - name: Test
         run: |
-          gem install bundler
           cp spec/dummy/config/database.yml.github_actions spec/dummy/config/database.yml
-          bundle install
           bundle exec rake --version
           bundle exec rake db:test:prepare
 

data/Gemfile

@@ -3,6 +3,10 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in metasploit-model.gemspec
 gemspec
 
+group :development do
+  gem 'pry-byebug'
+end
+
 # used by dummy application
 group :development, :test do
   # supplies factories for producing model instance for specs

data/README.md

@@ -22,9 +22,26 @@ Or install it yourself as:
 
     $ gem install metasploit-model
 
-## Usage
+## Running tests
 
-TODO: Write usage instructions here
+Copy the database configuration and modify as appropriate:
+
+```
+cp spec/dummy/config/database.yml.github_actions spec/dummy/config/database.yml
+```
+
+Set up the database:
+
+```
+bundle exec rake db:test:prepare
+bundle exec rake db:migrate RAILS_ENV=test
+```
+
+Run the test suite:
+
+```
+bundle exec rspec
+```
 
 ## Contributing
 

data/lib/metasploit/model/version.rb

@@ -1,7 +1,7 @@
 module Metasploit
   module Model
     # VERSION is managed by GemRelease
-    VERSION = '4.0.1'
+    VERSION = '4.0.4'
   
     # @return [String]
     #

data/spec/support/shared/examples/metasploit/model/search/operator/help.rb

@@ -32,14 +32,14 @@ RSpec.shared_examples_for 'Metasploit::Model::Search::Operator::Help' do
         backend.send(:init_translations)
       end
 
-      translations_by_locale = I18n.backend.send(:translations)
+      translations_by_locale = I18n.backend.send(:translations).deep_dup
       english_translations = translations_by_locale.fetch(:en)
       metasploit_translations = english_translations.fetch(:metasploit)
-      @metasploit_model_translations = metasploit_translations.fetch(:model)
+      metasploit_model_translations = metasploit_translations.fetch(:model)
 
-      expect(@metasploit_model_translations).not_to have_key(:ancestors)
+      expect(metasploit_model_translations).not_to have_key(:ancestors)
 
-      @metasploit_model_translations[:ancestors] = {
+      metasploit_model_translations[:ancestors] = {
           klass.model_name.i18n_key => {
               search: {
                   operator: {
@@ -52,10 +52,8 @@ RSpec.shared_examples_for 'Metasploit::Model::Search::Operator::Help' do
               }
           }
       }
-    end
 
-    after(:example) do
-      @metasploit_model_translations.delete(:ancestors)
+      allow(I18n.backend).to receive(:translations).and_return(translations_by_locale)
     end
 
     it 'should use #klass #i18n_scope to lookup translations specific to the #klass or one of its ancestors' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-model
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.4
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2021-04-29 00:00:00.000000000 Z
+date: 2022-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-yard