rubygems-update 2.1.11 → 2.2.0.rc.1

data/test/rubygems/test_gem_commands_list_command.rb

@@ -8,9 +8,9 @@ class TestGemCommandsListCommand < Gem::TestCase
 
     @cmd = Gem::Commands::ListCommand.new
 
-    util_setup_fake_fetcher
-
-    @si = util_setup_spec_fetcher @a1, @a2, @pl1
+    spec_fetcher do |fetcher|
+      fetcher.spec 'c', 1
+    end
 
     @fetcher.data["#{@gem_repo}Marshal.#{Gem.marshal_version}"] = proc do
       raise Gem::RemoteFetcher::FetchError

data/test/rubygems/test_gem_commands_outdated_command.rb

@@ -14,18 +14,13 @@ class TestGemCommandsOutdatedCommand < Gem::TestCase
   end
 
   def test_execute
-    remote_10 = quick_spec 'foo', '1.0'
-    remote_20 = quick_spec 'foo', '2.0'
-
-    Gem::RemoteFetcher.fetcher = @fetcher = Gem::FakeFetcher.new
-
-    util_clear_gems
-    util_setup_spec_fetcher remote_10, remote_20
-
-    quick_gem 'foo', '0.1'
-    quick_gem 'foo', '0.2'
-
-    Gem::Specification.reset
+    spec_fetcher do |fetcher|
+      fetcher.spec 'foo', '1.0'
+      fetcher.spec 'foo', '2.0'
+      fetcher.clear
+      fetcher.gem 'foo', '0.1'
+      fetcher.gem 'foo', '0.2'
+    end
 
     use_ui @ui do
       @cmd.execute

data/test/rubygems/test_gem_commands_pristine_command.rb

@@ -9,7 +9,7 @@ class TestGemCommandsPristineCommand < Gem::TestCase
   end
 
   def test_execute
-    a = quick_spec 'a' do |s|
+    a = util_spec 'a' do |s|
       s.executables = %w[foo]
       s.files = %w[bin/foo lib/a.rb]
     end
@@ -51,7 +51,7 @@ class TestGemCommandsPristineCommand < Gem::TestCase
   end
 
   def test_execute_all
-    a = quick_spec 'a' do |s| s.executables = %w[foo] end
+    a = util_spec 'a' do |s| s.executables = %w[foo] end
     write_file File.join(@tempdir, 'bin', 'foo') do |fp|
       fp.puts "#!/usr/bin/ruby"
     end
@@ -81,7 +81,7 @@ class TestGemCommandsPristineCommand < Gem::TestCase
   end
 
   def test_execute_env_shebang
-    a = quick_spec 'a' do |s|
+    a = util_spec 'a' do |s|
       s.executables = %w[foo]
       s.files = %w[bin/foo]
     end
@@ -110,8 +110,44 @@ class TestGemCommandsPristineCommand < Gem::TestCase
     end
   end
 
+  def test_execute_extensions_explicit
+    a = util_spec 'a' do |s| s.extensions << 'ext/a/extconf.rb' end
+
+    ext_path = File.join @tempdir, 'ext', 'a', 'extconf.rb'
+    write_file ext_path do |io|
+      io.write <<-'RUBY'
+      File.open "Makefile", "w" do |f|
+        f.puts "clean:\n\techo cleaned\n"
+        f.puts "all:\n\techo built\n"
+        f.puts "install:\n\techo installed\n"
+      end
+      RUBY
+    end
+
+    b = util_spec 'b'
+
+    install_gem a
+    install_gem b
+
+    @cmd.options[:extensions]     = true
+    @cmd.options[:extensions_set] = true
+    @cmd.options[:args] = []
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    out = @ui.output.split "\n"
+
+    assert_equal 'Restoring gems to pristine condition...', out.shift
+    assert_equal 'Building native extensions.  This could take a while...',
+                 out.shift
+    assert_equal "Restored #{a.full_name}", out.shift
+    assert_empty out, out.inspect
+  end
+
   def test_execute_no_extension
-    a = quick_spec 'a' do |s| s.extensions << 'ext/a/extconf.rb' end
+    a = util_spec 'a' do |s| s.extensions << 'ext/a/extconf.rb' end
 
     ext_path = File.join @tempdir, 'ext', 'a', 'extconf.rb'
     write_file ext_path do |io|
