rubygems-update 1.2.0 → 1.3.0

data/test/test_gem_gem_path_searcher.rb

@@ -5,10 +5,6 @@ require 'rubygems/gem_path_searcher'
 class Gem::GemPathSearcher
   attr_accessor :gemspecs
   attr_accessor :lib_dirs
-
-  public :init_gemspecs
-  public :matching_file
-  public :lib_dirs_for
 end
 
 class TestGemGemPathSearcher < RubyGemTestCase
@@ -40,6 +36,10 @@ class TestGemGemPathSearcher < RubyGemTestCase
     assert_equal @foo1, @gps.find('foo')
   end
 
+  def test_find_all
+    assert_equal [@foo1], @gps.find_all('foo')
+  end
+
   def test_init_gemspecs
     assert_equal [@bar2, @bar1, @foo2, @foo1], @gps.init_gemspecs
   end
@@ -51,9 +51,17 @@ class TestGemGemPathSearcher < RubyGemTestCase
     assert_equal expected, lib_dirs
   end
 
-  def test_matching_file
-    assert !@gps.matching_file(@foo1, 'bar')
-    assert @gps.matching_file(@foo1, 'foo')
+  def test_matching_file_eh
+    assert !@gps.matching_file?(@foo1, 'bar')
+    assert @gps.matching_file?(@foo1, 'foo')
+  end
+
+  def test_matching_files
+    assert_equal [], @gps.matching_files(@foo1, 'bar')
+
+    expected = File.join @foo1.full_gem_path, 'lib', 'foo.rb'
+
+    assert_equal [expected], @gps.matching_files(@foo1, 'foo')
   end
 
 end

data/test/test_gem_indexer.rb

@@ -21,7 +21,6 @@ class TestGemIndexer < RubyGemTestCase
     util_make_gems
 
     @d2_0 = quick_gem 'd', '2.0'
