rubygems-update 0.9.5 → 1.0.0

data/test/test_gem_version.rb

@@ -55,6 +55,11 @@ class TestGemVersion < RubyGemTestCase
     assert_inadequate( "1.0.0.1",     "= 1.0")
   end
 
+  def test_bump_trailing_zeros
+    v = Gem::Version.new("5.0.0")
+    assert_equal "5.1", v.bump.to_s
+  end
+
   def test_bump
     v = Gem::Version.new("5.2.4")
     assert_equal "5.3", v.bump.to_s
@@ -65,6 +70,16 @@ class TestGemVersion < RubyGemTestCase
     assert_equal "6", v.bump.to_s
   end
 
+  def test_eql_eh
+    v = Gem::Version.new("1.2")
+
+    assert_equal true, v.eql?(@v1_2)
+    assert_equal true, @v1_2.eql?(v)
+
+    assert_equal false, @v1_2.eql?(@v1_3)
+    assert_equal false, @v1_3.eql?(@v1_2)
+  end
+
   def test_equals2
     v = Gem::Version.new("1.2")
 

data/test/test_kernel.rb

@@ -25,39 +25,39 @@ class TestKernel < RubyGemTestCase
   end
 
   def test_gem
-    assert gem('a', '= 0.0.1'), "Should load"
-    assert $:.any? { |p| %r{a-0.0.1/lib} =~ p }
-    assert $:.any? { |p| %r{a-0.0.1/bin} =~ p }
+    assert gem('a', '= 1'), "Should load"
+    assert $:.any? { |p| %r{a-1/lib} =~ p }
+    assert $:.any? { |p| %r{a-1/bin} =~ p }
   end
 
   def test_gem_redundent
-    assert gem('a', '= 0.0.1'), "Should load"
-    assert ! gem('a', '= 0.0.1'), "Should not load"
-    assert_equal 1, $:.select { |p| %r{a-0.0.1/lib} =~ p }.size
-    assert_equal 1, $:.select { |p| %r{a-0.0.1/bin} =~ p }.size
+    assert gem('a', '= 1'), "Should load"
+    assert ! gem('a', '= 1'), "Should not load"
+    assert_equal 1, $:.select { |p| %r{a-1/lib} =~ p }.size
+    assert_equal 1, $:.select { |p| %r{a-1/bin} =~ p }.size
   end
 
   def test_gem_overlapping
-    assert gem('a', '= 0.0.1'), "Should load"
-    assert ! gem('a', '>= 0.0.1'), "Should not load"
-    assert_equal 1, $:.select { |p| %r{a-0.0.1/lib} =~ p }.size
-    assert_equal 1, $:.select { |p| %r{a-0.0.1/bin} =~ p }.size
+    assert gem('a', '= 1'), "Should load"
+    assert ! gem('a', '>= 1'), "Should not load"
+    assert_equal 1, $:.select { |p| %r{a-1/lib} =~ p }.size
+    assert_equal 1, $:.select { |p| %r{a-1/bin} =~ p }.size
   end
 
   def test_gem_conflicting
-    assert gem('a', '= 0.0.1'), "Should load"
+    assert gem('a', '= 1'), "Should load"
 
     ex = assert_raise Gem::Exception do
-      gem 'a', '= 0.0.2'
+      gem 'a', '= 2'
     end
 
-    assert_match(/activate a \(= 0\.0\.2\)/, ex.message)
-    assert_match(/activated a-0\.0\.1/, ex.message)
+    assert_match(/activate a \(= 2\)/, ex.message)
+    assert_match(/activated a-1/, ex.message)
 