@@ -136,14 +172,15 @@ class TestGemCommandsPristineCommand < Gem::TestCase
   end
 
   def test_execute_with_extension_with_build_args
-    a = quick_spec 'a' do |s| s.extensions << 'ext/a/extconf.rb' end
+    a = util_spec 'a' do |s| s.extensions << 'ext/a/extconf.rb' end
 
     ext_path = File.join @tempdir, 'ext', 'a', 'extconf.rb'
     write_file ext_path do |io|
       io.write <<-'RUBY'
       File.open "Makefile", "w" do |f|
+        f.puts "clean:\n\techo cleaned\n"
         f.puts "all:\n\techo built\n"
-        f.puts "install:\n\techo built\n"
+        f.puts "install:\n\techo installed\n"
       end
       RUBY
     end
@@ -168,8 +205,8 @@ class TestGemCommandsPristineCommand < Gem::TestCase
   end
 
   def test_execute_many
-    a = quick_spec 'a'
-    b = quick_spec 'b'
+    a = util_spec 'a'
+    b = util_spec 'b'
 
     install_gem a
     install_gem b
@@ -189,14 +226,14 @@ class TestGemCommandsPristineCommand < Gem::TestCase
   end
 
   def test_execute_many_multi_repo
-    a = quick_spec 'a'
+    a = util_spec 'a'
     install_gem a
 
     Gem.clear_paths
     gemhome2 = File.join @tempdir, 'gemhome2'
     Gem.paths = { "GEM_PATH" => [gemhome2, @gemhome], "GEM_HOME" => gemhome2 }
 
-    b = quick_spec 'b'
+    b = util_spec 'b'
     install_gem b
 
     @cmd.options[:args] = %w[a b]
@@ -219,24 +256,14 @@ class TestGemCommandsPristineCommand < Gem::TestCase
   end
 
   def test_execute_missing_cache_gem
-    a_2 = quick_spec 'a', 2
-    a_3 = quick_spec 'a', 3
-
-    install_gem a_2
-    install_gem a_3
-
-    a_2_data = nil
-    open File.join(@gemhome, 'cache', a_2.file_name), 'rb' do |fp|
-      a_2_data = fp.read
+    specs = spec_fetcher do |fetcher|
+      fetcher.gem 'a', 1
+      fetcher.gem 'a', 2
+      fetcher.gem 'a', 3
+      fetcher.gem 'a', '3.a'
     end
 
-    util_setup_fake_fetcher
-    util_setup_spec_fetcher a_2
-
-    url = "http://gems.example.com/gems/#{a_2.file_name}"
-    Gem::RemoteFetcher.fetcher.data[url] = a_2_data
-
-    FileUtils.rm a_2.cache_file
+    FileUtils.rm specs['a-2'].cache_file
 
     @cmd.options[:args] = %w[a]
 
@@ -273,7 +300,7 @@ class TestGemCommandsPristineCommand < Gem::TestCase
   end
 
   def test_execute_only_executables
-    a = quick_spec 'a' do |s|
+    a = util_spec 'a' do |s|
       s.executables = %w[foo]
       s.files = %w[bin/foo lib/a.rb]
     end
@@ -320,5 +347,24 @@ class TestGemCommandsPristineCommand < Gem::TestCase
                  @ui.output.split("\n"))
     assert_empty(@ui.error)
   end
+
+  def test_handle_options
+    @cmd.handle_options %w[]
+
+    refute @cmd.options[:all]
+
+    assert @cmd.options[:extensions]
+    refute @cmd.options[:extensions_set]
+
+    assert_equal Gem::Requirement.default, @cmd.options[:version]
+  end
+
+  def test_handle_options_extensions
+    @cmd.handle_options %w[--extensions]
+
+    assert @cmd.options[:extensions]
+    assert @cmd.options[:extensions_set]
+  end
+
 end
 

data/test/rubygems/test_gem_commands_push_command.rb

@@ -62,17 +62,15 @@ class TestGemCommandsPushCommand < Gem::TestCase
   end
 
   def test_execute
