rubygems-update 3.4.19 → 3.4.21

data/test/rubygems/test_gem_package_tar_writer.rb

@@ -28,12 +28,12 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
   end
 
   def test_add_file
-    Time.stub :now, Time.at(1458518157) do
-      @tar_writer.add_file "x", 0644 do |f|
+    Time.stub :now, Time.at(1_458_518_157) do
+      @tar_writer.add_file "x", 0o644 do |f|
         f.write "a" * 10
       end
 
-      assert_headers_equal(tar_file_header("x", "", 0644, 10, Time.now),
+      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.now),
                          @io.string[0, 512])
     end
     assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
@@ -42,19 +42,19 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
 
   def test_add_file_source_date_epoch
     ENV["SOURCE_DATE_EPOCH"] = "123456789"
-    Time.stub :now, Time.at(1458518157) do
-      @tar_writer.mkdir "foo", 0644
+    Time.stub :now, Time.at(1_458_518_157) do
+      @tar_writer.mkdir "foo", 0o644
 
-      assert_headers_equal tar_dir_header("foo", "", 0644, Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc),
+      assert_headers_equal tar_dir_header("foo", "", 0o644, Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc),
                            @io.string[0, 512]
     end
   end
 
   def test_add_symlink
-    Time.stub :now, Time.at(1458518157) do
-      @tar_writer.add_symlink "x", "y", 0644
+    Time.stub :now, Time.at(1_458_518_157) do
+      @tar_writer.add_symlink "x", "y", 0o644
 
-      assert_headers_equal(tar_symlink_header("x", "", 0644, Time.now, "y"),
+      assert_headers_equal(tar_symlink_header("x", "", 0o644, Time.now, "y"),
                          @io.string[0, 512])
     end
     assert_equal 512, @io.pos
@@ -62,10 +62,10 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
 
   def test_add_symlink_source_date_epoch
     ENV["SOURCE_DATE_EPOCH"] = "123456789"
-    Time.stub :now, Time.at(1458518157) do
-      @tar_writer.add_symlink "x", "y", 0644
+    Time.stub :now, Time.at(1_458_518_157) do
+      @tar_writer.add_symlink "x", "y", 0o644
 
-      assert_headers_equal(tar_symlink_header("x", "", 0644, Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc, "y"),
+      assert_headers_equal(tar_symlink_header("x", "", 0o644, Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc, "y"),
                          @io.string[0, 512])
     end
   end
@@ -73,8 +73,8 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
   def test_add_file_digest
     digest_algorithms = Digest::SHA1.new, Digest::SHA512.new
 
-    Time.stub :now, Time.at(1458518157) do
-      digests = @tar_writer.add_file_digest "x", 0644, digest_algorithms do |io|
+    Time.stub :now, Time.at(1_458_518_157) do
+      digests = @tar_writer.add_file_digest "x", 0o644, digest_algorithms do |io|
         io.write "a" * 10
       end
 
@@ -86,7 +86,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
                    "e1cf14b0",
                    digests["SHA512"].hexdigest
 
-      assert_headers_equal(tar_file_header("x", "", 0644, 10, Time.now),
+      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.now),
                          @io.string[0, 512])
     end
     assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
@@ -96,8 +96,8 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
   def test_add_file_digest_multiple
     digest_algorithms = [Digest::SHA1.new, Digest::SHA512.new]
 
-    Time.stub :now, Time.at(1458518157) do
-      digests = @tar_writer.add_file_digest "x", 0644, digest_algorithms do |io|
+    Time.stub :now, Time.at(1_458_518_157) do
+      digests = @tar_writer.add_file_digest "x", 0o644, digest_algorithms do |io|
         io.write "a" * 10
       end
 
@@ -109,7 +109,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
                    "e1cf14b0",
                    digests["SHA512"].hexdigest
 
-      assert_headers_equal(tar_file_header("x", "", 0644, 10, Time.now),
+      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.now),
                            @io.string[0, 512])
     end
     assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
@@ -121,12 +121,12 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
 
     signer = Gem::Security::Signer.new PRIVATE_KEY, [PUBLIC_CERT]
 
-    Time.stub :now, Time.at(1458518157) do
-      @tar_writer.add_file_signed "x", 0644, signer do |io|
+    Time.stub :now, Time.at(1_458_518_157) do
+      @tar_writer.add_file_signed "x", 0o644, signer do |io|
         io.write "a" * 10
       end
 
