ovirt_metrics 1.1.0 → 1.2.0

data/lib/ovirt_metrics/models/ovirt_history.rb

@@ -0,0 +1,12 @@
+module OvirtMetrics
+  class OvirtHistory < ActiveRecord::Base
+    self.abstract_class = true
+    self.pluralize_table_names = false
+
+    def self.with_time_range(start_time = nil, end_time = nil)
+      return all if start_time.nil?
+      where(:history_datetime => (start_time..(end_time || Time.now.utc)))
+    end
+
+  end
+end

data/lib/ovirt_metrics/version.rb

@@ -1,3 +1,3 @@
 module OvirtMetrics
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/ovirt_metrics.rb

@@ -1,10 +1,11 @@
+require "active_record"
 require "ovirt_metrics/version"
 require "ovirt_metrics/column_definitions"
 require "ovirt_metrics/nic_metrics"
 
 $:.push File.expand_path(File.dirname(__FILE__))
-require 'models/ovirt_history'
-Dir.glob(File.expand_path(File.join(File.dirname(__FILE__), "models", "*.rb"))) { |f| require "models/#{File.basename(f, ".*")}" }
+require 'ovirt_metrics/models/ovirt_history'
+Dir.glob(File.expand_path(File.join(File.dirname(__FILE__), "ovirt_metrics", "models", "*.rb"))) { |f| require "ovirt_metrics/models/#{File.basename(f, ".*")}" }
 
 module OvirtMetrics
   DEFAULT_HISTORY_DATABASE_NAME     = "ovirt_engine_history".freeze
@@ -19,7 +20,14 @@ module OvirtMetrics
     opts            ||= {}
     opts[:port]     ||= 5432
     opts[:database] ||= DEFAULT_HISTORY_DATABASE_NAME
-    opts[:adapter]    = 'postgresql'
+    opts[:adapter]    = begin
+                          if ActiveRecord::VERSION::MAJOR > 4
+                            require "active_record/connection_adapters/ovirt_legacy_postgresql_adapter"
+                            'ovirt_legacy_postgresql'
+                          else
+                            'postgresql'
+                          end
+                        end
 
     # Don't allow accidental connections to localhost.  A blank host will
     # connect to localhost, so don't allow that at all.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ovirt_metrics
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Oleg Barenboim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,6 +39,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -85,16 +99,36 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+- !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'
 description: OvirtMetrics is an ActiveRecord-based gem for reading the oVirt History
   database.
 email:
@@ -107,49 +141,82 @@ files:
 - ".rspec"
 - LICENSE.txt
 - README.md
-- lib/models/calendar.rb
-- lib/models/cluster_configuration.rb
-- lib/models/datacenter_configuration.rb
-- lib/models/datacenter_daily_history.rb
-- lib/models/datacenter_hourly_history.rb
-- lib/models/datacenter_samples_history.rb
-- lib/models/datacenter_storage_domain_map.rb
-- lib/models/disks_vm_map.rb
-- lib/models/enum_translator.rb
-- lib/models/history_configuration.rb
-- lib/models/host_configuration.rb
-- lib/models/host_daily_history.rb
-- lib/models/host_hourly_history.rb
-- lib/models/host_interface_configuration.rb
-- lib/models/host_interface_daily_history.rb
-- lib/models/host_interface_hourly_history.rb
-- lib/models/host_interface_samples_history.rb
-- lib/models/host_samples_history.rb
-- lib/models/ovirt_history.rb
-- lib/models/period.rb
-- lib/models/storage_domain_configuration.rb
-- lib/models/storage_domain_daily_history.rb
-- lib/models/storage_domain_hourly_history.rb
-- lib/models/storage_domain_samples_history.rb
-- lib/models/tag_details.rb
-- lib/models/tag_relations_history.rb
-- lib/models/vm_configuration.rb
-- lib/models/vm_daily_history.rb
-- lib/models/vm_disk_configuration.rb
-- lib/models/vm_disk_daily_history.rb
-- lib/models/vm_disk_hourly_history.rb
-- lib/models/vm_disk_samples_history.rb
-- lib/models/vm_disks_usage_daily_history.rb
-- lib/models/vm_disks_usage_hourly_history.rb
-- lib/models/vm_disks_usage_samples_history.rb
-- lib/models/vm_hourly_history.rb
-- lib/models/vm_interface_configuration.rb
-- lib/models/vm_interface_daily_history.rb
-- lib/models/vm_interface_hourly_history.rb
-- lib/models/vm_interface_samples_history.rb
-- lib/models/vm_samples_history.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/column.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/database_statements.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/explain_pretty_printer.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/array.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/bit.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/bit_varying.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/bytea.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/cidr.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/date_time.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/decimal.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/enum.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/hstore.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/inet.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/json.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/jsonb.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/money.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/point.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/rails_5_1_point.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/range.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/specialized_string.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/type_map_initializer.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/uuid.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/vector.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/oid/xml.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/quoting.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/referential_integrity.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/schema_definitions.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/schema_dumper.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/schema_statements.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/type_metadata.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql/utils.rb
+- lib/active_record/connection_adapters/ovirt_legacy_postgresql_adapter.rb
 - lib/ovirt_metrics.rb
 - lib/ovirt_metrics/column_definitions.rb