-    open 'example', 'w' do |io| io.write 'hello' end
-
     @response = "Successfully registered gem: freewill (1.0.0)"
     @fetcher.data["#{Gem.host}/api/v1/gems"] = [@response, 200, 'OK']
 
-    @cmd.options[:args] = %w[example]
+    @cmd.options[:args] = [@path]
 
     @cmd.execute
 
     assert_equal Net::HTTP::Post, @fetcher.last_request.class
-    assert_equal 'hello', @fetcher.last_request.body
+    assert_equal Gem.read_binary(@path), @fetcher.last_request.body
     assert_equal "application/octet-stream",
                  @fetcher.last_request["Content-Type"]
   end
@@ -80,20 +78,18 @@ class TestGemCommandsPushCommand < Gem::TestCase
   def test_execute_host
     host = 'https://other.example'
 
-    open 'example', 'w' do |io| io.write 'hello' end
-
     @response = "Successfully registered gem: freewill (1.0.0)"
     @fetcher.data["#{host}/api/v1/gems"] = [@response, 200, 'OK']
     @fetcher.data["#{Gem.host}/api/v1/gems"] =
       ['fail', 500, 'Internal Server Error']
 
     @cmd.options[:host] = host
-    @cmd.options[:args] = %w[example]
+    @cmd.options[:args] = [@path]
 
     @cmd.execute
 
     assert_equal Net::HTTP::Post, @fetcher.last_request.class
-    assert_equal 'hello', @fetcher.last_request.body
+    assert_equal Gem.read_binary(@path), @fetcher.last_request.body
     assert_equal "application/octet-stream",
                  @fetcher.last_request["Content-Type"]
   end
@@ -154,6 +150,78 @@ class TestGemCommandsPushCommand < Gem::TestCase
     send_battery
   end
 
+  def test_sending_gem_to_allowed_push_host
+    @host = "http://privategemserver.com"
+
+    @spec, @path = util_gem "freebird", "1.0.1" do |spec|
+      spec.metadata['allowed_push_host'] = @host
+    end
+
+    @api_key = "PRIVKEY"
+
+    keys = {
+      :rubygems_api_key => 'KEY',
+      @host => @api_key
+    }
+
+    FileUtils.mkdir_p File.dirname Gem.configuration.credentials_path
+    open Gem.configuration.credentials_path, 'w' do |f|
+      f.write keys.to_yaml
+    end
+    Gem.configuration.load_api_keys
+
+    FileUtils.rm Gem.configuration.credentials_path
+
+    @response = "Successfully registered gem: freebird (1.0.1)"
+    @fetcher.data["#{@host}/api/v1/gems"]  = [@response, 200, 'OK']
+    send_battery
+  end
+
+  def test_sending_gem_to_disallowed_default_host
+    @spec, @path = util_gem "freebird", "1.0.1" do |spec|
+      spec.metadata['allowed_push_host'] = "https://privategemserver.com"
+    end
+
+    response = %{ERROR:  "#{@host}" is not allowed by the gemspec, which only allows "https://privategemserver.com"}
+
+    assert_raises Gem::MockGemUi::TermError do
+      send_battery
+    end
+
+    assert_match response, @ui.error
+  end
+
+  def test_sending_gem_to_disallowed_push_host
+    @host = "https://somebodyelse.com"
+
+    @spec, @path = util_gem "freebird", "1.0.1" do |spec|
+      spec.metadata['allowed_push_host'] = "https://privategemserver.com"
+    end
+
+    @api_key = "PRIVKEY"
+
+    keys = {
+      :rubygems_api_key => 'KEY',
+      @host => @api_key
+    }
+
+    FileUtils.mkdir_p File.dirname Gem.configuration.credentials_path
+    open Gem.configuration.credentials_path, 'w' do |f|
+      f.write keys.to_yaml
+    end
+    Gem.configuration.load_api_keys
+
+    FileUtils.rm Gem.configuration.credentials_path
+
+    response = 'ERROR:  "https://somebodyelse.com" is not allowed by the gemspec, which only allows "https://privategemserver.com"'
+
+    assert_raises Gem::MockGemUi::TermError do
+      send_battery
+    end
+
+    assert_match response, @ui.error
+  end
+
   def test_raises_error_with_no_arguments
     def @cmd.sign_in(*); end
     assert_raises Gem::CommandLineError do