-      assert_headers_equal(tar_file_header("x", "", 0644, 10, Time.now),
+      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.now),
                            @io.string[0, 512])
 
       assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
@@ -136,7 +136,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
 
       signature = signer.sign digest.digest
 
-      assert_headers_equal(tar_file_header("x.sig", "", 0444, signature.length,
+      assert_headers_equal(tar_file_header("x.sig", "", 0o444, signature.length,
                                            Time.now),
                            @io.string[1024, 512])
       assert_equal "#{signature}#{"\0" * (512 - signature.length)}",
@@ -149,12 +149,12 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
   def test_add_file_signer_empty
     signer = Gem::Security::Signer.new nil, nil
 
-    Time.stub :now, Time.at(1458518157) do
-      @tar_writer.add_file_signed "x", 0644, signer do |io|
+    Time.stub :now, Time.at(1_458_518_157) do
+      @tar_writer.add_file_signed "x", 0o644, signer do |io|
         io.write "a" * 10
       end
 
-      assert_headers_equal(tar_file_header("x", "", 0644, 10, Time.now),
+      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.now),
                            @io.string[0, 512])
     end
     assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
@@ -163,12 +163,12 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
   end
 
   def test_add_file_simple
-    Time.stub :now, Time.at(1458518157) do
-      @tar_writer.add_file_simple "x", 0644, 10 do |io|
+    Time.stub :now, Time.at(1_458_518_157) do
+      @tar_writer.add_file_simple "x", 0o644, 10 do |io|
         io.write "a" * 10
       end
 
-      assert_headers_equal(tar_file_header("x", "", 0644, 10, Time.now),
+      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.now),
                            @io.string[0, 512])
 
       assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
@@ -178,18 +178,18 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
 
   def test_add_file_simple_source_date_epoch
     ENV["SOURCE_DATE_EPOCH"] = "123456789"
-    Time.stub :now, Time.at(1458518157) do
-      @tar_writer.add_file_simple "x", 0644, 10 do |io|
+    Time.stub :now, Time.at(1_458_518_157) do
+      @tar_writer.add_file_simple "x", 0o644, 10 do |io|
         io.write "a" * 10
       end
 
