Merge pull request ManageIQ#4 from Fryguy/upgrade_rspec_travis_et_al

Upgrade rspec travis et al

Author: jrafanie

.rspec

@@ -1,2 +1,3 @@
 --color
---format documentation
+--warnings
+--require spec_helper

.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 rvm:
-  - "1.9.2"
   - "1.9.3"
+  - "2.0"
+  - "2.1"
 #  - jruby-19mode # JRuby in 1.9 mode
-  - rbx-19mode
+  - rbx-2

README.md

@@ -1,10 +1,10 @@
 # OvirtMetrics
 
-[![Gem Version](https://badge.fury.io/rb/ovirt_metrics.png)](http://badge.fury.io/rb/ovirt_metrics)
-[![Build Status](https://travis-ci.org/ManageIQ/ovirt_metrics.png?branch=master)](https://travis-ci.org/ManageIQ/ovirt_metrics)
-[![Code Climate](https://codeclimate.com/github/ManageIQ/ovirt_metrics.png)](https://codeclimate.com/github/ManageIQ/ovirt_metrics)
-[![Coverage Status](https://coveralls.io/repos/ManageIQ/ovirt_metrics/badge.png?branch=master)](https://coveralls.io/r/ManageIQ/ovirt_metrics)
-[![Dependency Status](https://gemnasium.com/ManageIQ/ovirt_metrics.png)](https://gemnasium.com/ManageIQ/ovirt_metrics)
+[![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)
+[![Dependency Status](https://gemnasium.com/ManageIQ/ovirt_metrics.svg)](https://gemnasium.com/ManageIQ/ovirt_metrics)
 
 OvirtMetrics is an ActiveRecord-based gem for reading the oVirt History database.
 

lib/ovirt_metrics.rb

@@ -41,13 +41,13 @@ def self.vm_realtime(vm_id, start_time = nil, end_time = nil)
     metrics      = query_vm_realtime_metrics(vm_id, start_time, end_time)
     disk_metrics = query_vm_disk_realtime_metrics(vm_id, start_time, end_time)
     nic_metrics  = query_vm_nic_realtime_metrics(vm_id, start_time, end_time)
-    hashes       = vm_realtime_metrics_to_hashes(metrics, disk_metrics, nic_metrics)
+    vm_realtime_metrics_to_hashes(metrics, disk_metrics, nic_metrics)
   end
 
   def self.host_realtime(host_id, start_time = nil, end_time = nil)
     metrics      = query_host_realtime_metrics(host_id, start_time, end_time).all
     nic_metrics  = query_host_nic_realtime_metrics(host_id, start_time, end_time)
-    hashes       = host_realtime_metrics_to_hashes(metrics, nic_metrics)
+    host_realtime_metrics_to_hashes(metrics, nic_metrics)
   end
 
   private

ovirt_metrics.gemspec

@@ -20,9 +20,11 @@ Gem::Specification.new do |spec|
   spec.test_files   += %w[.rspec]
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = ">= 1.9.3"
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", ">= 3.0"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "coveralls"
 

spec/models/host_configuration_spec.rb

@@ -1,24 +1,20 @@
-require File.expand_path(File.join(File.dirname(__FILE__), %w{.. spec_helper}))
-
-require 'ovirt_metrics'
-
 describe OvirtMetrics::HostConfiguration do
   shared_examples_for "HostConfiguration" do
     context "#speed_in_mhz" do
       it "when cpu_model is nil" do
-        described_class.new(:cpu_model => nil).speed_in_mhz.should be_nil
+        expect(described_class.new(:cpu_model => nil).speed_in_mhz).to be_nil
       end
 
       it "when cpu_model is in GHz" do
-        described_class.new(:cpu_model => "Intel(R) Xeon(R) CPU E5506 @ 2.00GHz").speed_in_mhz.should == 2048.0
+        expect(described_class.new(:cpu_model => "Intel(R) Xeon(R) CPU E5506 @ 2.00GHz").speed_in_mhz).to eq(2048.0)
       end
 
       it "when cpu_model is in MHz" do
-        described_class.new(:cpu_model => "Intel(R) Xeon(R) CPU E5506 @ 2.00MHz").speed_in_mhz.should == 2.0
+        expect(described_class.new(:cpu_model => "Intel(R) Xeon(R) CPU E5506 @ 2.00MHz").speed_in_mhz).to eq(2.0)
       end
 
       it "when cpu_model is some other string" do
-        described_class.new(:cpu_model => "XXX").speed_in_mhz.should be_nil
+        expect(described_class.new(:cpu_model => "XXX").speed_in_mhz).to be_nil
       end
     end
   end
@@ -32,4 +28,4 @@
     before(:each) { load_rhev_31 }
     it_should_behave_like "HostConfiguration"
   end
-end
+end

spec/models/host_samples_history_spec.rb

@@ -1,45 +1,40 @@
-require File.expand_path(File.join(File.dirname(__FILE__), %w{.. spec_helper}))
-
-require 'ovirt_metrics'
-
 describe OvirtMetrics::HostSamplesHistory do
   shared_examples_for "HostSamplesHistory" do
     context "#cpu_usagemhz_rate_average" do
 
       it "when host_configuration is nil" do
         host_history = described_class.new(:host_configuration => nil)
-        host_history.cpu_usagemhz_rate_average.should == 0
+        expect(host_history.cpu_usagemhz_rate_average).to eq(0)
       end
 
       context "when host_configuration exists" do
         before(:each) { @host_configuration = OvirtMetrics::HostConfiguration.new }
         it "and speed_in_mhz and number_of_cores is nil" do
           host_history = described_class.new(:host_configuration => @host_configuration)
-          host_history.cpu_usagemhz_rate_average.should == 0
+          expect(host_history.cpu_usagemhz_rate_average).to eq(0)
         end
 
         it "and speed_in_mhz is nil and number_of_cores is numeric" do
           host_history = described_class.new(:host_configuration => @host_configuration)
-          @host_configuration.stub(:number_of_cores => 1)
-          host_history.cpu_usagemhz_rate_average.should == 0
+          allow(@host_configuration).to receive_messages(:number_of_cores => 1)
+          expect(host_history.cpu_usagemhz_rate_average).to eq(0)
         end
 
         it "and speed_in_mhz is numeric and number_of_cores is nil" do
           host_history = described_class.new(:host_configuration => @host_configuration)
-          @host_configuration.stub(:speed_in_mhz => 2048.0)
-          host_history.cpu_usagemhz_rate_average.should == 0
+          allow(@host_configuration).to receive_messages(:speed_in_mhz => 2048.0)
+          expect(host_history.cpu_usagemhz_rate_average).to eq(0)
         end
 
         it "and speed_in_mhz is numeric and number_of_cores is numeric" do
-          host_configuration = OvirtMetrics::HostConfiguration.new
-          @host_configuration.stub(:speed_in_mhz => 2048.0)
-          @host_configuration.stub(:number_of_cores => 2)
+          allow(@host_configuration).to receive_messages(:speed_in_mhz => 2048.0)
+          allow(@host_configuration).to receive_messages(:number_of_cores => 2)
 
           host_history = described_class.new(
             :cpu_usage_percent  => 50,
             :host_configuration => @host_configuration
           )
-          host_history.cpu_usagemhz_rate_average.should == 2048.0
+          expect(host_history.cpu_usagemhz_rate_average).to eq(2048.0)
         end
       end
     end
@@ -54,4 +49,4 @@
     before(:each) { load_rhev_31 }
     it_should_behave_like "HostSamplesHistory"
   end
-end
+end

spec/models/vm_disk_samples_history_spec.rb

@@ -1,35 +1,31 @@
-require File.expand_path(File.join(File.dirname(__FILE__), %w{.. spec_helper}))
-
-require 'ovirt_metrics'
-
 describe OvirtMetrics::VmDiskSamplesHistory do
   KILOBYTE = 1024
   MEGABYTE = KILOBYTE * 1024
 
   shared_examples_for "VmDiskSamplesHistory" do
     context ".disk_usage_rate_average_in_kilobytes_per_second" do
       it "when disk_metrics array is empty" do
-        described_class.disk_usage_rate_average_in_kilobytes_per_second([]).should == 0.0
+        expect(described_class.disk_usage_rate_average_in_kilobytes_per_second([])).to eq(0.0)
       end
 
       it "when disk_metrics array has one element" do
         disk_metric = double("disk_metric")
-        disk_metric.stub(:read_rate_bytes_per_second => 2.0 * MEGABYTE, :write_rate_bytes_per_second => 1.0 * MEGABYTE)
+        allow(disk_metric).to receive_messages(:read_rate_bytes_per_second => 2.0 * MEGABYTE, :write_rate_bytes_per_second => 1.0 * MEGABYTE)
         expected_result = (disk_metric.read_rate_bytes_per_second + disk_metric.write_rate_bytes_per_second) / KILOBYTE
-        described_class.disk_usage_rate_average_in_kilobytes_per_second([disk_metric]).should == expected_result
+        expect(described_class.disk_usage_rate_average_in_kilobytes_per_second([disk_metric])).to eq(expected_result)
       end
 
       it "when disk_metrics array has two elements" do
         disk_metric1 = double("disk_metric")
-        disk_metric1.stub(:read_rate_bytes_per_second => 2.0 * MEGABYTE, :write_rate_bytes_per_second => 1.0 * MEGABYTE)
+        allow(disk_metric1).to receive_messages(:read_rate_bytes_per_second => 2.0 * MEGABYTE, :write_rate_bytes_per_second => 1.0 * MEGABYTE)
 
         disk_metric2 = double("disk_metric")
-        disk_metric2.stub(:read_rate_bytes_per_second => 2.0 * MEGABYTE, :write_rate_bytes_per_second => 5.0 * MEGABYTE)
+        allow(disk_metric2).to receive_messages(:read_rate_bytes_per_second => 2.0 * MEGABYTE, :write_rate_bytes_per_second => 5.0 * MEGABYTE)
 
         sum_m1 = disk_metric1.read_rate_bytes_per_second + disk_metric1.write_rate_bytes_per_second
         sum_m2 = disk_metric2.read_rate_bytes_per_second + disk_metric2.write_rate_bytes_per_second
         expected_result = (sum_m1 + sum_m2) / KILOBYTE / 2
-        described_class.disk_usage_rate_average_in_kilobytes_per_second([disk_metric1, disk_metric2]).should == expected_result
+        expect(described_class.disk_usage_rate_average_in_kilobytes_per_second([disk_metric1, disk_metric2])).to eq(expected_result)
       end
     end
   end
@@ -43,4 +39,4 @@
     before(:each) { load_rhev_31 }
     it_should_behave_like "VmDiskSamplesHistory"
   end
-end
+end

spec/models/vm_samples_history_spec.rb

@@ -1,32 +1,28 @@
-require File.expand_path(File.join(File.dirname(__FILE__), %w{.. spec_helper}))
-
-require 'ovirt_metrics'
-
 describe OvirtMetrics::VmSamplesHistory do
   shared_examples_for "VmSamplesHistory" do
     context "#cpu_usagemhz_rate_average" do
       it "when host_configuration is nil" do
         vm_history = described_class.new
-        vm_history.stub(:host_configuration => nil)
+        allow(vm_history).to receive_messages(:host_configuration => nil)
 
-        vm_history.cpu_usagemhz_rate_average.should == 0
+        expect(vm_history.cpu_usagemhz_rate_average).to eq(0)
       end
 
       context "when host_configuration exists" do
         it "and speed_in_mhz is nil" do
           vm_history = described_class.new(:host_configuration => OvirtMetrics::HostConfiguration.new)
-          vm_history.cpu_usagemhz_rate_average.should == 0
+          expect(vm_history.cpu_usagemhz_rate_average).to eq(0)
         end
 
         it "and speed_in_mhz is not nil" do
           host_configuration = OvirtMetrics::HostConfiguration.new
-          host_configuration.stub(:speed_in_mhz => 2048.0)
+          allow(host_configuration).to receive_messages(:speed_in_mhz => 2048.0)
 
           vm_history = described_class.new(
             :cpu_usage_percent  => 50,
             :host_configuration => host_configuration
           )
-          vm_history.cpu_usagemhz_rate_average.should == 1024.0
+          expect(vm_history.cpu_usagemhz_rate_average).to eq(1024.0)
         end
       end
     end
@@ -41,4 +37,4 @@
     before(:each) { load_rhev_31 }
     it_should_behave_like "VmSamplesHistory"
   end
-end
+end

spec/nic_metrics_spec.rb

@@ -1,27 +1,23 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
-
-require 'ovirt_metrics'
-
 describe OvirtMetrics::NicMetrics do
   context ".net_usage_rate_average_in_kilobytes_per_second" do
     it "when nic_metrics array is empty" do
-      described_class.net_usage_rate_average_in_kilobytes_per_second([]).should == 0.0
+      expect(described_class.net_usage_rate_average_in_kilobytes_per_second([])).to eq(0.0)
     end
 
     it "when nic_metrics array has one element" do
       nic_metric = double("nic_metric")
-      nic_metric.stub(:receive_rate_percent => 90, :transmit_rate_percent => 10)
+      allow(nic_metric).to receive_messages(:receive_rate_percent => 90, :transmit_rate_percent => 10)
       expected = (OvirtMetrics::NicMetrics::GIGABYTE_PER_SECOND / 2) / 1024
-      described_class.net_usage_rate_average_in_kilobytes_per_second([nic_metric]).should == expected
+      expect(described_class.net_usage_rate_average_in_kilobytes_per_second([nic_metric])).to eq(expected)
     end
 
     it "when nic_metrics array has multiple elements" do
       nic_metric1 = double("nic_metric")
-      nic_metric1.stub(:receive_rate_percent => 90, :transmit_rate_percent => 10)
+      allow(nic_metric1).to receive_messages(:receive_rate_percent => 90, :transmit_rate_percent => 10)
       nic_metric2 = double("nic_metric")
-      nic_metric2.stub(:receive_rate_percent => 90, :transmit_rate_percent => 10)
+      allow(nic_metric2).to receive_messages(:receive_rate_percent => 90, :transmit_rate_percent => 10)
       expected = (OvirtMetrics::NicMetrics::GIGABYTE_PER_SECOND / 2) / 1024
-      described_class.net_usage_rate_average_in_kilobytes_per_second([nic_metric1, nic_metric2]).should == expected
+      expect(described_class.net_usage_rate_average_in_kilobytes_per_second([nic_metric1, nic_metric2])).to eq(expected)
     end
   end
-end
+end

spec/ovirt_metrics_spec.rb

@@ -1,12 +1,8 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
-
-require 'ovirt_metrics'
-
 describe OvirtMetrics do
   shared_examples_for "OvirtMetrics" do
     context ".vm_realtime" do
       it "when vm_id finds no matches" do
-        described_class.vm_realtime(42).should == [{}, {}]
+        expect(described_class.vm_realtime(42)).to eq([{}, {}])
       end
 
       it "when vm_id finds 1 match" do
@@ -16,7 +12,7 @@
 
     context ".host_realtime" do
       it "when host_id finds no matches" do
-        described_class.host_realtime(42).should == [{}, {}]
+        expect(described_class.host_realtime(42)).to eq([{}, {}])
       end
 
       it "when host_id finds 1 match" do
@@ -40,24 +36,22 @@ def assert_object_with_empty_samples_data(type)
 
       href = "/api/#{type.pluralize}/#{id}"
       constant = "OvirtMetrics::#{type.upcase}_COLUMN_DEFINITIONS".constantize
-      column_definitions = constant.each_with_object({}) do |defn, hash|
-        name, defn = defn
+      column_definitions = constant.each_with_object({}) do |(_name, defn), hash|
         key   = defn[:ovirt_key]
         value = defn[:counter]
         hash[key] = value
       end
       columns = { href => column_definitions }
 
-      rows_hash = {}
-      row_value = [0, 20, 40].each_with_object({}) do |offset, hash|
-        key = (record.history_datetime + offset).utc.iso8601.to_s
+      rows_hash = [0, 20, 40].each_with_object({}) do |offset, hash|
         value = column_definitions.keys.each_with_object({}) { |key, col_hash| col_hash[key] = 0.0 }
-        rows_hash[key] = value
+        key   = (record.history_datetime + offset).utc.iso8601.to_s
+        hash[key] = value
       end
       rows = { href => rows_hash }
 
       method = "#{type}_realtime"
-      described_class.send(method, id).should == [columns, rows]
+      expect(described_class.send(method, id)).to eq([columns, rows])
     end
 
   end
@@ -72,4 +66,4 @@ def assert_object_with_empty_samples_data(type)
     it_should_behave_like "OvirtMetrics"
   end
 
-end
+end