mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Update bundled bundler to 1.16.0.
* lib/bundler, spec/bundler: Merge bundler-1.16.0. * common.mk: rspec examples of bundler-1.16.0 needs require option. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60603 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
ae49dbd392
commit
be7b592912
1025 changed files with 13902 additions and 3180 deletions
|
@ -1,4 +1,5 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
module Bundler
|
||||
class Source
|
||||
class Path < Source
|
||||
|
@ -35,10 +36,12 @@ module Bundler
|
|||
end
|
||||
|
||||
def remote!
|
||||
@local_specs = nil
|
||||
@allow_remote = true
|
||||
end
|
||||
|
||||
def cached!
|
||||
@local_specs = nil
|
||||
@allow_cached = true
|
||||
end
|
||||
|
||||
|
@ -74,14 +77,14 @@ module Bundler
|
|||
end
|
||||
|
||||
def install(spec, options = {})
|
||||
Bundler.ui.info "Using #{version_message(spec)} from #{self}"
|
||||
print_using_message "Using #{version_message(spec)} from #{self}"
|
||||
generate_bin(spec, :disable_extensions => true)
|
||||
nil # no post-install message
|
||||
end
|
||||
|
||||
def cache(spec, custom_path = nil)
|
||||
app_cache_path = app_cache_path(custom_path)
|
||||
return unless Bundler.settings[:cache_all]
|
||||
return unless Bundler.feature_flag.cache_all?
|
||||
return if expand(@original_path).to_s.index(root_path.to_s + "/") == 0
|
||||
|
||||
unless @original_path.exist?
|
||||
|
@ -113,10 +116,6 @@ module Bundler
|
|||
Bundler.root
|
||||
end
|
||||
|
||||
def is_a_path?
|
||||
instance_of?(Path)
|
||||
end
|
||||
|
||||
def expanded_original_path
|
||||
@expanded_original_path ||= expand(original_path)
|
||||
end
|
||||
|
@ -228,7 +227,8 @@ module Bundler
|
|||
spec,
|
||||
:env_shebang => false,
|
||||
:disable_extensions => options[:disable_extensions],
|
||||
:build_args => options[:build_args]
|
||||
:build_args => options[:build_args],
|
||||
:bundler_extension_cache_path => extension_cache_path(spec)
|
||||
)
|
||||
installer.post_install
|
||||
rescue Gem::InvalidSpecificationException => e
|
||||
|
@ -242,7 +242,7 @@ module Bundler
|
|||
"to modify their .gemspec so it can work with `gem build`."
|
||||
end
|
||||
|
||||
Bundler.ui.warn "The validation message from Rubygems was:\n #{e.message}"
|
||||
Bundler.ui.warn "The validation message from RubyGems was:\n #{e.message}"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue