Skip to content

Commit

Permalink
Merge 9ebf769 into 8f559f1
Browse files Browse the repository at this point in the history
  • Loading branch information
thomas-mcdonald committed Apr 11, 2020
2 parents 8f559f1 + 9ebf769 commit 35e59eb
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 22 deletions.
1 change: 1 addition & 0 deletions .hakiri.yml
@@ -0,0 +1 @@
dependency_source: gemspec_file
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -22,7 +22,7 @@ gemfile:
- gemfiles/mongoid_6.gemfile
- gemfiles/mongoid_7.gemfile

env:
env:
- ADAPTER=active_record
- ADAPTER=mongoid

Expand Down
17 changes: 9 additions & 8 deletions Appraisals
@@ -1,26 +1,27 @@
appraise 'mongoid-6' do
gem "mongoid", "~> 6"
gem "bson_ext", :platform => "ruby"
gem "bson_ext", "1.5.1"
end

appraise 'mongoid-7' do
gem "mongoid", "~> 7"
gem "bson_ext", :platform => "ruby"
gem "bson_ext", "1.5.1"
gem "railties", "5.2.4.1"
end

appraise 'activerecord-4' do
gem "sqlite3", "~> 1.3.6", :platform => "ruby"
gem "sqlite3", "~> 1.3.6"
gem "activerecord", "~> 4.2.11", :require => "active_record"
end

appraise 'activerecord-5' do
gem "sqlite3", "~> 1.3.6", :platform => "ruby"
gem "activerecord", ">= 5.2.0", :require => "active_record"
gem "sqlite3", "~> 1.3.6"
gem "activerecord", "~> 5.2.4", :require => "active_record"

# Ammeter dependencies:
gem "actionpack", ">= 5.2.0"
gem "activemodel", ">= 5.2.0"
gem "railties", ">= 5.2.0"
gem "actionpack", "~> 5.2.4"
gem "activemodel", "~> 5.2.4"
gem "railties", "~> 5.2.4"

gem 'rspec-rails' , github: 'rspec/rspec-rails'
gem 'rspec-core' , github: 'rspec/rspec-core'
Expand Down
3 changes: 2 additions & 1 deletion Gemfile
Expand Up @@ -4,8 +4,9 @@ group :test do
gem 'appraisal'
gem 'coveralls', :require => false
gem 'its'
gem 'pry', '< 0.13.0' # pry pins can be removed when we drop 2.8
gem 'byebug'
gem 'pry-byebug'
gem 'pry-byebug', '< 3.8.0'
gem 'test-unit' # Implicitly loaded by ammeter
gem 'database_cleaner', '~> 1.6.2'
gem 'codeclimate-test-reporter', :require => nil
Expand Down
5 changes: 3 additions & 2 deletions gemfiles/activerecord_4.gemfile
Expand Up @@ -2,15 +2,16 @@

source "https://rubygems.org"

gem "sqlite3", "~> 1.3.6", platform: "ruby"
gem "sqlite3", "~> 1.3.6"
gem "activerecord", "~> 4.2.11", require: "active_record"

group :test do
gem "appraisal"
gem "coveralls", require: false
gem "its"
gem "pry", "< 0.13.0"
gem "byebug"
gem "pry-byebug"
gem "pry-byebug", "< 3.8.0"
gem "test-unit"
gem "database_cleaner", "~> 1.6.2"
gem "codeclimate-test-reporter", require: nil
Expand Down
13 changes: 7 additions & 6 deletions gemfiles/activerecord_5.gemfile
Expand Up @@ -2,11 +2,11 @@

source "https://rubygems.org"

gem "sqlite3", "~> 1.3.6", platform: "ruby"
gem "activerecord", ">= 5.2.0", require: "active_record"
gem "actionpack", ">= 5.2.0"
gem "activemodel", ">= 5.2.0"
gem "railties", ">= 5.2.0"
gem "sqlite3", "~> 1.3.6"
gem "activerecord", "~> 5.2.4", require: "active_record"
gem "actionpack", "~> 5.2.4"
gem "activemodel", "~> 5.2.4"
gem "railties", "~> 5.2.4"
gem "rspec-rails", github: "rspec/rspec-rails"
gem "rspec-core", github: "rspec/rspec-core"
gem "rspec-expectations", github: "rspec/rspec-expectations"
Expand All @@ -17,8 +17,9 @@ group :test do
gem "appraisal"
gem "coveralls", require: false
gem "its"
gem "pry", "< 0.13.0"
gem "byebug"
gem "pry-byebug"
gem "pry-byebug", "< 3.8.0"
gem "test-unit"
gem "database_cleaner", "~> 1.6.2"
gem "codeclimate-test-reporter", require: nil
Expand Down
5 changes: 3 additions & 2 deletions gemfiles/mongoid_6.gemfile
Expand Up @@ -3,14 +3,15 @@
source "https://rubygems.org"

gem "mongoid", "~> 6"
gem "bson_ext", platform: "ruby"
gem "bson_ext", "1.5.1"

group :test do
gem "appraisal"
gem "coveralls", require: false
gem "its"
gem "pry", "< 0.13.0"
gem "byebug"
gem "pry-byebug"
gem "pry-byebug", "< 3.8.0"
gem "test-unit"
gem "database_cleaner", "~> 1.6.2"
gem "codeclimate-test-reporter", require: nil
Expand Down
6 changes: 4 additions & 2 deletions gemfiles/mongoid_7.gemfile
Expand Up @@ -3,14 +3,16 @@
source "https://rubygems.org"

gem "mongoid", "~> 7"
gem "bson_ext", platform: "ruby"
gem "bson_ext", "1.5.1"
gem "railties", "5.2.4.1"

group :test do
gem "appraisal"
gem "coveralls", require: false
gem "its"
gem "pry", "< 0.13.0"
gem "byebug"
gem "pry-byebug"
gem "pry-byebug", "< 3.8.0"
gem "test-unit"
gem "database_cleaner", "~> 1.6.2"
gem "codeclimate-test-reporter", require: nil
Expand Down

0 comments on commit 35e59eb

Please sign in to comment.