inventory_refresh 2.0.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3230d7d712cf1e8ca4c20f070dae17686b8f879b34a4eb7cd59eafa00705ee44
-  data.tar.gz: 1242373300c55514fc0f3795826712babda1cc5d14983d0273c63e1214515ea9
+  metadata.gz: 614330dcc33f7041b91869447db2ed074ad70d0d22582a289ab45de42bdda9cd
+  data.tar.gz: 44f7cec03b86c2e14519dc88de9aba9fb060aa08f93097474b9b0c8d8148e6d1
 SHA512:
-  metadata.gz: f1e9aaccce8ca7179137b24eeba2f8bacc2d7c0401891ff6fbdbf03d99786c4bcfa65cb5bf81b461a7edfe5a62de8b21ee00ab8007e326c6afcf8debc685a616
-  data.tar.gz: fbf7e26bdb0d42e50253fdb9f70734a299c5f30df3fa64b6a05d68f2c80e6a8e1c06dbec902a1a3845e860cf86dd6add8931cf9ef809055534b327b370a2f375
+  metadata.gz: 6d50b13b3f88e8e810b6220f5e5bdc1d341057048afc19cfac9f453274c7816941200a313a4c2e4bc3af335faf27f4497363e0f37c0311f453845fcf86ea047c
+  data.tar.gz: d6b1c142c98a7272e5964a97e0d9f59033906707736d3b1e5f3f0722ccbfce6ed3e0c84530eae71d8cef8af0c1985a6477da35f8956cd9bad313a743c1e3a882

data/.codeclimate.yml

@@ -12,7 +12,7 @@ plugins:
   rubocop:
     enabled: true
     config: ".rubocop_cc.yml"
-    channel: rubocop-0-82
+    channel: rubocop-1-56-3
   brakeman:
     enabled: false
   bundler-audit:

data/.github/workflows/ci.yaml

@@ -14,13 +14,15 @@ jobs:
         ruby-version:
         - '2.7'
         - '3.0'
+        - '3.1'
+        - '3.2'
         rails-version:
         # rails 6.1 supports ruby >= 2.5
+        # rails 7.0 supports ruby >= 2.7
         - '6.1'
+        - '7.0'
+        - '7.1'
         include:
-        # rails 5.2 (EOL 6/22) supports ruby < 2.7 (2.6 EOL 3/22)
-        - ruby-version: '2.5'
-          rails-version: '5.2'
         # rails 6.0 (security EOL 6/23?) supports ruby < 2.8 (2.7 EOL 3/23?;)
         - ruby-version: '2.6'
           rails-version: '6.0'
@@ -28,7 +30,7 @@ jobs:
           rails-version: '6.0'
     services:
       postgres:
-        image: manageiq/postgresql:10
+        image: manageiq/postgresql:13
         env:
           POSTGRESQL_USER: root
           POSTGRESQL_PASSWORD: smartvm
@@ -42,7 +44,7 @@ jobs:
       PGPASSWORD: smartvm
       CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
@@ -54,6 +56,6 @@ jobs:
     - name: Run tests
       run: bundle exec rake
     - name: Report code coverage
-      if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '2.7' && matrix.rails-version == '6.1' }}
+      if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.1' && matrix.rails-version == '7.0' }}
       continue-on-error: true
-      uses: paambaati/codeclimate-action@v3.0.0
+      uses: paambaati/codeclimate-action@v8

data/CHANGELOG.md

