diff --git a/.circleci/config.yml b/.circleci/config.yml index 425b0690..85bacf45 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,26 +21,30 @@ shared_build_steps: &shared_build_steps - run: name: Storing Rails Version command: | - echo "$RUBY_VERSION/$RAILS_VERSION" > RAILS_VERSION - cat RAILS_VERSION + echo "$RUBY_VERSION/$BUNDLE_GEMFILE" > CACHE_ENV_VERSION + cat CACHE_ENV_VERSION + # To generate cache checksum, we need a static file, but Gemfile is + # based on the Rails version we are testing against. This step just puts + # a dynamically identified file into a known path. + cat "$BUNDLE_GEMFILE" > CACHE_GEMFILE # Download and cache dependencies - restore_cache: keys: - - dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "RAILS_VERSION" }}-{{ checksum "Gemfile" }}-{{ checksum "meta-tags.gemspec" }} + - dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }}-{{ checksum "CACHE_GEMFILE" }}-{{ checksum "meta-tags.gemspec" }} # fallback to using the latest cache if no exact match is found - - dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "RAILS_VERSION" }} + - dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }} - run: name: Installing Dependencies command: | - bundle config set --local path vendor/bundle + bundle config set --local path "${PWD}/vendor/bundle" bundle check || (bundle install --jobs=4 --retry=3 && bundle clean) - save_cache: paths: - ./vendor/bundle - key: dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "RAILS_VERSION" }}-{{ checksum "Gemfile" }}-{{ checksum "meta-tags.gemspec" }} + key: dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }}-{{ checksum "CACHE_GEMFILE" }}-{{ checksum "meta-tags.gemspec" }} # run tests! - run: @@ -89,7 +93,7 @@ shared_build_steps: &shared_build_steps jobs: - build-ruby26-rails-5_1_7: + build-ruby26-rails-51: parameters: is_main_build: type: boolean @@ -97,13 +101,13 @@ jobs: docker: - image: cimg/ruby:2.6 environment: - RAILS_VERSION: 5.1.7 + BUNDLE_GEMFILE: gemfiles/rails_5.1.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby26-rails-5.1.7 + working_directory: ~/meta-tags/ruby26-rails-51 steps: *shared_build_steps - build-ruby26-rails-5_2_8: + build-ruby26-rails-52: parameters: is_main_build: type: boolean @@ -111,13 +115,13 @@ jobs: docker: - image: cimg/ruby:2.6 environment: - RAILS_VERSION: 5.2.8 + BUNDLE_GEMFILE: gemfiles/rails_5.2.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby26-rails-5.2.8 + working_directory: ~/meta-tags/ruby26-rails-52 steps: *shared_build_steps - build-ruby26-rails-6_0_5: + build-ruby26-rails-60: parameters: is_main_build: type: boolean @@ -125,13 +129,13 @@ jobs: docker: - image: cimg/ruby:2.6 environment: - RAILS_VERSION: 6.0.5 + BUNDLE_GEMFILE: gemfiles/rails_6.0.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby26-rails-6.0.5 + working_directory: ~/meta-tags/ruby26-rails-60 steps: *shared_build_steps - build-ruby26-rails-6_1_6: + build-ruby26-rails-61: parameters: is_main_build: type: boolean @@ -139,13 +143,13 @@ jobs: docker: - image: cimg/ruby:2.6 environment: - RAILS_VERSION: 6.1.6 + BUNDLE_GEMFILE: gemfiles/rails_6.1.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby26-rails-6.1.6 + working_directory: ~/meta-tags/ruby26-rails-61 steps: *shared_build_steps - build-ruby27-rails-5_1_7: + build-ruby27-rails-51: parameters: is_main_build: type: boolean @@ -153,13 +157,13 @@ jobs: docker: - image: cimg/ruby:2.7 environment: - RAILS_VERSION: 5.1.7 + BUNDLE_GEMFILE: gemfiles/rails_5.1.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby27-rails-5.1.7 + working_directory: ~/meta-tags/ruby27-rails-51 steps: *shared_build_steps - build-ruby27-rails-5_2_8: + build-ruby27-rails-52: parameters: is_main_build: type: boolean @@ -167,13 +171,13 @@ jobs: docker: - image: cimg/ruby:2.7 environment: - RAILS_VERSION: 5.2.8 + BUNDLE_GEMFILE: gemfiles/rails_5.2.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby27-rails-5.2.8 + working_directory: ~/meta-tags/ruby27-rails-52 steps: *shared_build_steps - build-ruby27-rails-6_0_5: + build-ruby27-rails-60: parameters: is_main_build: type: boolean @@ -181,13 +185,13 @@ jobs: docker: - image: cimg/ruby:2.7 environment: - RAILS_VERSION: 6.0.5 + BUNDLE_GEMFILE: gemfiles/rails_6.0.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby27-rails-6.0.5 + working_directory: ~/meta-tags/ruby27-rails-60 steps: *shared_build_steps - build-ruby27-rails-6_1_6: + build-ruby27-rails-61: parameters: is_main_build: type: boolean @@ -195,13 +199,13 @@ jobs: docker: - image: cimg/ruby:2.7 environment: - RAILS_VERSION: 6.1.6 + BUNDLE_GEMFILE: gemfiles/rails_6.1.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby27-rails-6.1.6 + working_directory: ~/meta-tags/ruby27-rails-61 steps: *shared_build_steps - build-ruby27-rails-7_0_3: + build-ruby27-rails-70: parameters: is_main_build: type: boolean @@ -209,13 +213,41 @@ jobs: docker: - image: cimg/ruby:2.7 environment: - RAILS_VERSION: 7.0.3 + BUNDLE_GEMFILE: gemfiles/rails_7.0.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby27-rails-7.0.3 + working_directory: ~/meta-tags/ruby27-rails-70 steps: *shared_build_steps - build-ruby30-rails-6_0_5: + build-ruby27-rails-71: + parameters: + is_main_build: + type: boolean + default: false + docker: + - image: cimg/ruby:2.7 + environment: + BUNDLE_GEMFILE: gemfiles/rails_7.1.gemfile + ENABLE_CODE_COVERAGE: 1 + NO_STEEP: 1 + working_directory: ~/meta-tags/ruby27-rails-71 + steps: *shared_build_steps + + build-ruby30-rails-60: + parameters: + is_main_build: + type: boolean + default: false + docker: + - image: cimg/ruby:3.0 + environment: + BUNDLE_GEMFILE: gemfiles/rails_6.0.gemfile + ENABLE_CODE_COVERAGE: 1 + NO_STEEP: 1 + working_directory: ~/meta-tags/ruby30-rails-60 + steps: *shared_build_steps + + build-ruby30-rails-61: parameters: is_main_build: type: boolean @@ -223,13 +255,13 @@ jobs: docker: - image: cimg/ruby:3.0 environment: - RAILS_VERSION: 6.0.5 + BUNDLE_GEMFILE: gemfiles/rails_6.1.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby30-rails-6.0.5 + working_directory: ~/meta-tags/ruby30-rails-61 steps: *shared_build_steps - build-ruby30-rails-6_1_6: + build-ruby30-rails-70: parameters: is_main_build: type: boolean @@ -237,13 +269,13 @@ jobs: docker: - image: cimg/ruby:3.0 environment: - RAILS_VERSION: 6.1.6 + BUNDLE_GEMFILE: gemfiles/rails_7.0.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby30-rails-6.1.6 + working_directory: ~/meta-tags/ruby30-rails-70 steps: *shared_build_steps - build-ruby30-rails-7_0_3: + build-ruby30-rails-71: parameters: is_main_build: type: boolean @@ -251,13 +283,13 @@ jobs: docker: - image: cimg/ruby:3.0 environment: - RAILS_VERSION: 7.0.3 + BUNDLE_GEMFILE: gemfiles/rails_7.1.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby30-rails-7.0.3 + working_directory: ~/meta-tags/ruby30-rails-71 steps: *shared_build_steps - build-ruby31-rails-6_0_5: + build-ruby31-rails-60: parameters: is_main_build: type: boolean @@ -265,13 +297,13 @@ jobs: docker: - image: cimg/ruby:3.1 environment: - RAILS_VERSION: 6.0.5 + BUNDLE_GEMFILE: gemfiles/rails_6.0.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby31-rails-6.0.5 + working_directory: ~/meta-tags/ruby31-rails-60 steps: *shared_build_steps - build-ruby31-rails-6_1_6: + build-ruby31-rails-61: parameters: is_main_build: type: boolean @@ -279,13 +311,13 @@ jobs: docker: - image: cimg/ruby:3.1 environment: - RAILS_VERSION: 6.1.6 + BUNDLE_GEMFILE: gemfiles/rails_6.1.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby31-rails-6.1.6 + working_directory: ~/meta-tags/ruby31-rails-61 steps: *shared_build_steps - build-ruby31-rails-7_0_3: + build-ruby31-rails-70: parameters: is_main_build: type: boolean @@ -293,10 +325,24 @@ jobs: docker: - image: cimg/ruby:3.1 environment: - RAILS_VERSION: 7.0.3 + BUNDLE_GEMFILE: gemfiles/rails_7.0.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 0 - working_directory: ~/meta-tags/ruby31-rails-7.0.3 + working_directory: ~/meta-tags/ruby31-rails-70 + steps: *shared_build_steps + + build-ruby31-rails-71: + parameters: + is_main_build: + type: boolean + default: false + docker: + - image: cimg/ruby:3.1 + environment: + BUNDLE_GEMFILE: gemfiles/rails_7.1.gemfile + ENABLE_CODE_COVERAGE: 1 + NO_STEEP: 1 + working_directory: ~/meta-tags/ruby31-rails-71 steps: *shared_build_steps @@ -310,7 +356,7 @@ jobs: - run: name: Uploading Code Coverage command: | - cd /tmp/workspace/ruby31-rails-7.0.3 + cd /tmp/workspace/ruby31-rails-70 ./cc-test-reporter upload-coverage --input coverage/codeclimate.coverage.json || true tests: docker: @@ -318,93 +364,108 @@ jobs: steps: - run: name: All tests succeeded - command: ':' + command: ":" workflows: version: 2 test: jobs: - - build-ruby26-rails-5_1_7: + - build-ruby26-rails-51: + is_main_build: false + + - build-ruby26-rails-52: + is_main_build: false + + - build-ruby26-rails-60: is_main_build: false - - build-ruby26-rails-5_2_8: + - build-ruby26-rails-61: is_main_build: false - - build-ruby26-rails-6_0_5: + - build-ruby27-rails-51: is_main_build: false - - build-ruby26-rails-6_1_6: + - build-ruby27-rails-52: is_main_build: false - - build-ruby27-rails-5_1_7: + - build-ruby27-rails-60: is_main_build: false - - build-ruby27-rails-5_2_8: + - build-ruby27-rails-61: is_main_build: false - - build-ruby27-rails-6_0_5: + - build-ruby27-rails-70: is_main_build: false - - build-ruby27-rails-6_1_6: + - build-ruby27-rails-71: is_main_build: false - - build-ruby27-rails-7_0_3: + - build-ruby30-rails-60: is_main_build: false - - build-ruby30-rails-6_0_5: + - build-ruby30-rails-61: is_main_build: false - - build-ruby30-rails-6_1_6: + - build-ruby30-rails-70: is_main_build: false - - build-ruby30-rails-7_0_3: + - build-ruby30-rails-71: is_main_build: false - - build-ruby31-rails-6_0_5: + - build-ruby31-rails-60: is_main_build: false - - build-ruby31-rails-6_1_6: + - build-ruby31-rails-61: is_main_build: false - - build-ruby31-rails-7_0_3: + - build-ruby31-rails-70: is_main_build: true + - build-ruby31-rails-71: + is_main_build: false + - upload-coverage: requires: - - build-ruby31-rails-7_0_3 + - build-ruby31-rails-70 - tests: requires: - - build-ruby26-rails-5_1_7 + - build-ruby26-rails-51 + + - build-ruby26-rails-52 + + - build-ruby26-rails-60 + + - build-ruby26-rails-61 - - build-ruby26-rails-5_2_8 + - build-ruby27-rails-51 - - build-ruby26-rails-6_0_5 + - build-ruby27-rails-52 - - build-ruby26-rails-6_1_6 + - build-ruby27-rails-60 - - build-ruby27-rails-5_1_7 + - build-ruby27-rails-61 - - build-ruby27-rails-5_2_8 + - build-ruby27-rails-70 - - build-ruby27-rails-6_0_5 + - build-ruby27-rails-71 - - build-ruby27-rails-6_1_6 + - build-ruby30-rails-60 - - build-ruby27-rails-7_0_3 + - build-ruby30-rails-61 - - build-ruby30-rails-6_0_5 + - build-ruby30-rails-70 - - build-ruby30-rails-6_1_6 + - build-ruby30-rails-71 - - build-ruby30-rails-7_0_3 + - build-ruby31-rails-60 - - build-ruby31-rails-6_0_5 + - build-ruby31-rails-61 - - build-ruby31-rails-6_1_6 + - build-ruby31-rails-70 - - build-ruby31-rails-7_0_3 + - build-ruby31-rails-71 diff --git a/.circleci/config.yml.erb b/.circleci/config.yml.erb index 6d7b7f0c..0d46305f 100644 --- a/.circleci/config.yml.erb +++ b/.circleci/config.yml.erb @@ -3,35 +3,32 @@ # rake circleci # <% - rails51 = '5.1.7' - rails52 = '5.2.8' - rails60 = '6.0.5' - rails61 = '6.1.6' - rails70 = '7.0.3' - builds = [ # 2.6 - ['2.6', rails51], - ['2.6', rails52], - ['2.6', rails60], - ['2.6', rails61], + %w[2.6 5.1], + %w[2.6 5.2], + %w[2.6 6.0], + %w[2.6 6.1], # 2.7 - ['2.7', rails51], - ['2.7', rails52], - ['2.7', rails60], - ['2.7', rails61], - ['2.7', rails70], + %w[2.7 5.1], + %w[2.7 5.2], + %w[2.7 6.0], + %w[2.7 6.1], + %w[2.7 7.0], + %w[2.7 7.1], # 3.0 - ['3.0', rails60], - ['3.0', rails61], - ['3.0', rails70], + %w[3.0 6.0], + %w[3.0 6.1], + %w[3.0 7.0], + %w[3.0 7.1], # 3.1 - ['3.1', rails60], - ['3.1', rails61], - ['3.1', rails70, true], + %w[3.1 6.0], + %w[3.1 6.1], + ["3.1", "7.0", true], + %w[3.1 7.1], ] main_build = builds.find { |_, _, is_main_build| is_main_build } @@ -54,26 +51,30 @@ shared_build_steps: &shared_build_steps - run: name: Storing Rails Version command: | - echo "$RUBY_VERSION/$RAILS_VERSION" > RAILS_VERSION - cat RAILS_VERSION + echo "$RUBY_VERSION/$BUNDLE_GEMFILE" > CACHE_ENV_VERSION + cat CACHE_ENV_VERSION + # To generate cache checksum, we need a static file, but Gemfile is + # based on the Rails version we are testing against. This step just puts + # a dynamically identified file into a known path. + cat "$BUNDLE_GEMFILE" > CACHE_GEMFILE # Download and cache dependencies - restore_cache: keys: - - dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "RAILS_VERSION" }}-{{ checksum "Gemfile" }}-{{ checksum "meta-tags.gemspec" }} + - dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }}-{{ checksum "CACHE_GEMFILE" }}-{{ checksum "meta-tags.gemspec" }} # fallback to using the latest cache if no exact match is found - - dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "RAILS_VERSION" }} + - dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }} - run: name: Installing Dependencies command: | - bundle config set --local path vendor/bundle + bundle config set --local path "${PWD}/vendor/bundle" bundle check || (bundle install --jobs=4 --retry=3 && bundle clean) - save_cache: paths: - ./vendor/bundle - key: dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "RAILS_VERSION" }}-{{ checksum "Gemfile" }}-{{ checksum "meta-tags.gemspec" }} + key: dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }}-{{ checksum "CACHE_GEMFILE" }}-{{ checksum "meta-tags.gemspec" }} # run tests! - run: @@ -122,7 +123,7 @@ shared_build_steps: &shared_build_steps jobs: <% builds.each do |ruby_version, rails_version, is_main_build| %> - build-ruby<%= ruby_version.tr('.', '') %>-rails-<%= rails_version.tr('.', '_') %>: + build-ruby<%= ruby_version.delete(".") %>-rails-<%= rails_version.delete(".") %>: parameters: is_main_build: type: boolean @@ -130,10 +131,10 @@ jobs: docker: - image: cimg/ruby:<%= ruby_version %> environment: - RAILS_VERSION: <%= rails_version %> + BUNDLE_GEMFILE: gemfiles/rails_<%= rails_version %>.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: <%= is_main_build ? 0 : 1 %> - working_directory: ~/meta-tags/ruby<%= ruby_version.tr('.', '') %>-rails-<%= rails_version %> + working_directory: ~/meta-tags/ruby<%= ruby_version.delete(".") %>-rails-<%= rails_version.delete(".") %> steps: *shared_build_steps <% end %> @@ -147,7 +148,7 @@ jobs: - run: name: Uploading Code Coverage command: | - cd /tmp/workspace/ruby<%= main_build[0].tr('.', '') %>-rails-<%= main_build[1] %> + cd /tmp/workspace/ruby<%= main_build[0].delete(".") %>-rails-<%= main_build[1].delete(".") %> ./cc-test-reporter upload-coverage --input coverage/codeclimate.coverage.json || true tests: docker: @@ -155,23 +156,23 @@ jobs: steps: - run: name: All tests succeeded - command: ':' + command: ":" workflows: version: 2 test: jobs: <% builds.each do |ruby_version, rails_version, is_main_build| %> - - build-ruby<%= ruby_version.tr('.', '') %>-rails-<%= rails_version.tr('.', '_') %>: + - build-ruby<%= ruby_version.delete(".") %>-rails-<%= rails_version.delete(".") %>: is_main_build: <%= !!is_main_build %> <% end %> - upload-coverage: requires: - - build-ruby<%= main_build[0].tr('.', '') %>-rails-<%= main_build[1].tr('.', '_') %> + - build-ruby<%= main_build[0].delete(".") %>-rails-<%= main_build[1].delete(".") %> - tests: requires: <% builds.each do |ruby_version, rails_version| %> - - build-ruby<%= ruby_version.tr('.', '') %>-rails-<%= rails_version.tr('.', '_') %> + - build-ruby<%= ruby_version.delete(".") %>-rails-<%= rails_version.delete(".") %> <% end %> diff --git a/.gitignore b/.gitignore index 57a96b51..f02c3caf 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ .DS_Store .bundle Gemfile.lock +gemfiles/*.gemfile.lock .ruby-gemset coverage doc @@ -9,4 +10,4 @@ pkg *.gem .idea log/ -tmp/ \ No newline at end of file +tmp/ diff --git a/Appraisals b/Appraisals new file mode 100644 index 00000000..e9fffaae --- /dev/null +++ b/Appraisals @@ -0,0 +1,25 @@ +# frozen_string_literal: true + +appraise "rails-5.1" do + gem "railties", "5.1.7" +end + +appraise "rails-5.2" do + gem "railties", "5.2.8.1" +end + +appraise "rails-6.0" do + gem "railties", "6.0.6" +end + +appraise "rails-6.1" do + gem "railties", "6.1.7" +end + +appraise "rails-7.0" do + gem "railties", "7.0.4" +end + +appraise "rails-7.1" do + gem "railties", github: "rails" +end diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c59d9a3..54f4ef4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,8 @@ Changes: -- Switched code style from custom rules to Standard ([246](https://github.com/kpumuk/meta-tags/pull/246)). +- Switched code style from custom rules to Standard ([246](https://github.com/kpumuk/meta-tags/pull/251)). +- Switched from testing Rails using environment variables to Appraisal gem ([251](https://github.com/kpumuk/meta-tags/pull/247)). ## 2.18.0 (September 15, 2022) [☰](https://github.com/kpumuk/meta-tags/compare/v2.17.0...v2.18.0) diff --git a/Gemfile b/Gemfile index e886d722..6047aa3d 100644 --- a/Gemfile +++ b/Gemfile @@ -2,17 +2,14 @@ source "https://rubygems.org" -# Specify your gem's dependencies in meta-tags.gemspec +# Specify gem's dependencies in meta-tags.gemspec gemspec -if ENV["RAILS_VERSION"] - # Install specified version of actionpack if requested - gem "railties", "~> #{ENV["RAILS_VERSION"]}" -end +gem "railties", "~> 7.0.4" unless ENV["NO_STEEP"] == "1" # Ruby typings - gem "steep", "~> 1.1.1", platform: :mri + gem "steep", "~> 1.3.0", platform: :mri end group :test do diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile new file mode 100644 index 00000000..0c23c2b9 --- /dev/null +++ b/gemfiles/rails_5.1.gemfile @@ -0,0 +1,17 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "railties", "5.1.7" +gem "steep", "~> 1.3.0", platform: :mri + +group :test do + gem "standard" + gem "rubocop-rails" + gem "rubocop-rake" + gem "rubocop-rspec", require: false + gem "simplecov", "~> 0.21.2" + gem "rspec_junit_formatter" +end + +gemspec path: "../" diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile new file mode 100644 index 00000000..a0073ba8 --- /dev/null +++ b/gemfiles/rails_5.2.gemfile @@ -0,0 +1,17 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "railties", "5.2.8.1" +gem "steep", "~> 1.3.0", platform: :mri + +group :test do + gem "standard" + gem "rubocop-rails" + gem "rubocop-rake" + gem "rubocop-rspec", require: false + gem "simplecov", "~> 0.21.2" + gem "rspec_junit_formatter" +end + +gemspec path: "../" diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile new file mode 100644 index 00000000..87730d24 --- /dev/null +++ b/gemfiles/rails_6.0.gemfile @@ -0,0 +1,17 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "railties", "6.0.6" +gem "steep", "~> 1.3.0", platform: :mri + +group :test do + gem "standard" + gem "rubocop-rails" + gem "rubocop-rake" + gem "rubocop-rspec", require: false + gem "simplecov", "~> 0.21.2" + gem "rspec_junit_formatter" +end + +gemspec path: "../" diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile new file mode 100644 index 00000000..ddeab309 --- /dev/null +++ b/gemfiles/rails_6.1.gemfile @@ -0,0 +1,17 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "railties", "6.1.7" +gem "steep", "~> 1.3.0", platform: :mri + +group :test do + gem "standard" + gem "rubocop-rails" + gem "rubocop-rake" + gem "rubocop-rspec", require: false + gem "simplecov", "~> 0.21.2" + gem "rspec_junit_formatter" +end + +gemspec path: "../" diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile new file mode 100644 index 00000000..1f8662c4 --- /dev/null +++ b/gemfiles/rails_7.0.gemfile @@ -0,0 +1,17 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "railties", "7.0.4" +gem "steep", "~> 1.3.0", platform: :mri + +group :test do + gem "standard" + gem "rubocop-rails" + gem "rubocop-rake" + gem "rubocop-rspec", require: false + gem "simplecov", "~> 0.21.2" + gem "rspec_junit_formatter" +end + +gemspec path: "../" diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile new file mode 100644 index 00000000..e93e874a --- /dev/null +++ b/gemfiles/rails_7.1.gemfile @@ -0,0 +1,17 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "railties", github: "rails" +gem "steep", "~> 1.3.0", platform: :mri + +group :test do + gem "standard" + gem "rubocop-rails" + gem "rubocop-rake" + gem "rubocop-rspec", require: false + gem "simplecov", "~> 0.21.2" + gem "rspec_junit_formatter" +end + +gemspec path: "../" diff --git a/lib/meta_tags/railtie.rb b/lib/meta_tags/railtie.rb index 05dc6b18..2b27d139 100644 --- a/lib/meta_tags/railtie.rb +++ b/lib/meta_tags/railtie.rb @@ -4,13 +4,13 @@ module MetaTags class Railtie < Rails::Railtie initializer "meta_tags.setup_action_controller" do ActiveSupport.on_load :action_controller do - ActionController::Base.include MetaTags::ControllerHelper + include MetaTags::ControllerHelper end end initializer "meta_tags.setup_action_view" do ActiveSupport.on_load :action_view do - ActionView::Base.include MetaTags::ViewHelper + include MetaTags::ViewHelper end end end diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 60a85c1f..71b5ba8b 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -26,9 +26,10 @@ Gem::Specification.new do |spec| spec.add_development_dependency "railties", ">= 3.2.0", "< 7.1" spec.add_development_dependency "rake", "~> 13.0" - spec.add_development_dependency "rspec", "~> 3.11.0" + spec.add_development_dependency "rspec", "~> 3.12.0" spec.add_development_dependency "rspec-html-matchers", "~> 0.10.0" spec.add_development_dependency "standard", "~> 1.18.1" + spec.add_development_dependency "appraisal", "~> 2.4.1" spec.cert_chain = ["certs/kpumuk.pem"] spec.signing_key = File.expand_path("~/.ssh/gem-kpumuk.pem") if $PROGRAM_NAME.end_with?("gem")