rubygems-update 2.0.17 → 2.1.0.rc.1

data/test/rubygems/test_gem_commands_environment_command.rb

@@ -11,6 +11,7 @@ class TestGemCommandsEnvironmentCommand < Gem::TestCase
 
   def test_execute
     orig_sources = Gem.sources.dup
+    orig_path, ENV['PATH'] = ENV['PATH'], %w[/usr/local/bin /usr/bin /bin].join(File::PATH_SEPARATOR)
     Gem.sources.replace %w[http://gems.example.com]
     Gem.configuration['gemcutter_key'] = 'blah'
 
@@ -36,10 +37,17 @@ class TestGemCommandsEnvironmentCommand < Gem::TestCase
     assert_match %r|"gemcutter_key" => "\*\*\*\*"|, @ui.output
     assert_match %r|:verbose => |, @ui.output
     assert_match %r|REMOTE SOURCES:|, @ui.output
-    assert_equal '', @ui.error
+
+    assert_match %r|- SHELL PATH:|,     @ui.output
+    assert_match %r|- /usr/local/bin$|, @ui.output
+    assert_match %r|- /usr/bin$|,       @ui.output
+    assert_match %r|- /bin$|,           @ui.output
+
+    assert_empty @ui.error
 
   ensure
     Gem.sources.replace orig_sources
+    ENV['PATH'] = orig_path
   end
 
   def test_execute_gemdir

data/test/rubygems/test_gem_commands_fetch_command.rb

@@ -34,32 +34,6 @@ class TestGemCommandsFetchCommand < Gem::TestCase
                        'gem repository directories must not be created'
   end
 
-  def test_execute_latest
-    util_setup_fake_fetcher
-    util_setup_spec_fetcher @a1, @a2
-
-    @fetcher.data["#{@gem_repo}gems/#{@a1.file_name}"] =
-      File.read(@a1.cache_file)
-    @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]
-    @cmd.options[:version] = req('>= 0.1')
-
-    use_ui @ui do
-      Dir.chdir @tempdir do
-        @cmd.execute
-      end
-    end
-
-    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
     util_setup_fake_fetcher true
     util_clear_gems
@@ -79,8 +53,8 @@ class TestGemCommandsFetchCommand < Gem::TestCase
       end
     end
 
-    assert_path_exists(File.join(@tempdir, @a2.file_name),
-                       "#{@a2.full_name} not fetched")
+    assert_path_exists(File.join(@tempdir, @a2_pre.file_name),
+                       "#{@a2_pre.full_name} not fetched")
   end
 
   def test_execute_specific_prerelease

data/test/rubygems/test_gem_commands_help_command.rb

@@ -18,7 +18,7 @@ class TestGemCommandsHelpCommand < Gem::TestCase
   def test_gem_help_bad
     util_gem 'bad' do |out, err|
       assert_equal('', out)
-      assert_match(/Unknown command bad. Try gem help commands\n/, err)
+      assert_match "Unknown command bad", err
     end
   end
 