data/test/rubygems/test_gem_commands_query_command.rb

@@ -8,9 +8,11 @@ class TestGemCommandsQueryCommand < Gem::TestCase
 
     @cmd = Gem::Commands::QueryCommand.new
 
-    util_setup_fake_fetcher
-    util_clear_gems
-    util_setup_spec_fetcher @a1, @a2, @pl1, @a3a
+    @specs = spec_fetcher do |fetcher|
+      fetcher.spec 'a', 1
+      fetcher.spec 'a', 2
+      fetcher.spec 'a', '3.a'
+    end
 
     @fetcher.data["#{@gem_repo}Marshal.#{Gem.marshal_version}"] = proc do
       raise Gem::RemoteFetcher::FetchError
@@ -18,6 +20,10 @@ class TestGemCommandsQueryCommand < Gem::TestCase
   end
 
   def test_execute
+    spec_fetcher do |fetcher|
+      fetcher.legacy_platform
+    end
+
     @cmd.handle_options %w[-r]
 
     use_ui @ui do
@@ -37,13 +43,18 @@ pl (1 i386-linux)
   end
 
   def test_execute_platform
-    @a1r = @a1.dup
+    spec_fetcher do |fetcher|
+      fetcher.clear
 
-    @a1.platform = 'x86-linux'
-    @a2.platform = 'universal-darwin'
+      fetcher.spec 'a', 1
+      fetcher.spec 'a', 1 do |s|
+        s.platform = 'x86-linux'
+      end
 
-    util_clear_gems
-    util_setup_spec_fetcher @a1, @a1r, @a2, @b2, @pl1
+      fetcher.spec 'a', 2 do |s|
+        s.platform = 'universal-darwin'
+      end
+    end
 
     @cmd.handle_options %w[-r -a]
 
@@ -56,8 +67,6 @@ pl (1 i386-linux)
 *** REMOTE GEMS ***
 
 a (2 universal-darwin, 1 ruby x86-linux)
-b (2)
-pl (1 i386-linux)
     EOF
 
     assert_equal expected, @ui.output
@@ -65,6 +74,10 @@ pl (1 i386-linux)
   end
 
   def test_execute_all
+    spec_fetcher do |fetcher|
+      fetcher.legacy_platform
+    end
+
     @cmd.handle_options %w[-r --all]
 
     use_ui @ui do
@@ -84,6 +97,10 @@ pl (1 i386-linux)
   end
 
   def test_execute_all_prerelease
+    spec_fetcher do |fetcher|
+      fetcher.legacy_platform
+    end
+
     @cmd.handle_options %w[-r --all --prerelease]
 
     use_ui @ui do
@@ -103,12 +120,15 @@ pl (1 i386-linux)
   end
 
   def test_execute_details
-    @a2.summary = 'This is a lot of text. ' * 4
-    @a2.authors = ['Abraham Lincoln', 'Hirohito']
-    @a2.homepage = 'http://a.example.com/'
+    spec_fetcher do |fetcher|
+      fetcher.spec 'a', 2 do |s|
+        s.summary = 'This is a lot of text. ' * 4
+        s.authors = ['Abraham Lincoln', 'Hirohito']
+        s.homepage = 'http://a.example.com/'
+      end
 
-    util_clear_gems
-    util_setup_spec_fetcher @a1, @a2, @pl1
+      fetcher.legacy_platform
+    end
 
     @cmd.handle_options %w[-r -d]
 
@@ -140,15 +160,22 @@ pl (1)
   end
 
   def test_execute_details_platform
-    @a1.platform = 'x86-linux'
+    spec_fetcher do |fetcher|
+      fetcher.clear
 
-    @a2.summary = 'This is a lot of text. ' * 4
-    @a2.authors = ['Abraham Lincoln', 'Hirohito']
-    @a2.homepage = 'http://a.example.com/'
-    @a2.platform = 'universal-darwin'
+      fetcher.spec 'a', 1 do |s|
+        s.platform = 'x86-linux'
+      end
 