-      assert_headers_equal(tar_file_header("x", "", 0644, 10, Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc),
+      assert_headers_equal(tar_file_header("x", "", 0o644, 10, Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc),
                            @io.string[0, 512])
     end
   end
 
   def test_add_file_simple_padding
-    Time.stub :now, Time.at(1458518157) do
+    Time.stub :now, Time.at(1_458_518_157) do
       @tar_writer.add_file_simple "x", 0, 100
 
       assert_headers_equal tar_file_header("x", "", 0, 100, Time.now),
@@ -247,10 +247,10 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
   end
 
   def test_mkdir
-    Time.stub :now, Time.at(1458518157) do
-      @tar_writer.mkdir "foo", 0644
+    Time.stub :now, Time.at(1_458_518_157) do
+      @tar_writer.mkdir "foo", 0o644
 
-      assert_headers_equal tar_dir_header("foo", "", 0644, Time.now),
+      assert_headers_equal tar_dir_header("foo", "", 0o644, Time.now),
                            @io.string[0, 512]
 
       assert_equal 512, @io.pos
@@ -259,20 +259,20 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
 
   def test_mkdir_source_date_epoch
     ENV["SOURCE_DATE_EPOCH"] = "123456789"
-    Time.stub :now, Time.at(1458518157) do
-      @tar_writer.mkdir "foo", 0644
+    Time.stub :now, Time.at(1_458_518_157) do
+      @tar_writer.mkdir "foo", 0o644
 
-      assert_headers_equal tar_dir_header("foo", "", 0644, Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc),
+      assert_headers_equal tar_dir_header("foo", "", 0o644, Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc),
                            @io.string[0, 512]
     end
   end
 
   def test_split_name
     assert_equal ["b" * 100, "a" * 155],
-                 @tar_writer.split_name("#{'a' * 155}/#{'b' * 100}")
+                 @tar_writer.split_name("#{"a" * 155}/#{"b" * 100}")
 
-    assert_equal ["#{'qwer/' * 19}bla", "a" * 151],
-                 @tar_writer.split_name("#{'a' * 151}/#{'qwer/' * 19}bla")
+    assert_equal ["#{"qwer/" * 19}bla", "a" * 151],
+                 @tar_writer.split_name("#{"a" * 151}/#{"qwer/" * 19}bla")
     names = [
       ([""] + ["123456789"] * 9 + ["1234567890"]).join("/"),  # 101 bytes (several pieces)
       (["123456789"] * 9 + ["1234567890"] + [""]).join("/"),  # 101 bytes (several pieces)

data/test/rubygems/test_gem_rdoc.rb

@@ -100,7 +100,7 @@ class TestGemRDoc < Gem::TestCase
 
     assert_equal @a.base_dir, e.directory
   ensure
-    FileUtils.chmod(0755, @a.base_dir) if File.directory?(@a.base_dir)
+    FileUtils.chmod(0o755, @a.base_dir) if File.directory?(@a.base_dir)
   end
 
   def test_ri_installed?
@@ -130,7 +130,7 @@ class TestGemRDoc < Gem::TestCase
     assert_equal @a.doc_dir, e.directory
   ensure
     if File.exist? @a.doc_dir
-      FileUtils.chmod 0755, @a.doc_dir
+      FileUtils.chmod 0o755, @a.doc_dir
       FileUtils.rm_r @a.doc_dir
     end
   end

data/test/rubygems/test_gem_remote_fetcher.rb

@@ -361,9 +361,13 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
       FileUtils.mv @a1_gem, @tempdir
       local_path = File.join @tempdir, @a1.file_name
       inst = nil
-      FileUtils.chmod 0555, @a1.cache_dir
-      FileUtils.mkdir_p File.join(Gem.user_dir, "cache") rescue nil
-      FileUtils.chmod 0555, File.join(Gem.user_dir, "cache")
+      FileUtils.chmod 0o555, @a1.cache_dir
+      begin
+        FileUtils.mkdir_p File.join(Gem.user_dir, "cache")
+      rescue StandardError
+        nil
+      end
+      FileUtils.chmod 0o555, File.join(Gem.user_dir, "cache")
 
       Dir.chdir @tempdir do
         inst = Gem::RemoteFetcher.fetcher
@@ -372,21 +376,21 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
       assert_equal(File.join(@tempdir, @a1.file_name),
                    inst.download(@a1, local_path))
     ensure
-      FileUtils.chmod 0755, File.join(Gem.user_dir, "cache")
-      FileUtils.chmod 0755, @a1.cache_dir
+      FileUtils.chmod 0o755, File.join(Gem.user_dir, "cache")
+      FileUtils.chmod 0o755, @a1.cache_dir
     end
 
     def test_download_read_only
-      FileUtils.chmod 0555, @a1.cache_dir
-      FileUtils.chmod 0555, @gemhome
+      FileUtils.chmod 0o555, @a1.cache_dir
+      FileUtils.chmod 0o555, @gemhome
 
       fetcher = util_fuck_with_fetcher File.read(@a1_gem)
       fetcher.download(@a1, "http://gems.example.com")
       a1_cache_gem = File.join Gem.user_dir, "cache", @a1.file_name
       assert File.exist? a1_cache_gem
     ensure
-      FileUtils.chmod 0755, @gemhome
-      FileUtils.chmod 0755, @a1.cache_dir
+      FileUtils.chmod 0o755, @gemhome
+      FileUtils.chmod 0o755, @a1.cache_dir
     end
   end
 
@@ -749,7 +753,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
       "my-bucket" => { :id => "testuser", :secret => "testpass" },
     }
     url = "s3://my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1561353581) do
+    Time.stub :now, Time.at(1_561_353_581) do
       assert_fetch_s3 url, "20f974027db2f3cd6193565327a7c73457a138efb1a63ea248d185ce6827d41b"
     end
   ensure
@@ -761,7 +765,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
       "my-bucket" => { :id => "testuser", :secret => "testpass", :region => "us-west-2" },
     }
     url = "s3://my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1561353581) do
+    Time.stub :now, Time.at(1_561_353_581) do
       assert_fetch_s3 url, "4afc3010757f1fd143e769f1d1dabd406476a4fc7c120e9884fd02acbb8f26c9", nil, "us-west-2"
     end
   ensure
@@ -773,7 +777,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
       "my-bucket" => { :id => "testuser", :secret => "testpass", :security_token => "testtoken" },
     }
     url = "s3://my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1561353581) do
+    Time.stub :now, Time.at(1_561_353_581) do
       assert_fetch_s3 url, "935160a427ef97e7630f799232b8f208c4a4e49aad07d0540572a2ad5fe9f93c", "testtoken"
     end
   ensure