-    write_file File.join(*%W[gems #{@d2_0.original_name} lib code.rb]) do end
     util_build_gem @d2_0
 
     gems = File.join(@tempdir, 'gems')
@@ -38,6 +37,41 @@ class TestGemIndexer < RubyGemTestCase
                  @indexer.directory
   end
 
+  def test_build_indicies
+    spec = quick_gem 'd', '2.0'
+    spec.instance_variable_set :@original_platform, ''
+
+    @indexer.make_temp_directories
+
+    index = Gem::SourceIndex.new
+    index.add_spec spec
+
+    use_ui @ui do
+      @indexer.build_indicies index
+    end
+
+    specs_path = File.join @indexer.directory, "specs.#{@marshal_version}"
+    specs_dump = Gem.read_binary specs_path
+    specs = Marshal.load specs_dump
+
+    expected = [
+      ['d',      Gem::Version.new('2.0'), 'ruby'],
+    ]
+
+    assert_equal expected, specs, 'specs'
+
+    latest_specs_path = File.join @indexer.directory,
+                                  "latest_specs.#{@marshal_version}"
+    latest_specs_dump = Gem.read_binary latest_specs_path
+    latest_specs = Marshal.load latest_specs_dump
+
+    expected = [
+      ['d',      Gem::Version.new('2.0'), 'ruby'],
+    ]
+
+    assert_equal expected, latest_specs, 'latest_specs'
+  end
+
   def test_generate_index
     use_ui @ui do
       @indexer.generate_index

data/test/test_gem_install_update_options.rb

@@ -1,20 +1,21 @@
 require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.join(File.expand_path(File.dirname(__FILE__)),
+                  'gem_installer_test_case')
 require 'rubygems/install_update_options'
 require 'rubygems/command'
 
-class TestGemInstallUpdateOptions < RubyGemTestCase
+class TestGemInstallUpdateOptions < GemInstallerTestCase
 
   def setup
     super
 
     @cmd = Gem::Command.new 'dummy', 'dummy'
     @cmd.extend Gem::InstallUpdateOptions
+    @cmd.add_install_update_options
   end
 
   def test_add_install_update_options
-    @cmd.add_install_update_options
-
     args = %w[-i /install_to --rdoc --ri -E -f -t -w -P HighSecurity
               --ignore-dependencies --format-exec --include-dependencies]
 
@@ -22,8 +23,6 @@ class TestGemInstallUpdateOptions < RubyGemTestCase
   end
 
   def test_security_policy
-    @cmd.add_install_update_options
-
     @cmd.handle_options %w[-P HighSecurity]
 
     assert_equal Gem::Security::HighSecurity, @cmd.options[:security_policy]
@@ -37,4 +36,26 @@ class TestGemInstallUpdateOptions < RubyGemTestCase
     end
   end
 
+  def test_user_install_enabled
+    @cmd.handle_options %w[--user-install]
+
+    @installer = Gem::Installer.new @gem, @cmd.options
+    @installer.install
+    assert File.exist?(File.join(Gem.user_dir, 'gems'))
+    assert File.exist?(File.join(Gem.user_dir, 'gems',
+                                 @spec.full_name))
+  end
+
+  def test_user_install_disabled_read_only
+    @cmd.handle_options %w[--no-user-install]
+
+    File.chmod 0755, @userhome
+    FileUtils.chmod 0000, @gemhome
+
+    assert_raises(Gem::FilePermissionError) do
+      @installer = Gem::Installer.new @gem, @cmd.options
+    end
+  ensure
+    FileUtils.chmod 0755, @gemhome
+  end
 end

data/test/test_gem_installer.rb

@@ -70,7 +70,10 @@ load 'my_exec'
 #{Gem.ruby}: No such file or directory -- extconf.rb (LoadError)
     EOF
 
-    assert_equal expected, File.read(gem_make_out)
+    assert_match %r%#{Regexp.escape Gem.ruby} extconf.rb%,
+                 File.read(gem_make_out)
+    assert_match %r%#{Regexp.escape Gem.ruby}: No such file%,
+                 File.read(gem_make_out)
   end
 
   def test_build_extensions_unsupported
@@ -515,6 +518,7 @@ load 'my_exec'
     spec = quick_gem 'a' do |s| s.platform = Gem::Platform.new 'mswin32' end
     gem = File.join @tempdir, "#{spec.full_name}.gem"
 
+    Dir.mkdir util_inst_bindir
     util_build_gem spec
     FileUtils.mv File.join(@gemhome, 'cache', "#{spec.full_name}.gem"),
                  @tempdir
@@ -525,10 +529,23 @@ load 'my_exec'
   end
 
   def test_install
+    Dir.mkdir util_inst_bindir
     util_setup_gem
 
-    use_ui @ui do
-      assert_equal @spec, @installer.install
+    cache_file = File.join @gemhome, 'cache', "#{@spec.full_name}.gem"
+
+    Gem.pre_install do |installer|
+      assert !File.exist?(cache_file), 'cache file should not exist yet'
+    end
+
+    Gem.post_install do |installer|
+      assert File.exist?(cache_file), 'cache file should exist'
+    end
+
+    build_rake_in do
+      use_ui @ui do
+        assert_equal @spec, @installer.install
+      end
     end
 
     gemdir = File.join @gemhome, 'gems', @spec.full_name
@@ -548,6 +565,9 @@ load 'my_exec'
 
     assert_equal spec_file, @spec.loaded_from
     assert File.exist?(spec_file)
+
+    assert_same @installer, @pre_install_hook_arg
+    assert_same @installer, @post_install_hook_arg
   end
 
   def test_install_bad_gem
@@ -582,6 +602,29 @@ load 'my_exec'
     end
   end
 
+  def test_install_check_dependencies_install_dir
+    gemhome2 = "#{@gemhome}2"
+    @spec.add_dependency 'b'
+
+    b2 = quick_gem 'b', 2
+
+    FileUtils.mv @gemhome, gemhome2
+    Gem.source_index.gems.delete b2.full_name
+    source_index = Gem::SourceIndex.from_gems_in File.join(gemhome2,
+                                                           'specifications')
+
+    util_setup_gem
+
+    @installer = Gem::Installer.new @gem, :install_dir => gemhome2,
+                                    :source_index => source_index
+
+    use_ui @ui do
+      @installer.install
+    end
+
+    assert File.exist?(File.join(gemhome2, 'gems', @spec.full_name))
+  end
+
   def test_install_force
     use_ui @ui do
       installer = Gem::Installer.new old_ruby_required, :force => true
@@ -593,12 +636,15 @@ load 'my_exec'
   end
 
   def test_install_ignore_dependencies
+    Dir.mkdir util_inst_bindir
     @spec.add_dependency 'b', '> 5'
     util_setup_gem
     @installer.ignore_dependencies = true
 
-    use_ui @ui do
-      assert_equal @spec, @installer.install
+    build_rake_in do
+      use_ui @ui do
+        assert_equal @spec, @installer.install
+      end
     end
 
     gemdir = File.join @gemhome, 'gems', @spec.full_name
@@ -635,32 +681,58 @@ load 'my_exec'
                                  "#{@spec.full_name}.gemspec"))
   end
 
