ruby-changes:21337
From: drbrain <ko1@a...>
Date: Tue, 4 Oct 2011 07:16:06 +0900 (JST)
Subject: [ruby-changes:21337] drbrain:r33386 (trunk): * lib/rubygems: Update to RubyGems 1.8.11. Move Deprecate into the
drbrain 2011-10-04 07:15:47 +0900 (Tue, 04 Oct 2011) New Revision: 33386 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33386 Log: * lib/rubygems: Update to RubyGems 1.8.11. Move Deprecate into the Gem namespace. Modified files: trunk/ChangeLog trunk/lib/rubygems/commands/dependency_command.rb trunk/lib/rubygems/commands/query_command.rb trunk/lib/rubygems/dependency.rb trunk/lib/rubygems/dependency_list.rb trunk/lib/rubygems/deprecate.rb trunk/lib/rubygems/gem_path_searcher.rb trunk/lib/rubygems/indexer.rb trunk/lib/rubygems/platform.rb trunk/lib/rubygems/server.rb trunk/lib/rubygems/source_index.rb trunk/lib/rubygems/specification.rb trunk/lib/rubygems.rb trunk/test/rubygems/test_gem.rb trunk/test/rubygems/test_gem_dependency.rb trunk/test/rubygems/test_gem_dependency_list.rb trunk/test/rubygems/test_gem_gem_path_searcher.rb trunk/test/rubygems/test_gem_platform.rb trunk/test/rubygems/test_gem_server.rb trunk/test/rubygems/test_gem_source_index.rb trunk/test/rubygems/test_gem_specification.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 33385) +++ ChangeLog (revision 33386) @@ -1,3 +1,8 @@ +Tue Oct 4 07:15:17 2011 Eric Hodel <drbrain@s...> + + * lib/rubygems: Update to RubyGems 1.8.11. Move Deprecate into the + Gem namespace. + Tue Oct 4 06:43:47 2011 Aaron Patterson <aaron@t...> * ext/psych/lib/psych.rb: update psych version. Index: lib/rubygems/dependency.rb =================================================================== --- lib/rubygems/dependency.rb (revision 33385) +++ lib/rubygems/dependency.rb (revision 33386) @@ -35,7 +35,7 @@ if Regexp === name then msg = ["NOTE: Dependency.new w/ a regexp is deprecated.", "Dependency.new called from #{Gem.location_of_caller.join(":")}"] - warn msg.join("\n") unless Deprecate.skip + warn msg.join("\n") unless Gem::Deprecate.skip end type = Symbol === requirements.last ? requirements.pop : :runtime Index: lib/rubygems/deprecate.rb =================================================================== --- lib/rubygems/deprecate.rb (revision 33385) +++ lib/rubygems/deprecate.rb (revision 33386) @@ -11,58 +11,60 @@ # # ... # end # -# extend Deprecate +# extend Gem::Deprecate # deprecate :instance_method, "X.z", 2011, 4 # # class << self -# extend Deprecate +# extend Gem::Deprecate # deprecate :klass_method, :none, 2011, 4 # end # end -module Deprecate +module Gem + module Deprecate - def self.skip # :nodoc: - @skip ||= false - end + def self.skip # :nodoc: + @skip ||= false + end - def self.skip= v # :nodoc: - @skip = v - end + def self.skip= v # :nodoc: + @skip = v + end - ## - # Temporarily turn off warnings. Intended for tests only. + ## + # Temporarily turn off warnings. Intended for tests only. - def skip_during - Deprecate.skip, original = true, Deprecate.skip - yield - ensure - Deprecate.skip = original - end + def skip_during + Gem::Deprecate.skip, original = true, Gem::Deprecate.skip + yield + ensure + Gem::Deprecate.skip = original + end - ## - # Simple deprecation method that deprecates +name+ by wrapping it up - # in a dummy method. It warns on each call to the dummy method - # telling the user of +repl+ (unless +repl+ is :none) and the - # year/month that it is planned to go away. + ## + # Simple deprecation method that deprecates +name+ by wrapping it up + # in a dummy method. It warns on each call to the dummy method + # telling the user of +repl+ (unless +repl+ is :none) and the + # year/month that it is planned to go away. - def deprecate name, repl, year, month - class_eval { - old = "_deprecated_#{name}" - alias_method old, name - define_method name do |*args, &block| # TODO: really works on 1.8.7? - klass = self.kind_of? Module - target = klass ? "#{self}." : "#{self.class}#" - msg = [ "NOTE: #{target}#{name} is deprecated", - repl == :none ? " with no replacement" : ", use #{repl}", - ". It will be removed on or after %4d-%02d-01." % [year, month], - "\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}", - ] - warn "#{msg.join}." unless Deprecate.skip - send old, *args, &block - end - } + def deprecate name, repl, year, month + class_eval { + old = "_deprecated_#{name}" + alias_method old, name + define_method name do |*args, &block| # TODO: really works on 1.8.7? + klass = self.kind_of? Module + target = klass ? "#{self}." : "#{self.class}#" + msg = [ "NOTE: #{target}#{name} is deprecated", + repl == :none ? " with no replacement" : ", use #{repl}", + ". It will be removed on or after %4d-%02d-01." % [year, month], + "\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}", + ] + warn "#{msg.join}." unless Gem::Deprecate.skip + send old, *args, &block + end + } + end + + module_function :deprecate, :skip_during end - - module_function :deprecate, :skip_during end Index: lib/rubygems/indexer.rb =================================================================== --- lib/rubygems/indexer.rb (revision 33385) +++ lib/rubygems/indexer.rb (revision 33386) @@ -377,7 +377,7 @@ # Collect specifications from .gem files from the gem directory. def collect_specs(gems = gem_file_list) - Deprecate.skip_during do + Gem::Deprecate.skip_during do index = Gem::SourceIndex.new map_gems_to_specs(gems).each do |spec| Index: lib/rubygems/specification.rb =================================================================== --- lib/rubygems/specification.rb (revision 33385) +++ lib/rubygems/specification.rb (revision 33386) @@ -329,7 +329,7 @@ def self.all warn "NOTE: Specification.all called from #{caller.first}" unless - Deprecate.skip + Gem::Deprecate.skip _all end @@ -2104,7 +2104,7 @@ self.platform = Gem::Platform.new @platform end - extend Deprecate + extend Gem::Deprecate deprecate :test_suite_file, :test_file, 2011, 10 deprecate :test_suite_file=, :test_file=, 2011, 10 Index: lib/rubygems/platform.rb =================================================================== --- lib/rubygems/platform.rb (revision 33385) +++ lib/rubygems/platform.rb (revision 33386) @@ -186,7 +186,7 @@ CURRENT = 'current' - extend Deprecate + extend Gem::Deprecate deprecate :empty?, :none, 2011, 11 end Index: lib/rubygems/source_index.rb =================================================================== --- lib/rubygems/source_index.rb (revision 33385) +++ lib/rubygems/source_index.rb (revision 33386) @@ -72,7 +72,7 @@ # loaded spec. def self.load_specification(file_name) - Deprecate.skip_during do + Gem::Deprecate.skip_during do Gem::Specification.load Gem::Path.new(file_name) end end @@ -121,7 +121,7 @@ spec_files = Dir[File.join(spec_dir, "*.gemspec")] spec_files.each do |spec_file| - gemspec = Deprecate.skip_during do + gemspec = Gem::Deprecate.skip_during do Gem::Specification.load spec_file end add_spec gemspec if gemspec @@ -193,7 +193,7 @@ # Add gem specifications to the source index. def add_specs(*gem_specs) - Deprecate.skip_during do + Gem::Deprecate.skip_during do gem_specs.each do |spec| add_spec spec end @@ -251,7 +251,7 @@ def find_name(gem_name, requirement = Gem::Requirement.default) dep = Gem::Dependency.new gem_name, requirement - Deprecate.skip_during do + Gem::Deprecate.skip_during do search dep end end @@ -364,7 +364,7 @@ end class Gem::SourceIndex - extend Deprecate + extend Gem::Deprecate deprecate :all_gems, :none, 2011, 10 @@ -394,7 +394,7 @@ deprecate :specification, "Specification.find", 2011, 11 class << self - extend Deprecate + extend Gem::Deprecate deprecate :from_gems_in, :none, 2011, 10 deprecate :from_installed_gems, :none, 2011, 10 Index: lib/rubygems/commands/query_command.rb =================================================================== --- lib/rubygems/commands/query_command.rb (revision 33385) +++ lib/rubygems/commands/query_command.rb (revision 33386) @@ -79,7 +79,7 @@ req = Gem::Requirement.default # TODO: deprecate for real - dep = Deprecate.skip_during { Gem::Dependency.new name, req } + dep = Gem::Deprecate.skip_during { Gem::Dependency.new name, req } if local? then if prerelease and not both? then Index: lib/rubygems/commands/dependency_command.rb =================================================================== --- lib/rubygems/commands/dependency_command.rb (revision 33385) +++ lib/rubygems/commands/dependency_command.rb (revision 33386) @@ -59,7 +59,7 @@ end # TODO: deprecate for real damnit - dependency = Deprecate.skip_during { + dependency = Gem::Deprecate.skip_during { Gem::Dependency.new pattern, options[:version] } dependency.prerelease = options[:prerelease] Index: lib/rubygems/gem_path_searcher.rb =================================================================== --- lib/rubygems/gem_path_searcher.rb (revision 33385) +++ lib/rubygems/gem_path_searcher.rb (revision 33386) @@ -160,7 +160,7 @@ spec.require_paths end - extend Deprecate + extend Gem::Deprecate deprecate :initialize, :none, 2011, 10 deprecate :find, :none, 2011, 10 Index: lib/rubygems/server.rb =================================================================== --- lib/rubygems/server.rb (revision 33385) +++ lib/rubygems/server.rb (revision 33386) @@ -462,7 +462,7 @@ add_date res - index = Deprecate.skip_during { Marshal.dump Gem.source_index } + index = Gem::Deprecate.skip_during { Marshal.dump Gem.source_index } if req.request_method == 'HEAD' then res['content-length'] = index.length Index: lib/rubygems/dependency_list.rb =================================================================== --- lib/rubygems/dependency_list.rb (revision 33385) +++ lib/rubygems/dependency_list.rb (revision 33386) @@ -246,7 +246,7 @@ class Gem::DependencyList class << self - extend Deprecate + extend Gem::Deprecate deprecate :from_source_index, "from_specs", 2011, 11 end end Index: lib/rubygems.rb =================================================================== --- lib/rubygems.rb (revision 33385) +++ lib/rubygems.rb (revision 33386) @@ -118,7 +118,7 @@ # -The RubyGems Team module Gem - VERSION = '1.8.10' + VERSION = '1.8.11' ## # Raised when RubyGems is unable to load or activate a gem. Contains the @@ -956,7 +956,7 @@ # Returns the Gem::SourceIndex of specifications that are in the Gem.path def self.source_index - @@source_index ||= Deprecate.skip_during do + @@source_index ||= Gem::Deprecate.skip_during do SourceIndex.new Gem::Specification.dirs end end @@ -1262,7 +1262,7 @@ module Gem class << self - extend Deprecate + extend Gem::Deprecate deprecate :activate_dep, "Specification#activate", 2011, 6 deprecate :activate_spec, "Specification#activate", 2011, 6 deprecate :cache, "Gem::source_index", 2011, 8 Index: test/rubygems/test_gem_gem_path_searcher.rb =================================================================== --- test/rubygems/test_gem_gem_path_searcher.rb (revision 33385) +++ test/rubygems/test_gem_gem_path_searcher.rb (revision 33386) @@ -29,23 +29,23 @@ @fetcher = Gem::FakeFetcher.new Gem::RemoteFetcher.fetcher = @fetcher - @gps = Deprecate.skip_during { Gem::GemPathSearcher.new } + @gps = Gem::Deprecate.skip_during { Gem::GemPathSearcher.new } end def test_find - Deprecate.skip_during do + Gem::Deprecate.skip_during do assert_equal @foo1, @gps.find('foo') end end def test_find_all - Deprecate.skip_during do + Gem::Deprecate.skip_during do assert_equal [@foo1], @gps.find_all('foo') end end def test_init_gemspecs - Deprecate.skip_during do + Gem::Deprecate.skip_during do util_clear_gems util_setup_spec_fetcher @foo1, @foo2, @bar1, @bar2 expected = [@bar2, @bar1, @foo2, @foo1].map(&:full_name) @@ -55,7 +55,7 @@ end def test_lib_dirs_for - Deprecate.skip_during do + Gem::Deprecate.skip_during do lib_dirs = @gps.lib_dirs_for(@foo1) expected = File.join @gemhome, 'gems', @foo1.full_name, '{lib,lib2}' @@ -64,20 +64,20 @@ end def test_lib_dirs_for_nil_require_paths - Deprecate.skip_during do + Gem::Deprecate.skip_during do assert_nil @gps.lib_dirs_for(@nrp) end end def test_matching_file_eh - Deprecate.skip_during do + Gem::Deprecate.skip_during do refute @gps.matching_file?(@foo1, 'bar') assert @gps.matching_file?(@foo1, 'foo') end end def test_matching_files - Deprecate.skip_during do + Gem::Deprecate.skip_during do assert_equal [], @gps.matching_files(@foo1, 'bar') expected = File.join @foo1.full_gem_path, 'lib', 'foo.rb' @@ -87,7 +87,7 @@ end def test_matching_files_nil_require_paths - Deprecate.skip_during do + Gem::Deprecate.skip_during do assert_empty @gps.matching_files(@nrp, 'foo') end end Index: test/rubygems/test_gem_dependency_list.rb =================================================================== --- test/rubygems/test_gem_dependency_list.rb (revision 33385) +++ test/rubygems/test_gem_dependency_list.rb (revision 33386) @@ -28,7 +28,7 @@ util_clear_gems install_specs @a1, @b2 - deps = Deprecate.skip_during { Gem::DependencyList.from_source_index } + deps = Gem::Deprecate.skip_during { Gem::DependencyList.from_source_index } assert_equal %w[b-2 a-1], deps.dependency_order.map { |s| s.full_name } end Index: test/rubygems/test_gem.rb =================================================================== --- test/rubygems/test_gem.rb (revision 33385) +++ test/rubygems/test_gem.rb (revision 33386) @@ -435,7 +435,7 @@ def test_self_available? util_make_gems - Deprecate.skip_during do + Gem::Deprecate.skip_during do assert(Gem.available?("a")) assert(Gem.available?("a", "1")) assert(Gem.available?("a", ">1")) @@ -937,7 +937,7 @@ end def test_self_source_index - Deprecate.skip_during do + Gem::Deprecate.skip_during do assert_kind_of Gem::SourceIndex, Gem.source_index end end @@ -1093,7 +1093,7 @@ # @abin_path = File.join spec.full_gem_path, spec.bindir, 'abin' # FileUtils.mkdir_p File.join(stem, "gems", "test-3") - Deprecate.skip_during do + Gem::Deprecate.skip_during do expected = [File.join(@gemhome, "gems", "a-4", "lib")] assert_equal expected, Gem.latest_load_paths end Index: test/rubygems/test_gem_platform.rb =================================================================== --- test/rubygems/test_gem_platform.rb (revision 33385) +++ test/rubygems/test_gem_platform.rb (revision 33386) @@ -138,7 +138,7 @@ def test_empty platform = Gem::Platform.new 'cpu-other_platform1' assert_respond_to platform, :empty? - assert_equal false, Deprecate.skip_during { platform.empty? } + assert_equal false, Gem::Deprecate.skip_during { platform.empty? } end def test_to_s Index: test/rubygems/test_gem_source_index.rb =================================================================== --- test/rubygems/test_gem_source_index.rb (revision 33385) +++ test/rubygems/test_gem_source_index.rb (revision 33386) @@ -9,11 +9,11 @@ util_setup_fake_fetcher - @source_index = Deprecate.skip_during { Gem.source_index } + @source_index = Gem::Deprecate.skip_during { Gem.source_index } end def test_find_name - Deprecate.skip_during do + Gem::Deprecate.skip_during do assert_equal [@a1, @a2, @a3a], @source_index.find_name('a') assert_equal [@a2], @source_index.find_name('a', '= 2') assert_equal [], @source_index.find_name('bogusstring') @@ -31,7 +31,7 @@ end def test_find_name_empty_cache - Deprecate.skip_during do + Gem::Deprecate.skip_during do empty_source_index = Gem::SourceIndex.new assert_equal [], empty_source_index.find_name("foo") end @@ -39,7 +39,7 @@ # HACK: deprecated impl is failing tests, but I may want to port it over def test_latest_specs - Deprecate.skip_during do + Gem::Deprecate.skip_during do p1_ruby = quick_spec 'p', '1' p1_platform = quick_spec 'p', '1' do |spec| spec.platform = Gem::Platform::CURRENT @@ -87,7 +87,7 @@ end def test_load_gems_in - Deprecate.skip_during do + Gem::Deprecate.skip_during do spec_dir1 = File.join @gemhome, 'specifications' spec_dir2 = File.join @tempdir, 'gemhome2', 'specifications' @@ -118,7 +118,7 @@ # REFACTOR: move to test_gem_commands_outdated_command.rb def test_outdated - Deprecate.skip_during do + Gem::Deprecate.skip_during do util_setup_spec_fetcher assert_equal [], @source_index.outdated @@ -139,7 +139,7 @@ end def test_prerelease_specs_kept_in_right_place - Deprecate.skip_during do + Gem::Deprecate.skip_during do gem_a1_alpha = quick_spec 'abba', '1.a' @source_index.add_spec gem_a1_alpha @@ -151,7 +151,7 @@ end def test_refresh_bang - Deprecate.skip_during do + Gem::Deprecate.skip_during do a1_spec = File.join @gemhome, "specifications", @a1.spec_name FileUtils.mv a1_spec, @tempdir @@ -171,7 +171,7 @@ end def test_remove_spec - Deprecate.skip_during do + Gem::Deprecate.skip_during do si = Gem.source_index expected = si.gems.keys.sort @@ -189,7 +189,7 @@ end def test_search - Deprecate.skip_during do + Gem::Deprecate.skip_during do requirement = Gem::Requirement.create '= 9' with_version = Gem::Dependency.new(/^a/, requirement) assert_equal [@a_evil9], @source_index.search(with_version) @@ -203,7 +203,7 @@ end def test_search_platform - Deprecate.skip_during do + Gem::Deprecate.skip_during do util_set_arch 'x86-my_platform1' a1 = quick_spec 'a', '1' @@ -226,7 +226,7 @@ end def test_signature - Deprecate.skip_during do + Gem::Deprecate.skip_during do sig = @source_index.gem_signature('foo-1.2.3') assert_equal 64, sig.length assert_match(/^[a-f0-9]{64}$/, sig) @@ -234,7 +234,7 @@ end def test_specification - Deprecate.skip_during do + Gem::Deprecate.skip_during do assert_equal @a1, @source_index.specification(@a1.full_name) assert_nil @source_index.specification("foo-1.2.4") @@ -242,7 +242,7 @@ end def test_index_signature - Deprecate.skip_during do + Gem::Deprecate.skip_during do sig = @source_index.index_signature assert_match(/^[a-f0-9]{64}$/, sig) end Index: test/rubygems/test_gem_server.rb =================================================================== --- test/rubygems/test_gem_server.rb (revision 33385) +++ test/rubygems/test_gem_server.rb (revision 33386) @@ -33,7 +33,7 @@ data = StringIO.new "GET /Marshal.#{Gem.marshal_version} HTTP/1.0\r\n\r\n" @req.parse data - Deprecate.skip_during do + Gem::Deprecate.skip_during do @server.Marshal @req, @res end @@ -41,7 +41,7 @@ assert_match %r| \d\d:\d\d:\d\d |, @res['date'] assert_equal 'application/octet-stream', @res['content-type'] - Deprecate.skip_during do + Gem::Deprecate.skip_during do si = Gem::SourceIndex.new si.add_specs @a1, @a2 @@ -53,7 +53,7 @@ data = StringIO.new "GET /Marshal.#{Gem.marshal_version}.Z HTTP/1.0\r\n\r\n" @req.parse data - Deprecate.skip_during do + Gem::Deprecate.skip_during do @server.Marshal @req, @res end @@ -61,7 +61,7 @@ assert_match %r| \d\d:\d\d:\d\d |, @res['date'] assert_equal 'application/x-deflate', @res['content-type'] - Deprecate.skip_during do + Gem::Deprecate.skip_during do si = Gem::SourceIndex.new si.add_specs @a1, @a2 @@ -73,7 +73,7 @@ data = StringIO.new "GET /latest_specs.#{Gem.marshal_version} HTTP/1.0\r\n\r\n" @req.parse data - Deprecate.skip_during do + Gem::Deprecate.skip_during do @server.latest_specs @req, @res end @@ -88,7 +88,7 @@ data (... truncated) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/