diff options
author | Asutosh Palai <asupalai@gmail.com> | 2016-06-09 20:20:18 +0530 |
---|---|---|
committer | Asutosh Palai <asupalai@gmail.com> | 2016-06-09 20:24:29 +0530 |
commit | f684a6d9d184b9acb9a12fb1009d4c1a18db71ac (patch) | |
tree | e390cec062ec1fdcadfa475183568db2f2c2b88c /lib/bundler | |
parent | df5a8e97044a92965e25a344da89f550ab570956 (diff) | |
download | bundler-f684a6d9d184b9acb9a12fb1009d4c1a18db71ac.tar.gz |
Fixed the errors in spec for older versions
Diffstat (limited to 'lib/bundler')
-rw-r--r-- | lib/bundler/plugin/installer.rb | 2 | ||||
-rw-r--r-- | lib/bundler/yaml_serializer.rb | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/lib/bundler/plugin/installer.rb b/lib/bundler/plugin/installer.rb index 64d7f8a372..2c10bb24c8 100644 --- a/lib/bundler/plugin/installer.rb +++ b/lib/bundler/plugin/installer.rb @@ -17,7 +17,7 @@ module Bundler if options[:git] install_git(names, version, options) else - sources = options[:source] || Gem.sources.sources.map(&:uri) + sources = options[:source] || Bundler.rubygems.sources install_rubygems(names, version, sources) end end diff --git a/lib/bundler/yaml_serializer.rb b/lib/bundler/yaml_serializer.rb index 327baa4ee7..015fd17c6f 100644 --- a/lib/bundler/yaml_serializer.rb +++ b/lib/bundler/yaml_serializer.rb @@ -40,7 +40,6 @@ module Bundler res = {} stack = [res] str.scan(SCAN_REGEX).each do |(indent, key, _, val)| - key = convert_to_backward_compatible_key(key) depth = indent.scan(/ /).length if val.empty? new_hash = {} @@ -53,15 +52,8 @@ module Bundler res end - # for settings' keys - def convert_to_backward_compatible_key(key) - key = "#{key}/" if key =~ /https?:/i && key !~ %r{/\Z} - key = key.gsub(".", "__") if key.include?(".") - key - end - class << self - private :dump_hash, :convert_to_backward_compatible_key + private :dump_hash end end end |