-  def test_install_with_message
-    @spec.post_install_message = 'I am a shiny gem!'
+  unless win_platform? # File.chmod doesn't work
+    def test_install_user_local_fallback
+      Dir.mkdir util_inst_bindir
+      File.chmod 0755, @userhome
+      File.chmod 0000, util_inst_bindir
+      File.chmod 0000, Gem.dir
+      @spec.executables = ["executable"]
 
-    use_ui @ui do
-      Dir.chdir @tempdir do Gem::Builder.new(@spec).build end
+      build_rake_in do
+        use_ui @ui do
+          util_setup_gem
+          @installer.install
+        end
+      end
 
-      @installer.install
-    end
+      assert File.exist?(File.join(Gem.user_dir, 'gems',
+                                   @spec.full_name, 'lib', 'code.rb'))
+      assert File.exist?(File.join(Gem.user_dir, 'bin', 'executable'))
+    ensure
+      File.chmod 0755, Gem.dir
+      File.chmod 0755, util_inst_bindir
+    end
+
+    def test_install_bindir_read_only
+      Dir.mkdir util_inst_bindir
+      File.chmod 0755, @userhome
+      File.chmod 0000, util_inst_bindir
+
+      build_rake_in do
+        use_ui @ui do
+          setup
+          util_setup_gem
+          @installer.install
+        end
+      end
 
-    assert_match %r|I am a shiny gem!|, @ui.output
+      assert File.exist?(File.join(Gem.user_dir, 'bin', 'executable'))
+    ensure
+      File.chmod 0755, util_inst_bindir
+    end
   end
 
-  def test_install_writable
-    util_setup_gem
+  def test_install_with_message
+    @spec.post_install_message = 'I am a shiny gem!'
 
-    orig_mode = File.stat(Gem.dir).mode
-    File.chmod 0000, Gem.dir
+    use_ui @ui do
+      Dir.chdir @tempdir do Gem::Builder.new(@spec).build end
 
-    e = assert_raise Gem::FilePermissionError do
       @installer.install
     end
 
-    assert_equal "You don't have write permissions into the #{@gemhome} directory.",
-                 e.message
-  ensure
-    File.chmod orig_mode, Gem.dir
+    assert_match %r|I am a shiny gem!|, @ui.output
   end
 
   def test_install_wrong_ruby_version

data/test/test_gem_local_remote_options.rb

@@ -19,6 +19,18 @@ class TestGemLocalRemoteOptions < RubyGemTestCase
     assert @cmd.handles?(args)
   end
 
+  def test_both_eh
+    assert_equal false, @cmd.both?
+
+    @cmd.options[:domain] = :local
+
+    assert_equal false, @cmd.both?
+
+    @cmd.options[:domain] = :both
+
+    assert_equal true, @cmd.both?
+  end
+
   def test_local_eh
     assert_equal false, @cmd.local?
 