-    assert $:.any? { |p| %r{a-0.0.1/lib} =~ p }
-    assert $:.any? { |p| %r{a-0.0.1/bin} =~ p }
-    assert ! $:.any? { |p| %r{a-0.0.2/lib} =~ p }
-    assert ! $:.any? { |p| %r{a-0.0.2/bin} =~ p }
+    assert $:.any? { |p| %r{a-1/lib} =~ p }
+    assert $:.any? { |p| %r{a-1/bin} =~ p }
+    assert ! $:.any? { |p| %r{a-2/lib} =~ p }
+    assert ! $:.any? { |p| %r{a-2/bin} =~ p }
   end
 
 end

metadata

@@ -1,41 +1,27 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4.6
-specification_version: 2
 name: rubygems-update
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
-date: 2007-11-19 00:00:00 -08:00
-summary: RubyGems Update GEM
-require_paths: 
-- lib
-email: rubygems-developers@rubyforge.org
-homepage: http://rubygems.rubyforge.org
-rubyforge_project: rubygems
-description: RubyGems is a package management framework for Ruby.  This Gem is a update for the base RubyGems software.  You must have a base installation of RubyGems before this update can be applied.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+  version: 1.0.0
 platform: ruby
-signing_key: 
-cert_chain: []
-
-post_install_message: 
 authors: 
 - Jim Weirich
 - Chad Fowler
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2007-12-19 00:00:00 -08:00
+default_executable: 
+dependencies: []
+
+description: RubyGems is a package management framework for Ruby.  This Gem is a update for the base RubyGems software.  You must have a base installation of RubyGems before this update can be applied.
+email: rubygems-developers@rubyforge.org
+executables: 
+- update_rubygems
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
 - Rakefile
 - ChangeLog
@@ -101,6 +87,7 @@ files:
 - lib/rubygems/commands/which_command.rb
 - lib/rubygems/config_file.rb
 - lib/rubygems/custom_require.rb
+- lib/rubygems/defaults.rb
 - lib/rubygems/dependency.rb
 - lib/rubygems/dependency_installer.rb
 - lib/rubygems/dependency_list.rb
@@ -133,7 +120,7 @@ files:
 - lib/rubygems/package.rb
 - lib/rubygems/platform.rb
 - lib/rubygems/remote_fetcher.rb
-- lib/rubygems/remote_installer.rb
+- lib/rubygems/require_paths_builder.rb
 - lib/rubygems/requirement.rb
 - lib/rubygems/rubygems_version.rb
 - lib/rubygems/security.rb
@@ -168,11 +155,14 @@ files:
 - test/fake_certlib/openssl.rb
 - test/functional.rb
 - test/gemutilities.rb
+- test/gemutilities.rbc
 - test/insure_session.rb
 - test/mockgemui.rb
+- test/mockgemui.rbc
 - test/simple_gem.rb
 - test/test_config.rb
 - test/test_gem.rb
+- test/test_gem.rbc
 - test/test_gem_builder.rb
 - test/test_gem_command.rb
 - test/test_gem_command_manager.rb
@@ -188,6 +178,7 @@ files:
 - test/test_gem_commands_mirror_command.rb
 - test/test_gem_commands_pristine_command.rb
 - test/test_gem_commands_query_command.rb
+- test/test_gem_commands_server_command.rb
 - test/test_gem_commands_sources_command.rb
 - test/test_gem_commands_specification_command.rb
 - test/test_gem_commands_unpack_command.rb
@@ -210,7 +201,6 @@ files:
 - test/test_gem_outdated_command.rb
 - test/test_gem_platform.rb
 - test/test_gem_remote_fetcher.rb
-- test/test_gem_remote_installer.rb
 - test/test_gem_requirement.rb
 - test/test_gem_server.rb
 - test/test_gem_source_index.rb
@@ -225,17 +215,31 @@ files:
 - test/test_open_uri.rb
 - test/test_package.rb
 - .document
-test_files: []
-
+has_rdoc: false
+homepage: http://rubygems.rubyforge.org
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: []
-
-executables: 
-- update_rubygems
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
+rubyforge_project: rubygems
+rubygems_version: 0.9.5
+signing_key: 
+specification_version: 2
+summary: RubyGems Update GEM
+test_files: []
 

