mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/win32ole/win32ole_variant.c: fix typo "indicies".
the patch is from davydovanton <antondavydov.o at gmail.com>. [fix GH-892] * lib/rubygems/indexer.rb: ditto. * test/rubygems/test_gem_indexer.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50459 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
f64ac5d4cd
commit
0c14c3ab0b
4 changed files with 35 additions and 25 deletions
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
|||
Sun May 10 11:57:48 2015 Masaki Matsushita <glass.saga@gmail.com>
|
||||
|
||||
* ext/win32ole/win32ole_variant.c: fix typo "indicies".
|
||||
the patch is from davydovanton <antondavydov.o at gmail.com>.
|
||||
[fix GH-892]
|
||||
|
||||
* lib/rubygems/indexer.rb: ditto.
|
||||
|
||||
* test/rubygems/test_gem_indexer.rb: ditto.
|
||||
|
||||
Sun May 10 11:44:37 2015 Masaki Matsushita <glass.saga@gmail.com>
|
||||
|
||||
* string.c (rb_str_crypt): Raise ArgumentError when
|
||||
|
|
|
@ -491,9 +491,9 @@ unlock_safe_array(SAFEARRAY *psa)
|
|||
* WIN32OLE_VARIANT object is VT_ARRAY.
|
||||
*
|
||||
* REMARK:
|
||||
* The all indicies should be 0 or natural number and
|
||||
* lower than or equal to max indicies.
|
||||
* (This point is different with Ruby Array indicies.)
|
||||
* The all indices should be 0 or natural number and
|
||||
* lower than or equal to max indices.
|
||||
* (This point is different with Ruby Array indices.)
|
||||
*
|
||||
* obj = WIN32OLE_VARIANT.new([[1,2,3],[4,5,6]])
|
||||
* p obj[0,0] # => 1
|
||||
|
@ -546,9 +546,9 @@ folevariant_ary_aref(int argc, VALUE *argv, VALUE self)
|
|||
* WIN32OLE_VARIANT object is VT_ARRAY.
|
||||
*
|
||||
* REMARK:
|
||||
* The all indicies should be 0 or natural number and
|
||||
* lower than or equal to max indicies.
|
||||
* (This point is different with Ruby Array indicies.)
|
||||
* The all indices should be 0 or natural number and
|
||||
* lower than or equal to max indices.
|
||||
* (This point is different with Ruby Array indices.)
|
||||
*
|
||||
* obj = WIN32OLE_VARIANT.new([[1,2,3],[4,5,6]])
|
||||
* obj[0,0] = 7
|
||||
|
|
|
@ -93,16 +93,16 @@ class Gem::Indexer
|
|||
end
|
||||
|
||||
##
|
||||
# Build various indicies
|
||||
# Build various indices
|
||||
|
||||
def build_indicies
|
||||
def build_indices
|
||||
Gem::Specification.dirs = []
|
||||
Gem::Specification.add_specs(*map_gems_to_specs(gem_file_list))
|
||||
|
||||
build_marshal_gemspecs
|
||||
build_modern_indicies if @build_modern
|
||||
build_modern_indices if @build_modern
|
||||
|
||||
compress_indicies
|
||||
compress_indices
|
||||
end
|
||||
|
||||
##
|
||||
|
@ -169,9 +169,9 @@ class Gem::Indexer
|
|||
end
|
||||
|
||||
##
|
||||
# Builds indicies for RubyGems 1.2 and newer. Handles full, latest, prerelease
|
||||
# Builds indices for RubyGems 1.2 and newer. Handles full, latest, prerelease
|
||||
|
||||
def build_modern_indicies
|
||||
def build_modern_indices
|
||||
specs = Gem::Specification.reject { |s| s.default_gem? }
|
||||
|
||||
prerelease, released = specs.partition { |s|
|
||||
|
@ -221,14 +221,14 @@ class Gem::Indexer
|
|||
end
|
||||
|
||||
##
|
||||
# Compresses indicies on disk
|
||||
# Compresses indices on disk
|
||||
#--
|
||||
# All future files should be compressed using gzip, not deflate
|
||||
|
||||
def compress_indicies
|
||||
say "Compressing indicies"
|
||||
def compress_indices
|
||||
say "Compressing indices"
|
||||
|
||||
Gem.time 'Compressed indicies' do
|
||||
Gem.time 'Compressed indices' do
|
||||
if @build_modern then
|
||||
gzip @specs_index
|
||||
gzip @latest_specs_index
|
||||
|
@ -276,12 +276,12 @@ class Gem::Indexer
|
|||
end
|
||||
|
||||
##
|
||||
# Builds and installs indicies.
|
||||
# Builds and installs indices.
|
||||
|
||||
def generate_index
|
||||
make_temp_directories
|
||||
build_indicies
|
||||
install_indicies
|
||||
build_indices
|
||||
install_indices
|
||||
rescue SignalException
|
||||
ensure
|
||||
FileUtils.rm_rf @directory
|
||||
|
@ -297,9 +297,9 @@ class Gem::Indexer
|
|||
end
|
||||
|
||||
##
|
||||
# Install generated indicies into the destination directory.
|
||||
# Install generated indices into the destination directory.
|
||||
|
||||
def install_indicies
|
||||
def install_indices
|
||||
verbose = Gem.configuration.really_verbose
|
||||
|
||||
say "Moving index into production dir #{@dest_directory}" if verbose
|
||||
|
@ -389,7 +389,7 @@ class Gem::Indexer
|
|||
@prerelease_specs_index)
|
||||
end
|
||||
|
||||
compress_indicies
|
||||
compress_indices
|
||||
|
||||
verbose = Gem.configuration.really_verbose
|
||||
|
||||
|
|
|
@ -48,11 +48,11 @@ class TestGemIndexer < Gem::TestCase
|
|||
assert indexer.build_modern
|
||||
end
|
||||
|
||||
def test_build_indicies
|
||||
def test_build_indices
|
||||
@indexer.make_temp_directories
|
||||
|
||||
use_ui @ui do
|
||||
@indexer.build_indicies
|
||||
@indexer.build_indices
|
||||
end
|
||||
|
||||
specs_path = File.join @indexer.directory, "specs.#{@marshal_version}"
|
||||
|
@ -198,7 +198,7 @@ class TestGemIndexer < Gem::TestCase
|
|||
assert_match %r%^Generating latest specs index$%, @ui.output
|
||||
assert_match %r%^Generating prerelease specs index$%, @ui.output
|
||||
assert_match %r%^Complete$%, @ui.output
|
||||
assert_match %r%^Compressing indicies$%, @ui.output
|
||||
assert_match %r%^Compressing indices$%, @ui.output
|
||||
|
||||
assert_equal '', @ui.error
|
||||
end
|
||||
|
|
Loading…
Add table
Reference in a new issue