+- lib/ovirt_metrics/models/calendar.rb
+- lib/ovirt_metrics/models/cluster_configuration.rb
+- lib/ovirt_metrics/models/datacenter_configuration.rb
+- lib/ovirt_metrics/models/datacenter_daily_history.rb
+- lib/ovirt_metrics/models/datacenter_hourly_history.rb
+- lib/ovirt_metrics/models/datacenter_samples_history.rb
+- lib/ovirt_metrics/models/datacenter_storage_domain_map.rb
+- lib/ovirt_metrics/models/disks_vm_map.rb
+- lib/ovirt_metrics/models/enum_translator.rb
+- lib/ovirt_metrics/models/history_configuration.rb
+- lib/ovirt_metrics/models/host_configuration.rb
+- lib/ovirt_metrics/models/host_daily_history.rb
+- lib/ovirt_metrics/models/host_hourly_history.rb
+- lib/ovirt_metrics/models/host_interface_configuration.rb
+- lib/ovirt_metrics/models/host_interface_daily_history.rb
+- lib/ovirt_metrics/models/host_interface_hourly_history.rb
+- lib/ovirt_metrics/models/host_interface_samples_history.rb
+- lib/ovirt_metrics/models/host_samples_history.rb
+- lib/ovirt_metrics/models/ovirt_history.rb
+- lib/ovirt_metrics/models/period.rb
+- lib/ovirt_metrics/models/storage_domain_configuration.rb
+- lib/ovirt_metrics/models/storage_domain_daily_history.rb
+- lib/ovirt_metrics/models/storage_domain_hourly_history.rb
+- lib/ovirt_metrics/models/storage_domain_samples_history.rb
+- lib/ovirt_metrics/models/tag_details.rb
+- lib/ovirt_metrics/models/tag_relations_history.rb
+- lib/ovirt_metrics/models/vm_configuration.rb
+- lib/ovirt_metrics/models/vm_daily_history.rb
+- lib/ovirt_metrics/models/vm_disk_configuration.rb
+- lib/ovirt_metrics/models/vm_disk_daily_history.rb
+- lib/ovirt_metrics/models/vm_disk_hourly_history.rb
+- lib/ovirt_metrics/models/vm_disk_samples_history.rb
+- lib/ovirt_metrics/models/vm_disks_usage_daily_history.rb
+- lib/ovirt_metrics/models/vm_disks_usage_hourly_history.rb
+- lib/ovirt_metrics/models/vm_disks_usage_samples_history.rb
+- lib/ovirt_metrics/models/vm_hourly_history.rb
+- lib/ovirt_metrics/models/vm_interface_configuration.rb
+- lib/ovirt_metrics/models/vm_interface_daily_history.rb
+- lib/ovirt_metrics/models/vm_interface_hourly_history.rb
+- lib/ovirt_metrics/models/vm_interface_samples_history.rb
+- lib/ovirt_metrics/models/vm_samples_history.rb
 - lib/ovirt_metrics/nic_metrics.rb
 - lib/ovirt_metrics/version.rb
 - spec/models/host_configuration_spec.rb
@@ -174,7 +241,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -182,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: OvirtMetrics is an ActiveRecord-based gem for reading the oVirt History database.

data/lib/models/ovirt_history.rb

@@ -1,24 +0,0 @@
-require 'active_record'
-
-module OvirtMetrics
-  class OvirtHistory < ActiveRecord::Base
-    # HACK: The following line is needed so that ActiveRecord 3.2.8 does not try
-    #   to dynamically define attribute methods for the OvirtHistory class
-    #   itself.  This class does not have a backing table, and is only needed to
-    #   allow a shared connection for all subclasses.  If not set, you get the
-    #   error "PGError: ERROR:  relation "rhevm_histories" does not exist"
-    @attribute_methods_generated = true
-
-    def self.inherited(other)
-      super
-      other.primary_key = :history_id
-      other.table_name  = other.name.split('::').last.underscore
-    end
-
-    def self.with_time_range(start_time = nil, end_time = nil)
-      return all if start_time.nil?
-      where(:history_datetime => (start_time..(end_time || Time.now.utc)))
-    end
-
-  end
-end