data/test/test_gem_platform.rb

@@ -5,19 +5,6 @@ require 'rbconfig'
 
 class TestGemPlatform < RubyGemTestCase
 
-  def test_self_const_missing
-    consts = [:DARWIN, :LINUX_586, :MSWIN32, :PPC_DARWIN, :WIN32, :X86_LINUX]
-
-    consts.each do |const|
-      e = assert_raise NameError do
-        Gem::Platform.const_missing const
-      end
-
-      assert_equal "#{const} has been removed, use CURRENT instead",
-                   e.message
-    end
-  end
-
   def test_self_local
     util_set_arch 'i686-darwin8.10.1'
 
@@ -105,6 +92,12 @@ class TestGemPlatform < RubyGemTestCase
     platform = Gem::Platform.new 'i386-mswin32-80'
 
     assert_equal expected, platform.to_a, 'i386-mswin32-80'
+
+    expected = ['x86', 'solaris', '2.10']
+
+    platform = Gem::Platform.new 'i386-solaris-2.10'
+
+    assert_equal expected, platform.to_a, 'i386-solaris-2.10'
   end
 
   def test_initialize_mswin32_vc6

data/test/test_gem_remote_fetcher.rb

@@ -10,6 +10,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'webrick'
 require 'zlib'
 require 'rubygems/remote_fetcher'
+require 'ostruct'
 
 # = Testing Proxy Settings
 #
@@ -106,6 +107,8 @@ gems:
     @a1, @a1_gem = util_gem 'a', '1' do |s| s.executables << 'a_bin' end
 
     Gem::RemoteFetcher.fetcher = nil
+
+    @fetcher = Gem::RemoteFetcher.fetcher
   end
 
   def test_self_fetcher
@@ -117,7 +120,10 @@ gems:
   def test_self_fetcher_with_proxy
     proxy_uri = 'http://proxy.example.com'
     Gem.configuration[:http_proxy] = proxy_uri
+    Gem::RemoteFetcher.fetcher = nil
+
     fetcher = Gem::RemoteFetcher.fetcher
+
     assert_not_nil fetcher
     assert_kind_of Gem::RemoteFetcher, fetcher
     assert_equal proxy_uri, fetcher.instance_variable_get(:@proxy_uri).to_s
@@ -145,7 +151,7 @@ gems:
   def test_fetch_size_socket_error
     fetcher = Gem::RemoteFetcher.new nil
     def fetcher.connection_for(uri)
-      raise SocketError
+      raise SocketError, "tarded"
     end
 
     uri = 'http://gems.example.com/yaml'
@@ -153,15 +159,13 @@ gems:
       fetcher.fetch_size uri
     end
 
-    assert_equal "SocketError (SocketError)\n\tfetching size (#{uri})",
-                 e.message
+    assert_equal "SocketError: tarded (#{uri})", e.message
   end
 
   def test_no_proxy
     use_ui @ui do
-      fetcher = Gem::RemoteFetcher.new nil
-      assert_data_from_server fetcher.fetch_path(@server_uri)
-      assert_equal SERVER_DATA.size, fetcher.fetch_size(@server_uri)
+      assert_data_from_server @fetcher.fetch_path(@server_uri)
+      assert_equal SERVER_DATA.size, @fetcher.fetch_size(@server_uri)
     end
   end
 
@@ -238,6 +242,7 @@ gems:
     install_dir = File.join @tempdir, 'more_gems'
 
     a1_cache_gem = File.join install_dir, 'cache', "#{@a1.full_name}.gem"
+    FileUtils.mkdir_p(File.dirname(a1_cache_gem))
     actual = fetcher.download(@a1, 'http://gems.example.com', install_dir)
 
     assert_equal a1_cache_gem, actual
@@ -247,7 +252,7 @@ gems:
     assert File.exist?(a1_cache_gem)
   end
 
