ovirt_metrics 3.1.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6211f1ed82214c903ff55a414db74930b58ee2bdc4c581f22cb3dd3f4f01bd3a
-  data.tar.gz: aa3a4075b113230c0c1f19d80c5d8c43a82dafacd34dc2b64b1c867d3b8a4d0f
+  metadata.gz: e391ddd37fb669e49664820bf19ddd99926281cf5dda6b12312407e952010a1c
+  data.tar.gz: fd4c03768e3d17cfe7665fa824a70df6a2b4d8e10f76780f36c41e3783a1e842
 SHA512:
-  metadata.gz: 59e4b4e747d95bd9f75e511a135636b0aa09065516b3cc11d1aa7176fb3b496b2463518b6dbf4d1de6cd11e9f4de890509402e7b693245f1dfe03200cacd2e5d
-  data.tar.gz: 2151ec8e5dfc07cc350c4f7b1bc6bd51377d22d7242f0bd897913aab35b8d8d705b9ba4c24dd43b2776424c911a2a7dbcf6001d5ccd57ca86b47ab62338876dc
+  metadata.gz: af60f8e7e2b1d932e73f3ea48c83560722f29039bd8b7661e443cf063258b061743a6c35204c69d25e7fe41e8fb110529057e1f5cc8562ee406e74cbdd2a81c8
+  data.tar.gz: 7d3fce36ea946033f604249ce3597d10bcce5d1cd74226d008f22a254a08d25d7e2f292df0a3e3a34e32ee5c2e87ac09f006bf388d70f55aa12a62fde6f79829

data/.rspec

@@ -1,3 +1,3 @@
---color
---warnings
 --require spec_helper
+--color
+--order random

data/README.md

@@ -1,9 +1,7 @@
 # OvirtMetrics
 
 [![Gem Version](https://badge.fury.io/rb/ovirt_metrics.svg)](http://badge.fury.io/rb/ovirt_metrics)
-[![Build Status](https://travis-ci.org/ManageIQ/ovirt_metrics.svg?branch=master)](https://travis-ci.org/ManageIQ/ovirt_metrics)
-[![Code Climate](http://img.shields.io/codeclimate/github/ManageIQ/ovirt_metrics.svg)](https://codeclimate.com/github/ManageIQ/ovirt_metrics)
-[![Coverage Status](http://img.shields.io/coveralls/ManageIQ/ovirt_metrics.svg)](https://coveralls.io/r/ManageIQ/ovirt_metrics)
+[![CI](https://github.com/ManageIQ/ovirt_metrics/actions/workflows/ci.yaml/badge.svg)](https://github.com/ManageIQ/ovirt_metrics/actions/workflows/ci.yaml)
 
 OvirtMetrics is an ActiveRecord-based gem for reading the oVirt History database.
 

data/lib/active_record/connection_adapters/ovirt_postgresql_adapter.rb

@@ -17,9 +17,19 @@ module ActiveRecord
   end
 
   module ConnectionAdapters
+    require 'active_record/connection_adapters/postgresql_adapter'
+
     class OvirtPostgreSQLAdapter < PostgreSQLAdapter
       ADAPTER_NAME = "OvirtPostgreSQL"
 
+      # ActiveRecord 7.2 introduced a .register method for connection adapters,
+      # replacing the auto-require with path based on adapter name.
+      # Without registering the adapter active_record won't be able to find the
+      # ovirt_postgresql adapter.
+      if ActiveRecord::VERSION::MAJOR > 7 || (ActiveRecord::VERSION::MAJOR == 7 && ActiveRecord::VERSION::MINOR >= 2)
+        ActiveRecord::ConnectionAdapters.register('ovirt_postgresql', name, 'active_record/connection_adapters/ovirt_postgresql_adapter')
+      end
+
       def check_version
         msg = "The version of PostgreSQL (#{postgresql_version}) is too old (9.2+ required)"
         if postgresql_version < 90200

data/lib/ovirt_metrics/configurator.rb

@@ -10,15 +10,7 @@ module OvirtMetrics
     attr_reader :connection_specification_name
 
     def connection_specification_name=(value)
-      if ActiveRecord::VERSION::MAJOR < 5
-        OvirtMetrics.warn "WARNING: ovirt_metric's " \
-          "connection_specification_name option is only available with " \
-          "Active Record 5 or newer. The main application pool " \
-          "('primary') will be used by default until you connect to a " \
-          "separate Ovirt database."
-      else
-        @connection_specification_name = value
-      end
+      @connection_specification_name = value
     end
   end
 end

data/lib/ovirt_metrics/version.rb

@@ -1,3 +1,3 @@
 module OvirtMetrics
-  VERSION = "3.1.0"
+  VERSION = "3.3.0"
 end

data/lib/ovirt_metrics.rb

@@ -1,3 +1,4 @@
+require "logger" # Require logger due to active_support breaking on Rails <= 7.0. See https://github.com/rails/rails/pull/54264
 require "active_record"
 require "ovirt_metrics/version"
 require "ovirt_metrics/configurator"

data/spec/spec_helper.rb

@@ -1,3 +1,8 @@
+if ENV['CI']
+  require 'simplecov'
+  SimpleCov.start
+end
+
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause this
@@ -79,20 +84,20 @@ end
 require 'support/active_record'
 require 'ovirt_metrics'
 
-begin
-  require 'coveralls'
-  Coveralls.wear!
-rescue LoadError
-end
-
 OvirtMetrics.config do |c|
   # Necessary because you currently cannot specify the
   # connection name for ActiveRecord::Schema, which we use
   # in tests to reset db schema for different RHEV versions.
-  c.connection_specification_name = 'primary' if ActiveRecord::VERSION::MAJOR >= 5
+  case ActiveRecord::VERSION::MAJOR
+  when 7
+    c.connection_specification_name = 'ActiveRecord::Base'
+  else
+    c.connection_specification_name = 'primary'
+  end
 end
-ActiveRecord::Base.establish_connection :adapter => "sqlite3", :database => ":memory:"
 
-require "active_record"
+require "active_record/connection_adapters/ovirt_postgresql_adapter"
+ActiveRecord::Base.establish_connection :adapter => "ovirt_postgresql", :database => "ovirt_engine_history", :user => "root", :host => "localhost", :password => "smartvm"
+
 puts
 puts "\e[93mUsing ActiveRecord #{ActiveRecord.version}\e[0m"

data/spec/support/active_record.rb

@@ -1,3 +1,4 @@
+require "logger" # Require logger due to active_support breaking on Rails <= 7.0. See https://github.com/rails/rails/pull/54264
 require 'active_record'
 
 module ActiveModel::Validations

metadata

@@ -1,38 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: ovirt_metrics
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Oleg Barenboim
 - Jason Frey
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '7.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -40,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: manageiq-style
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -54,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: manageiq-style
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -96,53 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.21.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.21.2
 description: OvirtMetrics is an ActiveRecord-based gem for reading the oVirt History
   database.
 email:
@@ -216,7 +181,6 @@ homepage: http://github.com/ManageIQ/ovirt_metrics
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -224,18 +188,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.8
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: OvirtMetrics is an ActiveRecord-based gem for reading the oVirt History database.
 test_files:
+- ".rspec"
 - spec/models/host_samples_history_spec.rb
 - spec/models/vm_disk_samples_history_spec.rb
 - spec/models/vm_samples_history_spec.rb
@@ -245,4 +209,3 @@ test_files:
 - spec/schemas/schema_rhev40.rb
 - spec/spec_helper.rb
 - spec/support/active_record.rb
-- ".rspec"