Skip to content

Commit fe1077e

Browse files
author
Colby Swandale
committed
allow importing of ruby 3.0.0-preview1
1 parent 9f16f4d commit fe1077e

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

app/models/ruby_version.rb

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,31 @@
22

33
class RubyVersion
44
attr_accessor :version, :sha512, :source_url
5+
56
def initialize(version, sha512: nil, source_url: nil)
6-
if version == "dev"
7-
@version = "dev"
8-
else
9-
raise ArgumentError unless Gem::Version.correct?(version)
10-
@version = Gem::Version.new(version)
7+
unless version == "dev"
8+
raise ArgumentError, "invalid version #{version.inspect}" unless Gem::Version.correct?(version)
9+
@_version = Gem::Version.new(version)
1110
end
1211

12+
# RubyGems::Version changes the version string if it has a `-`, we want to keep the original
13+
@version = version
1314
@sha512 = sha512
1415
@source_url = URI(source_url) if source_url.present?
1516
end
1617

1718
def minor_version
19+
return @version if prerelease?
1820
return "dev" if dev?
19-
version.segments[0..1].join(".")
21+
@_version.segments[0..1].join(".")
2022
end
2123

2224
def prerelease?
2325
return true if dev?
24-
version.prerelease?
26+
@_version.prerelease?
2527
end
2628

2729
def dev?
28-
version == "dev"
30+
@version == "dev"
2931
end
3032
end

app/views/layouts/_header.html.slim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ header id="header" class="flex items-center inset-x-0 z-50 h-16 #{'text-white bg
77
- unless homepage?
88
div class="lg:w-5/12 md:w-6/12 w-8/12"
99
= render 'layouts/search_form'
10-
div class="#{homepage? ? 'md:w-2/12 w-6/12' : 'w-2/12'}"
10+
div class="#{homepage? ? 'md:w-2/12 w-6/12' : 'w-3/12'}"
1111
div class="flex flex-row-reverse"
1212
= render 'layouts/theme_selector'
1313
= render 'layouts/github_links'

config/application.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class Application < Rails::Application
2424
config.default_ruby_version = '2.7'
2525

2626
config.ruby_versions = %w[
27-
2.7 2.6 2.5 2.4 2.3 dev
27+
3.0-preview1 2.7 2.6 2.5 2.4 2.3 dev
2828
]
2929

3030
config.eol_ruby_versions = %w[2.4 2.3]

lib/tasks/import.rake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ namespace :import do
1010

1111
release = RubyReleases::ReleaseList.fetch.find { |r| r.version.to_s == args.version }
1212

13+
if ENV["FORCE_RUBY_DOWNLOAD_URL"].present?
14+
release = RubyVersion.new(args.version, source_url: ENV["FORCE_RUBY_DOWNLOAD_URL"])
15+
end
16+
1317
unless release
1418
puts "Could not find MRI release for version #{args.version}"
1519
exit 1

0 commit comments

Comments
 (0)