@@ -36,9 +36,12 @@ class TestGemCommandsHelpCommand < Gem::TestCase
       mgr.command_names.each do |cmd|
         assert_match(/\s+#{cmd}\s+\S+/, out)
       end
-      assert_equal '', err
 
-      refute_match 'No command found for ', out
+      if defined?(OpenSSL::SSL) then
+        assert_empty err
+
+        refute_match 'No command found for ', out
+      end
     end
   end
 

data/test/rubygems/test_gem_commands_install_command.rb

@@ -1,11 +1,11 @@
 require 'rubygems/test_case'
 require 'rubygems/commands/install_command'
-require 'rubygems/rdoc'
 
 class TestGemCommandsInstallCommand < Gem::TestCase
 
   def setup
     super
+    common_installer_setup
 
     @cmd = Gem::Commands::InstallCommand.new
     @cmd.options[:document] = []
@@ -168,8 +168,7 @@ class TestGemCommandsInstallCommand < Gem::TestCase
 
     # This is needed because we need to exercise the cache path
     # within SpecFetcher
-    path = File.join Gem.user_home, '.gem', 'specs', "not-there.nothing%80",
-                                    "latest_specs.4.8"
+    path = File.join Gem.spec_cache_dir, "not-there.nothing%80", "latest_specs.4.8"
 
     FileUtils.mkdir_p File.dirname(path)
 
@@ -633,67 +632,6 @@ ERROR:  Possible alternatives: non_existent_with_hint
     assert_equal x, e
   end
 
-  def test_execute_installs_dependencies
-    r, r_gem = util_gem 'r', '1', 'q' => '= 1'
-    q, q_gem = util_gem 'q', '1'
-
-    util_setup_fake_fetcher
-    util_setup_spec_fetcher r, q
-
-    Gem::Specification.reset
-
-    @fetcher.data["#{@gem_repo}gems/#{q.file_name}"] = read_binary(q_gem)
-    @fetcher.data["#{@gem_repo}gems/#{r.file_name}"] = read_binary(r_gem)
-
-    @cmd.options[:args] = ["r"]
-
-    e = nil
-    use_ui @ui do
-      e = assert_raises Gem::SystemExitException do
-        capture_io do
-          @cmd.execute
-        end
-      end
-    end
-
-    out = @ui.output.split "\n"
-    assert_equal "2 gems installed", out.shift
-    assert out.empty?, out.inspect
-
-    assert_equal %w[q-1 r-1], @cmd.installed_specs.map { |spec| spec.full_name }
-
-    assert_equal 0, e.exit_code
-  end
-
-  def test_execute_satisfy_deps_of_local_from_sources
-    r, r_gem = util_gem 'r', '1', 'q' => '= 1'
-    q, q_gem = util_gem 'q', '1'
-
-    util_setup_fake_fetcher
-    util_setup_spec_fetcher r, q
-
-    Gem::Specification.reset
-
-    @fetcher.data["#{@gem_repo}gems/#{q.file_name}"] = read_binary(q_gem)
-
-    @cmd.options[:args] = [r_gem]
-
-    use_ui @ui do
-      e = assert_raises Gem::SystemExitException do
-        capture_io do
-          @cmd.execute
-        end
-      end
-      assert_equal 0, e.exit_code
-    end
-
-    assert_equal %w[q-1 r-1], @cmd.installed_specs.map { |spec| spec.full_name }
-
-    out = @ui.output.split "\n"
-    assert_equal "2 gems installed", out.shift
-    assert out.empty?, out.inspect
-  end
-
   def test_execute_uses_from_a_gemdeps
     util_setup_fake_fetcher
     util_setup_spec_fetcher
@@ -951,4 +889,3 @@ ERROR:  Possible alternatives: non_existent_with_hint
 
 
 end
-

data/test/rubygems/test_gem_commands_owner_command.rb

@@ -6,6 +6,7 @@ class TestGemCommandsOwnerCommand < Gem::TestCase
   def setup
     super
 
+    ENV["RUBYGEMS_HOST"] = nil
     @fetcher = Gem::FakeFetcher.new
     Gem::RemoteFetcher.fetcher = @fetcher
     Gem.configuration.rubygems_api_key = "ed244fbf2b1a52e012da8616c512fa47f9aa5250"
@@ -34,6 +35,36 @@ EOF
     assert_match %r{- user2@example.com}, @ui.output
   end
 
+  def test_show_owners_setting_up_host_through_env_var
+    response = "- email: user1@example.com\n"
+    host = "http://rubygems.example"
+    ENV["RUBYGEMS_HOST"] = host
+
+    @fetcher.data["#{host}/api/v1/gems/freewill/owners.yaml"] = [response, 200, 'OK']
+
+    use_ui @ui do
+      @cmd.show_owners("freewill")
+    end
+
+    assert_match %r{Owners for gem: freewill}, @ui.output
+    assert_match %r{- user1@example.com}, @ui.output
+  end
+
+  def test_show_owners_setting_up_host
+    response = "- email: user1@example.com\n"
+    host = "http://rubygems.example"
+    @cmd.host = host
+
+    @fetcher.data["#{host}/api/v1/gems/freewill/owners.yaml"] = [response, 200, 'OK']
+
+    use_ui @ui do
+      @cmd.show_owners("freewill")
+    end
+
+    assert_match %r{Owners for gem: freewill}, @ui.output
+    assert_match %r{- user1@example.com}, @ui.output
+  end
+
   def test_show_owners_denied
     response = "You don't have permission to push to this gem"
     @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners.yaml"] = [response, 403, 'Forbidden']
@@ -87,6 +118,24 @@ EOF
     assert_match response, @ui.output
   end
 
+  def test_add_owner_with_host_option_through_execute
+    host = "http://rubygems.example"
+    add_owner_response = "Owner added successfully."
+    show_owners_response = "- email: user1@example.com\n"
+    @fetcher.data["#{host}/api/v1/gems/freewill/owners"] = [add_owner_response, 200, 'OK']
+    @fetcher.data["#{host}/api/v1/gems/freewill/owners.yaml"] = [show_owners_response, 200, 'OK']
+
+    @cmd.handle_options %W[--host #{host} --add user-new1@example.com freewill]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_match add_owner_response, @ui.output
+    assert_match %r{Owners for gem: freewill}, @ui.output
+    assert_match %r{- user1@example.com}, @ui.output
+  end
+
   def test_add_owners_key
     response = "Owner added successfully."
     @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 200, 'OK']

data/test/rubygems/test_gem_commands_pristine_command.rb

@@ -80,6 +80,36 @@ class TestGemCommandsPristineCommand < Gem::TestCase
     assert_empty out, out.inspect
   end
 
+  def test_execute_env_shebang
+    a = quick_spec 'a' do |s|
+      s.executables = %w[foo]
+      s.files = %w[bin/foo]
+    end
+    write_file File.join(@tempdir, 'bin', 'foo') do |fp|
+      fp.puts "#!/usr/bin/ruby"
+    end
+
+    install_gem a
+
+    gem_exec = File.join @gemhome, 'bin', 'foo'
+
+    FileUtils.rm gem_exec
+
+    @cmd.handle_options %w[--all --env-shebang]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_path_exists gem_exec
+
+    if win_platform?
+      assert_match %r%\A#!\s*ruby%, File.read(gem_exec)
+    else
+      assert_match %r%\A#!\s*/usr/bin/env ruby%, File.read(gem_exec)
+    end
+  end
+
   def test_execute_no_extension
     a = quick_spec 'a' do |s| s.extensions << 'ext/a/extconf.rb' end
 

data/test/rubygems/test_gem_commands_sources_command.rb

@@ -194,7 +194,7 @@ beta-gems.example.com is not a URI
     assert_equal expected, @ui.output
     assert_equal '', @ui.error
 
-    dir = File.join Gem.user_home, '.gem', 'specs'
+    dir = Gem.spec_cache_dir
     refute File.exist?(dir), 'cache dir removed'
   end
 

data/test/rubygems/test_gem_commands_uninstall_command.rb

@@ -16,6 +16,20 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
     @executable = File.join(@gemhome, 'bin', 'executable')
   end
 
+  def test_execute_all_gem_names
+    @cmd.options[:args] = %w[a b]
+    @cmd.options[:all] = true
+
+    assert_raises Gem::MockGemUi::TermError do
+      use_ui @ui do
+        @cmd.execute
+      end
+    end
+
+    assert_equal "ERROR:  Gem names and --all may not be used together\n",
+                 @ui.error
+  end
+
   def test_execute_dependency_order
     c = quick_gem 'c' do |spec|
       spec.add_dependency 'a'
@@ -43,6 +57,7 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
 
   def test_execute_removes_executable
     ui = Gem::MockGemUi.new
+
     util_setup_gem ui
 
     build_rake_in do
@@ -175,5 +190,23 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
     assert Gem::Specification.find_all_by_name('x').length == 0
   end
 
+  def test_execute_all
+    ui = Gem::MockGemUi.new "y\n"
+
+    util_make_gems
+    util_setup_gem ui
+
+    assert Gem::Specification.find_all_by_name('a').length > 1
+
+    @cmd.options[:all] = true
+    @cmd.options[:args] = []
+
+    use_ui ui do
+      @cmd.execute
+    end
+
+    refute_includes Gem::Specification.all_names, 'a'
+  end
+
 end
 

data/test/rubygems/test_gem_commands_update_command.rb

@@ -11,6 +11,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def setup
     super
+    common_installer_setup
 
     @cmd = Gem::Commands::UpdateCommand.new
 
@@ -253,7 +254,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     out = @ui.output.split "\n"
     assert_equal "Updating installed gems", out.shift
     assert_equal "Updating #{@a2.name}", out.shift
-    assert_equal "Gems updated: #{@c2.name} #{@b2.name} #{@a2.name}",
+    assert_equal "Gems updated: #{@a2.name} #{@b2.name} #{@c2.name}",
                  out.shift
 
     assert_empty out

data/test/rubygems/test_gem_config_file.rb

@@ -201,6 +201,10 @@ ERROR:  Your gem push credentials file located at:
 
 has file permissions of 0644 but 0600 is required.
 
+To fix this error run:
+
+\tchmod 0600 #{@cfg.credentials_path}
+
 You should reset your credentials at:
 
 \thttps://rubygems.org/profile/edit
@@ -428,6 +432,14 @@ if you believe they were disclosed to a third party.
     assert_equal('/home/me/certs', @cfg.ssl_ca_cert)
   end
 
+  def test_load_ssl_client_cert_from_config
+    File.open @temp_conf, 'w' do |fp|
+      fp.puts ":ssl_client_cert: /home/me/mine.pem"
+    end
+    util_config_file
+    assert_equal('/home/me/mine.pem', @cfg.ssl_client_cert)
+  end
+
   def util_config_file(args = @cfg_args)
     @cfg = Gem::ConfigFile.new args
   end

data/test/rubygems/test_gem_dependency_installer.rb

@@ -6,6 +6,7 @@ class TestGemDependencyInstaller < Gem::TestCase
 
   def setup
     super
+    common_installer_setup
 
     @gems_dir  = File.join @tempdir, 'gems'
     @cache_dir = File.join @gemhome, 'cache'
@@ -172,7 +173,8 @@ class TestGemDependencyInstaller < Gem::TestCase
 
     FileUtils.mv @a1_gem, @tempdir
     FileUtils.mv @b1_gem, @tempdir
-    FileUtils.mv e1_gem, @tempdir
+    FileUtils.mv  e1_gem, @tempdir
+
     inst = nil
 
     Dir.chdir @tempdir do
@@ -180,40 +182,15 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'b'
     end
 
-    Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new
-      inst.install 'e'
-    end
-
-    assert_equal %w[e-1 a-1], inst.installed_gems.map { |s| s.full_name }
-  end
-
-  def test_install_ignore_satified_deps
-    util_setup_gems
-
-    _, e1_gem = util_gem 'e', '1' do |s|
-      s.add_dependency 'b'
-    end
-
-    util_clear_gems
-
-    FileUtils.mv @a1_gem, @tempdir
-    FileUtils.mv @b1_gem, @tempdir
-    FileUtils.mv e1_gem, @tempdir
+    assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name },
+                 'sanity check'
 
     Dir.chdir @tempdir do
