metasploit-erd 3.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 734f972ac50cadb23d37c83099d61132ec43e01c4af6872531be3aa5c063b4a8
-  data.tar.gz: 34cbc519ee6d107e64b9a4e18f9b9e2d84563f987be6747469a3736953f16461
+  metadata.gz: c88c2c2d209027c9310d8923b7fa4dd5e6113bb1007b96a80f11e13690204a1e
+  data.tar.gz: 0d06d2a810de4e3308a3f8184d285b5e16ab2329f84ddeefe6ac7880356e107b
 SHA512:
-  metadata.gz: ec97c2af7fe26753ca39bb8738ca762a5a314ea8649641c0a8f7de90c6b392634806aaa321f04ce0fb531b54d5ca12aeb3cf0e06d6d221d4d0dd0a3b58d0c4d4
-  data.tar.gz: d6d090cc84609d9bffa881af8ba150674baa7af3ed0debc09056e132bf7de6242f6e03ac744d0edc47a99416a43f7d1a65f434b01e8a6d2c2cc2d657247e5e1b
+  metadata.gz: 066a2c5c4fef78ffb1ff64353a2a48af8d2f0334221bf2aceca923727d8bbfc9d0919481175116583354b5d8ab895345f83633d2c87fdb0a0691aff5b640c562
+  data.tar.gz: 02e446dae86c6f53b1c8c0f52e6af5aeff531ad109312e24ca593e72afc23f26fdd9854faea75beb98111783837e34e5e70b19218ce0158ec704cd9f8a7b4389

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
 
     strategy:
@@ -20,6 +20,7 @@ jobs:
           - 2.5
           - 2.6
           - 2.7
+          - 3.0
 
     env:
       RAILS_ENV: test
@@ -32,23 +33,11 @@ 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
-      - uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-gems-
-      - name: Bundle install
-        run: |
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
+          bundler-cache: true
 
       - name: Test
         run: |

data/Gemfile

@@ -12,8 +12,6 @@ group :development do
 end
 
 group :test do
-  # blank?
-  gem 'activesupport', '~> 5.2.2'
   # code coverage of tests
   gem 'simplecov', :require => false
   # in-memory database for ActiveRecord association traversal

data/lib/metasploit/erd/entity/namespace.rb

@@ -31,7 +31,7 @@ class Metasploit::ERD::Entity::Namespace
   # @return [Array<Class<ActiveRecord::Base>
   def classes
     ActiveRecord::Base.descendants.select { |klass|
-      klass.parents.any? { |parent|
+      klass.module_parents.any? { |parent|
         parent.name == namespace_name
       }
     }
@@ -63,4 +63,4 @@ class Metasploit::ERD::Entity::Namespace
 
     super(super_options)
   end
-end
+end

data/lib/metasploit/erd/version.rb

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

data/metasploit-erd.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
 
-  spec.add_runtime_dependency 'activerecord', '~> 5.2.2'
-  spec.add_runtime_dependency 'activesupport', '~> 5.2.2'
+  spec.add_runtime_dependency 'activerecord', '~> 6.0'
+  spec.add_runtime_dependency 'activesupport', '~> 6.0'
   spec.add_runtime_dependency 'rails-erd'
 end

data/spec/metasploit/erd/relationship_spec.rb

@@ -124,13 +124,10 @@ RSpec.describe Metasploit::ERD::Relationship do
 
           ActiveRecord::Migration.create_table :owners do |t|
             t.references :thing
-
-            t.timestamp
           end
 
           things.each do |thing|
             ActiveRecord::Migration.create_table thing.table_name do |t|
-              t.timestamp
             end
           end
         end
@@ -210,8 +207,6 @@ RSpec.describe Metasploit::ERD::Relationship do
         group_names.each do |group_name|
           t.references group_name.underscore.to_sym
         end
-
-        t.timestamp
       end
 
       polymorphics_by_group_name.each do |group_name, polymorphics|
@@ -241,4 +236,4 @@ RSpec.describe Metasploit::ERD::Relationship do
       end
     end
   end
-end
+end

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

@@ -7,6 +7,6 @@ RSpec.shared_context 'ActiveRecord::Base connection' do
   end
 
   after(:example) do
-    ActiveRecord::Base.connection.disconnect!
+    ActiveRecord::Base.connection.disconnect! rescue nil
   end
-end
+end

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

@@ -6,6 +6,12 @@ RSpec.shared_context 'ActiveRecord::Base.descendants cleaner' do
   after(:example) do
     # `ActiveSupport::DescendantsTracker.clear` will not clear ActiveRecord::Base subclasses because
     # ActiveSupport::Dependencies is loaded
-    ActiveRecord::Base.direct_descendants.clear
+    if ActiveRecord.version >= Gem::Version.new("6.0.0.rc1")
+      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
+end

metadata

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