rubygems-update 1.8.30 → 2.0.0.preview2

data/test/rubygems/test_gem_ext_rake_builder.rb

@@ -24,18 +24,18 @@ class TestGemExtRakeBuilder < Gem::TestCase
     output = []
     realdir = nil # HACK /tmp vs. /private/tmp
 
-    build_rake_in do
+    build_rake_in do |rake|
       Dir.chdir @ext do
         realdir = Dir.pwd
         Gem::Ext::RakeBuilder.build 'mkrf_conf.rb', nil, @dest_path, output
       end
-    end
 
-    output = output.join "\n"
+      output = output.join "\n"
 
-    refute_match %r%^rake failed:%, output
-    assert_match %r%^#{Regexp.escape @@ruby} mkrf_conf\.rb%, output
-    assert_match %r%^#{Regexp.escape @@rake} RUBYARCHDIR=#{Regexp.escape @dest_path} RUBYLIBDIR=#{Regexp.escape @dest_path}%, output
+      refute_match %r%^rake failed:%, output
+      assert_match %r%^#{Regexp.escape @@ruby} mkrf_conf\.rb%, output
+      assert_match %r%^#{Regexp.escape rake} RUBYARCHDIR=#{Regexp.escape @dest_path} RUBYLIBDIR=#{Regexp.escape @dest_path}%, output
+    end
   end
 
   def test_class_build_fail
@@ -44,22 +44,22 @@ class TestGemExtRakeBuilder < Gem::TestCase
         File.open("Rakefile","w") do |f|
           f.puts "task :default do abort 'fail' end"
         end
-        EO_MKRF
+      EO_MKRF
     end
 
     output = []
 
-    error = assert_raises Gem::InstallError do
-      build_rake_in do
+    build_rake_in(false) do |rake|
+      error = assert_raises Gem::InstallError do
         Dir.chdir @ext do
           Gem::Ext::RakeBuilder.build "mkrf_conf.rb", nil, @dest_path, output
         end
       end
-    end
 
-    assert_match %r%^rake failed:%, error.message
-    assert_match %r%^#{Regexp.escape @@ruby} mkrf_conf\.rb%, error.message
-    assert_match %r%^#{Regexp.escape @@rake} RUBYARCHDIR=#{Regexp.escape @dest_path} RUBYLIBDIR=#{Regexp.escape @dest_path}%, error.message
+      assert_match %r%^rake failed:%, error.message
+      assert_match %r%^#{Regexp.escape @@ruby} mkrf_conf\.rb%, error.message
+      assert_match %r%^#{Regexp.escape rake} RUBYARCHDIR=#{Regexp.escape @dest_path} RUBYLIBDIR=#{Regexp.escape @dest_path}%, error.message
+    end
   end
 
 end

data/test/rubygems/test_gem_gem_runner.rb

@@ -3,6 +3,18 @@ require 'rubygems/gem_runner'
 
 class TestGemGemRunner < Gem::TestCase
 
+  def setup
+    super
+
+    @orig_args = Gem::Command.build_args
+  end
+
+  def teardown
+    super
+
+    Gem::Command.build_args = @orig_args
+  end
+
   def test_do_configuration
     Gem.clear_paths
 