-      i = Gem::DependencyInstaller.new :ignore_dependencies => true
-      i.install 'b'
-    end
-
-    inst = nil
-
-    Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new :minimal_deps => true
+      inst = Gem::DependencyInstaller.new
       inst.install 'e'
     end
 
-    assert_equal %w[e-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[a-1 e-1], inst.installed_gems.map { |s| s.full_name }
   end
 
   def test_install_cache_dir
@@ -246,15 +223,18 @@ class TestGemDependencyInstaller < Gem::TestCase
     Gem::Specification.reset
 
     FileUtils.mv @a1_gem, @tempdir
-    FileUtils.mv a2_gem, @tempdir # not in index
+    FileUtils.mv  a2_gem, @tempdir # not in index
     FileUtils.mv @b1_gem, @tempdir
     inst = nil
 
     Dir.chdir @tempdir do
       inst = Gem::DependencyInstaller.new
-      inst.install 'a', Gem::Requirement.create("= 2")
+      inst.install 'a', req("= 2")
     end
 
+    assert_equal %w[a-2], inst.installed_gems.map { |s| s.full_name },
+                 'sanity check'
+
     FileUtils.rm File.join(@tempdir, a2.file_name)
 
     Dir.chdir @tempdir do
@@ -282,19 +262,18 @@ class TestGemDependencyInstaller < Gem::TestCase
     Gem::Specification.reset
 
     FileUtils.mv @a1_gem, @tempdir
-    FileUtils.mv a2_gem, @tempdir # not in index
+    FileUtils.mv  a2_gem, @tempdir # not in index
     FileUtils.mv @b1_gem, @tempdir
-    FileUtils.mv a3_gem, @tempdir
-
-    inst = nil
+    FileUtils.mv  a3_gem, @tempdir
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new
-      inst.install 'a', Gem::Requirement.create("= 2")
+      Gem::DependencyInstaller.new.install 'a', req("= 2")
     end
 
     FileUtils.rm File.join(@tempdir, a2.file_name)
 
+    inst = nil
+
     Dir.chdir @tempdir do
       inst = Gem::DependencyInstaller.new
       inst.install 'b'
@@ -488,6 +467,42 @@ class TestGemDependencyInstaller < Gem::TestCase
     assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name }
   end
 
