rubygems-update 2.1.11 → 2.2.0.rc.1

data/test/rubygems/test_gem_commands_which_command.rb

@@ -44,7 +44,9 @@ class TestGemCommandsWhichCommand < Gem::TestCase
     @cmd.handle_options %w[foo_bar missinglib]
 
     use_ui @ui do
-      @cmd.execute
+      assert_raises Gem::MockGemUi::TermError do
+        @cmd.execute
+      end
     end
 
     assert_equal "#{@foo_bar.full_gem_path}/lib/foo_bar.rb\n", @ui.output
@@ -68,7 +70,7 @@ class TestGemCommandsWhichCommand < Gem::TestCase
 
   def util_foo_bar
     files = %w[lib/foo_bar.rb lib/directory/baz.rb Rakefile]
-    @foo_bar = quick_spec 'foo_bar' do |gem|
+    @foo_bar = util_spec 'foo_bar' do |gem|
       gem.files = files
     end
 

data/test/rubygems/test_gem_dependency_installer.rb

@@ -388,6 +388,41 @@ class TestGemDependencyInstaller < Gem::TestCase
     assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name }
   end
 
+  def test_install_dependency_existing_extension
+    extconf_rb = File.join @gemhome, 'gems', 'e-1', 'extconf.rb'
+    FileUtils.mkdir_p File.dirname extconf_rb
+
+    open extconf_rb, 'w' do |io|
+      io.write <<-EXTCONF_RB
+        require 'mkmf'
+        create_makefile 'e'
+      EXTCONF_RB
+    end
+
+    e1 = new_spec 'e', '1', nil, 'extconf.rb' do |s|
+      s.extensions << 'extconf.rb'
+    end
+    e1_gem = File.join @tempdir, 'gems', "#{e1.full_name}.gem"
+
+    _, f1_gem = util_gem 'f', '1', 'e' => nil
+
+    Gem::Installer.new(e1_gem).install
+    FileUtils.rm_r e1.extension_dir
+
+    FileUtils.mv e1_gem, @tempdir
+    FileUtils.mv f1_gem, @tempdir
+    inst = nil
+
+    Dir.chdir @tempdir do
+      inst = Gem::DependencyInstaller.new
+      inst.install 'f'
+    end
+
+    assert_equal %w[f-1], inst.installed_gems.map { |s| s.full_name }
+
+    assert_path_exists e1.extension_dir
+  end
+
   def test_install_dependency_old
     _, e1_gem = util_gem 'e', '1'
     _, f1_gem = util_gem 'f', '1', 'e' => nil
@@ -684,6 +719,9 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'a'
     end
 
+    assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name },
+                 'sanity check'
+
     ENV['GEM_HOME'] = @gemhome
     ENV['GEM_PATH'] = [@gemhome, gemhome2].join File::PATH_SEPARATOR
     Gem.clear_paths
@@ -1164,6 +1202,36 @@ class TestGemDependencyInstaller < Gem::TestCase
     assert_resolve %w[d-1 e-1], e1, @d1, @d2
   end
 
+  def test_resolve_dependencies
+    util_setup_gems
+
+    FileUtils.mv @a1_gem, @tempdir
+    FileUtils.mv @b1_gem, @tempdir
+
+    inst = Gem::DependencyInstaller.new
+    request_set = inst.resolve_dependencies 'b', req('>= 0')
+
+    requests = request_set.sorted_requests.map { |req| req.full_name }
+
+    assert_equal %w[a-1 b-1], requests
+  end
+
+  def test_resolve_dependencies_ignore_dependencies
+    util_setup_gems
+
+    FileUtils.mv @a1_gem, @tempdir
+    FileUtils.mv @b1_gem, @tempdir
+
+    inst = Gem::DependencyInstaller.new :ignore_dependencies => true
+    request_set = inst.resolve_dependencies 'b', req('>= 0')
+
+    requests = request_set.sorted_requests.map { |req| req.full_name }
+
+    assert request_set.ignore_dependencies
+
+    assert_equal %w[b-1], requests
+  end
+
   def util_write_a1_bin
     write_file File.join('gems', 'a-1', 'bin', 'a_bin') do |fp|
       fp.puts "#!/usr/bin/ruby"

data/test/rubygems/test_gem_dependency_list.rb

@@ -11,17 +11,17 @@ class TestGemDependencyList < Gem::TestCase
     @deplist = Gem::DependencyList.new
 
     # TODO: switch to new_spec
-    @a1 = quick_spec 'a', '1'
-    @a2 = quick_spec 'a', '2'
-    @a3 = quick_spec 'a', '3'
+    @a1 = util_spec 'a', '1'
+    @a2 = util_spec 'a', '2'
+    @a3 = util_spec 'a', '3'
 