-    util_clear_gems
-    util_setup_spec_fetcher @a1, @a2, @pl1
+      fetcher.spec 'a', 2 do |s|
+        s.summary = 'This is a lot of text. ' * 4
+        s.authors = ['Abraham Lincoln', 'Hirohito']
+        s.homepage = 'http://a.example.com/'
+        s.platform = 'universal-darwin'
+      end
+
+      fetcher.legacy_platform
+    end
 
     @cmd.handle_options %w[-r -d]
 
@@ -281,7 +308,34 @@ pl (1)
     assert_equal 1, e.exit_code
   end
 
+  def test_execute_local
+    spec_fetcher do |fetcher|
+      fetcher.legacy_platform
+    end
+
+    @cmd.options[:domain] = :local
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    expected = <<-EOF
+
+*** LOCAL GEMS ***
+
+a (3.a, 2, 1)
+pl (1 i386-linux)
+    EOF
+
+    assert_equal expected, @ui.output
+    assert_equal '', @ui.error
+  end
+
   def test_execute_local_notty
+    spec_fetcher do |fetcher|
+      fetcher.legacy_platform
+    end
+
     @cmd.handle_options %w[]
 
     @ui.outs.tty = false
@@ -299,7 +353,32 @@ pl (1 i386-linux)
     assert_equal '', @ui.error
   end
 
+  def test_execute_local_quiet
+    spec_fetcher do |fetcher|
+      fetcher.legacy_platform
+    end
+
+    @cmd.options[:domain] = :local
+    Gem.configuration.verbose = false
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    expected = <<-EOF
+a (3.a, 2, 1)
+pl (1 i386-linux)
+    EOF
+
+    assert_equal expected, @ui.output
+    assert_equal '', @ui.error
+  end
+
   def test_execute_no_versions
+    spec_fetcher do |fetcher|
+      fetcher.legacy_platform
+    end
+
     @cmd.handle_options %w[-r --no-versions]
 
     use_ui @ui do
@@ -319,6 +398,10 @@ pl
   end
 
   def test_execute_notty
+    spec_fetcher do |fetcher|
+      fetcher.legacy_platform
+    end
+
     @cmd.handle_options %w[-r]
 
     @ui.outs.tty = false
@@ -355,6 +438,10 @@ a (3.a)
   end
 
   def test_execute_prerelease_local
+    spec_fetcher do |fetcher|
+      fetcher.legacy_platform
+    end
+
     @cmd.handle_options %w[-l --prerelease]
 
     use_ui @ui do
@@ -373,16 +460,89 @@ pl (1 i386-linux)
     assert_equal "WARNING:  prereleases are always shown locally\n", @ui.error
   end
 
+  def test_execute_remote
+    spec_fetcher do |fetcher|
+      fetcher.legacy_platform
+    end
+
+    @cmd.options[:domain] = :remote
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    expected = <<-EOF
+
+*** REMOTE GEMS ***
+
+a (2)
+pl (1 i386-linux)
+    EOF
+
+    assert_equal expected, @ui.output
+    assert_equal '', @ui.error
+  end
+
+  def test_execute_remote_notty
+    spec_fetcher do |fetcher|
+      fetcher.legacy_platform
+    end
+
+    @cmd.handle_options %w[]
+
+    @ui.outs.tty = false
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    expected = <<-EOF
+a (3.a, 2, 1)
+pl (1 i386-linux)
+    EOF
+
+    assert_equal expected, @ui.output
+    assert_equal '', @ui.error
+  end
+
+  def test_execute_remote_quiet
+    spec_fetcher do |fetcher|
+      fetcher.legacy_platform
+    end
+
+    @cmd.options[:domain] = :remote
+    Gem.configuration.verbose = false
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    expected = <<-EOF
+a (2)
+pl (1 i386-linux)
+    EOF
+
+    assert_equal expected, @ui.output
+    assert_equal '', @ui.error
+  end
+
   def test_execute_local_details
-    @a1.platform = 'x86-linux'
+    spec_fetcher do |fetcher|
+      fetcher.clear
 
