Skip to content

Commit be899d5

Browse files
committed
Auto merge of #2033 - hsbt:remove-trailing-whitespace, r=hsbt
Remove trailing-whitespaces and append newline at EOF.
2 parents bdadcaf + 42b5862 commit be899d5

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

lib/rubygems/commands/pristine_command.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,14 @@ def execute
157157
install_defaults.to_s['--env-shebang']
158158
end
159159

160-
installer_options = {
160+
installer_options = {
161161
:wrappers => true,
162162
:force => true,
163163
:install_dir => spec.base_dir,
164164
:env_shebang => env_shebang,
165165
:build_args => spec.build_args,
166166
}
167-
167+
168168
if options[:only_executables] then
169169
installer = Gem::Installer.for_spec(spec, installer_options)
170170
installer.generate_bin

test/rubygems/test_gem.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1756,7 +1756,7 @@ def test_use_gemdeps_missing_gem
17561756
else
17571757
platform = " #{platform}"
17581758
end
1759-
expected = if Gem::USE_BUNDLER_FOR_GEMDEPS
1759+
expected = if Gem::USE_BUNDLER_FOR_GEMDEPS
17601760
<<-EXPECTED
17611761
Could not find gem 'a#{platform}' in any of the gem sources listed in your Gemfile.
17621762
You may need to `gem install -g` to install missing gems

test/rubygems/test_gem_bundler_version_finder.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,4 @@ def util_filter_specs(specs)
122122
bvf.filter!(specs)
123123
specs
124124
end
125-
end
125+
end

test/rubygems/test_gem_commands_signin_command.rb

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ class TestGemCommandsSigninCommand < Gem::TestCase
77

88
def setup
99
super
10-
10+
1111
Gem.configuration.rubygems_api_key = nil
1212
Gem.configuration.api_keys.clear
13-
13+
1414
@cmd = Gem::Commands::SigninCommand.new
1515
end
1616

@@ -19,7 +19,7 @@ def teardown
1919
File.delete(credentials_path) if File.exist?(credentials_path)
2020
super
2121
end
22-
22+
2323
def test_execute_when_not_already_signed_in
2424
sign_in_ui = util_capture() { @cmd.execute }
2525
assert_match %r{Signed in.}, sign_in_ui.output
@@ -29,11 +29,11 @@ def test_execute_when_already_signed_in_with_same_host
2929
host = 'http://some-gemcutter-compatible-host.org'
3030
sign_in_ui = util_capture(nil, host) { @cmd.execute }
3131
old_credentials = YAML.load_file Gem.configuration.credentials_path
32-
32+
3333
sign_in_ui = util_capture(nil, host) { @cmd.execute }
3434
new_credentials = YAML.load_file Gem.configuration.credentials_path
35-
36-
assert_equal old_credentials[host], new_credentials[host]
35+
36+
assert_equal old_credentials[host], new_credentials[host]
3737
end
3838

3939
def test_execute_when_already_signed_in_with_different_host
@@ -57,15 +57,15 @@ def test_execute_with_host_supplied
5757

5858
api_key = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
5959
credentials = YAML.load_file Gem.configuration.credentials_path
60-
assert_equal api_key, credentials[host]
60+
assert_equal api_key, credentials[host]
6161
end
62-
62+
6363
def test_execute_with_valid_creds_set_for_default_host
6464
util_capture {@cmd.execute}
65-
65+
6666
api_key = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
6767
credentials = YAML.load_file Gem.configuration.credentials_path
68-
68+
6969
assert_equal api_key, credentials[:rubygems_api_key]
7070
end
7171

test/rubygems/test_gem_commands_uninstall_command.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ def test_execute_with_gem_not_installed
287287
end
288288

289289
output = ui.output.split "\n"
290-
290+
291291
assert_equal output.first, "Gem 'd' is not installed"
292292
end
293293

0 commit comments

Comments
 (0)