diff options
| -rw-r--r-- | lib/rubygems/commands/pristine_command.rb | 4 | ||||
| -rw-r--r-- | test/rubygems/test_gem.rb | 2 | ||||
| -rw-r--r-- | test/rubygems/test_gem_bundler_version_finder.rb | 2 | ||||
| -rw-r--r-- | test/rubygems/test_gem_commands_signin_command.rb | 20 | ||||
| -rw-r--r-- | test/rubygems/test_gem_commands_uninstall_command.rb | 2 |
5 files changed, 15 insertions, 15 deletions
diff --git a/lib/rubygems/commands/pristine_command.rb b/lib/rubygems/commands/pristine_command.rb index 408672158f..fafe35bec1 100644 --- a/lib/rubygems/commands/pristine_command.rb +++ b/lib/rubygems/commands/pristine_command.rb @@ -157,14 +157,14 @@ extensions will be restored. 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 diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index 2ec7044d7a..3225a05c6b 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb @@ -1756,7 +1756,7 @@ class TestGem < Gem::TestCase 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 diff --git a/test/rubygems/test_gem_bundler_version_finder.rb b/test/rubygems/test_gem_bundler_version_finder.rb index fff52e8186..7dafe13033 100644 --- a/test/rubygems/test_gem_bundler_version_finder.rb +++ b/test/rubygems/test_gem_bundler_version_finder.rb @@ -122,4 +122,4 @@ class TestGemBundlerVersionFinder < Gem::TestCase bvf.filter!(specs) specs end -end
\ No newline at end of file +end diff --git a/test/rubygems/test_gem_commands_signin_command.rb b/test/rubygems/test_gem_commands_signin_command.rb index ec40b71ada..b41fed86e8 100644 --- a/test/rubygems/test_gem_commands_signin_command.rb +++ b/test/rubygems/test_gem_commands_signin_command.rb @@ -7,10 +7,10 @@ class TestGemCommandsSigninCommand < Gem::TestCase 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::TestCase 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::TestCase 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::TestCase 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 diff --git a/test/rubygems/test_gem_commands_uninstall_command.rb b/test/rubygems/test_gem_commands_uninstall_command.rb index cca135afde..2097ca7d43 100644 --- a/test/rubygems/test_gem_commands_uninstall_command.rb +++ b/test/rubygems/test_gem_commands_uninstall_command.rb @@ -287,7 +287,7 @@ WARNING: Use your OS package manager to uninstall vendor gems end output = ui.output.split "\n" - + assert_equal output.first, "Gem 'd' is not installed" end |