Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 879f5ba2ee3e
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4f0fdb8098ff
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jun 16, 2016

  1. Use platform defaults from defaults file rather than eager load. 

    This trims off a bit of startup time by not loading more of RG
than is necessary. Pending release of rubygems/rubygems#1644.
    @headius
    headius committed Jun 16, 2016
    Copy the full SHA
    90ff5b1 View commit details

Commits on Jun 28, 2016

  1. Merge pull request #3972 from headius/platform_defaults 

    Use platform defaults from defaults file rather than eager load.
    @headius
    headius authored Jun 28, 2016
    Copy the full SHA
    4f0fdb8 View commit details
Showing with 7 additions and 4 deletions.
  1. +7 −4 lib/ruby/stdlib/rubygems/defaults/jruby.rb
11 changes: 7 additions & 4 deletions lib/ruby/stdlib/rubygems/defaults/jruby.rb
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
require 'rubygems/config_file'
require 'rbconfig'
require 'jruby/util'

module Gem

ConfigFile::PLATFORM_DEFAULTS['install'] = '--no-rdoc --no-ri --env-shebang'
ConfigFile::PLATFORM_DEFAULTS['update'] = '--no-rdoc --no-ri --env-shebang'

class << self
alias_method :original_ruby, :ruby
def ruby
@@ -22,6 +18,13 @@ def jarred_path?(p)
end
end

def self.platform_defaults
return {
'install' => '--no-rdoc --no-ri --env-shebang',
'update' => '--no-rdoc --no-ri --env-shebang'
}
end

# Default home directory path to be used if an alternate value is not
# specified in the environment.
#