-  unless win_platform? then # File.chmod doesn't work
+  unless win_platform? # File.chmod doesn't work
     def test_download_local_read_only
       FileUtils.mv @a1_gem, @tempdir
       local_path = File.join @tempdir, "#{@a1.full_name}.gem"
@@ -263,6 +268,19 @@ gems:
     ensure
       File.chmod 0755, File.join(@gemhome, 'cache')
     end
+
+    def test_download_read_only
+      File.chmod 0555, File.join(@gemhome, 'cache')
+      File.chmod 0555, File.join(@gemhome)
+
+      fetcher = util_fuck_with_fetcher File.read(@a1_gem)
+      fetcher.download(@a1, 'http://gems.example.com')
+      assert File.exist?(File.join(Gem.user_dir, 'cache',
+                                   "#{@a1.full_name}.gem"))
+    ensure
+      File.chmod 0755, File.join(@gemhome)
+      File.chmod 0755, File.join(@gemhome, 'cache')
+    end
   end
 
   def test_download_platform_legacy
@@ -363,10 +381,32 @@ gems:
     end
   end
 
+  def test_fetch_path_gzip
+    fetcher = Gem::RemoteFetcher.new nil
+
+    def fetcher.open_uri_or_path(uri, mtime, head = nil)
+      Gem.gzip 'foo'
+    end
+
+    assert_equal 'foo', fetcher.fetch_path(@uri + 'foo.gz')
+  end
+
+  def test_fetch_path_gzip_unmodified
+    fetcher = Gem::RemoteFetcher.new nil
+
+    def fetcher.open_uri_or_path(uri, mtime, head = nil)
+      nil
+    end
+
+    assert_equal nil, fetcher.fetch_path(@uri + 'foo.gz', Time.at(0))
+  end
+
   def test_fetch_path_io_error
     fetcher = Gem::RemoteFetcher.new nil
 
-    def fetcher.open_uri_or_path(uri) raise EOFError; end
+    def fetcher.open_uri_or_path(uri, mtime, head = nil)
+      raise EOFError
+    end
 
     e = assert_raise Gem::RemoteFetcher::FetchError do
       fetcher.fetch_path 'uri'
@@ -379,7 +419,9 @@ gems:
   def test_fetch_path_socket_error
     fetcher = Gem::RemoteFetcher.new nil
 
-    def fetcher.open_uri_or_path(uri) raise SocketError; end
+    def fetcher.open_uri_or_path(uri, mtime, head = nil)
+      raise SocketError
+    end
 
     e = assert_raise Gem::RemoteFetcher::FetchError do
       fetcher.fetch_path 'uri'
@@ -392,7 +434,7 @@ gems:
   def test_fetch_path_system_call_error
     fetcher = Gem::RemoteFetcher.new nil
 
-    def fetcher.open_uri_or_path(uri);
+    def fetcher.open_uri_or_path(uri, mtime = nil, head = nil)
       raise Errno::ECONNREFUSED, 'connect(2)'
     end
 
@@ -405,6 +447,16 @@ gems:
     assert_equal 'uri', e.uri
   end
 
+  def test_fetch_path_unmodified
+    fetcher = Gem::RemoteFetcher.new nil
+
+    def fetcher.open_uri_or_path(uri, mtime, head = nil)
+      nil
+    end
+
+    assert_equal nil, fetcher.fetch_path(URI.parse(@gem_repo), Time.at(0))
+  end
+
   def test_get_proxy_from_env_empty
     orig_env_HTTP_PROXY = ENV['HTTP_PROXY']
     orig_env_http_proxy = ENV['http_proxy']
@@ -462,7 +514,7 @@ gems:
     def conn.request(req)
       unless defined? @requested then
         @requested = true
-        res = Net::HTTPRedirection.new nil, 301, nil
+        res = Net::HTTPMovedPermanently.new nil, 301, nil
         res.add_field 'Location', 'http://gems.example.com/real_path'
         res
       else