data/lib/rubygems/remote_installer.rb

@@ -1,195 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'fileutils'
-
-require 'rubygems'
-require 'rubygems/installer'
-require 'rubygems/source_info_cache'
-
-module Gem
-
-  class RemoteInstaller
-
-    include UserInteraction
-
-    # <tt>options[:http_proxy]</tt>::
-    # * [String]: explicit specification of proxy; overrides any
-    #   environment variable setting
-    # * nil: respect environment variables (HTTP_PROXY, HTTP_PROXY_USER, HTTP_PROXY_PASS)
-    # * <tt>:no_proxy</tt>: ignore environment variables and _don't_
-    #   use a proxy
-    #
-    # * <tt>:cache_dir</tt>: override where downloaded gems are cached.
-    def initialize(options={})
-      @options = options
-      @source_index_hash = nil
-    end
-
-    # This method will install package_name onto the local system.
-    #
-    # gem_name::
-    #   [String] Name of the Gem to install
-    #
-    # version_requirement::
-    #   [default = ">= 0"] Gem version requirement to install
-    #
-    # Returns::
-    #   an array of Gem::Specification objects, one for each gem installed.
-    #
-    def install(gem_name, version_requirement = Gem::Requirement.default,
-                force = false, install_dir = Gem.dir)
-      unless version_requirement.respond_to?(:satisfied_by?)
-        version_requirement = Gem::Requirement.new [version_requirement]
-      end
-      installed_gems = []
-      begin
-        spec, source = find_gem_to_install(gem_name, version_requirement)
-        dependencies = find_dependencies_not_installed(spec.dependencies)
-
-        installed_gems << install_dependencies(dependencies, force, install_dir)
-
-        cache_dir = @options[:cache_dir] || File.join(install_dir, "cache")
-        destination_file = File.join(cache_dir, spec.full_name + ".gem")
-
-        download_gem(destination_file, source, spec)
-
-        installer = new_installer(destination_file)
-        installed_gems.unshift installer.install(force, install_dir)
-      rescue RemoteInstallationSkipped => e
-        alert_error e.message
-      end
-      installed_gems.flatten
-    end
-
-    # Return a hash mapping the available source names to the source
-    # index of that source.
-    def source_index_hash
-      return @source_index_hash if @source_index_hash
-      @source_index_hash = {}
-      Gem::SourceInfoCache.cache_data.each do |source_uri, sic_entry|
-        @source_index_hash[source_uri] = sic_entry.source_index
-      end
-      @source_index_hash
-    end
-
-    # Finds the Gem::Specification objects and the corresponding source URI
-    # for gems matching +gem_name+ and +version_requirement+
-    def specs_n_sources_matching(gem_name, version_requirement)
-      specs_n_sources = []
-
-      source_index_hash.each do |source_uri, source_index|
-        specs = source_index.search(/^#{Regexp.escape gem_name}$/i,
-                                    version_requirement)
-        # TODO move to SourceIndex#search?
-        ruby_version = Gem::Version.new RUBY_VERSION
-        specs = specs.select do |spec|
-          spec.required_ruby_version.nil? or
-            spec.required_ruby_version.satisfied_by? ruby_version
-        end
-        specs.each { |spec| specs_n_sources << [spec, source_uri] }
-      end
-
-      if specs_n_sources.empty? then
-        raise GemNotFoundException, "Could not find #{gem_name} (#{version_requirement}) in any repository"
-      end
-
-      specs_n_sources = specs_n_sources.sort_by { |gs,| gs.version }.reverse
-
-      specs_n_sources
-    end
-
-    # Find a gem to be installed by interacting with the user.
-    def find_gem_to_install(gem_name, version_requirement)
-      specs_n_sources = specs_n_sources_matching gem_name, version_requirement
-
-      top_3_versions = specs_n_sources.map{|gs| gs.first.version}.uniq[0..3]
-      specs_n_sources.reject!{|gs| !top_3_versions.include?(gs.first.version)}
-
-      binary_gems = specs_n_sources.reject { |item|
-        item[0].platform.nil? || item[0].platform==Platform::RUBY
-      }
-
-      # only non-binary gems...return latest
-      return specs_n_sources.first if binary_gems.empty?
-
-      list = specs_n_sources.collect { |spec, source_uri|
-        "#{spec.name} #{spec.version} (#{spec.platform})"
-      }
-
-      list << "Skip this gem"
-      list << "Cancel installation"
-
-      string, index = choose_from_list(
-        "Select which gem to install for your platform (#{RUBY_PLATFORM})",
-        list)
-
-      if index.nil? or index == (list.size - 1) then
-        raise RemoteInstallationCancelled, "Installation of #{gem_name} cancelled."
-      end
-
-      if index == (list.size - 2) then
-        raise RemoteInstallationSkipped, "Installation of #{gem_name} skipped."
-      end
-
-      specs_n_sources[index]
-    end
-
-    def find_dependencies_not_installed(dependencies)
-      to_install = []
-      dependencies.each do |dependency|
-        srcindex = Gem::SourceIndex.from_installed_gems
-        matches = srcindex.find_name(dependency.name, dependency.requirement_list)
-        to_install.push dependency if matches.empty?
-      end
-      to_install
-    end
-
-    # Install all the given dependencies.  Returns an array of
-    # Gem::Specification objects, one for each dependency installed.
-    #
-    # TODO: For now, we recursively install, but this is not the right
-    # way to do things (e.g.  if a package fails to download, we
-    # shouldn't install anything).
-    def install_dependencies(dependencies, force, install_dir)
-      return if @options[:ignore_dependencies]
-      installed_gems = []
-      dependencies.each do |dep|
-        if @options[:include_dependencies] ||
-           ask_yes_no("Install required dependency #{dep.name}?", true)
-          remote_installer = RemoteInstaller.new @options
-          installed_gems << remote_installer.install(dep.name,
-                                                     dep.version_requirements,
-                                                     force, install_dir)
-        elsif force then
-          # ignore
-        else
-          raise DependencyError, "Required dependency #{dep.name} not installed"
-        end
-      end
-      installed_gems
-    end
-
-    def download_gem(destination_file, source, spec)
-      return if File.exist? destination_file
-      uri = source + "/gems/#{spec.full_name}.gem"
-      response = Gem::RemoteFetcher.fetcher.fetch_path uri
-      write_gem_to_file response, destination_file
-    end
-
-    def write_gem_to_file(body, destination_file)
-      FileUtils.mkdir_p(File.dirname(destination_file)) unless File.exist?(destination_file)
-      File.open(destination_file, 'wb') do |out|
-        out.write(body)
-      end
-    end
-
-    def new_installer(gem)
-      return Installer.new(gem, @options)
-    end
-  end
-
-end

