Merge pull request #41 from jrafanie/rails61

Allow rails 6.1

.gitignore

@@ -4,6 +4,7 @@
 .config
 .yardoc
 Gemfile.lock
+/gemfiles/*gemfile.lock
 InstalledFiles
 _yardoc
 coverage

.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 rvm:
-  - 2.5.8
-  - 2.6.6
-  - 2.7.2
-  - 3.0.0
-env:
-  - RAILS_VERSION=6.0
+  - 2.6.9
+  - 2.7.5
+  - 3.0.3
+gemfile:
+  - gemfiles/activerecord_6.0.gemfile
+  - gemfiles/activerecord_6.1.gemfile
 fast_finish: true

Appraisals

@@ -0,0 +1,7 @@
+appraise "activerecord-6.0" do
+  gem "activerecord", "~>6.0.4"
+end
+
+appraise "activerecord-6.1" do
+  gem "activerecord", "~>6.1.4"
+end

Gemfile

@@ -1,6 +1,3 @@
 source 'https://rubygems.org'
-RAILS_VERSION = ENV.fetch("RAILS_VERSION", "5.0")
-
-gem "rails", "~> #{RAILS_VERSION}.0"
 
 gemspec

Rakefile

@@ -1,13 +1,7 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
-begin
-  require "rspec/core/rake_task"
-
-  RSpec::Core::RakeTask.new(:spec) do
-    puts "Testing with Rails #{ENV["RAILS_VERSION"]}..." if ENV["RAILS_VERSION"]
-  end
-rescue LoadError
-end
+RSpec::Core::RakeTask.new(:spec)
 
 task :test => :spec
 task :default => :spec

gemfiles/activerecord_6.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~>6.0.4"
+
+gemspec path: "../"

gemfiles/activerecord_6.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~>6.1.4"
+
+gemspec path: "../"

ovirt_metrics.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.5.8"
 
+  spec.add_development_dependency "appraisal"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "manageiq-style"
@@ -29,6 +30,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec",         ">= 3.0"
   spec.add_development_dependency "sqlite3"
 
-  spec.add_dependency "activerecord", "< 6.1"
+  spec.add_dependency "activerecord", ">=5.0", "<7.0"
   spec.add_dependency "pg"
 end