From 702dd872afb74dd390d28f5c4468f5b4cb2b68ba Mon Sep 17 00:00:00 2001 From: Joe Rafaniello Date: Fri, 7 Apr 2023 16:24:08 -0400 Subject: [PATCH 1/2] These aren't acronyms, so use regular case to enable proper loading These aren't widely known acronyms, so Zeitwerk and rails need to be told about them. We should avoid using acronyms and default to using the "rails" convention unless it's warranted to specify acronyms. All other usages of the same acronyms would need to be enforced in locations so it's not without side effects. It's just not worth it here. --- app/models/manageiq/showback/data_rollup.rb | 2 +- app/models/manageiq/showback/data_rollup/cpu.rb | 2 +- app/models/manageiq/showback/data_rollup/disk.rb | 2 +- app/models/manageiq/showback/data_rollup/fixed.rb | 2 +- app/models/manageiq/showback/data_rollup/flavor.rb | 2 +- app/models/manageiq/showback/data_rollup/mem.rb | 2 +- app/models/manageiq/showback/data_rollup/metering.rb | 2 +- app/models/manageiq/showback/data_rollup/net.rb | 2 +- app/models/manageiq/showback/data_rollup/storage.rb | 2 +- spec/models/data_rollup/cpu_spec.rb | 2 +- spec/models/data_rollup/flavor_spec.rb | 2 +- spec/models/data_rollup/mem_spec.rb | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/models/manageiq/showback/data_rollup.rb b/app/models/manageiq/showback/data_rollup.rb index 88bd1e9..8aa2e7b 100644 --- a/app/models/manageiq/showback/data_rollup.rb +++ b/app/models/manageiq/showback/data_rollup.rb @@ -22,7 +22,7 @@ class DataRollup < ApplicationRecord extend ActiveSupport::Concern - Dir.glob(Pathname.new(File.dirname(__dir__)).join("showback/data_rollup/*")).each { |lib| include_concern lib.split("showback/data_rollup/")[1].split(".rb")[0].upcase } + Dir.glob(Pathname.new(File.dirname(__dir__)).join("showback/data_rollup/*")).each { |lib| include_concern lib.split("showback/data_rollup/")[1].split(".rb")[0].capitalize } self.table_name = 'showback_data_rollups' diff --git a/app/models/manageiq/showback/data_rollup/cpu.rb b/app/models/manageiq/showback/data_rollup/cpu.rb index 4d6f595..ca0da4d 100644 --- a/app/models/manageiq/showback/data_rollup/cpu.rb +++ b/app/models/manageiq/showback/data_rollup/cpu.rb @@ -1,4 +1,4 @@ -module ManageIQ::Showback::DataRollup::CPU +module ManageIQ::Showback::DataRollup::Cpu # # Return the average acumulated with the new one # diff --git a/app/models/manageiq/showback/data_rollup/disk.rb b/app/models/manageiq/showback/data_rollup/disk.rb index f473a87..6947f42 100644 --- a/app/models/manageiq/showback/data_rollup/disk.rb +++ b/app/models/manageiq/showback/data_rollup/disk.rb @@ -1,4 +1,4 @@ -module ManageIQ::Showback::DataRollup::DISK +module ManageIQ::Showback::DataRollup::Disk # for old chargeback integration def disk_io_disk_usage_rate_average end diff --git a/app/models/manageiq/showback/data_rollup/fixed.rb b/app/models/manageiq/showback/data_rollup/fixed.rb index ce0625f..5814c7c 100644 --- a/app/models/manageiq/showback/data_rollup/fixed.rb +++ b/app/models/manageiq/showback/data_rollup/fixed.rb @@ -1,4 +1,4 @@ -module ManageIQ::Showback::DataRollup::FIXED +module ManageIQ::Showback::DataRollup::Fixed def fixed_fixed_compute_1 end diff --git a/app/models/manageiq/showback/data_rollup/flavor.rb b/app/models/manageiq/showback/data_rollup/flavor.rb index e931b7a..317afe3 100644 --- a/app/models/manageiq/showback/data_rollup/flavor.rb +++ b/app/models/manageiq/showback/data_rollup/flavor.rb @@ -1,4 +1,4 @@ -module ManageIQ::Showback::DataRollup::FLAVOR +module ManageIQ::Showback::DataRollup::Flavor # # Return Number Ocurrences # diff --git a/app/models/manageiq/showback/data_rollup/mem.rb b/app/models/manageiq/showback/data_rollup/mem.rb index b54fa22..498241b 100644 --- a/app/models/manageiq/showback/data_rollup/mem.rb +++ b/app/models/manageiq/showback/data_rollup/mem.rb @@ -1,4 +1,4 @@ -module ManageIQ::Showback::DataRollup::MEM +module ManageIQ::Showback::DataRollup::Mem # # Return the average acumulated with the new one # diff --git a/app/models/manageiq/showback/data_rollup/metering.rb b/app/models/manageiq/showback/data_rollup/metering.rb index bc0f2fa..9565266 100644 --- a/app/models/manageiq/showback/data_rollup/metering.rb +++ b/app/models/manageiq/showback/data_rollup/metering.rb @@ -1,4 +1,4 @@ -module ManageIQ::Showback::DataRollup::METERING +module ManageIQ::Showback::DataRollup::Metering # for old chargeback integration def metering_metering_used_hours end diff --git a/app/models/manageiq/showback/data_rollup/net.rb b/app/models/manageiq/showback/data_rollup/net.rb index 5b0da0c..6f2e468 100644 --- a/app/models/manageiq/showback/data_rollup/net.rb +++ b/app/models/manageiq/showback/data_rollup/net.rb @@ -1,4 +1,4 @@ -module ManageIQ::Showback::DataRollup::NET +module ManageIQ::Showback::DataRollup::Net # for old chargeback integration def net_io_net_usage_rate_average end diff --git a/app/models/manageiq/showback/data_rollup/storage.rb b/app/models/manageiq/showback/data_rollup/storage.rb index a392259..50abe9d 100644 --- a/app/models/manageiq/showback/data_rollup/storage.rb +++ b/app/models/manageiq/showback/data_rollup/storage.rb @@ -1,4 +1,4 @@ -module ManageIQ::Showback::DataRollup::STORAGE +module ManageIQ::Showback::DataRollup::Storage # for old chargeback integration def storage_derived_vm_used_disk_storage end diff --git a/spec/models/data_rollup/cpu_spec.rb b/spec/models/data_rollup/cpu_spec.rb index 8aa77e6..9651fe0 100644 --- a/spec/models/data_rollup/cpu_spec.rb +++ b/spec/models/data_rollup/cpu_spec.rb @@ -1,4 +1,4 @@ -describe ManageIQ::Showback::DataRollup::CPU do +describe ManageIQ::Showback::DataRollup::Cpu do let(:data_rollup) { FactoryBot.build(:data_rollup) } let(:con_data_rollup) { FactoryBot.build(:data_rollup) } context "CPU in vm" do diff --git a/spec/models/data_rollup/flavor_spec.rb b/spec/models/data_rollup/flavor_spec.rb index 3fcf3ea..4162dd5 100644 --- a/spec/models/data_rollup/flavor_spec.rb +++ b/spec/models/data_rollup/flavor_spec.rb @@ -1,4 +1,4 @@ -describe ManageIQ::Showback::DataRollup::FLAVOR do +describe ManageIQ::Showback::DataRollup::Flavor do let(:data_rollup) { FactoryBot.build(:data_rollup) } context "FLAVOR in vm" do before(:each) do diff --git a/spec/models/data_rollup/mem_spec.rb b/spec/models/data_rollup/mem_spec.rb index 9a95076..9264f2a 100644 --- a/spec/models/data_rollup/mem_spec.rb +++ b/spec/models/data_rollup/mem_spec.rb @@ -1,4 +1,4 @@ -describe ManageIQ::Showback::DataRollup::MEM do +describe ManageIQ::Showback::DataRollup::Mem do let(:data_rollup) { FactoryBot.build(:data_rollup) } let(:con_data_rollup) { FactoryBot.build(:data_rollup) } context "memory in vm" do From d883ad5641bf9748dc869bb562501b26bf0ea075 Mon Sep 17 00:00:00 2001 From: Joe Rafaniello Date: Thu, 20 Apr 2023 12:03:06 -0400 Subject: [PATCH 2/2] Use zeitwerk/bundler friendly namespaced gem 'require' There is no need create a file called lib/my-gem.rb. Bundler will automatically treat this as a namespace due to the hyphen, so it will try a my-gem require first and then fallback on my/gem. See: https://github.com/rubygems/rubygems/blob/a223274e4627e8a76112415c0e38f8a45a42f97e/bundler/lib/bundler/runtime.rb#L72-L73 Because we're moving towards zeitwerk, ruby files should be named based on their namespace/class names. 1) Moving / renaming based on a namespaced gem name works automatically with bundler. 2) Zeitwerk knows to ignore this file, so we don't need to. --- lib/{manageiq-consumption.rb => manageiq/consumption.rb} | 0 spec/spec_helper.rb | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename lib/{manageiq-consumption.rb => manageiq/consumption.rb} (100%) diff --git a/lib/manageiq-consumption.rb b/lib/manageiq/consumption.rb similarity index 100% rename from lib/manageiq-consumption.rb rename to lib/manageiq/consumption.rb diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 65d53fb..2648cfb 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -6,4 +6,4 @@ Dir[Rails.root.join("spec/shared/**/*.rb")].each { |f| require f } Dir[File.join(__dir__, "support/**/*.rb")].each { |f| require f } -require "manageiq-consumption" +require "manageiq/consumption"