allow importing of ruby 3.0.0-preview1

Colby Swandale · Colby Swandale · commit fe1077e11e4f · 2020-09-26T21:24:55.000+10:00
diff --git a/app/models/ruby_version.rb b/app/models/ruby_version.rb
@@ -2,29 +2,31 @@
 
 class RubyVersion
   attr_accessor :version, :sha512, :source_url
+
   def initialize(version, sha512: nil, source_url: nil)
-    if version == "dev"
-      @version = "dev"
-    else
-      raise ArgumentError unless Gem::Version.correct?(version)
-      @version = Gem::Version.new(version)
+    unless version == "dev"
+      raise ArgumentError, "invalid version #{version.inspect}" unless Gem::Version.correct?(version)
+      @_version = Gem::Version.new(version)
     end
 
+    # RubyGems::Version changes the version string if it has a `-`, we want to keep the original
+    @version = version
     @sha512 = sha512
     @source_url = URI(source_url) if source_url.present?
   end
 
   def minor_version
+    return @version if prerelease?
     return "dev" if dev?
-    version.segments[0..1].join(".")
+    @_version.segments[0..1].join(".")
   end
 
   def prerelease?
     return true if dev?
-    version.prerelease?
+    @_version.prerelease?
   end
 
   def dev?
-    version == "dev"
+    @version == "dev"
   end
 end
diff --git a/app/views/layouts/_header.html.slim b/app/views/layouts/_header.html.slim
@@ -7,7 +7,7 @@ header id="header" class="flex items-center inset-x-0 z-50 h-16 #{'text-white bg
       - unless homepage?
         div class="lg:w-5/12 md:w-6/12 w-8/12"
             = render 'layouts/search_form'
-      div class="#{homepage? ? 'md:w-2/12 w-6/12' : 'w-2/12'}"
+      div class="#{homepage? ? 'md:w-2/12 w-6/12' : 'w-3/12'}"
         div class="flex flex-row-reverse"
           = render 'layouts/theme_selector'
           = render 'layouts/github_links'
diff --git a/config/application.rb b/config/application.rb
@@ -24,7 +24,7 @@ class Application < Rails::Application
     config.default_ruby_version = '2.7'
 
     config.ruby_versions = %w[
-      2.7 2.6 2.5 2.4 2.3 dev
+      3.0-preview1 2.7 2.6 2.5 2.4 2.3 dev
     ]
 
     config.eol_ruby_versions = %w[2.4 2.3]
diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
@@ -10,6 +10,10 @@ namespace :import do
 
     release = RubyReleases::ReleaseList.fetch.find { |r| r.version.to_s == args.version }
 
+    if ENV["FORCE_RUBY_DOWNLOAD_URL"].present?
+      release = RubyVersion.new(args.version, source_url: ENV["FORCE_RUBY_DOWNLOAD_URL"])
+    end
+
     unless release
       puts "Could not find MRI release for version #{args.version}"
       exit 1

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class Application < Rails::Application`
`24`	`24`	`config.default_ruby_version = '2.7'`
`25`	`25`
`26`	`26`	`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`
`28`	`28`	`]`
`29`	`29`
`30`	`30`	`config.eol_ruby_versions = %w[2.4 2.3]`