-    @a2.summary = 'This is a lot of text. ' * 4
-    @a2.authors = ['Abraham Lincoln', 'Hirohito']
-    @a2.homepage = 'http://a.example.com/'
-    @a2.platform = 'universal-darwin'
+      fetcher.spec 'a', 1 do |s|
+        s.platform = 'x86-linux'
+      end
+
+      fetcher.spec 'a', 2 do |s|
+        s.summary = 'This is a lot of text. ' * 4
+        s.authors = ['Abraham Lincoln', 'Hirohito']
+        s.homepage = 'http://a.example.com/'
+        s.platform = 'universal-darwin'
+      end
 
-    util_clear_gems
-    util_setup_spec_fetcher @a1, @a2, @pl1
+      fetcher.legacy_platform
+    end
 
     @cmd.handle_options %w[-l -d]
 
@@ -396,6 +556,7 @@ pl (1 i386-linux)
     str.gsub!(/at: [^\n]*/, "at: -")
 
     expected = <<-EOF
+
 *** LOCAL GEMS ***
 
 a (2, 1)
@@ -410,7 +571,7 @@ a (2, 1)
     This is a lot of text. This is a lot of text. This is a lot of text.
     This is a lot of text.
 
-pl \(1\)
+pl (1)
     Platform: i386-linux
     Author: A User
     Homepage: http://example.com
@@ -419,13 +580,18 @@ pl \(1\)
     this is a summary
     EOF
 
-    assert_match expected, @ui.output
+    assert_equal expected, @ui.output
   end
 
   def test_execute_default_details
-    default_gem_dir = Gem::Specification.default_specifications_dir
-    @a1.loaded_from =
-      File.join default_gem_dir, @a1.spec_name
+    spec_fetcher do |fetcher|
+      fetcher.clear
+
+      fetcher.spec 'a', 2
+    end
+
+    a1 = new_default_spec 'a', 1
+    install_default_specs a1
 
     @cmd.handle_options %w[-l -d]
 
@@ -437,20 +603,11 @@ pl \(1\)
 
 *** LOCAL GEMS ***
 
-a (3.a, 2, 1)
-    Author: A User
-    Homepage: http://example.com
-    Installed at (3.a): #{@gemhome}
-                 (2): #{@gemhome}
-                 (1, default): #{@a1.base_dir}
-
-    this is a summary
-
-pl \(1\)
-    Platform: i386-linux
+a (2, 1)
     Author: A User
     Homepage: http://example.com
-    Installed at: #{@gemhome}
+    Installed at (2): #{@gemhome}
+                 (1, default): #{a1.base_dir}
 
     this is a summary
     EOF
@@ -459,20 +616,53 @@ pl \(1\)
   end
 
   def test_make_entry
+    a_2_name = @specs['a-2'].original_name
+
     @fetcher.data.delete \
-      "#{@gem_repo}quick/Marshal.#{Gem.marshal_version}/#{@a2.original_name}.gemspec.rz"
+      "#{@gem_repo}quick/Marshal.#{Gem.marshal_version}/#{a_2_name}.gemspec.rz"
 
+    a2 = @specs['a-2']
     entry_tuples = [
-      [Gem::NameTuple.new(@a2.name, @a2.version, @a2.platform),
+      [Gem::NameTuple.new(a2.name, a2.version, a2.platform),
        Gem.sources.first],
     ]
 
-    platforms = { @a2.version => [@a2.platform] }
+    platforms = { a2.version => [a2.platform] }
 
     entry = @cmd.send :make_entry, entry_tuples, platforms
 
     assert_equal 'a (2)', entry
   end
 
+  # Test for multiple args handling!
+  def test_execute_multiple_args
+    spec_fetcher do |fetcher|
+      fetcher.legacy_platform
+    end
+
+    @cmd.handle_options %w[a pl]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_match %r%^a %, @ui.output
+    assert_match %r%^pl %, @ui.output
+    assert_equal '', @ui.error
+  end
+
+  def test_show_gems
+    @cmd.options[:name] = //
+    @cmd.options[:domain] = :remote
+
+    use_ui @ui do
+      @cmd.send :show_gems, /a/i, false
+    end
+
+    assert_match %r%^a %,  @ui.output
+    refute_match %r%^pl %, @ui.output
+    assert_empty @ui.error
+  end
+
 end