@@ -25,17 +37,27 @@ class TestGemGemRunner < Gem::TestCase
     gr = Gem::GemRunner.new
     gr.send :do_configuration, %W[--config-file #{temp_conf}]
 
-    assert_equal [other_gem_home, other_gem_path], Gem.path
+    assert_equal [other_gem_path, other_gem_home], Gem.path
     assert_equal %w[--commands], Gem::Command.extra_args
-    assert_equal %w[--all], Gem::DocManager.configured_args
   end
 
-  def test_build_args__are_handled
+  def test_build_args_are_handled
     Gem.clear_paths
 
-    Gem::GemRunner.new.run(%W[help -- --build_arg1 --build_arg2])
+    cls = Class.new(Gem::Command) do
+      def execute
+      end
+    end
+
+    test_obj = cls.new :ba_test
+
+    cmds = Gem::CommandManager.new
+    cmds.register_command :ba_test, test_obj
+
+    runner = Gem::GemRunner.new :command_manager => cmds
+    runner.run(%W[ba_test -- --build_arg1 --build_arg2])
 
-    assert_equal %w[--build_arg1 --build_arg2], Gem::Command.build_args
+    assert_equal %w[--build_arg1 --build_arg2], test_obj.options[:build_args]
   end
 
 end

data/test/rubygems/test_gem_gemcutter_utilities.rb

@@ -15,6 +15,25 @@ class TestGemGemcutterUtilities < Gem::TestCase
     @cmd.extend Gem::GemcutterUtilities
   end
 
+  def test_alternate_key_alternate_host
+    keys = {
+      :rubygems_api_key => 'KEY',
+      "http://rubygems.engineyard.com" => "EYKEY"
+    }
+
+    FileUtils.mkdir_p File.dirname Gem.configuration.credentials_path
+
+    open Gem.configuration.credentials_path, 'w' do |f|
+      f.write keys.to_yaml
+    end
+
+    ENV["RUBYGEMS_HOST"] = "http://rubygems.engineyard.com"
+
+    Gem.configuration.load_api_keys
+
+    assert_equal 'EYKEY', @cmd.api_key
+  end
+
   def test_api_key
     keys = { :rubygems_api_key => 'KEY' }
     FileUtils.mkdir_p File.dirname Gem.configuration.credentials_path

data/test/rubygems/test_gem_indexer.rb

@@ -30,10 +30,7 @@ class TestGemIndexer < Gem::TestCase
     FileUtils.mkdir_p gems
     FileUtils.mv Dir[File.join(@gemhome, "cache", '*.gem')], gems
 
-    @indexer = Gem::Indexer.new(@tempdir,
-                                :rss_title     => 'ExampleForge gems',
-                                :rss_host      => 'example.com',
-                                :rss_gems_host => 'gems.example.com')
+    @indexer = Gem::Indexer.new(@tempdir)
   end
 
   def test_initialize
@@ -42,18 +39,10 @@ class TestGemIndexer < Gem::TestCase
                  @indexer.directory
 
     indexer = Gem::Indexer.new @tempdir
-    assert indexer.build_legacy
     assert indexer.build_modern
 
-    indexer = Gem::Indexer.new @tempdir, :build_legacy => false,
-                               :build_modern => true
-    refute indexer.build_legacy
+    indexer = Gem::Indexer.new @tempdir, :build_modern => true
     assert indexer.build_modern
-
-    indexer = Gem::Indexer.new @tempdir, :build_legacy => true,
-                               :build_modern => false
-    assert indexer.build_legacy
-    refute indexer.build_modern
   end
 
   def test_build_indicies
@@ -73,7 +62,9 @@ class TestGemIndexer < Gem::TestCase
                 ["b",      Gem::Version.new("2"),   "ruby"],
                 ["c",      Gem::Version.new("1.2"), "ruby"],
                 ["d",      Gem::Version.new("2.0"), "ruby"],
-                ["pl",     Gem::Version.new("1"),   "i386-linux"]]
+                ["dep_x",  Gem::Version.new("1"),   "ruby"],
+                ["pl",     Gem::Version.new("1"),   "i386-linux"],
+                ["x",      Gem::Version.new("1"),   "ruby"]]
 
     assert_equal expected, specs
 
@@ -87,7 +78,9 @@ class TestGemIndexer < Gem::TestCase
                 ["b",      Gem::Version.new("2"),   "ruby"],
                 ["c",      Gem::Version.new("1.2"), "ruby"],
                 ["d",      Gem::Version.new("2.0"), "ruby"],
-                ["pl",     Gem::Version.new("1"),   "i386-linux"]]
+                ["dep_x",  Gem::Version.new("1"),   "ruby"],
+                ["pl",     Gem::Version.new("1"),   "i386-linux"],
+                ["x",      Gem::Version.new("1"),   "ruby"]]
 
     assert_equal expected, latest_specs, 'latest_specs'
   end