-    @b1 = quick_spec 'b', '1' do |s| s.add_dependency 'a', '>= 1' end
-    @b2 = quick_spec 'b', '2' do |s| s.add_dependency 'a', '>= 1' end
+    @b1 = util_spec 'b', '1' do |s| s.add_dependency 'a', '>= 1' end
+    @b2 = util_spec 'b', '2' do |s| s.add_dependency 'a', '>= 1' end
 
-    @c1 = quick_spec 'c', '1' do |s| s.add_dependency 'b', '>= 1' end
-    @c2 = quick_spec 'c', '2'
+    @c1 = util_spec 'c', '1' do |s| s.add_dependency 'b', '>= 1' end
+    @c2 = util_spec 'c', '2'
 
-    @d1 = quick_spec 'd', '1' do |s| s.add_dependency 'c', '>= 1' end
+    @d1 = util_spec 'd', '1' do |s| s.add_dependency 'c', '>= 1' end
   end
 
   def test_active_count
@@ -57,9 +57,9 @@ class TestGemDependencyList < Gem::TestCase
   end
 
   def test_dependency_order_development
-    e1 = quick_spec 'e', '1'
-    f1 = quick_spec 'f', '1'
-    g1 = quick_spec 'g', '1'
+    e1 = util_spec 'e', '1'
+    f1 = util_spec 'f', '1'
+    g1 = util_spec 'g', '1'
 
     @a1.add_dependency 'e'
     @a1.add_dependency 'f'
@@ -85,7 +85,7 @@ class TestGemDependencyList < Gem::TestCase
 
   def test_dependency_order_diamond
     util_diamond
-    e1 = quick_spec 'e', '1'
+    e1 = util_spec 'e', '1'
     @deplist.add e1
     @a1.add_dependency 'e', '>= 1'
 
@@ -161,13 +161,13 @@ class TestGemDependencyList < Gem::TestCase
   end
 
   def test_ok_eh_mismatch
-    a1 = quick_spec 'a', '1'
-    a2 = quick_spec 'a', '2'
+    a1 = util_spec 'a', '1'
+    a2 = util_spec 'a', '2'
 
-    b = quick_spec 'b', '1' do |s| s.add_dependency 'a', '= 1' end
-    c = quick_spec 'c', '1' do |s| s.add_dependency 'a', '= 2' end
+    b = util_spec 'b', '1' do |s| s.add_dependency 'a', '= 1' end
+    c = util_spec 'c', '1' do |s| s.add_dependency 'a', '= 2' end
 
-    d = quick_spec 'd', '1' do |s|
+    d = util_spec 'd', '1' do |s|
       s.add_dependency 'b'
       s.add_dependency 'c'
     end

data/test/rubygems/test_gem_dependency_resolution_error.rb

@@ -0,0 +1,28 @@
+require 'rubygems/test_case'
+
+class TestGemDependencyResolutionError < Gem::TestCase
+
+  def setup
+    super
+
+    @DR = Gem::Resolver
+
+    @spec = util_spec 'a', 2
+
+    @a1_req = @DR::DependencyRequest.new dep('a', '= 1'), nil
+    @a2_req = @DR::DependencyRequest.new dep('a', '= 2'), nil
+
+    @activated = @DR::ActivationRequest.new @spec, @a2_req
+
+    @conflict = @DR::Conflict.new @a1_req, @activated
+
+    @error = Gem::DependencyResolutionError.new @conflict
+  end
+
+  def test_message
+    assert_match %r%^conflicting dependencies a \(= 1\) and a \(= 2\)$%,
+                 @error.message
+  end
+
+end
+

data/test/rubygems/test_gem_doctor.rb

@@ -157,7 +157,7 @@ This directory does not appear to be a RubyGems repository, skipping
 
     refute doctor.gem_repository?, 'no gems installed'
 
-    quick_spec 'a'
+    util_spec 'a'
 
     doctor = Gem::Doctor.new @gemhome
 

data/test/rubygems/test_gem_ext_builder.rb

@@ -15,7 +15,7 @@ class TestGemExtBuilder < Gem::TestCase
 
     @orig_DESTDIR = ENV['DESTDIR']
 
-    @spec = quick_spec 'a'
+    @spec = util_spec 'a'
 
     @builder = Gem::Ext::Builder.new @spec, ''
   end
@@ -36,6 +36,9 @@ class TestGemExtBuilder < Gem::TestCase
 all:
 \t@#{Gem.ruby} -e "puts %Q{all: \#{ENV['DESTDIR']}}"
 
+clean:
+\t@#{Gem.ruby} -e "puts %Q{clean: \#{ENV['DESTDIR']}}"
+
 install:
 \t@#{Gem.ruby} -e "puts %Q{install: \#{ENV['DESTDIR']}}"
         MAKEFILE
