Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .idea/omniauth-identity.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .rubocop_gradual.lock
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
[13, 7, 113, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 353293128],
[23, 9, 23, "ThreadSafety/ClassAndModuleAttributes: Avoid mutating class and module attributes.", 1578198260]
],
"omniauth-identity.gemspec:941751779": [
"omniauth-identity.gemspec:4235459274": [
[4, 23, 12, "Gemspec/RubyVersionGlobalsUsage: Do not use `RUBY_VERSION` in gemspec file.", 31296028]
],
"spec/omniauth/identity/model_spec.rb:3920022856": [
Expand Down
2 changes: 0 additions & 2 deletions Appraisal.root.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,3 @@ source "https://rubygems.org"
# We do not load the standard Gemfile, as it is tailored for local development.

gemspec

gem "appraisal", github: "pboling/appraisal", branch: "galtzo"
37 changes: 0 additions & 37 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
appraise "dep-heads" do
eval_gemfile "modular/activerecord/vHEAD.gemfile"
eval_gemfile "modular/runtime_heads.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 2.2.2
Expand All @@ -20,7 +19,6 @@ appraise "ar-5-2-r2.4" do
eval_gemfile "modular/activerecord/r2.4/v5.2.gemfile"
eval_gemfile "modular/omniauth/r2/v1.0.gemfile"
eval_gemfile "modular/x_std_libs/r2.4/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 2.2.2
Expand All @@ -32,7 +30,6 @@ appraise "ar-5-2-r2" do
eval_gemfile "modular/activerecord/r2/v5.2.gemfile"
eval_gemfile "modular/omniauth/r2/v1.1.gemfile"
eval_gemfile "modular/x_std_libs/r2/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 2.5
Expand All @@ -44,7 +41,6 @@ appraise "ar-6-0" do
eval_gemfile "modular/activerecord/r2/v6.0.gemfile"
eval_gemfile "modular/omniauth/r2/v1.2.gemfile"
eval_gemfile "modular/x_std_libs/r2/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 2.5
Expand All @@ -58,7 +54,6 @@ appraise "ar-6-1-r2" do
eval_gemfile "modular/activerecord/r2/v6.1.gemfile"
eval_gemfile "modular/omniauth/r2/v1.3.gemfile"
eval_gemfile "modular/x_std_libs/r2/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 2.5
Expand All @@ -68,7 +63,6 @@ appraise "ar-6-1-r3" do
eval_gemfile "modular/activerecord/r3/v6.1.gemfile"
eval_gemfile "modular/omniauth/r3/v2.1.gemfile"
eval_gemfile "modular/x_std_libs/r3/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 2.7
Expand All @@ -78,7 +72,6 @@ appraise "ar-7-0-r2" do
eval_gemfile "modular/activerecord/r2/v7.0.gemfile"
eval_gemfile "modular/omniauth/r2/v1.4.gemfile"
eval_gemfile "modular/x_std_libs/r2/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 2.7
Expand All @@ -89,7 +82,6 @@ appraise "ar-7-0-r3" do
eval_gemfile "modular/activerecord/r3/v7.0.gemfile"
eval_gemfile "modular/omniauth/r3/v2.1.gemfile"
eval_gemfile "modular/x_std_libs/r3/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 2.7
Expand All @@ -99,7 +91,6 @@ appraise "ar-7-1-r2" do
eval_gemfile "modular/activerecord/r2/v7.1.gemfile"
eval_gemfile "modular/omniauth/r2/v1.5.gemfile"
eval_gemfile "modular/x_std_libs/r2/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 2.7
Expand All @@ -112,7 +103,6 @@ appraise "ar-7-1-r3" do
eval_gemfile "modular/activerecord/r3/v7.1.gemfile"
eval_gemfile "modular/omniauth/r3/v2.1.gemfile"
eval_gemfile "modular/x_std_libs/r3/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 3.1
Expand All @@ -127,7 +117,6 @@ appraise "ar-7-2" do
eval_gemfile "modular/activerecord/r3/v7.2.gemfile"
eval_gemfile "modular/omniauth/r3/v2.1.gemfile"
eval_gemfile "modular/x_std_libs/r3/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 3.2
Expand All @@ -141,7 +130,6 @@ appraise "ar-8-0" do
eval_gemfile "modular/activerecord/r3/v8.0.gemfile"
eval_gemfile "modular/omniauth/r3/v2.1.gemfile"
eval_gemfile "modular/x_std_libs/r3/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 2.2.2 (due to AR >= 5)
Expand All @@ -154,7 +142,6 @@ appraise "couch-1.17-r2.4" do
eval_gemfile "modular/activerecord/r2/v5.2.gemfile"
eval_gemfile "modular/omniauth/r2/v1.6.gemfile"
eval_gemfile "modular/x_std_libs/r2.4/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 2.2.2 (due to AR >= 5)
Expand All @@ -168,7 +155,6 @@ appraise "couch-1.17-r2.5" do
eval_gemfile "modular/activerecord/r2/v6.0.gemfile"
eval_gemfile "modular/omniauth/r2/v1.7.gemfile"
eval_gemfile "modular/x_std_libs/r2/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 2.2.2 (due to AR >= 5)
Expand All @@ -184,7 +170,6 @@ appraise "couch-1.17-r2" do
eval_gemfile "modular/activerecord/r2/v6.1.gemfile"
eval_gemfile "modular/omniauth/r2/v1.7.gemfile"
eval_gemfile "modular/x_std_libs/r2/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 2.2.2 (due to AR >= 5)
Expand All @@ -206,7 +191,6 @@ appraise "couch-1.17-r3" do
eval_gemfile "modular/activerecord/r3/v7.1.gemfile"
eval_gemfile "modular/omniauth/r3/v2.1.gemfile"
eval_gemfile "modular/x_std_libs/r3/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 2.3
Expand All @@ -220,7 +204,6 @@ appraise "mongoid-7.3-b4.12" do
eval_gemfile "modular/activerecord/r2.4/v5.2.gemfile"
eval_gemfile "modular/omniauth/r2/v1.8.gemfile"
eval_gemfile "modular/x_std_libs/r2.4/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 2.3
Expand All @@ -235,7 +218,6 @@ appraise "mongoid-7.3-b4.15" do
eval_gemfile "modular/activerecord/r2/v6.1.gemfile"
eval_gemfile "modular/omniauth/r2/v1.9.gemfile"
eval_gemfile "modular/x_std_libs/r2/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 2.5
Expand All @@ -250,7 +232,6 @@ appraise "mongoid-7.4-b4.15" do
eval_gemfile "modular/activerecord/r2/v6.1.gemfile"
eval_gemfile "modular/omniauth/r2/v2.0.gemfile"
eval_gemfile "modular/x_std_libs/r2/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 2.5
Expand All @@ -266,7 +247,6 @@ appraise "mongoid-7.4-b5" do
eval_gemfile "modular/activerecord/r2/v6.1.gemfile"
eval_gemfile "modular/omniauth/r2/v2.0.gemfile"
eval_gemfile "modular/x_std_libs/r2/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 2.6
Expand All @@ -282,7 +262,6 @@ appraise "mongoid-8.1-r2" do
eval_gemfile "modular/activerecord/r2/v6.1.gemfile"
eval_gemfile "modular/omniauth/r2/v2.0.gemfile"
eval_gemfile "modular/x_std_libs/r2/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 2.6
Expand All @@ -296,7 +275,6 @@ appraise "mongoid-8.1-r3.0" do
eval_gemfile "modular/activerecord/r3/v7.1.gemfile"
eval_gemfile "modular/omniauth/r3/v2.1.gemfile"
eval_gemfile "modular/x_std_libs/r3/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 2.6
Expand All @@ -314,7 +292,6 @@ appraise "mongoid-8.1-r3" do
eval_gemfile "modular/activerecord/r3/v7.1.gemfile"
eval_gemfile "modular/omniauth/r3/v2.1.gemfile"
eval_gemfile "modular/x_std_libs/r3/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 2.7
Expand All @@ -329,7 +306,6 @@ appraise "mongoid-9.0-r2-omni1.9" do
eval_gemfile "modular/omniauth/r2/v1.9.gemfile"
eval_gemfile "modular/x_std_libs/r2/libs.gemfile"
gem "ostruct", "~> 0.6", ">= 0.6.1" # Ruby >= 2.5
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 2.7
Expand All @@ -344,7 +320,6 @@ appraise "mongoid-9.0-r2-omni2.0" do
eval_gemfile "modular/omniauth/r2/v2.0.gemfile"
eval_gemfile "modular/x_std_libs/r2/libs.gemfile"
gem "ostruct", "~> 0.6", ">= 0.6.1" # Ruby >= 2.5
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 2.7
Expand All @@ -359,7 +334,6 @@ appraise "mongoid-9.0-r2-omni2.1" do
eval_gemfile "modular/omniauth/r2/v2.1.gemfile"
eval_gemfile "modular/x_std_libs/r2/libs.gemfile"
gem "ostruct", "~> 0.6", ">= 0.6.1" # Ruby >= 2.5
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 2.7
Expand All @@ -374,7 +348,6 @@ appraise "mongoid-9.0-r3.0" do
eval_gemfile "modular/omniauth/r3/v2.1.gemfile"
eval_gemfile "modular/x_std_libs/r3/libs.gemfile"
gem "ostruct", "~> 0.6", ">= 0.6.1" # Ruby >= 2.5
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 2.7
Expand All @@ -395,7 +368,6 @@ appraise "mongoid-9.0-r3" do
eval_gemfile "modular/omniauth/r3/v2.1.gemfile"
eval_gemfile "modular/x_std_libs/r3/libs.gemfile"
gem "ostruct", "~> 0.6", ">= 0.6.1" # Ruby >= 2.5
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# 1. While the Ruby driver, nobrainer, is maintained,
Expand Down Expand Up @@ -434,7 +406,6 @@ appraise "sequel-5.86-r2.4" do
eval_gemfile "modular/activerecord/r2.4/v5.2.gemfile"
eval_gemfile "modular/omniauth/r2/v2.0.gemfile"
eval_gemfile "modular/x_std_libs/r2.4/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 1.9.2
Expand All @@ -445,7 +416,6 @@ appraise "sequel-5.86-r2.5" do
eval_gemfile "modular/activerecord/r2/v6.0.gemfile"
eval_gemfile "modular/omniauth/r2/v2.1.gemfile"
eval_gemfile "modular/x_std_libs/r2/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 1.9.2
Expand All @@ -456,7 +426,6 @@ appraise "sequel-5.86-r2.6" do
eval_gemfile "modular/activerecord/r2/v6.1.gemfile"
eval_gemfile "modular/omniauth/r2/v2.1.gemfile"
eval_gemfile "modular/x_std_libs/r2/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 1.9.2
Expand All @@ -467,7 +436,6 @@ appraise "sequel-5.86-r2.7" do
eval_gemfile "modular/activerecord/r2/v7.1.gemfile"
eval_gemfile "modular/omniauth/r2/v2.1.gemfile"
eval_gemfile "modular/x_std_libs/r2/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 1.9.2
Expand All @@ -478,7 +446,6 @@ appraise "sequel-5.86-r3.0" do
eval_gemfile "modular/activerecord/r3/v7.1.gemfile"
eval_gemfile "modular/omniauth/r3/v2.1.gemfile"
eval_gemfile "modular/x_std_libs/r3/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Compat: Ruby >= 1.9.2
Expand All @@ -497,15 +464,13 @@ appraise "sequel-5.86-r3" do
eval_gemfile "modular/activerecord/r3/v7.1.gemfile"
eval_gemfile "modular/omniauth/r3/v2.1.gemfile"
eval_gemfile "modular/x_std_libs/r3/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Only run security audit on the latest version of Ruby
appraise "audit" do
eval_gemfile "modular/omniauth/r3/v2.1.gemfile"
eval_gemfile "modular/audit.gemfile"
eval_gemfile "modular/x_std_libs/r3/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Only run coverage on the latest version of Ruby
Expand All @@ -520,13 +485,11 @@ appraise "coverage" do
eval_gemfile "modular/coverage.gemfile"
gem "ostruct", "~> 0.6", ">= 0.6.1" # Ruby >= 2.5
eval_gemfile "modular/x_std_libs/r3/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end

# Only run linter on the latest version of Ruby (but, in support of the oldest supported Ruby version)
appraise "style" do
eval_gemfile "modular/style.gemfile"
eval_gemfile "modular/omniauth/r3/v2.1.gemfile"
eval_gemfile "modular/x_std_libs/r3/libs.gemfile"
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
end
6 changes: 0 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ Follow these instructions:

From time to time the appraisal gemfiles in `gemfiles/` will need to be updated.

NOTE: The `eval_gemfile` feature comes from a [fork][🚎appraisal-fork] of Appraisal.

Please upvote the PR for `eval_gemfile` [support][🚎appraisal-eval-gemfile-pr]

Create or update them with the commands:

```shell
Expand Down Expand Up @@ -183,6 +179,4 @@ NOTE: To build without signing the gem set `SKIP_GEM_SIGNING` to any value in th
[💎stone_checksums]: https://github.com/pboling/stone_checksums
[📗keep-changelog]: https://keepachangelog.com/en/1.0.0/
[📗keep-changelog-img]: https://img.shields.io/badge/keep--a--changelog-1.0.0-FFDD67.svg?style=flat
[🚎appraisal-eval-gemfile-pr]: https://github.com/thoughtbot/appraisal/pull/248
[🚎appraisal-fork]: https://github.com/pboling/appraisal/tree/galtzo
[🏃‍♂️runner-tool-cache]: https://github.com/ruby/ruby-builder/releases/tag/toolcache
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ gem "rb-fsevent"
eval_gemfile "gemfiles/modular/coverage.gemfile"

### Testing
gem "appraisal", github: "pboling/appraisal", branch: "galtzo"
gem "test-unit", ">= 3.0"

platform :mri do
Expand Down
18 changes: 6 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,6 @@ GIT
bigdecimal
ostruct

GIT
remote: https://github.com/pboling/appraisal
revision: a3a3e4b7db67d9b085f96b2ffddd2b51bd8a1196
branch: galtzo
specs:
appraisal (3.0.0.rc1)
bundler (>= 1.17.3)
rake (>= 10)
thor (>= 0.14)

GIT
remote: https://github.com/pboling/yard-junk
revision: 54ccebabbfa9a9cd44d0b991687ebbfd22c32b55
Expand Down Expand Up @@ -65,6 +55,10 @@ GEM
activesupport (>= 5)
version_gem (~> 1.1, >= 1.1.4)
ansi (1.5.0)
appraisal2 (3.0.0)
bundler (>= 1.17.3)
rake (>= 10)
thor (>= 0.14)
ast (2.4.3)
backports (3.25.1)
base64 (0.3.0)
Expand Down Expand Up @@ -434,7 +428,7 @@ PLATFORMS
DEPENDENCIES
activerecord (>= 5)
anonymous_active_record (~> 1.0, >= 1.0.9)
appraisal!
appraisal2 (~> 3.0)
benchmark (~> 0.4, >= 0.4.1)
bson!
bundler-audit (~> 0.9.2)
Expand All @@ -461,7 +455,7 @@ DEPENDENCIES
rspec (~> 3.13)
rspec-block_is_expected (~> 1.0, >= 1.0.6)
rubocop-lts (~> 12.1, >= 12.1.1)
rubocop-minitest
rubocop-minitest (~> 0.36)
rubocop-packaging (~> 0.6, >= 0.6.0)
rubocop-rspec (~> 3.6)
rubocop-sequel
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/ar_5_2_r2.4.gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated by Appraisal
# This file was generated by Appraisal2

source "https://rubygems.org"

Expand Down
Loading