@@ -788,7 +792,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
       "my-bucket" => { :provider => "env" },
     }
     url = "s3://my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1561353581) do
+    Time.stub :now, Time.at(1_561_353_581) do
       assert_fetch_s3 url, "20f974027db2f3cd6193565327a7c73457a138efb1a63ea248d185ce6827d41b"
     end
   ensure
@@ -804,7 +808,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
       "my-bucket" => { :provider => "env", :region => "us-west-2" },
     }
     url = "s3://my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1561353581) do
+    Time.stub :now, Time.at(1_561_353_581) do
       assert_fetch_s3 url, "4afc3010757f1fd143e769f1d1dabd406476a4fc7c120e9884fd02acbb8f26c9", nil, "us-west-2"
     end
   ensure
@@ -820,7 +824,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
       "my-bucket" => { :provider => "env" },
     }
     url = "s3://my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1561353581) do
+    Time.stub :now, Time.at(1_561_353_581) do
       assert_fetch_s3 url, "935160a427ef97e7630f799232b8f208c4a4e49aad07d0540572a2ad5fe9f93c", "testtoken"
     end
   ensure
@@ -830,7 +834,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
 
   def test_fetch_s3_url_creds
     url = "s3://testuser:testpass@my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1561353581) do
+    Time.stub :now, Time.at(1_561_353_581) do
       assert_fetch_s3 url, "20f974027db2f3cd6193565327a7c73457a138efb1a63ea248d185ce6827d41b"
     end
   end
@@ -841,7 +845,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
     }
 
     url = "s3://my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1561353581) do
+    Time.stub :now, Time.at(1_561_353_581) do
       assert_fetch_s3 url, "20f974027db2f3cd6193565327a7c73457a138efb1a63ea248d185ce6827d41b", nil, "us-east-1",
                       '{"AccessKeyId": "testuser", "SecretAccessKey": "testpass"}'
     end
@@ -855,7 +859,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
     }
 
     url = "s3://my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1561353581) do
+    Time.stub :now, Time.at(1_561_353_581) do
       assert_fetch_s3 url, "4afc3010757f1fd143e769f1d1dabd406476a4fc7c120e9884fd02acbb8f26c9", nil, "us-west-2",
                       '{"AccessKeyId": "testuser", "SecretAccessKey": "testpass"}'
     end
@@ -869,7 +873,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
     }
 
     url = "s3://my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1561353581) do
+    Time.stub :now, Time.at(1_561_353_581) do
       assert_fetch_s3 url, "935160a427ef97e7630f799232b8f208c4a4e49aad07d0540572a2ad5fe9f93c", "testtoken", "us-east-1",
                       '{"AccessKeyId": "testuser", "SecretAccessKey": "testpass", "Token": "testtoken"}'
     end
@@ -1151,14 +1155,12 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
     end
     server.ssl_context.tmp_dh_callback = proc { TEST_KEY_DH2048 }
     t = Thread.new do
-      begin
-        server.start
-      rescue Exception => ex
-        puts "ERROR during server thread: #{ex.message}"
-        raise
-      ensure
-        server.shutdown
-      end
+      server.start
+    rescue Exception => ex
+      puts "ERROR during server thread: #{ex.message}"
+      raise
+    ensure
+      server.shutdown
     end
     while server.status != :Running
       sleep 0.1
@@ -1205,13 +1207,11 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
       end
     end
     th = Thread.new do
-      begin
-        s.start
-      rescue Exception => ex
-        abort "ERROR during server thread: #{ex.message}"
-      ensure
-        s.shutdown
-      end
+      s.start
+    rescue Exception => ex
+      abort "ERROR during server thread: #{ex.message}"
+    ensure
+      s.shutdown
     end
     th[:server] = s
     th

data/test/rubygems/test_gem_request.rb

@@ -112,8 +112,8 @@ class TestGemRequest < Gem::TestCase
   end
 
   def test_configure_connection_for_https_ssl_ca_cert
-    ssl_ca_cert, Gem.configuration.ssl_ca_cert =
-      Gem.configuration.ssl_ca_cert, CA_CERT_FILE
+    ssl_ca_cert = Gem.configuration.ssl_ca_cert
+    Gem.configuration.ssl_ca_cert = CA_CERT_FILE
 
     connection = Net::HTTP.new "localhost", 443
 
@@ -214,7 +214,7 @@ class TestGemRequest < Gem::TestCase
     end
 
     auth_header = conn.payload["Authorization"]