@@ -97,9 +90,6 @@ class TestGemIndexer < Gem::TestCase
       @indexer.generate_index
     end
 
-    assert_indexed @tempdir, "Marshal.#{@marshal_version}"
-    assert_indexed @tempdir, "Marshal.#{@marshal_version}.Z"
-
     quickdir = File.join @tempdir, 'quick'
     marshal_quickdir = File.join quickdir, "Marshal.#{@marshal_version}"
 
@@ -116,210 +106,10 @@ class TestGemIndexer < Gem::TestCase
 
     assert_indexed @tempdir, "latest_specs.#{@marshal_version}"
     assert_indexed @tempdir, "latest_specs.#{@marshal_version}.gz"
-
-    single_quote = CGI.escapeHTML "'"
-
-    expected = <<-EOF
-<?xml version=\"1.0\"?>
-<rss version=\"2.0\">
-  <channel>
-    <title>ExampleForge gems</title>
-    <link>http://example.com</link>
-    <description>Recently released gems from http://example.com</description>
-    <generator>RubyGems v#{Gem::VERSION}</generator>
-    <docs>http://cyber.law.harvard.edu/rss/rss.html</docs>
-    <item>
-      <title>a-2</title>
-      <description>
-&lt;pre&gt;This is a test description&lt;/pre&gt;
-      </description>
-      <author>example@example.com (A User)</author>
-      <guid>a-2</guid>
-      <enclosure url=\"http://gems.example.com/gems/a-2.gem\"
-                 length=\"3072\" type=\"application/octet-stream\" />
-      <pubDate>#{@a2.date.rfc2822}</pubDate>
-      <link>http://example.com</link>
-    </item>
-    <item>
-      <title>a-3.a</title>
-      <description>
-&lt;pre&gt;This is a test description&lt;/pre&gt;
-      </description>
-      <author>example@example.com (A User)</author>
-      <guid>a-3.a</guid>
-      <enclosure url=\"http://gems.example.com/gems/a-3.a.gem\"
-                 length=\"3072\" type=\"application/octet-stream\" />
-      <pubDate>#{@a3a.date.rfc2822}</pubDate>
-      <link>http://example.com</link>
-    </item>
-    <item>
-      <title>a_evil-9</title>
-      <description>
-&lt;pre&gt;This is a test description&lt;/pre&gt;
-      </description>
-      <author>example@example.com (A User)</author>
-      <guid>a_evil-9</guid>
-      <enclosure url=\"http://gems.example.com/gems/a_evil-9.gem\"
-                 length=\"3072\" type=\"application/octet-stream\" />
-      <pubDate>#{@a_evil9.date.rfc2822}</pubDate>
-      <link>http://example.com</link>
-    </item>
-    <item>
-      <title>b-2</title>
-      <description>
-&lt;pre&gt;This is a test description&lt;/pre&gt;
-      </description>
-      <author>example@example.com (A User)</author>
-      <guid>b-2</guid>
-      <enclosure url=\"http://gems.example.com/gems/b-2.gem\"
-                 length=\"3072\" type=\"application/octet-stream\" />
-      <pubDate>#{@b2.date.rfc2822}</pubDate>
-      <link>http://example.com</link>
-    </item>
-    <item>
-      <title>c-1.2</title>
-      <description>
-&lt;pre&gt;This is a test description&lt;/pre&gt;
-      </description>
-      <author>example@example.com (A User)</author>
-      <guid>c-1.2</guid>
-      <enclosure url=\"http://gems.example.com/gems/c-1.2.gem\"
-                 length=\"3072\" type=\"application/octet-stream\" />
-      <pubDate>#{@c1_2.date.rfc2822}</pubDate>
-      <link>http://example.com</link>
-    </item>
-    <item>
-      <title>d-2.0.a</title>
-      <description>
-&lt;pre&gt;This is a test description&lt;/pre&gt;
-      </description>
-      <author>example@example.com (A User)</author>
-      <guid>d-2.0.a</guid>
-      <enclosure url=\"http://gems.example.com/gems/d-2.0.a.gem\"
-                 length=\"3072\" type=\"application/octet-stream\" />
-      <pubDate>#{@d2_0_a.date.rfc2822}</pubDate>
-      <link>http://example.com</link>
-    </item>
-    <item>
-      <title>d-2.0.b</title>
-      <description>
-&lt;pre&gt;This is a test description&lt;/pre&gt;
-      </description>
-      <author>example@example.com (A User)</author>
-      <guid>d-2.0.b</guid>
-      <enclosure url=\"http://gems.example.com/gems/d-2.0.b.gem\"
-                 length=\"3072\" type=\"application/octet-stream\" />
-      <pubDate>#{@d2_0_b.date.rfc2822}</pubDate>
-      <link>http://example.com</link>
-    </item>
-    <item>
-      <title>pl-1-x86-linux</title>
-      <description>
-&lt;pre&gt;This is a test description&lt;/pre&gt;
-      </description>
-      <author>example@example.com (A User)</author>
-      <guid>pl-1-x86-linux</guid>
-      <enclosure url=\"http://gems.example.com/gems/pl-1-x86-linux.gem\"
-                 length=\"3072\" type=\"application/octet-stream\" />
-      <pubDate>#{@pl1.date.rfc2822}</pubDate>
-      <link>http://example.com</link>
-    </item>
-    <item>
-      <title>a-1</title>
-      <description>
-&lt;pre&gt;This line is really, really long.  So long, in fact, that it is more than
-eighty characters long!  The purpose of this line is for testing wrapping
-behavior because sometimes people don#{single_quote}t wrap their text to eighty characters.
-Without the wrapping, the text might not look good in the RSS feed.
-
-Also, a list:
-  * An entry that#{single_quote}s actually kind of sort
-  * an entry that#{single_quote}s really long, which will probably get wrapped funny.
-That#{single_quote}s ok, somebody wasn#{single_quote}t thinking straight when they made it more than
-eighty characters.&lt;/pre&gt;
-      </description>
-      <author>example@example.com (Example), example2@example.com (Example2)</author>
-      <guid>a-1</guid>
-      <enclosure url=\"http://gems.example.com/gems/a-1.gem\"
-                 length=\"3584\" type=\"application/octet-stream\" />
-      <pubDate>#{@a1.date.rfc2822}</pubDate>
-      <link>http://a.example.com</link>
-    </item>
-  </channel>
-</rss>
-    EOF
-
-    gems_rss = File.read File.join(@tempdir, 'index.rss')
-
-    assert_equal expected, gems_rss
-  end
-
-  def test_generate_index_legacy
-    @indexer.build_modern = false
-    @indexer.build_legacy = true
-
-    use_ui @ui do
-      @indexer.generate_index
-    end
-
-    assert_indexed @tempdir, "Marshal.#{@marshal_version}"
-    assert_indexed @tempdir, "Marshal.#{@marshal_version}.Z"
-
-    quickdir = File.join @tempdir, 'quick'
-    marshal_quickdir = File.join quickdir, "Marshal.#{@marshal_version}"
-
-    assert File.directory?(quickdir)
-    assert File.directory?(marshal_quickdir)
-
-    assert_indexed marshal_quickdir, "#{File.basename(@a1.spec_file)}.rz"
-    assert_indexed marshal_quickdir, "#{File.basename(@a2.spec_file)}.rz"
-
-    refute_indexed marshal_quickdir, "#{File.basename(@c1_2.spec_file)}"
-
-    refute_indexed @tempdir, "specs.#{@marshal_version}"
-    refute_indexed @tempdir, "specs.#{@marshal_version}.gz"
-
-    refute_indexed @tempdir, "latest_specs.#{@marshal_version}"
-    refute_indexed @tempdir, "latest_specs.#{@marshal_version}.gz"
-  end
-
-  def test_generate_index_legacy_back_to_back
-    @indexer.build_modern = true
-    @indexer.build_legacy = true
-
-    use_ui @ui do
-      @indexer.generate_index
-    end
-
-    @indexer = Gem::Indexer.new @tempdir
-    @indexer.build_modern = false
-    @indexer.build_legacy = true
-
-    use_ui @ui do
-      @indexer.generate_index
-    end
-
-    assert_indexed @tempdir, "Marshal.#{@marshal_version}"
-    assert_indexed @tempdir, "Marshal.#{@marshal_version}.Z"
-
-    quickdir = File.join @tempdir, 'quick'
-    marshal_quickdir = File.join quickdir, "Marshal.#{@marshal_version}"
-
-    assert File.directory?(marshal_quickdir)
-
-    assert_indexed marshal_quickdir, "#{File.basename(@a1.spec_file)}.rz"
-    assert_indexed marshal_quickdir, "#{File.basename(@a2.spec_file)}.rz"
-
-    assert_indexed @tempdir, "specs.#{@marshal_version}"
-    assert_indexed @tempdir, "specs.#{@marshal_version}.gz"
-
-    assert_indexed @tempdir, "latest_specs.#{@marshal_version}"
-    assert_indexed @tempdir, "latest_specs.#{@marshal_version}.gz"
   end
 
   def test_generate_index_modern
     @indexer.build_modern = true
