[rubygems/rubygems] RUBY_REVISION is also provided by supported platf…

…orms rubygems/rubygems@71a237aeec
ruby · Mar 22, 2023 · 3dc4bc3 · 3dc4bc3
1 parent ea1dcb3
commit 3dc4bc3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/lib/rubygems/request.rb b/lib/rubygems/request.rb
@@ -282,7 +282,7 @@ def user_agent
     ua << " Ruby/#{ruby_version} (#{RUBY_RELEASE_DATE}"
     if RUBY_PATCHLEVEL >= 0
       ua << " patchlevel #{RUBY_PATCHLEVEL}"
-    elsif defined?(RUBY_REVISION)
+    else
       ua << " revision #{RUBY_REVISION}"
     end
     ua << ")"

diff --git a/test/rubygems/helper.rb b/test/rubygems/helper.rb
@@ -1096,7 +1096,7 @@ def util_set_RUBY_VERSION(version, patchlevel, revision, description, engine = "
 
     @RUBY_VERSION        = RUBY_VERSION
     @RUBY_PATCHLEVEL     = RUBY_PATCHLEVEL
-    @RUBY_REVISION       = RUBY_REVISION if defined?(RUBY_REVISION)
+    @RUBY_REVISION       = RUBY_REVISION
     @RUBY_DESCRIPTION    = RUBY_DESCRIPTION
     @RUBY_ENGINE         = RUBY_ENGINE
     @RUBY_ENGINE_VERSION = RUBY_ENGINE_VERSION if defined?(RUBY_ENGINE_VERSION)
@@ -1116,7 +1116,7 @@ def util_restore_RUBY_VERSION
 
     Object.const_set :RUBY_VERSION,        @RUBY_VERSION
     Object.const_set :RUBY_PATCHLEVEL,     @RUBY_PATCHLEVEL
-    Object.const_set :RUBY_REVISION,       @RUBY_REVISION if defined?(@RUBY_REVISION)
+    Object.const_set :RUBY_REVISION,       @RUBY_REVISION
     Object.const_set :RUBY_DESCRIPTION,    @RUBY_DESCRIPTION
     Object.const_set :RUBY_ENGINE,         @RUBY_ENGINE
     Object.const_set :RUBY_ENGINE_VERSION, @RUBY_ENGINE_VERSION if defined?(@RUBY_ENGINE_VERSION)
@@ -1125,7 +1125,7 @@ def util_restore_RUBY_VERSION
   def util_clear_RUBY_VERSION
     Object.send :remove_const, :RUBY_VERSION
     Object.send :remove_const, :RUBY_PATCHLEVEL
-    Object.send :remove_const, :RUBY_REVISION       if defined?(RUBY_REVISION)
+    Object.send :remove_const, :RUBY_REVISION
     Object.send :remove_const, :RUBY_DESCRIPTION
     Object.send :remove_const, :RUBY_ENGINE
     Object.send :remove_const, :RUBY_ENGINE_VERSION if defined?(RUBY_ENGINE_VERSION)

diff --git a/test/rubygems/test_gem_request.rb b/test/rubygems/test_gem_request.rb
@@ -327,7 +327,7 @@ def test_user_agent_revision
 
     Object.send :remove_const, :RUBY_PATCHLEVEL
     Object.send :const_set,    :RUBY_PATCHLEVEL, -1
-    Object.send :remove_const, :RUBY_REVISION if defined?(RUBY_REVISION)
+    Object.send :remove_const, :RUBY_REVISION
     Object.send :const_set,    :RUBY_REVISION, 6
 
     ua = make_request(@uri, nil, nil, nil).user_agent
@@ -343,7 +343,7 @@ def test_user_agent_revision_missing
 
     Object.send :remove_const, :RUBY_PATCHLEVEL
     Object.send :const_set,    :RUBY_PATCHLEVEL, -1
-    Object.send :remove_const, :RUBY_REVISION if defined?(RUBY_REVISION)
+    Object.send :remove_const, :RUBY_REVISION
 
     ua = make_request(@uri, nil, nil, nil).user_agent
 
@@ -498,15 +498,15 @@ def util_restore_version
     Object.send :remove_const, :RUBY_PATCHLEVEL
     Object.send :const_set,    :RUBY_PATCHLEVEL, @orig_RUBY_PATCHLEVEL
 
-    Object.send :remove_const, :RUBY_REVISION if defined?(RUBY_REVISION)
+    Object.send :remove_const, :RUBY_REVISION
     Object.send :const_set,    :RUBY_REVISION, @orig_RUBY_REVISION if
       defined?(@orig_RUBY_REVISION)
   end
 
   def util_save_version
     @orig_RUBY_ENGINE     = RUBY_ENGINE
     @orig_RUBY_PATCHLEVEL = RUBY_PATCHLEVEL
-    @orig_RUBY_REVISION   = RUBY_REVISION if defined? RUBY_REVISION
+    @orig_RUBY_REVISION   = RUBY_REVISION
   end
 
   def util_stub_net_http(hash)