-    assert_equal "Basic #{base64_encode64('user:pass')}".strip, auth_header
+    assert_equal "Basic #{base64_encode64("user:pass")}".strip, auth_header
     assert_includes @ui.output, "GET https://user:REDACTED@example.rubygems/specs.#{Gem.marshal_version}"
   end
 
@@ -231,7 +231,7 @@ class TestGemRequest < Gem::TestCase
     end
 
     auth_header = conn.payload["Authorization"]
-    assert_equal "Basic #{base64_encode64('user:{DEScede}pass')}".strip, auth_header
+    assert_equal "Basic #{base64_encode64("user:{DEScede}pass")}".strip, auth_header
     assert_includes @ui.output, "GET https://user:REDACTED@example.rubygems/specs.#{Gem.marshal_version}"
   end
 
@@ -248,7 +248,7 @@ class TestGemRequest < Gem::TestCase
     end
 
     auth_header = conn.payload["Authorization"]
-    assert_equal "Basic #{base64_encode64('{DEScede}pass:x-oauth-basic')}".strip, auth_header
+    assert_equal "Basic #{base64_encode64("{DEScede}pass:x-oauth-basic")}".strip, auth_header
     assert_includes @ui.output, "GET https://REDACTED:x-oauth-basic@example.rubygems/specs.#{Gem.marshal_version}"
   end
 

data/test/rubygems/test_gem_request_connection_pools.rb

@@ -121,7 +121,8 @@ class TestGemRequestConnectionPool < Gem::TestCase
   end
 
   def test_net_http_args_no_proxy
-    orig_no_proxy, ENV["no_proxy"] = ENV["no_proxy"], "example"
+    orig_no_proxy = ENV["no_proxy"]
+    ENV["no_proxy"] = "example"
 
     pools = Gem::Request::ConnectionPools.new nil, []
 

data/test/rubygems/test_gem_request_set_gem_dependency_api.rb

@@ -246,7 +246,8 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   end
 
   def test_gem_platforms
-    win_platform, Gem.win_platform = Gem.win_platform?, false
+    win_platform = Gem.win_platform?
+    Gem.win_platform = false
 
     with_engine_version "ruby", "2.0.0" do
       @gda.gem "a", :platforms => :ruby
@@ -258,7 +259,8 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   end
 
   def test_gem_platforms_bundler_ruby
-    win_platform, Gem.win_platform = Gem.win_platform?, false
+    win_platform = Gem.win_platform?
+    Gem.win_platform = false
 
     with_engine_version "ruby", "2.0.0" do
       set = Gem::RequestSet.new
@@ -320,7 +322,8 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   end
 
   def test_gem_platforms_maglev
-    win_platform, Gem.win_platform = Gem.win_platform?, false
+    win_platform = Gem.win_platform?
+    Gem.win_platform = false
 
     with_engine_version "maglev", "1.0.0" do
       set = Gem::RequestSet.new
@@ -356,7 +359,8 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   end
 
   def test_gem_platforms_multiple
-    win_platform, Gem.win_platform = Gem.win_platform?, false
+    win_platform = Gem.win_platform?
+    Gem.win_platform = false
 
     with_engine_version "ruby", "2.0.0" do
       @gda.gem "a", :platforms => [:mswin, :jruby]
@@ -369,7 +373,8 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   end
 
   def test_gem_platforms_platform
-    win_platform, Gem.win_platform = Gem.win_platform?, false
+    win_platform = Gem.win_platform?
+    Gem.win_platform = false
 
     with_engine_version "ruby", "2.0.0" do
       @gda.gem "a", :platforms => :jruby, :platform => :ruby
@@ -696,7 +701,8 @@ end
   end
 
   def test_platform_multiple
-    win_platform, Gem.win_platform = Gem.win_platform?, false
+    win_platform = Gem.win_platform?
+    Gem.win_platform = false
 
     gda = @GDA.new @set, nil
 
@@ -722,7 +728,8 @@ end
   end
 
   def test_platform_ruby
-    win_platform, Gem.win_platform = Gem.win_platform?, false
+    win_platform = Gem.win_platform?
+    Gem.win_platform = false
 
     @gda.platform :ruby do
       @gda.gem "a"

data/test/rubygems/test_gem_requirement.rb

@@ -84,7 +84,7 @@ class TestGemRequirement < Gem::TestCase
       Gem::Requirement.parse(Gem::Version.new("2"))
   end
 