data/test/test_gem_remote_installer.rb

@@ -1,161 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'test/unit'
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
-require 'rubygems/remote_installer'
-
-class MockFetcher
-  def initialize(uri, proxy)
-    @uri = uri
-    @proxy = proxy
-  end
-
-  def size
-    1000
-  end
-  
-  def source_index
-    if @uri =~ /non.existent.url/
-      fail Gem::RemoteSourceException,
-        "Error fetching remote gem cache: Mock Socket Exception"
-    end
-    result = {
-      'foo-1.2.3' => Gem::Specification.new do |s|
-        s.name = 'foo'
-        s.version = "1.2.3"
-        s.summary = "This is a cool package"
-      end,
-      'foo-tools-2.0.0' => Gem::Specification.new do |s|
-        s.name = 'foo-tools'
-        s.version = "2.0.0"
-        s.summary = "This is an even cooler package"
-      end,
-      'foo-2-2.0.0' => Gem::Specification.new do |s|
-        s.name = 'foo-2'
-        s.version = "2.0.0"
-        s.summary = "This is the coolest package evar!~!"
-      end,
-    }
-    result
-  end
-
-  def fetch_path(path)
-  end
-
-  def self.finish
-  end
-end
-
-class TestGemRemoteInstaller < RubyGemTestCase
-
-  def setup
-    super
-
-    util_setup_fake_fetcher
-
-    util_setup_source_info_cache @gem1, @gem4
-
-    @installer = Gem::RemoteInstaller.new
-    @installer.instance_variable_set("@fetcher_class", MockFetcher)
-  end
-
-  def teardown
-    FileUtils.rm "dest_file" rescue nil
-  end
-
-  def test_find_gem_to_install
-    future_gem = quick_gem @gem1.name, '9.9.9' do |spec|
-      spec.required_ruby_version = '> 999.999.999' # HACK
-    end
-
-    util_setup_source_info_cache @gem1, future_gem
-    version = Gem::Version::Requirement.new "> 0.0.0"
-    gems = @installer.find_gem_to_install(@gem1.name, version)
-
-    assert_equal @gem1.full_name, gems.first.full_name
-  end
-
-  def test_source_index_hash
-    source_hash = @installer.source_index_hash
-
-    assert_equal 1, source_hash.size
-    assert source_hash.has_key?('http://gems.example.com')
-    assert_equal [@gem1, @gem4],
-                 source_hash['http://gems.example.com'].search(@gem1.name)
-  end
-
-  def test_specs_n_sources_matching
-    version = Gem::Version::Requirement.new "> 0.0.0"
-    specs_n_sources = @installer.specs_n_sources_matching @gem1.name, version
-
-    gems = specs_n_sources.map { |g,| g.full_name }
-
-    assert_equal [@gem1.full_name], gems,
-                 "Gems with longer names and higher versions must not match"
-  end
-
-end
-
-# This test suite has a number of TODOs in the test cases.  The
-# TestRemoteInstaller test suite is a reworking of this class from
-# scratch.
-class RemoteInstallerTest #< RubyGemTestCase # HACK disabled
-  class RInst < Gem::RemoteInstaller
-    include Test::Unit::Assertions
-
-    attr_accessor :expected_destination_files
-    attr_accessor :expected_bodies
-    attr_accessor :caches
-    attr_accessor :responses
-
-    def source_index_hash
-      @caches
-    end
-
-    def fetch(uri)
-      @reponses ||= {}
-      @responses[uri]
-    end
-
-    def write_gem_to_file(body, destination_file)
-      expected_destination_file = expected_destination_files.pop
-      expected_body = expected_bodies.pop
-      assert_equal expected_body, body, "Unexpected body"
-      assert_equal expected_destination_file, destination_file, "Unexpected destination file"
-    end
-
-    def new_installer(gem)
-      return MockInstaller.new(gem)
-    end
-  end
-
-  def setup
-    Gem.clear_paths
-    @remote_installer = Gem::RemoteInstaller.new
-    @remote_installer.instance_eval { @fetcher_class = MockFetcher }
-  end
-
-  SAMPLE_SPEC = Gem::Specification.new do |s|
-    s.name = 'foo'
-    s.version = "1.2.3"
-    s.platform = Gem::Platform::RUBY
-    s.summary = "This is a cool package"
-    s.files = []
-  end
-  SAMPLE_CACHE = { 'foo-1.2.3' => SAMPLE_SPEC }
-  SAMPLE_CACHE_YAML = SAMPLE_CACHE.to_yaml
-
-  FOO_GEM = '' # TODO
-  CACHE_DIR = File.join(Gem.dir, 'cache')
-
-  def test_install
-    result = @remote_installer.install('foo')
-    assert_equal [nil], result
-  end
-
-end
-