mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
59c8d50653
* bin/*, lib/bundler/*, lib/bundler.rb, spec/bundler, man/*:
Merge from latest stable branch of bundler/bundler repository and
added workaround patches. I will backport them into upstream.
* common.mk, defs/gmake.mk: Added `test-bundler` task for test suite
of bundler.
* tool/sync_default_gems.rb: Added sync task for bundler.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65509 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
37 lines
853 B
Ruby
37 lines
853 B
Ruby
# frozen_string_literal: true
|
|
|
|
# Psych could be a gem, so try to ask for it
|
|
begin
|
|
gem "psych"
|
|
rescue LoadError
|
|
end if defined?(gem)
|
|
|
|
# Psych could be in the stdlib
|
|
# but it's too late if Syck is already loaded
|
|
begin
|
|
require "psych" unless defined?(Syck)
|
|
rescue LoadError
|
|
# Apparently Psych wasn't available. Oh well.
|
|
end
|
|
|
|
# At least load the YAML stdlib, whatever that may be
|
|
require "yaml" unless defined?(YAML.dump)
|
|
|
|
module Bundler
|
|
# On encountering invalid YAML,
|
|
# Psych raises Psych::SyntaxError
|
|
if defined?(::Psych::SyntaxError)
|
|
YamlLibrarySyntaxError = ::Psych::SyntaxError
|
|
else # Syck raises ArgumentError
|
|
YamlLibrarySyntaxError = ::ArgumentError
|
|
end
|
|
end
|
|
|
|
require "bundler/deprecate"
|
|
begin
|
|
Bundler::Deprecate.skip_during do
|
|
require "rubygems/safe_yaml"
|
|
end
|
|
rescue LoadError
|
|
# it's OK if the file isn't there
|
|
end
|