inventory_refresh 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba062c3d0e3f8355def18ece2eab7ad2c9ee6e2eb98420473f4101d2d2945a65
-  data.tar.gz: c3fcc1bfc13384de18fc20db6a315f8a9fa8c205153de9b21b7877a9a8e02929
+  metadata.gz: b6942604d2501cd3b0bf5245144f1a90cf2c63d314774eae29a7d0a76af5c82e
+  data.tar.gz: 881b3474280819e6fec3a222bd460d47bb757926e265c04232eb3b9c2632ddc3
 SHA512:
-  metadata.gz: ae6d904a94d75f73699a614f8b3e5dd83f4c53e39874eda2df37c900856da26b16b5d0bdf93917b495de2aef599ab08ad6959c935413a1caa223a114a01c9d11
-  data.tar.gz: 784a2b2c2e154bcf6b827a6a51ce7a09d6533dedefea0457313d0efe325284621a5a3a7988393c6b6cb5652909f5c3756269d98dfea0437cfe666e6a858462b6
+  metadata.gz: 7d831efe8b6f4e3ca0a9187ea133ad7c0da372aa80b86d0219fccf77abb8b870e4ccce2a4acbd4d4a39cfe0d86cecaf15b7f3ecd7812d52b0fdbfa537674345e
+  data.tar.gz: de6d47d1e11c101ede913c66f74a589d14500ce5c96be8e7ba85adbd91be8a57f21850ae4aee57af736dbe1917616481164e1ffe596793bf6abdf373da61a987

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

@@ -12,20 +12,17 @@ jobs:
     strategy:
       matrix:
         ruby-version:
-        - '2.7'
         - '3.0'
         - '3.1'
+        - '3.2'
+        - '3.3'
         rails-version:
-        # rails 6.1 supports ruby >= 2.5
-        # rails 7.0 supports ruby >= 2.7
-        - '6.1'
         - '7.0'
-        include:
-        # rails 6.0 (security EOL 6/23?) supports ruby < 2.8 (2.7 EOL 3/23?;)
-        - ruby-version: '2.6'
-          rails-version: '6.0'
-        - ruby-version: '2.7'
-          rails-version: '6.0'
+        - '7.1'
+        - '7.2'
+        exclude:
+        - ruby-version: '3.0'
+          rails-version: '7.2'
     services:
       postgres:
         image: manageiq/postgresql:13
@@ -54,6 +51,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@v5
+      uses: paambaati/codeclimate-action@v9

data/CHANGELOG.md

@@ -5,6 +5,20 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [2.2.0] - 2024-09-30
+### Changed
+- Drop old versions of ruby and rails, add ruby 3.3 and rails 7.2 ([#139](https://github.com/ManageIQ/inventory_refresh/pull/139))
+
+## [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))

data/Gemfile

@@ -6,11 +6,14 @@ require File.join(Bundler::Plugin.index.load_paths("bundler-inject")[0], "bundle
 # Specify your gem's dependencies in inventory_refresh.gemspec
 gemspec
 
-case ENV['TEST_RAILS_VERSION']
-when "5.2"
-  gem "activerecord", "~>5.2.6"
-when "6.0"
-  gem "activerecord", "~>6.0.4"
-when "6.1"
-  gem "activerecord", "~>6.1.4"
-end
+minimum_version =
+  case ENV['TEST_RAILS_VERSION']
+  when "7.2"
+    "~>7.2.1"
+  when "7.1"
+    "~>7.1.4"
+  else
+    "~>7.0.8"
+  end
+
+gem "activerecord", minimum_version

data/inventory_refresh.gemspec

@@ -22,7 +22,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.metadata['rubygems_mfa_required'] = 'true'
 
-  spec.add_dependency "activerecord", ">=5.0", "<7.1"
+  spec.required_ruby_version = '>= 3.0'
+  spec.add_dependency "activerecord", ">=7.0.8", "<8.0"
   spec.add_dependency "more_core_extensions", ">=3.5", "< 5"
   spec.add_dependency "pg", "> 0"
 
@@ -30,7 +31,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/inventory_collection/index/proxy.rb

@@ -111,7 +111,8 @@ module InventoryRefresh
 
           raise ArgumentError, "only one of manager_uuid or manager_uuid_hash must be passed" unless !!manager_uuid ^ !!manager_uuid_hash.present?
 
-          ActiveSupport::Deprecation.warn("Passing a hash for options is deprecated and will be removed in an upcoming release.") if opts.present?
+          # TODO: switch to ActiveSupport.deprecator.warn once 7.1+ is a minimum, see: https://github.com/rails/rails/pull/47354
+          ActiveSupport::Deprecation.new.warn("Passing a hash for options is deprecated and will be removed in an upcoming release.") if opts.present?
 
           manager_uuid ||= manager_uuid_hash
 

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.1.0".freeze
+  VERSION = "2.2.0".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.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-08 00:00:00.000000000 Z
+date: 2024-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 7.0.8
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 7.0.8
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.0'
 - !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
@@ -246,7 +247,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="