@@ -46,21 +49,138 @@ install:
 
     results = results.join "\n"
 
-
     if RUBY_VERSION > '2.0' then
+      assert_match %r%"DESTDIR=#{ENV['DESTDIR']}" clean$%,   results
       assert_match %r%"DESTDIR=#{ENV['DESTDIR']}"$%,         results
       assert_match %r%"DESTDIR=#{ENV['DESTDIR']}" install$%, results
     else
+      refute_match %r%"DESTDIR=#{ENV['DESTDIR']}" clean$%,   results
       refute_match %r%"DESTDIR=#{ENV['DESTDIR']}"$%,         results
       refute_match %r%"DESTDIR=#{ENV['DESTDIR']}" install$%, results
     end
 
     if /nmake/ !~ results
+      assert_match %r%^clean: destination$%,   results
       assert_match %r%^all: destination$%,     results
       assert_match %r%^install: destination$%, results
     end
   end
 
+  def test_class_make_no_clean
+    ENV['DESTDIR'] = 'destination'
+    results = []
+
+    Dir.chdir @ext do
+      open 'Makefile', 'w' do |io|
+        io.puts <<-MAKEFILE
+all:
+\t@#{Gem.ruby} -e "puts %Q{all: \#{ENV['DESTDIR']}}"
+
+install:
+\t@#{Gem.ruby} -e "puts %Q{install: \#{ENV['DESTDIR']}}"
+        MAKEFILE
+      end
+
+      Gem::Ext::Builder.make @dest_path, results
+    end
+
+    results = results.join "\n"
+
+    if RUBY_VERSION > '2.0' then
+      assert_match %r%"DESTDIR=#{ENV['DESTDIR']}" clean$%,   results
+      assert_match %r%"DESTDIR=#{ENV['DESTDIR']}"$%,         results
+      assert_match %r%"DESTDIR=#{ENV['DESTDIR']}" install$%, results
+    else
+      refute_match %r%"DESTDIR=#{ENV['DESTDIR']}" clean$%,   results
+      refute_match %r%"DESTDIR=#{ENV['DESTDIR']}"$%,         results
+      refute_match %r%"DESTDIR=#{ENV['DESTDIR']}" install$%, results
+    end
+  end
+
+  def test_build_extensions
+    @spec.extensions << 'ext/extconf.rb'
+
+    ext_dir = File.join @spec.gem_dir, 'ext'
+
+    FileUtils.mkdir_p ext_dir
+
+    extconf_rb = File.join ext_dir, 'extconf.rb'
+
+    open extconf_rb, 'w' do |f|
+      f.write <<-'RUBY'
+        require 'mkmf'
+
+        create_makefile 'a'
+      RUBY
+    end
+
+    ext_lib_dir = File.join ext_dir, 'lib'
+    FileUtils.mkdir ext_lib_dir
+    FileUtils.touch File.join ext_lib_dir, 'a.rb'
+    FileUtils.mkdir File.join ext_lib_dir, 'a'
+    FileUtils.touch File.join ext_lib_dir, 'a', 'b.rb'
+
+    use_ui @ui do
+      @builder.build_extensions
+    end
+
+    assert_path_exists @spec.extension_dir
+    assert_path_exists @spec.gem_build_complete_path
+    assert_path_exists File.join @spec.extension_dir, 'gem_make.out'
+    assert_path_exists File.join @spec.extension_dir, 'a.rb'
+    assert_path_exists File.join @spec.gem_dir, 'lib', 'a.rb'
+    assert_path_exists File.join @spec.gem_dir, 'lib', 'a', 'b.rb'
+  end
+
+  def test_build_extensions_install_ext_only
+    class << Gem
+      alias orig_install_extension_in_lib install_extension_in_lib
+
+      def Gem.install_extension_in_lib
+        false
+      end
+    end
+
+    @spec.extensions << 'ext/extconf.rb'
+
+    ext_dir = File.join @spec.gem_dir, 'ext'
+
+    FileUtils.mkdir_p ext_dir
+
+    extconf_rb = File.join ext_dir, 'extconf.rb'
+
+    open extconf_rb, 'w' do |f|
+      f.write <<-'RUBY'
+        require 'mkmf'
+
+        create_makefile 'a'
+      RUBY
+    end
+
+    ext_lib_dir = File.join ext_dir, 'lib'
+    FileUtils.mkdir ext_lib_dir
+    FileUtils.touch File.join ext_lib_dir, 'a.rb'
+    FileUtils.mkdir File.join ext_lib_dir, 'a'
+    FileUtils.touch File.join ext_lib_dir, 'a', 'b.rb'
+
+    use_ui @ui do
+      @builder.build_extensions
+    end
+
+    assert_path_exists @spec.extension_dir
+    assert_path_exists @spec.gem_build_complete_path
+    assert_path_exists File.join @spec.extension_dir, 'gem_make.out'
+    assert_path_exists File.join @spec.extension_dir, 'a.rb'
+    refute_path_exists File.join @spec.gem_dir, 'lib', 'a.rb'
+    refute_path_exists File.join @spec.gem_dir, 'lib', 'a', 'b.rb'
+  ensure
+    class << Gem
+      remove_method :install_extension_in_lib
+
+      alias install_extension_in_lib orig_install_extension_in_lib
+    end
+  end
+
   def test_build_extensions_none
     use_ui @ui do
       @builder.build_extensions
