Skip to content

Commit

Permalink
bugfix: build failures (#548)
Browse files Browse the repository at this point in the history
* Update hacking notes and tidy up gem restrictions

* Shoe-horn in psych restrictions

* Remove duplicate psych reference

* Remove old note references as most are incorrect

* Use appraisals to rebuild gemfiles

* Remove temporary rdoc restriction

* Add in deprecative versions of rhs

* Fix rubocop
  • Loading branch information
luke-hill authored Jun 21, 2022
1 parent a6d60de commit b3d0ba2
Show file tree
Hide file tree
Showing 10 changed files with 43 additions and 38 deletions.
24 changes: 17 additions & 7 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,44 +1,54 @@
# frozen_string_literal: true

appraise 'rails_5_0' do
gem 'activerecord'
gem 'capybara', '< 3'
gem 'cucumber', '< 4'
gem 'psych', '< 4'
gem 'rails-html-sanitizer', '< 1.4'
gem 'railties', '~> 5.0.7'
gem 'activerecord'
gem 'sqlite3', '~> 1.3.13'
end

appraise 'rails_5_1' do
gem 'activerecord'
gem 'capybara', '< 3.15'
gem 'cucumber', '< 5'
gem 'psych', '< 4'
gem 'rails-html-sanitizer', '< 1.4'
gem 'railties', '~> 5.1.7'
gem 'activerecord'
gem 'sqlite3', '~> 1.3.13'
end

appraise 'rails_5_2' do
gem 'activerecord'
gem 'capybara', '< 3.33'
gem 'cucumber', '< 6'
gem 'psych', '< 4'
gem 'rails-html-sanitizer', '< 1.4.3'
gem 'railties', '~> 5.2.4'
gem 'activerecord'
gem 'sqlite3', '~> 1.3.13'
end

appraise 'rails_6_0' do
gem 'cucumber', '< 6'
gem 'railties', '~> 6.0.3'
gem 'activerecord'
gem 'cucumber', '< 6'
gem 'psych', '< 4'
gem 'rails-html-sanitizer', '< 1.4.3'
gem 'railties', '~> 6.0.3'
gem 'sqlite3', '~> 1.4'
end

appraise 'rails_6_1' do
gem 'railties', '~> 6.1.3'
gem 'activerecord'
gem 'cucumber', '< 9'
gem 'psych', '< 4'
gem 'railties', '~> 6.1.3'
gem 'sqlite3', '~> 1.4'
end

appraise 'rails_7_0' do
gem 'railties', '~> 7.0.0'
gem 'activerecord'
gem 'railties', '~> 7.0.0'
gem 'sqlite3', '~> 1.4'
end
20 changes: 3 additions & 17 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ We appreciate that. But before you do, please learn our basic rules:
* Do you have an idea for a new feature? Then don't expect it to be implemented unless you or someone else sends a [pull request](https://help.github.com/articles/using-pull-requests). You might be better to start a discussion on [the google group](http://groups.google.com/group/cukes).
* Reporting a bug? Please tell us:
* which version of Cucumber you're using
* which version of Ruby you're using.
* which version of Ruby you're using
* which version of Rails you're using (include all associated gems)
* How to reproduce it. Bugs with a failing test in a [pull request](https://help.github.com/articles/using-pull-requests) get fixed much quicker. Some bugs may never be fixed.
* Want to paste some code or output? Put \`\`\` on a line above and below your code/output. See [GFM](https://help.github.com/articles/github-flavored-markdown)'s *Fenced Code Blocks* for details.
* Want to paste some code or output? Put ``` on a line above and below your code/output. See [GFM](https://help.github.com/articles/github-flavored-markdown)'s *Fenced Code Blocks* for details.
* We love [pull requests](https://help.github.com/articles/using-pull-requests). But if you don't have a test to go with it we probably won't merge it.

# Contributing to cucumber-rails
Expand Down Expand Up @@ -58,18 +59,3 @@ Now release it
bundle exec rake
git commit -m "Release X.Y.Z"
rake release

## Gaining Release Karma

To become a release manager, create a pull request adding your name to the list below, including
your Rubygems email address in the ticket. One of the existing Release managers will then add you.

Current release managers:
* Kosmas Chatzimichalis
* Matt Wynne
* Mathieu Jobin
* Andrew Walter

To grant release karma, issue the following command:

gem owner cucumber-rails --add <NEW OWNER RUBYGEMS EMAIL>
5 changes: 2 additions & 3 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require 'rubygems'
require 'bundler'
require 'bundler/setup'
require 'appraisal'
require 'rdoc' # https://github.com/lsegal/yard/commit/b861dcc2d7f7e1fbbed7b552ac2e4f7caf68bafa
require 'rdoc'
require 'rake/clean'
require 'pathname'
Bundler::GemHelper.install_tasks
Expand Down Expand Up @@ -40,8 +40,7 @@ end
namespace :gemfiles do
desc 'Install dependencies for all gemfiles'
task :install do
ENV['BUNDLE_GEMFILE'] = 'Gemfile.appraisal'
Rake::Task['appraisal:install'].invoke
system 'bundle exec appraisal update'
end

task :clean do
Expand Down
10 changes: 5 additions & 5 deletions cucumber-rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ Gem::Specification.new do |s|
'source_code_uri' => "https://github.com/cucumber/cucumber-rails/tree/v#{s.version}"
}

s.add_runtime_dependency('capybara', ['>= 2.18', '< 4']) # We support legacy capybara (But only the last 2.x)
s.add_runtime_dependency('cucumber', '>= 3.2', '< 9') # Support cucumber in the 3.x <-> 7.x revision range
s.add_runtime_dependency('mime-types', ['~> 3.3']) # Only support the latest major (3+ years old)
s.add_runtime_dependency('nokogiri', '~> 1.10') # Only support the latest major (3+ years old)
s.add_runtime_dependency('railties', ['>= 5.0', '< 8']) # We support any version of Rails in the 5.x, 6.x and 7.x series
s.add_runtime_dependency('capybara', ['>= 2.18', '< 4'])
s.add_runtime_dependency('cucumber', '>= 3.2', '< 9')
s.add_runtime_dependency('mime-types', ['~> 3.3'])
s.add_runtime_dependency('nokogiri', '~> 1.10')
s.add_runtime_dependency('railties', ['>= 5.0', '< 8'])
s.add_runtime_dependency('rexml', '~> 3.0') # rexml is a bundled gem from ruby 3
s.add_runtime_dependency('webrick', '~> 1.7') # webrick is a bundled gem from ruby 3

Expand Down
4 changes: 3 additions & 1 deletion gemfiles/rails_5_0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

source "https://rubygems.org"

gem "activerecord"
gem "capybara", "< 3"
gem "cucumber", "< 4"
gem "psych", "< 4"
gem "rails-html-sanitizer", "< 1.4"
gem "railties", "~> 5.0.7"
gem "activerecord"
gem "sqlite3", "~> 1.3.13"

gemspec path: "../"
4 changes: 3 additions & 1 deletion gemfiles/rails_5_1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

source "https://rubygems.org"

gem "activerecord"
gem "capybara", "< 3.15"
gem "cucumber", "< 5"
gem "psych", "< 4"
gem "rails-html-sanitizer", "< 1.4"
gem "railties", "~> 5.1.7"
gem "activerecord"
gem "sqlite3", "~> 1.3.13"

gemspec path: "../"
4 changes: 3 additions & 1 deletion gemfiles/rails_5_2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

source "https://rubygems.org"

gem "activerecord"
gem "capybara", "< 3.33"
gem "cucumber", "< 6"
gem "psych", "< 4"
gem "rails-html-sanitizer", "< 1.4.3"
gem "railties", "~> 5.2.4"
gem "activerecord"
gem "sqlite3", "~> 1.3.13"

gemspec path: "../"
4 changes: 3 additions & 1 deletion gemfiles/rails_6_0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@

source "https://rubygems.org"

gem "activerecord"
gem "cucumber", "< 6"
gem "psych", "< 4"
gem "rails-html-sanitizer", "< 1.4.3"
gem "railties", "~> 6.0.3"
gem "activerecord"
gem "sqlite3", "~> 1.4"

gemspec path: "../"
4 changes: 3 additions & 1 deletion gemfiles/rails_6_1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

source "https://rubygems.org"

gem "railties", "~> 6.1.3"
gem "activerecord"
gem "cucumber", "< 9"
gem "psych", "< 4"
gem "railties", "~> 6.1.3"
gem "sqlite3", "~> 1.4"

gemspec path: "../"
2 changes: 1 addition & 1 deletion gemfiles/rails_7_0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

source "https://rubygems.org"

gem "railties", "~> 7.0.0"
gem "activerecord"
gem "railties", "~> 7.0.0"
gem "sqlite3", "~> 1.4"

gemspec path: "../"

0 comments on commit b3d0ba2

Please sign in to comment.