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/commands/contents_command.rb (files_in_default_gem):

Browse source 
remove useless sort. show_files will sort the result and
  another branch, files_in_gem, doesn't sort.
  it should be removed for consistency.

* test/rubygems/test_gem_commands_contents_command.rb
  (test_execute_default_gem): adjust the sort algorithm with
  Gem::Commands::ContentsCommand#show_files, which sort items
  as array of [prefix, basename] not strings.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48370 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2014-11-11 05:08:59 +00:00
parent 495548ace4
commit 05eb6111d9
3 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
Tue Nov 11 13:01:31 2014 NARUSE, Yui <naruse@ruby-lang.org>
* lib/rubygems/commands/contents_command.rb (files_in_default_gem):
remove useless sort. show_files will sort the result and
another branch, files_in_gem, doesn't sort.
it should be removed for consistency.
* test/rubygems/test_gem_commands_contents_command.rb
(test_execute_default_gem): adjust the sort algorithm with
Gem::Commands::ContentsCommand#show_files, which sort items
as array of [prefix, basename] not strings.
Tue Nov 11 10:37:09 2014 Koichi Sasada <ko1@atdot.net> Tue Nov 11 10:37:09 2014 Koichi Sasada <ko1@atdot.net>
* string.c (sym_equal): use rb_obj_equal(). * string.c (sym_equal): use rb_obj_equal().

2
lib/rubygems/commands/contents_command.rb
View file

@ -102,7 +102,7 @@ prefix or only the files that are requireable.
end end
def files_in_default_gem spec def files_in_default_gem spec
spec.files.sort.map do |file| spec.files.map do |file|
case file case file
when /\A#{spec.bindir}\// when /\A#{spec.bindir}\//
[RbConfig::CONFIG['bindir'], $POSTMATCH] [RbConfig::CONFIG['bindir'], $POSTMATCH]

8
test/rubygems/test_gem_commands_contents_command.rb
View file

@ -203,10 +203,10 @@ lib/foo.rb
end end
expected = [ expected = [
File.join(RbConfig::CONFIG['bindir'], 'default_command'), [RbConfig::CONFIG['bindir'], 'default_command'],
File.join(RbConfig::CONFIG['rubylibdir'], 'default/gem.rb'), [RbConfig::CONFIG['rubylibdir'], 'default/gem.rb'],
File.join(RbConfig::CONFIG['archdir'], 'default_gem.so') [RbConfig::CONFIG['archdir'].sub(/x86_64/,'armv7l'), 'default_gem.so']
].sort.join "\n" ].sort.map{|a|File.join a}.join "\n"
assert_equal expected, @ui.output.chomp assert_equal expected, @ui.output.chomp
assert_equal "", @ui.error assert_equal "", @ui.error