kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/rubygems/package.rb: Load YAML for building gems.

Browse source 
* test/rubygems/test_gem_commands_contents_command.rb:  Sort expected
  output of default gem contents.  Re-fixes r38004 and r38005.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38038 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain 2012-11-30 06:20:34 +00:00
parent 0d672c18cf
commit 6969043477
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Fri Nov 30 15:20:12 2012 Eric Hodel <drbrain@segment7.net>
* lib/rubygems/package.rb: Load YAML for building gems.
* test/rubygems/test_gem_commands_contents_command.rb: Sort expected
output of default gem contents. Re-fixes r38004 and r38005.
Fri Nov 30 15:15:00 2012 Zachary Scott <zachary@zacharyscott.net> Fri Nov 30 15:15:00 2012 Zachary Scott <zachary@zacharyscott.net>
* vm_trace.c (set_trace_func): Formatting of params and events * vm_trace.c (set_trace_func): Formatting of params and events

1
lib/rubygems/package.rb
View file

@ -217,6 +217,7 @@ class Gem::Package
# Builds this package based on the specification set by #spec= # Builds this package based on the specification set by #spec=
def build skip_validation = false def build skip_validation = false
Gem.load_yaml
require 'rubygems/security' require 'rubygems/security'
@spec.validate unless skip_validation @spec.validate unless skip_validation

12
test/rubygems/test_gem_commands_contents_command.rb
View file

@ -140,13 +140,13 @@ lib/foo.rb
@cmd.execute @cmd.execute
end end
expected = <<-EOF expected = %W[
#{Gem::ConfigMap[:bindir]}/default_command #{Gem::ConfigMap[:bindir]}/default_command
#{Gem::ConfigMap[:rubylibdir]}/default/gem.rb #{Gem::ConfigMap[:rubylibdir]}/default/gem.rb
#{Gem::ConfigMap[:archdir]}/default_gem.so #{Gem::ConfigMap[:archdir]}/default_gem.so
EOF ].sort.join "\n"
assert_equal expected, @ui.output assert_equal expected, @ui.output.chomp
assert_equal "", @ui.error assert_equal "", @ui.error
end end