-  if !(Gem.java_platform? && ENV["JRUBY_OPTS"].to_s.include?("--debug"))
+  unless (Gem.java_platform? && ENV["JRUBY_OPTS"].to_s.include?("--debug"))
     def test_parse_deduplication
       assert_same "~>", Gem::Requirement.parse("~> 1").first
     end

data/test/rubygems/test_gem_security.rb

@@ -308,7 +308,7 @@ class TestGemSecurity < Gem::TestCase
 
     passphrase = "It should be long."
 
-    @SEC.write key, path, 0600, passphrase
+    @SEC.write key, path, 0o600, passphrase
 
     assert_path_exist path
 
@@ -326,7 +326,7 @@ class TestGemSecurity < Gem::TestCase
 
     cipher = OpenSSL::Cipher.new "AES-192-CBC"
 
-    @SEC.write key, path, 0600, passphrase, cipher
+    @SEC.write key, path, 0o600, passphrase, cipher
 
     assert_path_exist path
 

data/test/rubygems/test_gem_security_signer.rb

@@ -144,7 +144,7 @@ B8khkB8hDKC6moCzebmUxCBmTmXD0Wjzon+bf4MOriVE3a0ySGRvpr1mKR2+
 
   def test_sign_expired_auto_update
     pend if Gem.java_platform?
-    FileUtils.mkdir_p File.join(Gem.user_home, ".gem"), :mode => 0700
+    FileUtils.mkdir_p File.join(Gem.user_home, ".gem"), :mode => 0o700
 
     private_key_path = File.join(Gem.user_home, ".gem", "gem-private_key.pem")
     Gem::Security.write PRIVATE_KEY, private_key_path
@@ -171,7 +171,7 @@ B8khkB8hDKC6moCzebmUxCBmTmXD0Wjzon+bf4MOriVE3a0ySGRvpr1mKR2+
   end
 
   def test_sign_expired_auto_update_exists
-    FileUtils.mkdir_p File.join(Gem.user_home, ".gem"), :mode => 0700
+    FileUtils.mkdir_p File.join(Gem.user_home, ".gem"), :mode => 0o700
 
     expiry = EXPIRED_CERT.not_after.strftime "%Y%m%d%H%M%S"
     expired_path =

data/test/rubygems/test_gem_security_trust_dir.rb

@@ -56,7 +56,7 @@ class TestGemSecurityTrustDir < Gem::TestCase
 
     assert_path_exist trusted
 
-    mask = 0100600 & (~File.umask)
+    mask = 0o100600 & (~File.umask)
 
     assert_equal mask, File.stat(trusted).mode unless win_platform?
 
@@ -70,8 +70,8 @@ class TestGemSecurityTrustDir < Gem::TestCase
 
     assert_path_exist @dest_dir
 
-    mask = 040700 & (~File.umask)
-    mask |= 0200000 if RUBY_PLATFORM.include?("aix")
+    mask = 0o40700 & (~File.umask)
+    mask |= 0o200000 if RUBY_PLATFORM.include?("aix")
 
     assert_equal mask, File.stat(@dest_dir).mode unless win_platform?
   end
@@ -87,12 +87,12 @@ class TestGemSecurityTrustDir < Gem::TestCase
   end
 
   def test_verify_wrong_permissions
-    FileUtils.mkdir_p @dest_dir, :mode => 0777
+    FileUtils.mkdir_p @dest_dir, :mode => 0o777
 
     @trust_dir.verify
 
-    mask = 040700 & (~File.umask)
-    mask |= 0200000 if RUBY_PLATFORM.include?("aix")
+    mask = 0o40700 & (~File.umask)
+    mask |= 0o200000 if RUBY_PLATFORM.include?("aix")
 
     assert_equal mask, File.stat(@dest_dir).mode unless win_platform?
   end

data/test/rubygems/test_gem_spec_fetcher.rb

@@ -41,12 +41,12 @@ class TestGemSpecFetcher < Gem::TestCase
   def test_initialize_unwritable_home_dir
     pend "chmod not supported" if Gem.win_platform?
 
-    FileUtils.chmod 0000, Gem.user_home
+    FileUtils.chmod 0o000, Gem.user_home
 
     begin
       assert Gem::SpecFetcher.new
     ensure
-      FileUtils.chmod 0755, Gem.user_home
+      FileUtils.chmod 0o755, Gem.user_home
     end
   end