Przeglądaj źródła

Merge pull request #6887 from infosiftr/ruby-open-uri

Update ruby-gems open-uri usage for 2.5+ to use "URI.open"
yosifkit 6 lat temu
rodzic
commit
288b23948c
1 zmienionych plików z 12 dodań i 1 usunięć
  1. 12 1
      test/tests/ruby-gems/container.sh

+ 12 - 1
test/tests/ruby-gems/container.sh

@@ -20,11 +20,22 @@ gems="$(ruby -e '
 	require "json"
 	require "open-uri"
 
+	# https://github.com/ruby/ruby/commit/05aac90a1bcfeb180f5e78ea8b00a4d1b04d5eed
+	# https://bugs.ruby-lang.org/issues/15893
+	# for Ruby 2.5+, we should use "URI.open", but for Ruby 2.4 we still need to use "open(...)" directly
+	def openURI(uri)
+		if Gem::Version.create(RUBY_VERSION) >= Gem::Version.create("2.5")
+			URI.open(uri)
+		else
+			open(uri)
+		end
+	end
+
 	for gem in gems
 		# ruby 2.2.2+: rack activesupport
 		# ruby 2.0+: mime-types
 		# (jruby 1.7 is ruby 1.9)
-		gemRubyVersion = JSON.load(open("https://rubygems.org/api/v1/versions/#{ gem }.json"))[0]["ruby_version"]
+		gemRubyVersion = JSON.load(openURI("https://rubygems.org/api/v1/versions/#{ gem }.json"))[0]["ruby_version"]
 		if Gem::Dependency.new("", gemRubyVersion).match?("", RUBY_VERSION)
 			puts gem
 		else