-    @indexer.build_legacy = false
 
     use_ui @ui do
       @indexer.generate_index
@@ -365,7 +155,6 @@ eighty characters.&lt;/pre&gt;
 
   def test_generate_index_modern_back_to_back
     @indexer.build_modern = true
-    @indexer.build_legacy = true
 
     use_ui @ui do
       @indexer.generate_index
@@ -373,15 +162,10 @@ eighty characters.&lt;/pre&gt;
 
     @indexer = Gem::Indexer.new @tempdir
     @indexer.build_modern = true
-    @indexer.build_legacy = false
 
     use_ui @ui do
       @indexer.generate_index
     end
-
-    assert_indexed @tempdir, "Marshal.#{@marshal_version}"
-    assert_indexed @tempdir, "Marshal.#{@marshal_version}.Z"
-
     quickdir = File.join @tempdir, 'quick'
     marshal_quickdir = File.join quickdir, "Marshal.#{@marshal_version}"
 
@@ -403,14 +187,13 @@ eighty characters.&lt;/pre&gt;
       @indexer.generate_index
     end
 
-    assert_match %r%^\.\.\.\.\.\.\.\.\.\.$%, @ui.output
-    assert_match %r%^Generating Marshal quick index gemspecs for 10 gems$%,
+    assert_match %r%^\.\.\.\.\.\.\.\.\.\.\.\.$%, @ui.output
+    assert_match %r%^Generating Marshal quick index gemspecs for 12 gems$%,
                  @ui.output
     assert_match %r%^Complete$%, @ui.output
     assert_match %r%^Generating specs index$%, @ui.output
     assert_match %r%^Generating latest specs index$%, @ui.output
     assert_match %r%^Generating prerelease specs index$%, @ui.output
-    assert_match %r%^Generating Marshal master index$%, @ui.output
     assert_match %r%^Complete$%, @ui.output
     assert_match %r%^Compressing indicies$%, @ui.output
 
@@ -434,7 +217,9 @@ eighty characters.&lt;/pre&gt;
       ['b',      Gem::Version.new(2),     'ruby'],
       ['c',      Gem::Version.new('1.2'), 'ruby'],
       ['d',      Gem::Version.new('2.0'), 'ruby'],
+      ['dep_x',  Gem::Version.new(1),     'ruby'],
       ['pl',     Gem::Version.new(1),     'i386-linux'],
+      ['x',      Gem::Version.new(1),     'ruby'],
     ]
 
     assert_equal expected, specs
@@ -468,7 +253,9 @@ eighty characters.&lt;/pre&gt;
       ['b',      Gem::Version.new(2),     'ruby'],
       ['c',      Gem::Version.new('1.2'), 'ruby'],
       ['d',      Gem::Version.new('2.0'), 'ruby'],
+      ['dep_x',  Gem::Version.new(1),     'ruby'],
       ['pl',     Gem::Version.new(1),     'i386-linux'],
+      ['x',      Gem::Version.new(1),     'ruby'],
     ]
 
     assert_equal expected, latest_specs