Merge RubyGems master@9be7858f7f17eae3058204f3c03e4b798ba18b9c

  This version contains the some style changes by RuboCop.

    * https://github.com/rubygems/rubygems/commit/9d810be0ede925fb2e3af535848582c3f8e0e72f
    * https://github.com/rubygems/rubygems/commit/61ea98a727fb1b76b6fac52d74107ee4b02aaef2
    * https://github.com/rubygems/rubygems/commit/795893dce3c5f8540804fc08144cc6a90f086b13
    * https://github.com/rubygems/rubygems/commit/9be7858f7f17eae3058204f3c03e4b798ba18b9c

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 47 insertions, 13 deletions

diff --git a/test/rubygems/test_gem_commands_setup_command.rb b/test/rubygems/test_gem_commands_setup_command.rb
index 4f34112099..569091a8a7 100644
--- a/test/rubygems/test_gem_commands_setup_command.rb
+++ b/test/rubygems/test_gem_commands_setup_command.rb
@@ -23,17 +23,36 @@ class TestGemCommandsSetupCommand < Gem::TestCase
     FileUtils.mkdir_p 'bin'
     FileUtils.mkdir_p 'lib/rubygems/ssl_certs/rubygems.org'
 
-    File.open 'bin/gem',                   'w' do |io| io.puts '# gem'          end
-    File.open 'lib/rubygems.rb',           'w' do |io| io.puts '# rubygems.rb'  end
-    File.open 'lib/rubygems/test_case.rb', 'w' do |io| io.puts '# test_case.rb' end
-    File.open 'lib/rubygems/ssl_certs/rubygems.org/foo.pem', 'w' do |io| io.puts 'PEM'       end
+    File.open 'bin/gem',                   'w' do
+      |io| io.puts '# gem'
+    end
+
+    File.open 'lib/rubygems.rb',           'w' do |io|
+      io.puts '# rubygems.rb'
+    end
+
+    File.open 'lib/rubygems/test_case.rb', 'w' do |io|
+      io.puts '# test_case.rb'
+    end
+
+    File.open 'lib/rubygems/ssl_certs/rubygems.org/foo.pem', 'w' do |io|
+      io.puts 'PEM'
+    end
 
     FileUtils.mkdir_p 'bundler/exe'
     FileUtils.mkdir_p 'bundler/lib/bundler'
 
-    File.open 'bundler/exe/bundle',        'w' do |io| io.puts '# bundle'       end
-    File.open 'bundler/lib/bundler.rb',    'w' do |io| io.puts '# bundler.rb'   end
-    File.open 'bundler/lib/bundler/b.rb',  'w' do |io| io.puts '# b.rb'         end
+    File.open 'bundler/exe/bundle',        'w' do |io|
+      io.puts '# bundle'
+    end
+
+    File.open 'bundler/lib/bundler.rb',    'w' do |io|
+      io.puts '# bundler.rb'
+    end
+
+    File.open 'bundler/lib/bundler/b.rb',  'w' do |io|
+      io.puts '# b.rb'
+    end
 
     FileUtils.mkdir_p 'default/gems'
 
@@ -220,14 +239,29 @@ class TestGemCommandsSetupCommand < Gem::TestCase
     FileUtils.mkdir_p lib_rubygems_defaults
     FileUtils.mkdir_p lib_bundler
 
-    File.open securerandom_rb,    'w' do |io| io.puts '# securerandom.rb'     end
+    File.open securerandom_rb,    'w' do |io|
+      io.puts '# securerandom.rb'
+    end
+
+    File.open old_builder_rb,     'w' do |io|
+      io.puts '# builder.rb'
+    end
+
+    File.open old_format_rb,      'w' do |io|
+      io.puts '# format.rb'
+    end
 
-    File.open old_builder_rb,     'w' do |io| io.puts '# builder.rb'          end
-    File.open old_format_rb,      'w' do |io| io.puts '# format.rb'           end
-    File.open old_bundler_c_rb,   'w' do |io| io.puts '# c.rb'                end
+    File.open old_bundler_c_rb,   'w' do |io|
+      io.puts '# c.rb'
+    end
 
-    File.open engine_defaults_rb, 'w' do |io| io.puts '# jruby.rb'            end
-    File.open os_defaults_rb,     'w' do |io| io.puts '# operating_system.rb' end
+    File.open engine_defaults_rb, 'w' do |io|
+      io.puts '# jruby.rb'
+    end
+
+    File.open os_defaults_rb,     'w' do |io|
+      io.puts '# operating_system.rb'
+    end
 
     @cmd.remove_old_lib_files lib