metasploit-erd 4.0.3 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c88c2c2d209027c9310d8923b7fa4dd5e6113bb1007b96a80f11e13690204a1e
-  data.tar.gz: 0d06d2a810de4e3308a3f8184d285b5e16ab2329f84ddeefe6ac7880356e107b
+  metadata.gz: 1f7c65eec175b6d3f11433038377ec2697d0cb10dc56182294b189c8af7f03a5
+  data.tar.gz: 960d983c4ea14db538dff44b6ec2b815bbf7b9fef6bf4e1cbb4f09b67fe6f138
 SHA512:
-  metadata.gz: 066a2c5c4fef78ffb1ff64353a2a48af8d2f0334221bf2aceca923727d8bbfc9d0919481175116583354b5d8ab895345f83633d2c87fdb0a0691aff5b640c562
-  data.tar.gz: 02e446dae86c6f53b1c8c0f52e6af5aeff531ad109312e24ca593e72afc23f26fdd9854faea75beb98111783837e34e5e70b19218ce0158ec704cd9f8a7b4389
+  metadata.gz: cb209394ed236815e83f13b394214a473340e9e93c6d003329dc328bff2980cf13a7bc0d5d83b82560c9886648121af8b5af52cf0869b9bd38ea5c2854dd46d0
+  data.tar.gz: 48db8e20d89b3d348f67e6b9d96b1c8a441706fc886a3e940b7529073216c344540f580492f0639161c9d11271a396f8d5e8bf294c50fdb194a2cd2c2a26c08a

data/.github/workflows/verify.yml

@@ -10,22 +10,27 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ${{ matrix.os }}
     timeout-minutes: 40
 
     strategy:
       fail-fast: true
       matrix:
         ruby:
-          - 2.5
-          - 2.6
           - 2.7
           - 3.0
+          - 3.1
+        os:
+          - ubuntu-20.04
+          - ubuntu-latest
+        exclude:
+          - { os: ubuntu-latest, ruby: 2.7 }
+          - { os: ubuntu-latest, ruby: 3.0 }
 
     env:
       RAILS_ENV: test
 
-    name: Ruby ${{ matrix.ruby }}
+    name: ${{ matrix.os }} - Ruby ${{ matrix.ruby }}
     steps:
       - name: Install system dependencies
         run: sudo apt-get install graphviz

data/lib/metasploit/erd/version.rb

@@ -1,7 +1,7 @@
 module Metasploit
   module ERD
     # VERSION is managed by GemRelease
-    VERSION = '4.0.3'
+    VERSION = '5.0.0'
 
     # @return [String]
     #

data/metasploit-erd.gemspec

@@ -19,13 +19,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.2.0'
+  spec.required_ruby_version = '>= 2.7.0'
 
   spec.add_development_dependency 'metasploit-yard'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
 
-  spec.add_runtime_dependency 'activerecord', '~> 6.0'
-  spec.add_runtime_dependency 'activesupport', '~> 6.0'
+  spec.add_runtime_dependency 'activerecord', '~> 7.0'
+  spec.add_runtime_dependency 'activesupport', '~> 7.0'
   spec.add_runtime_dependency 'rails-erd'
 end

data/spec/metasploit/erd/cluster_spec.rb

@@ -1,6 +1,6 @@
 RSpec.describe Metasploit::ERD::Cluster do
   include_context 'ActiveRecord::Base connection'
-  include_context 'ActiveRecord::Base.descendants cleaner'
+  include_context 'ActiveRecord::Base.subclasses cleaner'
 
   subject(:cluster) {
     described_class.new(*roots)
@@ -153,4 +153,4 @@ RSpec.describe Metasploit::ERD::Cluster do
       it { is_expected.to be_empty }
     end
   end
-end
+end

data/spec/metasploit/erd/entity/class_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe Metasploit::ERD::Entity::Class do
-  include_context 'ActiveRecord::Base.descendants cleaner'
+  include_context 'ActiveRecord::Base.subclasses cleaner'
 
   subject(:class_entity) {
     described_class.new(klass)

data/spec/metasploit/erd/entity/namespace_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe Metasploit::ERD::Entity::Namespace do
-  include_context 'ActiveRecord::Base.descendants cleaner'
+  include_context 'ActiveRecord::Base.subclasses cleaner'
 
   subject(:namespace_entity) {
     described_class.new(namespace_name)

data/spec/metasploit/erd/relationship_spec.rb

@@ -1,6 +1,6 @@
 RSpec.describe Metasploit::ERD::Relationship do
   include_context 'ActiveRecord::Base connection'
-  include_context 'ActiveRecord::Base.descendants cleaner'
+  include_context 'ActiveRecord::Base.subclasses cleaner'
 
   subject(:relationship) {
     described_class.new(association)

data/spec/support/shared/contexts/active_record_base_descendants_cleaner.rb

@@ -1,17 +1,16 @@
-RSpec.shared_context 'ActiveRecord::Base.descendants cleaner' do
+RSpec.shared_context 'ActiveRecord::Base.subclasses cleaner' do
   before(:example) do
-    expect(ActiveRecord::Base.direct_descendants).to be_empty
+    expect(ActiveRecord::Base.subclasses).to be_empty
   end
 
   after(:example) do
-    # `ActiveSupport::DescendantsTracker.clear` will not clear ActiveRecord::Base subclasses because
-    # ActiveSupport::Dependencies is loaded
-    if ActiveRecord.version >= Gem::Version.new("6.0.0.rc1")
+    if ActiveRecord.version >= Gem::Version.new("7.0.0")
+      subclasses = ActiveSupport::DescendantsTracker.subclasses(ActiveRecord::Base)
+      ActiveSupport::DescendantsTracker.clear(subclasses)
+    else
       cv = ActiveSupport::DescendantsTracker.class_variable_get(:@@direct_descendants)
       cv.delete(ActiveRecord::Base)
       ActiveSupport::DescendantsTracker.class_variable_set(:@@direct_descendants, cv)
-    else
-      ActiveRecord::Base.direct_descendants.clear
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-erd
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 5.0.0
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2021-09-16 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-yard
@@ -143,28 +143,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rails-erd
   requirement: !ruby/object:Gem::Requirement
@@ -233,7 +233,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="