Skip to content

Minimal support for Ruby 3 #473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PeterJCLaw merged 5 commits into from
Jan 8, 2023
Merged

Minimal support for Ruby 3 #473

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aeff6dd
Minimal support for Ruby 3
PeterJCLaw Jan 5, 2023
ef3e8cb
Implement file patching in Ruby for cross platform compatibility
PeterJCLaw Jan 7, 2023
6696920
Simplify conditional block
PeterJCLaw Jan 8, 2023
b2a180d
Make the string interpolation work
PeterJCLaw Jan 8, 2023
58d109b
Drop redundant backup of this file
PeterJCLaw Jan 8, 2023
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
3 changes: 3 additions & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ gem 'html-proofer'

# Avoid polling on windows
gem 'wdm', '>= 0.1.0'

# For local Ruby 3 support; works around https://github.com/github/pages-gem/issues/752
gem "webrick", "~> 1.7"
2 changes: 2 additions & 0 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ GEM
tzinfo-data (1.2018.5)
tzinfo (>= 1.0.0)
wdm (0.1.1)
webrick (1.7.0)
yell (2.2.2)

PLATFORMS
Expand All @@ -118,6 +119,7 @@ DEPENDENCIES
tzinfo
tzinfo-data
wdm (>= 0.1.0)
webrick (~> 1.7)

BUNDLED WITH
2.3.6
4 changes: 4 additions & 0 deletions Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ task :dependencies do
sh('bundle config set --local path "gems"')
end
sh('bundle install')

# Fix pathutil on Ruby 3; works around https://github.com/envygeeks/pathutil/pull/5
# as suggested by https://stackoverflow.com/a/73909894/67873
sh('sed -i.bak "s/, kwd/, **kwd/" $(bundle exec gem which pathutil)')

@sedders123 sedders123 Jan 7, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think sed comes as standard on Windows. Can we do this in a cross platform way or only run this fix where sed is available?

@PeterJCLaw PeterJCLaw Jan 7, 2023 •
edited
Loading

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

f0e143c ef3e8cb hopefully does this.

end

task :spelling_dependencies do
Expand Down