@@ -69,13 +189,30 @@ install:
     assert_equal '', @ui.output
     assert_equal '', @ui.error
 
-    refute File.exist?('gem_make.out')
+    refute_path_exists File.join @spec.extension_dir, 'gem_make.out'
+  end
+
+  def test_build_extensions_rebuild_failure
+    FileUtils.mkdir_p @spec.extension_dir
+    FileUtils.touch @spec.gem_build_complete_path
+
+    @spec.extensions << nil
+
+    assert_raises Gem::Ext::BuildError do
+      use_ui @ui do
+        @builder.build_extensions
+      end
+    end
+
+    refute_path_exists @spec.gem_build_complete_path
   end
 
   def test_build_extensions_extconf_bad
     @spec.extensions << 'extconf.rb'
 
-    e = assert_raises Gem::Installer::ExtensionBuildError do
+    FileUtils.mkdir_p @spec.gem_dir
+
+    e = assert_raises Gem::Ext::BuildError do
       use_ui @ui do
         @builder.build_extensions
       end
@@ -87,20 +224,28 @@ install:
                  @ui.output
     assert_equal '', @ui.error
 
-    gem_make_out = File.join @gemhome, 'gems', @spec.full_name, 'gem_make.out'
+    gem_make_out = File.join @spec.extension_dir, 'gem_make.out'
 
     assert_match %r%#{Regexp.escape Gem.ruby} extconf\.rb%,
                  File.read(gem_make_out)
+    assert_match /: No such file/,
+                 File.read(gem_make_out)
+
+    refute_path_exists @spec.gem_build_complete_path
+
+    skip "Gem.ruby is not the name of the binary being run in the end" \
+      unless File.read(gem_make_out).include? "#{Regexp.escape Gem.ruby}:"
+
     assert_match %r%#{Regexp.escape Gem.ruby}: No such file%,
                  File.read(gem_make_out)
   end
 
   def test_build_extensions_unsupported
     FileUtils.mkdir_p @spec.gem_dir
-    gem_make_out = File.join @spec.gem_dir, 'gem_make.out'
+    gem_make_out = File.join @spec.extension_dir, 'gem_make.out'
     @spec.extensions << nil
 
-    e = assert_raises Gem::Installer::ExtensionBuildError do
+    e = assert_raises Gem::Ext::BuildError do
       use_ui @ui do
         @builder.build_extensions
       end
@@ -113,6 +258,8 @@ install:
     assert_equal '', @ui.error
 
     assert_equal "No builder for extension ''\n", File.read(gem_make_out)
+
+    refute_path_exists @spec.gem_build_complete_path
   ensure
     FileUtils.rm_f gem_make_out
   end
@@ -133,6 +280,7 @@ install:
         end
 
         File.open 'Makefile', 'w' do |f|
+          f.puts "clean:\n\techo cleaned"
           f.puts "default:\n\techo built"
           f.puts "install:\n\techo installed"
         end
@@ -146,7 +294,29 @@ install:
     path = File.join @spec.gem_dir, "extconf_args"
 
     assert_equal args.inspect, File.read(path).strip
-    assert File.directory? File.join(@spec.gem_dir, 'lib')
+    assert_path_exists @spec.extension_dir
+  end
+
+  def test_initialize
+    build_info_dir = File.join @gemhome, 'build_info'
+
+    FileUtils.mkdir_p build_info_dir
+
+    build_info_file = File.join build_info_dir, "#{@spec.full_name}.info"
+
+    open build_info_file, 'w' do |io|
+      io.puts '--with-foo-dir=/nonexistent'
+    end
+
+    builder = Gem::Ext::Builder.new @spec
+
+    assert_equal %w[--with-foo-dir=/nonexistent], builder.build_args
+  end
+
+  def test_initialize_build_args
+    builder = Gem::Ext::Builder.new @spec, %w[--with-foo-dir=/nonexistent]
+
+    assert_equal %w[--with-foo-dir=/nonexistent], builder.build_args
   end
 
 end