rubygems-update 2.0.0 → 2.0.2

data/lib/rubygems/ssl_certs/GeoTrust_Global_CA.pem

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
+MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
+YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
+R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
+9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
+fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
+iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
+1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
+bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
+MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
+ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
+uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
+Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
+tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
+PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
+hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
+5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
+-----END CERTIFICATE-----

data/lib/rubygems/test_utilities.rb

@@ -38,6 +38,11 @@ class Gem::FakeFetcher
   end
 
   def find_data(path)
+    if URI === path and "URI::#{path.scheme.upcase}" != path.class.name then
+      raise ArgumentError,
+        "mismatch for scheme #{path.scheme} and class #{path.class}"
+    end
+
     path = path.to_s
     @paths << path
     raise ArgumentError, 'need full URI' unless path =~ %r'^https?://'
@@ -49,7 +54,7 @@ class Gem::FakeFetcher
     @data[path]
   end
 
-  def fetch_path path, mtime = nil
+  def fetch_path path, mtime = nil, head = false
     data = find_data(path)
 
     if data.respond_to?(:call) then
@@ -121,8 +126,6 @@ class Gem::FakeFetcher
 
     path = File.join path, name
 
-    Gem.ensure_gem_subdirectories install_dir
-
     if source_uri =~ /^http/ then
       File.open(path, "wb") do |f|
         f.write fetch_path(File.join(source_uri, "gems", name))

data/test/rubygems/test_gem.rb

@@ -665,7 +665,7 @@ class TestGem < Gem::TestCase
   end
 
   def test_self_default_sources