+  def test_install_minimal_deps
+    util_setup_gems
+
+    _, e1_gem = util_gem 'e', '1' do |s|
+      s.add_dependency 'b'
+    end
+
+    _, b2_gem = util_gem 'b', '2' do |s|
+      s.add_dependency 'a'
+    end
+
+    util_clear_gems
+
+    FileUtils.mv @a1_gem, @tempdir
+    FileUtils.mv @b1_gem, @tempdir
+    FileUtils.mv  b2_gem, @tempdir
+    FileUtils.mv  e1_gem, @tempdir
+
+    inst = nil
+
+    Dir.chdir @tempdir do
+      inst = Gem::DependencyInstaller.new :ignore_dependencies => true
+      inst.install 'b', req('= 1')
+    end
+
+    assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name },
+                 'sanity check'
+
+    Dir.chdir @tempdir do
+      inst = Gem::DependencyInstaller.new :minimal_deps => true
+      inst.install 'e'
+    end
+
+    assert_equal %w[a-1 e-1], inst.installed_gems.map { |s| s.full_name }
+  end
+
   def test_install_env_shebang
     util_setup_gems
 
@@ -627,12 +642,12 @@ class TestGemDependencyInstaller < Gem::TestCase
     inst = nil
 
     Dir.chdir @tempdir do