@@ -475,9 +527,9 @@ gems:
     conn = { 'gems.example.com:80' => conn }
     fetcher.instance_variable_set :@connections, conn
 
-    fetcher.send :open_uri_or_path, 'http://gems.example.com/redirect' do |io|
-      assert_equal 'real_path', io.read
-    end
+    data = fetcher.open_uri_or_path 'http://gems.example.com/redirect'
+
+    assert_equal 'real_path', data
   end
 
   def test_open_uri_or_path_limited_redirects
@@ -486,7 +538,7 @@ gems:
     conn = Object.new
     def conn.started?() true end
     def conn.request(req)
-      res = Net::HTTPRedirection.new nil, 301, nil
+      res = Net::HTTPMovedPermanently.new nil, 301, nil
       res.add_field 'Location', 'http://gems.example.com/redirect'
       res
     end
@@ -495,29 +547,43 @@ gems:
     fetcher.instance_variable_set :@connections, conn
 
     e = assert_raise Gem::RemoteFetcher::FetchError do
-      fetcher.send :open_uri_or_path, 'http://gems.example.com/redirect'
+      fetcher.open_uri_or_path 'http://gems.example.com/redirect'
     end
 
     assert_equal 'too many redirects (http://gems.example.com/redirect)',
                  e.message
   end
 
-  def test_zip
-    use_ui @ui do
-      self.class.enable_zip = true
-      fetcher = Gem::RemoteFetcher.new nil
-      assert_equal SERVER_DATA.size, fetcher.fetch_size(@server_uri), "probably not from proxy"
-      zip_data = fetcher.fetch_path(@server_z_uri)
-      assert zip_data.size < SERVER_DATA.size, "Zipped data should be smaller"
-    end
+  def test_request
+    uri = URI.parse "#{@gem_repo}/specs.#{Gem.marshal_version}"
+    util_stub_connection_for :body => :junk, :code => 200
+
+    response = @fetcher.request uri, Net::HTTP::Get
+
+    assert_equal 200, response.code
+    assert_equal :junk, response.body
   end
 
-  def test_no_zip
-    use_ui @ui do
-      self.class.enable_zip = false
-      fetcher = Gem::RemoteFetcher.new nil
-      assert_error { fetcher.fetch_path(@server_z_uri) }
-    end
+  def test_request_head
+    uri = URI.parse "#{@gem_repo}/specs.#{Gem.marshal_version}"
+    util_stub_connection_for :body => '', :code => 200
+    response = @fetcher.request uri, Net::HTTP::Head
+
+    assert_equal 200, response.code
+    assert_equal '', response.body
+  end
+
+  def test_request_unmodifed
+    uri = URI.parse "#{@gem_repo}/specs.#{Gem.marshal_version}"
+    conn = util_stub_connection_for :body => '', :code => 304
+
+    t = Time.now
+    response = @fetcher.request uri, Net::HTTP::Head, t
+
+    assert_equal 304, response.code
+    assert_equal '', response.body
+
+    assert_equal t.rfc2822, conn.payload['if-modified-since']
   end
 
   def test_yaml_error_on_size
@@ -528,7 +594,17 @@ gems:
     end
   end
 
-  private
+  def util_stub_connection_for hash
+    def @fetcher.connection= conn
+      @conn = conn
+    end
+
+    def @fetcher.connection_for uri
+      @conn
+    end
+
+    @fetcher.connection = Conn.new OpenStruct.new(hash)
+  end
 
   def assert_error(exception_class=Exception)
     got_exception = false
@@ -548,6 +624,20 @@ gems:
     assert_block("Data is not from proxy") { data =~ /0\.4\.2/ }
   end
 
+  class Conn
+    attr_accessor :payload
+
+    def initialize(response)
+      @response = response
+      self.payload = nil
+    end
+
+    def request(req)
+      self.payload = req
+      @response
+    end
+  end
+
   class NilLog < WEBrick::Log
     def log(level, data) #Do nothing
     end