ruby-changes:48020
From: svn <ko1@a...>
Date: Sun, 8 Oct 2017 10:32:27 +0900 (JST)
Subject: [ruby-changes:48020] svn:r60135 (trunk): * remove trailing spaces, append newline at EOF.
svn 2017-10-08 10:32:22 +0900 (Sun, 08 Oct 2017) New Revision: 60135 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=60135 Log: * remove trailing spaces, append newline at EOF. Modified files: trunk/lib/rubygems/commands/pristine_command.rb trunk/test/rubygems/test_gem.rb trunk/test/rubygems/test_gem_bundler_version_finder.rb trunk/test/rubygems/test_gem_commands_signin_command.rb trunk/test/rubygems/test_gem_commands_uninstall_command.rb Index: lib/rubygems/commands/pristine_command.rb =================================================================== --- lib/rubygems/commands/pristine_command.rb (revision 60134) +++ lib/rubygems/commands/pristine_command.rb (revision 60135) @@ -157,14 +157,14 @@ extensions will be restored. https://github.com/ruby/ruby/blob/trunk/lib/rubygems/commands/pristine_command.rb#L157 install_defaults.to_s['--env-shebang'] end - installer_options = { + installer_options = { :wrappers => true, :force => true, :install_dir => spec.base_dir, :env_shebang => env_shebang, :build_args => spec.build_args, } - + if options[:only_executables] then installer = Gem::Installer.for_spec(spec, installer_options) installer.generate_bin Index: test/rubygems/test_gem.rb =================================================================== --- test/rubygems/test_gem.rb (revision 60134) +++ test/rubygems/test_gem.rb (revision 60135) @@ -1756,7 +1756,7 @@ class TestGem < Gem::TestCase https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem.rb#L1756 else platform = " #{platform}" end - expected = if Gem::USE_BUNDLER_FOR_GEMDEPS + expected = if Gem::USE_BUNDLER_FOR_GEMDEPS <<-EXPECTED Could not find gem 'a#{platform}' in any of the gem sources listed in your Gemfile. You may need to `gem install -g` to install missing gems Index: test/rubygems/test_gem_commands_uninstall_command.rb =================================================================== --- test/rubygems/test_gem_commands_uninstall_command.rb (revision 60134) +++ test/rubygems/test_gem_commands_uninstall_command.rb (revision 60135) @@ -287,7 +287,7 @@ WARNING: Use your OS package manager to https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_commands_uninstall_command.rb#L287 end output = ui.output.split "\n" - + assert_equal output.first, "Gem 'd' is not installed" end Index: test/rubygems/test_gem_bundler_version_finder.rb =================================================================== --- test/rubygems/test_gem_bundler_version_finder.rb (revision 60134) +++ test/rubygems/test_gem_bundler_version_finder.rb (revision 60135) @@ -122,4 +122,4 @@ class TestGemBundlerVersionFinder < Gem: https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_bundler_version_finder.rb#L122 bvf.filter!(specs) specs end -end \ No newline at end of file +end Index: test/rubygems/test_gem_commands_signin_command.rb =================================================================== --- test/rubygems/test_gem_commands_signin_command.rb (revision 60134) +++ test/rubygems/test_gem_commands_signin_command.rb (revision 60135) @@ -7,10 +7,10 @@ class TestGemCommandsSigninCommand < Gem https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_commands_signin_command.rb#L7 def setup super - + Gem.configuration.rubygems_api_key = nil Gem.configuration.api_keys.clear - + @cmd = Gem::Commands::SigninCommand.new end @@ -19,7 +19,7 @@ class TestGemCommandsSigninCommand < Gem https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_commands_signin_command.rb#L19 File.delete(credentials_path) if File.exist?(credentials_path) super end - + def test_execute_when_not_already_signed_in sign_in_ui = util_capture() { @cmd.execute } assert_match %r{Signed in.}, sign_in_ui.output @@ -29,11 +29,11 @@ class TestGemCommandsSigninCommand < Gem https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_commands_signin_command.rb#L29 host = 'http://some-gemcutter-compatible-host.org' sign_in_ui = util_capture(nil, host) { @cmd.execute } old_credentials = YAML.load_file Gem.configuration.credentials_path - + sign_in_ui = util_capture(nil, host) { @cmd.execute } new_credentials = YAML.load_file Gem.configuration.credentials_path - - assert_equal old_credentials[host], new_credentials[host] + + assert_equal old_credentials[host], new_credentials[host] end def test_execute_when_already_signed_in_with_different_host @@ -57,15 +57,15 @@ class TestGemCommandsSigninCommand < Gem https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_commands_signin_command.rb#L57 api_key = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903' credentials = YAML.load_file Gem.configuration.credentials_path - assert_equal api_key, credentials[host] + assert_equal api_key, credentials[host] end - + def test_execute_with_valid_creds_set_for_default_host util_capture {@cmd.execute} - + api_key = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903' credentials = YAML.load_file Gem.configuration.credentials_path - + assert_equal api_key, credentials[:rubygems_api_key] end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/