-    assert_equal %w[http://rubygems.org/], Gem.default_sources
+    assert_equal %w[https://rubygems.org/], Gem.default_sources
   end
 
   def test_self_detect_gemdeps
@@ -700,6 +700,18 @@ class TestGem < Gem::TestCase
     assert File.directory? File.join(@gemhome, "cache")
   end
 
+  def test_self_ensure_gem_directories_permissions
+    FileUtils.rm_r @gemhome
+    Gem.use_paths @gemhome
+
+    Gem.ensure_gem_subdirectories @gemhome, 0750
+
+    assert File.directory? File.join(@gemhome, "cache")
+
+    assert_equal 0750, File::Stat.new(@gemhome).mode & 0777
+    assert_equal 0750, File::Stat.new(File.join(@gemhome, "cache")).mode & 0777
+  end unless win_platform?
+
   def test_self_ensure_gem_directories_safe_permissions
     FileUtils.rm_r @gemhome
     Gem.use_paths @gemhome

data/test/rubygems/test_gem_commands_fetch_command.rb

@@ -18,6 +18,8 @@ class TestGemCommandsFetchCommand < Gem::TestCase
     @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
       File.read(@a2.cache_file)
 
+    refute_path_exists File.join(@tempdir, 'cache'), 'sanity check'
+
     @cmd.options[:args] = [@a2.name]
 
     use_ui @ui do
@@ -28,6 +30,8 @@ class TestGemCommandsFetchCommand < Gem::TestCase
 
     assert_path_exists(File.join(@tempdir, @a2.file_name),
                        "#{@a2.full_name} not fetched")
+    refute_path_exists File.join(@tempdir, 'cache'),
+                       'gem repository directories must not be created'
   end
 
   def test_execute_prerelease

data/test/rubygems/test_gem_commands_query_command.rb

@@ -430,5 +430,21 @@ pl \(1\)
     assert_equal expected, @ui.output
   end
 
+  def test_make_entry
+    @fetcher.data.delete \
+      "#{@gem_repo}quick/Marshal.#{Gem.marshal_version}/#{@a2.original_name}.gemspec.rz"
+
+    entry_tuples = [
+      [Gem::NameTuple.new(@a2.name, @a2.version, @a2.platform),
+       Gem.sources.first],
+    ]
+
+    platforms = { @a2.version => [@a2.platform] }
+
+    entry = @cmd.send :make_entry, entry_tuples, platforms
+
+    assert_equal 'a (2)', entry
+  end
+
 end
 

data/test/rubygems/test_gem_commands_setup_command.rb

@@ -11,11 +11,17 @@ class TestGemCommandsSetupCommand < Gem::TestCase
     @cmd.options[:prefix] = @install_dir
 
     FileUtils.mkdir_p 'bin'
-    FileUtils.mkdir_p 'lib/rubygems'
+    FileUtils.mkdir_p 'lib/rubygems/ssl_certs'
 
     open 'bin/gem',                   'w' do |io| io.puts '# gem'          end
     open 'lib/rubygems.rb',           'w' do |io| io.puts '# rubygems.rb'  end
     open 'lib/rubygems/test_case.rb', 'w' do |io| io.puts '# test_case.rb' end
+    open 'lib/rubygems/ssl_certs/foo.pem', 'w' do |io| io.puts 'PEM'       end
+  end
+
+  def test_pem_files_in
+    assert_equal %w[rubygems/ssl_certs/foo.pem],
+                 @cmd.pem_files_in('lib').sort
   end
 
   def test_rb_files_in
@@ -23,6 +29,17 @@ class TestGemCommandsSetupCommand < Gem::TestCase
                  @cmd.rb_files_in('lib').sort
   end
 
+  def test_install_lib
+    @cmd.extend FileUtils
+
+    Dir.mktmpdir 'lib' do |dir|
+      @cmd.install_lib dir
+
+      assert_path_exists File.join(dir, 'rubygems.rb')
+      assert_path_exists File.join(dir, 'rubygems/ssl_certs/foo.pem')
+    end
+  end
+
   def test_remove_old_lib_files
     lib            = File.join @install_dir, 'lib'
     lib_rubygems   = File.join lib, 'rubygems'

data/test/rubygems/test_gem_commands_sources_command.rb

@@ -118,6 +118,45 @@ source #{@gem_repo} already present in the cache
     assert_equal '', @ui.error
   end
 
+  def test_execute_add_http_rubygems_org
+    http_rubygems_org = 'http://rubygems.org'
+    util_setup_fake_fetcher
+
+    install_specs @a1
+
+    specs = Gem::Specification.map { |spec|
+      [spec.name, spec.version, spec.original_platform]
+    }
+
+    specs_dump_gz = StringIO.new
+    Zlib::GzipWriter.wrap specs_dump_gz do |io|
+      Marshal.dump specs, io
+    end
+
+    @fetcher.data["#{http_rubygems_org}/specs.#{@marshal_version}.gz"] =
+      specs_dump_gz.string
+
+    @cmd.handle_options %W[--add #{http_rubygems_org}]
+
+    util_setup_spec_fetcher
+
+    ui = Gem::MockGemUi.new "n"
+
+    use_ui ui do
+      assert_raises Gem::MockGemUi::TermError do
+        @cmd.execute
+      end
+    end
+
+    assert_equal [@gem_repo], Gem.sources
+
+    expected = <<-EXPECTED
+    EXPECTED
+
+    assert_equal expected, @ui.output
+    assert_empty @ui.error
+  end
+
   def test_execute_add_bad_uri
     @cmd.handle_options %w[--add beta-gems.example.com]
 

data/test/rubygems/test_gem_config_file.rb

@@ -164,6 +164,21 @@ class TestGemConfigFile < Gem::TestCase
     assert_equal 2048, @cfg.bulk_threshold
   end
 
+  def test_api_keys
+    assert_nil @cfg.instance_variable_get :@api_keys
+
+    temp_cred = File.join Gem.user_home, '.gem', 'credentials'
+    FileUtils.mkdir File.dirname(temp_cred)
+    File.open temp_cred, 'w', 0600 do |fp|
+      fp.puts ':rubygems_api_key: 701229f217cdf23b1344c7b4b54ca97'
+    end
+
+    util_config_file
+
+    assert_equal({:rubygems => '701229f217cdf23b1344c7b4b54ca97'},
+                 @cfg.api_keys)
+  end
+
   def test_check_credentials_permissions
     skip 'chmod not supported' if win_platform?
 

data/test/rubygems/test_gem_dependency_installer.rb

@@ -35,6 +35,61 @@ class TestGemDependencyInstaller < Gem::TestCase
     util_reset_gems
   end
 
+  def test_available_set_for_name
+    util_setup_gems
+    p1a, = util_gem 'a', '10.a'
+    util_setup_spec_fetcher p1a, @a1, @a1_pre
+
+    inst = Gem::DependencyInstaller.new
+
+    available = inst.available_set_for 'a', Gem::Requirement.default
+
+    assert_equal %w[a-1], available.set.map { |s| s.spec.full_name }
+  end
+
+  def test_available_set_for_name_prerelease
+    util_setup_gems
+    p1a, = util_gem 'a', '10.a'
+    util_setup_spec_fetcher p1a, @a1, @a1_pre
+
+    inst = Gem::DependencyInstaller.new :prerelease => true
+
+    available = inst.available_set_for 'a', Gem::Requirement.default
+
+    assert_equal %w[a-10.a],
+                 available.sorted.map { |s| s.spec.full_name }
+  end
+
+  def test_available_set_for_dep
+    util_setup_gems
+    p1a, = util_gem 'a', '10.a'
+    util_setup_spec_fetcher p1a, @a1, @a1_pre
+
+    inst = Gem::DependencyInstaller.new
+
+    dep = Gem::Dependency.new 'a', Gem::Requirement.default
+
+    available = inst.available_set_for dep, Gem::Requirement.default
+
+    assert_equal %w[a-1], available.set.map { |s| s.spec.full_name }
+  end
+
+  def test_available_set_for_dep_prerelease
+    util_setup_gems
+    p1a, = util_gem 'a', '10.a'
+    util_setup_spec_fetcher p1a, @a1, @a1_pre
+
+    inst = Gem::DependencyInstaller.new :prerelease => true
+
+    dep = Gem::Dependency.new 'a', Gem::Requirement.default
+    dep.prerelease = true
+
+    available = inst.available_set_for dep, Gem::Requirement.default
+
+    assert_equal %w[a-10.a],
+                 available.sorted.map { |s| s.spec.full_name }
+  end
+
   def test_install
     util_setup_gems
 

data/test/rubygems/test_gem_dependency_resolver_api_set.rb

@@ -0,0 +1,80 @@
+require 'rubygems/test_case'
+require 'rubygems/dependency_resolver'
+
+class TestGemDependencyResolverAPISet < Gem::TestCase
+
+  def setup
+    super
+
+    @DR = Gem::DependencyResolver
+
+    @api_set = @DR::APISet.new
+    @uri = 'https://rubygems.org/api/v1/dependencies'
+    @fetcher = Gem::FakeFetcher.new
+    Gem::RemoteFetcher.fetcher = @fetcher
+  end
+
+  def test_find_all
+    b_entry = {
+      :name         => 'b',
+      :number       => '2',
+      :platform     => 'ruby',
+      :dependencies => [['a', '>= 0']],
+    }
+
+    @fetcher.data["#{@uri}?gems=b"] = Marshal.dump [b_entry]
+
+    b_req = @DR::DependencyRequest.new dep('b', '>= 0'), nil
+
+    expected = [
+      @DR::APISpecification.new(@api_set, b_entry)
+    ]
+
+    assert_equal expected, @api_set.find_all(b_req)
+  end
+
+  def test_prefetch
+    b_entry = {
+      :name         => 'b',
+      :number       => '2',
+      :platform     => 'ruby',
+      :dependencies => [['a', '>= 0']],
+    }
+
+    a_entry = {
+      :name         => 'a',
+      :number       => '2',
+      :platform     => 'ruby',
+      :dependencies => [],
+    }
+
+    @fetcher.data["#{@uri}?gems=a,b"] = Marshal.dump [a_entry, b_entry]
+
+    a_req = @DR::DependencyRequest.new dep('a', '>= 0'), nil
+    b_req = @DR::DependencyRequest.new dep('b', '>= 0'), nil
+
+    @api_set.prefetch([b_req, a_req])
+
+    assert_equal [a_entry], @api_set.versions('a')
+    assert_equal [b_entry], @api_set.versions('b')
+  end
+
+  def test_versions_cache
+    entry = {
+      :name         => 'b',
+      :number       => '2',
+      :platform     => 'ruby',
+      :dependencies => [['a', '>= 0']],
+    }
+
+    @fetcher.data["#{@uri}?gems=b"] = Marshal.dump [entry]
+
+    assert_equal [entry], @api_set.versions('b')
+
+    @fetcher.data["#{@uri}?gems=b"] = 'garbage'
+
+    assert_equal [entry], @api_set.versions('b'), 'version data must be cached'
+  end
+
+end
+

data/test/rubygems/test_gem_ext_ext_conf_builder.rb

@@ -110,7 +110,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
 #{Gem.ruby} extconf.rb.*
 checking for main\(\) in .*?nonexistent/m, error.message)
 
-    assert_match(/^#{Gem.ruby} extconf.rb/, output[0])
+    assert_equal("#{Gem.ruby} extconf.rb", output[0])
   end
 
   def test_class_make
@@ -134,12 +134,6 @@ checking for main\(\) in .*?nonexistent/m, error.message)
 
     assert_equal make_command, output[0]
     assert_equal "#{make_command} install", output[2]
-
-    edited_makefile = Gem.read_binary makefile_path
-    edited_makefile.gsub!(/\r/, '') if Gem.win_platform?
-
-    assert_match "\nRUBYARCHDIR = #{@ext}$(target_prefix)\n", edited_makefile
-    assert_match "\nRUBYLIBDIR = #{@ext}$(target_prefix)\n", edited_makefile
   end
 
   def test_class_make_no_Makefile

data/test/rubygems/test_gem_installer.rb

@@ -119,7 +119,8 @@ load Gem.bin_path('a', 'executable', version)
     File.open File.join(@spec.gem_dir, "extconf.rb"), "w" do |f|
       f.write <<-'RUBY'
         puts "IN EXTCONF"
-        File.open 'extconf_args', 'w' do |f|
+        extconf_args = File.join File.dirname(__FILE__), 'extconf_args'
+        File.open extconf_args, 'w' do |f|
           f.puts ARGV.inspect
         end
 
@@ -190,6 +191,43 @@ load Gem.bin_path('a', 'executable', version)
     Gem::ConfigMap[:bindir] = orig_bindir
   end
 
+  def test_check_executable_overwrite_format_executable
+    @installer.generate_bin
+
+    @spec = Gem::Specification.new do |s|
+      s.files = ['lib/code.rb']
+      s.name = "a"
+      s.version = "3"
+      s.summary = "summary"
+      s.description = "desc"
+      s.require_path = 'lib'
+    end
+
+    open File.join(util_inst_bindir, 'executable'), 'w' do |io|
+     io.write <<-EXEC
+#!/usr/local/bin/ruby
+#
+# This file was generated by RubyGems
+
+gem 'other', version
+     EXEC
+    end
+
+    util_make_exec
+    Gem::Installer.exec_format = 'foo-%s-bar'
+    @installer.gem_dir = @spec.gem_dir
+    @installer.wrappers = true
+    @installer.format_executable = true
+
+    @installer.generate_bin # should not raise
+
+    installed_exec = File.join util_inst_bindir, 'foo-executable-bar'
+    assert File.exist? installed_exec
+
+    wrapper = File.read installed_exec
+    assert_match %r|generated by RubyGems|, wrapper
+  end
+
   def test_check_executable_overwrite_other_gem
     util_conflict_executable true
 
@@ -1000,7 +1038,17 @@ load Gem.bin_path('a', 'executable', version)
       RUBY
     end
 
+    Dir.mkdir(File.join("lib", @spec.name))
+    rb2 = File.join("lib", @spec.name, "#{@spec.name}.rb")
+    @spec.files << rb2
+    write_file File.join(@tempdir, rb2) do |io|
+      io.write <<-RUBY
+        # #{@spec.name}/#{@spec.name}.rb
+      RUBY
+    end
+
     assert !File.exist?(File.join(@spec.gem_dir, rb))
+    assert !File.exist?(File.join(@spec.gem_dir, rb2))
     use_ui @ui do
       path = Gem::Package.build @spec
 
@@ -1008,6 +1056,49 @@ load Gem.bin_path('a', 'executable', version)
       @installer.install
     end
     assert File.exist?(File.join(@spec.gem_dir, rb))
+    assert File.exist?(File.join(@spec.gem_dir, rb2))
+  end
+
+  def test_install_extension_flat
+    skip '1.9.2 and earlier mkmf.rb does not create TOUCH' if
+      RUBY_VERSION < '1.9.3'
+
+    @spec.require_paths = ["."]
+
+    @spec.extensions << "extconf.rb"
+
+    write_file File.join(@tempdir, "extconf.rb") do |io|
+      io.write <<-RUBY
+        require "mkmf"
+
+        CONFIG['CC'] = '$(TOUCH) $@ ||'
+        CONFIG['LDSHARED'] = '$(TOUCH) $@ ||'
+
+        create_makefile("#{@spec.name}")
+      RUBY
+    end
+
+    # empty depend file for no auto dependencies
+    @spec.files += %W"depend #{@spec.name}.c".each {|file|
+      write_file File.join(@tempdir, file)
+    }
+
+    so = File.join(@spec.gem_dir, "#{@spec.name}.#{RbConfig::CONFIG["DLEXT"]}")
+    assert !File.exist?(so)
+    use_ui @ui do
+      path = Gem::Package.build @spec
+
+      @installer = Gem::Installer.new path
+      @installer.install
+    end
+    assert File.exist?(so)
+  rescue
+    puts '-' * 78
+    puts File.read File.join(@gemhome, 'gems', 'a-2', 'Makefile')
+    puts '-' * 78
+    puts File.read File.join(@gemhome, 'gems', 'a-2', 'gem_make.out')
+    puts '-' * 78
+    raise
   end
 
   def test_installation_satisfies_dependency_eh