@@ -5,6 +5,22 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [2.1.1] - 2024-08-06
+### Fixed
+- Fix rails 7 deprecation on ActiveRecord::Base.default_timezone ([#124](https://github.com/ManageIQ/inventory_refresh/pull/124))
+- Fix missing constant OpenStruct in tests ([#131](https://github.com/ManageIQ/inventory_refresh/pull/131))
+
+### Added
+- Test with ruby 3.2 and rails 7.1 ([#122](https://github.com/ManageIQ/inventory_refresh/pull/122))
+- Log destroy result when duplicate record is found ([#120](https://github.com/ManageIQ/inventory_refresh/pull/120))
+- Use ruby 3.1 and rails 7 for code coverage ([#136](https://github.com/ManageIQ/inventory_refresh/pull/136))
+
+## [2.1.0] - 2024-02-08
+### Changed
+- Update GitHub Actions versions ([#117](https://github.com/ManageIQ/inventory_refresh/pull/117))
+- Update actions/checkout version to v4 ([#118](https://github.com/ManageIQ/inventory_refresh/pull/118))
+- Allow rails 7 gems in gemspec ([#119](https://github.com/ManageIQ/inventory_refresh/pull/119))
+
 ## [2.0.0] - 2022-09-06
 ### Added
 - Add timeout-minutes to setup-ruby job (#110)

data/Rakefile

@@ -20,7 +20,12 @@ namespace :spec do
 
   def connection_spec
     require 'yaml'
-    @connection_spec ||= YAML.load_file(File.join(__dir__, %w[config database.yml]))
+    @connection_spec ||=
+      if YAML.respond_to?(:safe_load)
+        YAML.safe_load(File.read(File.join(__dir__, %w[config database.yml])), :aliases => true)
+      else
+        YAML.load_file(File.join(__dir__, %w[config database.yml]))
+      end
   end
 
   def test_database_name

data/inventory_refresh.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.metadata['rubygems_mfa_required'] = 'true'
 
-  spec.add_dependency "activerecord", ">=5.0", "< 7.0"
+  spec.add_dependency "activerecord", ">=5.0", "<7.2"
   spec.add_dependency "more_core_extensions", ">=3.5", "< 5"
   spec.add_dependency "pg", "> 0"
 
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "factory_bot", "~> 4.11.1"
   spec.add_development_dependency "manageiq-style"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.2"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "simplecov", ">= 0.21.2"
 end

data/lib/inventory_refresh/save_collection/saver/base.rb

@@ -269,14 +269,8 @@ module InventoryRefresh::SaveCollection
         true
       end
 
-      # @return [Time] A rails friendly time getting config from ActiveRecord::Base.default_timezone (can be :local
-      #         or :utc)
       def time_now
-        if ActiveRecord::Base.default_timezone == :utc
-          Time.now.utc
-        else
-          Time.zone.now
-        end
+        Time.current
       end
 
       # Enriches data hash with timestamp columns

data/lib/inventory_refresh/save_collection/saver/default.rb

@@ -43,9 +43,9 @@ module InventoryRefresh::SaveCollection
         if unique_db_indexes.include?(index) # Include on Set is O(1)
           # We have a duplicate in the DB, destroy it. A find_each method does automatically .order(:id => :asc)
           # so we always keep the oldest record in the case of duplicates.
-          logger.warn("A duplicate record was detected and destroyed, inventory_collection: "\
+          destroyed = record.destroy ? "and destroyed" : "but could not be destroyed"
+          logger.warn("A duplicate record was detected #{destroyed}, inventory_collection:" \
                       "'#{inventory_collection}', record: '#{record}', duplicate_index: '#{index}'")
-          record.destroy
           return false
         else
           unique_db_indexes << index

data/lib/inventory_refresh/version.rb

@@ -1,3 +1,3 @@
 module InventoryRefresh
-  VERSION = "2.0.0".freeze
+  VERSION = "2.1.1".freeze
 end

data/renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inventory_refresh
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.1
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-06 00:00:00.000000000 Z
+date: 2024-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: more_core_extensions
   requirement: !ruby/object:Gem::Requirement
@@ -126,14 +126,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -233,6 +233,7 @@ files:
 - lib/inventory_refresh/target.rb
 - lib/inventory_refresh/target_collection.rb
 - lib/inventory_refresh/version.rb
+- renovate.json
 homepage: https://github.com/ManageIQ/inventory_refresh
 licenses:
 - Apache-2.0
@@ -253,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.15
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Topological Inventory Persister