-      e = assert_raises Gem::DependencyError do
+      e = assert_raises Gem::UnsatisfiableDependencyError do
         inst = Gem::DependencyInstaller.new :domain => :local
         inst.install 'b'
       end
 
-      expected = "Unable to resolve dependencies: b requires a (>= 0)"
+      expected = "Unable to resolve dependency: b (= 1) requires a (>= 0)"
       assert_equal expected, e.message
     end
 
@@ -854,29 +869,6 @@ class TestGemDependencyInstaller < Gem::TestCase
     assert_equal Gem::Source.new(@gem_repo), s.source
   end
 
-  def test_find_spec_by_name_and_version_wildcard
-    util_gem 'a', 1
-    FileUtils.mv 'gems/a-1.gem', @tempdir
-
-    FileUtils.touch 'rdoc.gem'
-
-    inst = Gem::DependencyInstaller.new
-
-    available = inst.find_spec_by_name_and_version('*.gem')
-
-    assert_equal %w[a-1], available.all_specs.map { |spec| spec.full_name }
-  end
-
-  def test_find_spec_by_name_and_version_wildcard_bad_gem
-    FileUtils.touch 'rdoc.gem'
-
-    inst = Gem::DependencyInstaller.new
-
-    assert_raises Gem::Package::FormatError do
-      inst.find_spec_by_name_and_version '*.gem'
-    end
-  end
-
   def test_find_spec_by_name_and_version_bad_gem
     FileUtils.touch 'rdoc.gem'
 
@@ -933,12 +925,13 @@ class TestGemDependencyInstaller < Gem::TestCase
     gems = set.sorted
 
     assert_equal 2, gems.length
-    local = gems.first
+
+    remote, local = gems
+
     assert_equal 'a-1', local.spec.full_name, 'local spec'
     assert_equal File.join(@tempdir, @a1.file_name),
                  local.source.download(local.spec), 'local path'
 
-    remote = gems.last
     assert_equal 'a-1', remote.spec.full_name, 'remote spec'
     assert_equal Gem::Source.new(@gem_repo), remote.source, 'remote path'