rubygems-update 1.7.2 → 1.8.0

data/lib/rubygems/installer_test_case.rb

@@ -6,7 +6,7 @@ class Gem::Installer
   ##
   # Available through requiring rubygems/installer_test_case
 
-  attr_accessor :gem_dir
+  attr_writer :gem_dir
 
   ##
   # Available through requiring rubygems/installer_test_case
@@ -57,29 +57,38 @@ class Gem::InstallerTestCase < Gem::TestCase
   def setup
     super
 
-    @spec = quick_gem 'a'
-    util_make_exec @spec
+    @installer_tmp = File.join @tempdir, 'installer'
+    FileUtils.mkdir_p @installer_tmp
 
-    @gem = File.join @tempdir, @spec.file_name
+    Gem.use_paths @installer_tmp
+    Gem.ensure_gem_subdirectories @installer_tmp
 
-    @installer = util_installer @spec, @gem, @gemhome
+    @spec = quick_gem 'a'
+    util_make_exec @spec
+    util_build_gem @spec
+    @gem = @spec.cache_file
 
     @user_spec = quick_gem 'b'
     util_make_exec @user_spec
+    util_build_gem @user_spec
+    @user_gem = @user_spec.cache_file
+
+    Gem.use_paths @gemhome
 
-    @user_gem = File.join @tempdir, @user_spec.file_name
+    @installer      = util_installer @spec, @gemhome
+    @user_installer = util_installer @user_spec, Gem.user_dir, :user
 
-    @user_installer = util_installer @user_spec, @user_gem, Gem.user_dir
-    @user_installer.gem_dir = File.join(Gem.user_dir, 'gems',
-                                        @user_spec.full_name)
+    Gem.use_paths @gemhome
   end
 
   def util_gem_bindir spec = @spec
-    File.join util_gem_dir(spec), "bin"
+    # TODO: deprecate
+    spec.bin_dir
   end
 
   def util_gem_dir spec = @spec
-    File.join @gemhome, "gems", spec.full_name
+    # TODO: deprecate
+    spec.gem_dir
   end
 
   def util_inst_bindir
@@ -90,16 +99,13 @@ class Gem::InstallerTestCase < Gem::TestCase
     spec.executables = %w[executable]
     spec.files << 'bin/executable'
 
-    bindir = util_gem_bindir spec
-    FileUtils.mkdir_p bindir
-    exec_path = File.join bindir, 'executable'
-    open exec_path, 'w' do |io|
+    exec_path = spec.bin_file "executable"
+    write_file exec_path do |io|
       io.puts shebang
     end
 
-    temp_bin = File.join(@tempdir, 'bin')
-    FileUtils.mkdir_p temp_bin
-    open File.join(temp_bin, 'executable'), 'w' do |io|
+    bin_path = File.join @tempdir, "bin", "executable"
+    write_file bin_path do |io|
       io.puts shebang
     end
   end
@@ -122,23 +128,15 @@ class Gem::InstallerTestCase < Gem::TestCase
 
       use_ui ui do
         FileUtils.rm @gem
-        Gem::Builder.new(@spec).build
+
+        @gem = Gem::Builder.new(@spec).build
       end
     end
 
     @installer = Gem::Installer.new @gem
   end
 
-  def util_installer(spec, gem_path, gem_home)
-    util_build_gem spec
-    FileUtils.mv Gem.cache_gem(spec.file_name), @tempdir
-    installer = Gem::Installer.new gem_path
-    installer.gem_dir = util_gem_dir
-    installer.gem_home = gem_home
-    installer.spec = spec
-
-    installer
+  def util_installer(spec, gem_home, user=false)
+    Gem::Installer.new spec.cache_file, :user_install => user
   end
-
 end
-

data/lib/rubygems/local_remote_options.rb

@@ -76,7 +76,7 @@ module Gem::LocalRemoteOptions
     add_option(:"Local/Remote", '--clear-sources',
                'Clear the gem sources') do |value, options|
 
-      Gem.sources.clear
+      Gem.sources = nil
       options[:sources_cleared] = true
     end
   end

data/lib/rubygems/mock_gem_ui.rb

@@ -6,7 +6,14 @@ require 'rubygems/user_interaction'
 # retrieval during tests.
 
 class Gem::MockGemUi < Gem::StreamUI
-  class TermError < RuntimeError; end
+  class TermError < RuntimeError
+    attr_reader :exit_code
+
+    def initialize exit_code
+      super
+      @exit_code = exit_code
+    end
+  end
   class SystemExitException < RuntimeError; end
 
   module TTY
@@ -56,8 +63,8 @@ class Gem::MockGemUi < Gem::StreamUI
   def terminate_interaction(status=0)
     @terminated = true
 
-    raise TermError unless status == 0
-    raise SystemExitException, status
+    raise TermError, status if status != 0
+    raise SystemExitException
   end
 
 end

data/lib/rubygems/package.rb

@@ -6,32 +6,6 @@
 
 require 'rubygems/specification'
 
-##
-# Wrapper for FileUtils meant to provide logging and additional operations if
-# needed.
-
-class Gem::FileOperations
-
-  def initialize(logger = nil)
-    require 'fileutils'
-    @logger = logger
-  end
-
-  def method_missing(meth, *args, &block)
-    case
-    when FileUtils.respond_to?(meth)
-      @logger.log "#{meth}: #{args}" if @logger
-      FileUtils.send meth, *args, &block
-    when Gem::FileOperations.respond_to?(meth)
-      @logger.log "#{meth}: #{args}" if @logger
-      Gem::FileOperations.send meth, *args, &block
-    else
-      super
-    end
-  end
-
-end
-
 module Gem::Package
 
   class Error < StandardError; end

data/lib/rubygems/package/tar_input.rb

@@ -110,7 +110,6 @@ class Gem::Package::TarInput
     end
 
     @tarreader.rewind
-    @fileops = Gem::FileOperations.new
 
     unless has_meta then
       path = io.path if io.respond_to? :path
@@ -146,9 +145,9 @@ class Gem::Package::TarInput
       dest = File.join destdir, entry.full_name
 
       if File.directory? dest then
-        @fileops.chmod entry.header.mode, dest, :verbose => false
+        FileUtils.chmod entry.header.mode, dest, :verbose => false
       else
-        @fileops.mkdir_p dest, :mode => entry.header.mode, :verbose => false
+        FileUtils.mkdir_p dest, :mode => entry.header.mode, :verbose => false
       end
 
       fsync_dir dest
@@ -160,9 +159,9 @@ class Gem::Package::TarInput
     # it's a file
     md5 = Digest::MD5.new if expected_md5sum
     destdir = File.join destdir, File.dirname(entry.full_name)
-    @fileops.mkdir_p destdir, :mode => 0755, :verbose => false
+    FileUtils.mkdir_p destdir, :mode => 0755, :verbose => false
     destfile = File.join destdir, File.basename(entry.full_name)
-    @fileops.chmod 0600, destfile, :verbose => false rescue nil # Errno::ENOENT
+    FileUtils.chmod 0600, destfile, :verbose => false rescue nil # Errno::ENOENT
 
     open destfile, "wb", entry.header.mode do |os|
       loop do
@@ -176,7 +175,7 @@ class Gem::Package::TarInput
       os.fsync
     end
 
-    @fileops.chmod entry.header.mode, destfile, :verbose => false
+    FileUtils.chmod entry.header.mode, destfile, :verbose => false
     fsync_dir File.dirname(destfile)
     fsync_dir File.join(File.dirname(destfile), "..")
 

data/lib/rubygems/package_task.rb

@@ -100,7 +100,7 @@ class Gem::PackageTask < Rake::PackageTask
 
     task :package => [:gem]
 
-    gem_file = gem_spec.file_name
+    gem_file = File.basename gem_spec.cache_file
     gem_path = File.join package_dir, gem_file
     gem_dir  = File.join package_dir, gem_spec.full_name
 

data/lib/rubygems/path_support.rb

@@ -0,0 +1,72 @@
+##
+#
+# Gem::PathSupport facilitates the GEM_HOME and GEM_PATH environment settings
+# to the rest of RubyGems.
+#
+class Gem::PathSupport
+  ##
+  # The default system path for managing Gems.
+  attr_reader :home
+
+  ##
+  # Array of paths to search for Gems.
+  attr_reader :path
+
+  ##
+  #
+  # Constructor. Takes a single argument which is to be treated like a
+  # hashtable, or defaults to ENV, the system environment.
+  #
+  def initialize(env=ENV)
+    @env = env
+
+    # note 'env' vs 'ENV'...
+    @home     = env["GEM_HOME"] || ENV["GEM_HOME"] || Gem.default_dir
+    self.path = env["GEM_PATH"] || ENV["GEM_PATH"]
+  end
+
+  private
+
+  ##
+  # Set the Gem home directory (as reported by Gem.dir).
+
+  def home=(home)
+    @home = home.to_s
+  end
+
+  ##
+  # Set the Gem search path (as reported by Gem.path).
+
+  def path=(gpaths)
+    # FIX: it should be [home, *path], not [*path, home]
+
+    gem_path = []
+
+    # FIX: I can't tell wtf this is doing.
+    gpaths ||= (ENV['GEM_PATH'] || "").empty? ? nil : ENV["GEM_PATH"]
+
+    if gpaths
+      if gpaths.kind_of?(Array)
+        gem_path = gpaths.dup
+      else
+        gem_path = gpaths.split(File::PATH_SEPARATOR)
+      end
+
+      if File::ALT_SEPARATOR then
+        gem_path.map! do |this_path|
+          this_path.gsub File::ALT_SEPARATOR, File::SEPARATOR
+        end
+      end
+
+      gem_path << @home
+    else
+      gem_path = Gem.default_path + [@home]
+
+      if defined?(Gem::APPLE_GEM_HOME)
+        gem_path << Gem::APPLE_GEM_HOME
+      end
+    end
+
+    @path = gem_path.uniq
+  end
+end

data/lib/rubygems/platform.rb

@@ -1,3 +1,5 @@
+require "rubygems/deprecate"
+
 ##
 # Available list of platforms for targeting Gem installations.
 
@@ -115,8 +117,13 @@ class Gem::Platform
   # the same CPU, OS and version.
 
   def ==(other)
-    self.class === other and
-      @cpu == other.cpu and @os == other.os and @version == other.version
+    self.class === other and to_a == other.to_a
+  end
+
+  alias :eql? :==
+
+  def hash # :nodoc:
+    to_a.hash
   end
 
   ##
@@ -179,5 +186,8 @@ class Gem::Platform
 
   CURRENT = 'current'
 
+  extend Deprecate
+
+  deprecate :empty?, :none, 2011, 11
 end
 

data/lib/rubygems/remote_fetcher.rb

@@ -80,7 +80,8 @@ class Gem::RemoteFetcher
   # larger, more emcompassing effort. -erikh
 
   def download_to_cache dependency
-    found = Gem::SpecFetcher.fetcher.fetch dependency
+    found = Gem::SpecFetcher.fetcher.fetch dependency, true, true,
+                                           dependency.prerelease?
 
     return if found.empty?
 
@@ -98,12 +99,12 @@ class Gem::RemoteFetcher
     Gem.ensure_gem_subdirectories(install_dir) rescue nil
 
     if File.writable?(install_dir)
-      cache_dir = Gem.cache_dir(install_dir)
+      cache_dir = File.join install_dir, "cache"
     else
-      cache_dir = Gem.cache_dir(Gem.user_dir)
+      cache_dir = File.join Gem.user_dir, "cache"
     end
 
-    gem_file_name = spec.file_name
+    gem_file_name = File.basename spec.cache_file
     local_gem_path = File.join cache_dir, gem_file_name
 
     FileUtils.mkdir_p cache_dir rescue nil unless File.exist? cache_dir
@@ -111,8 +112,8 @@ class Gem::RemoteFetcher
    # Always escape URI's to deal with potential spaces and such
     unless URI::Generic === source_uri
       source_uri = URI.parse(URI.const_defined?(:DEFAULT_PARSER) ?
-                             URI::DEFAULT_PARSER.escape(source_uri) :
-                             URI.escape(source_uri))
+                             URI::DEFAULT_PARSER.escape(source_uri.to_s) :
+                             URI.escape(source_uri.to_s))
     end
 
     scheme = source_uri.scheme

data/lib/rubygems/requirement.rb

@@ -135,6 +135,9 @@ class Gem::Requirement
     requirements.all? { |op, rv| (OPS[op] || OPS["="]).call version, rv }
   end
 
+  alias :=== :satisfied_by?
+  alias :=~ :satisfied_by?
+
   def to_s # :nodoc:
     as_list.join ", "
   end

data/lib/rubygems/security.rb

@@ -387,7 +387,7 @@ module Gem::Security
     :munge_re   => Regexp.new(/[^a-z0-9_.-]+/),
 
     # output directory for trusted certificate checksums
-    :trust_dir => File::join(Gem.user_home, '.gem', 'trust'),
+    :trust_dir => File.join(Gem.user_home, '.gem', 'trust'),
 
     # default permissions for trust directory and certs
     :perms => {

data/lib/rubygems/server.rb

@@ -75,47 +75,47 @@ class Gem::Server
 
   <dl>
   <% values["specs"].each do |spec| %>
-  	<dt>
-  	<% if spec["first_name_entry"] then %>
-  	  <a name="<%=spec["name"]%>"></a>
-  	<% end %>
-
-  	<b><%=spec["name"]%> <%=spec["version"]%></b>
-
-  	<% if spec["rdoc_installed"] then %>
-  	  <a href="<%=spec["doc_path"]%>">[rdoc]</a>
-  	<% else %>
-  	  <span title="rdoc not installed">[rdoc]</span>
-  	<% end %>
-
-  	<% if spec["homepage"] then %>
-  		<a href="<%=spec["homepage"]%>" title="<%=spec["homepage"]%>">[www]</a>
-  	<% else %>
-  		<span title="no homepage available">[www]</span>
-  	<% end %>
-
-  	<% if spec["has_deps"] then %>
-  	 - depends on
-  		<%= spec["dependencies"].map { |v| "<a href=\"##{v["name"]}\">#{v["name"]}</a>" }.join ', ' %>.
-  	<% end %>
-  	</dt>
-  	<dd>
-  	<%=spec["summary"]%>
-  	<% if spec["executables"] then %>
-  	  <br/>
-
-  		<% if spec["only_one_executable"] then %>
-  		    Executable is
-  		<% else %>
-  		    Executables are
-  		<%end%>
-
-  		<%= spec["executables"].map { |v| "<span class=\"context-item-name\">#{v["executable"]}</span>"}.join ', ' %>.
-
-  	<%end%>
-  	<br/>
-  	<br/>
-  	</dd>
+    <dt>
+    <% if spec["first_name_entry"] then %>
+      <a name="<%=spec["name"]%>"></a>
+    <% end %>
+
+    <b><%=spec["name"]%> <%=spec["version"]%></b>
+
+    <% if spec["rdoc_installed"] then %>
+      <a href="<%=spec["doc_path"]%>">[rdoc]</a>
+    <% else %>
+      <span title="rdoc not installed">[rdoc]</span>
+    <% end %>
+
+    <% if spec["homepage"] then %>
+      <a href="<%=spec["homepage"]%>" title="<%=spec["homepage"]%>">[www]</a>
+    <% else %>
+      <span title="no homepage available">[www]</span>
+    <% end %>
+
+    <% if spec["has_deps"] then %>
+     - depends on
+      <%= spec["dependencies"].map { |v| "<a href=\"##{v["name"]}\">#{v["name"]}</a>" }.join ', ' %>.
+    <% end %>
+    </dt>
+    <dd>
+    <%=spec["summary"]%>
+    <% if spec["executables"] then %>
+      <br/>
+
+      <% if spec["only_one_executable"] then %>
+          Executable is
+      <% else %>
+          Executables are
+      <%end%>
+
+      <%= spec["executables"].map { |v| "<span class=\"context-item-name\">#{v["executable"]}</span>"}.join ', ' %>.
+
+    <%end%>
+    <br/>
+    <br/>
+    </dd>
   <% end %>
   </dl>
 
@@ -454,15 +454,15 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
       spec_dir
     end
 
-    @source_index = Gem::SourceIndex.new(@spec_dirs)
+    Gem::Specification.dirs = @gem_dirs
   end
 
   def Marshal(req, res)
-    @source_index.refresh!
+    Gem::Specification.reset
 
     add_date res
 
-    index = Marshal.dump @source_index
+    index = Deprecate.skip_during { Marshal.dump Gem.source_index }
 
     if req.request_method == 'HEAD' then
       res['content-length'] = index.length
@@ -486,15 +486,16 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
   end
 
   def latest_specs(req, res)
-    @source_index.refresh!
+    Gem::Specification.reset
 
     res['content-type'] = 'application/x-gzip'
 
     add_date res
 
-    specs = @source_index.latest_specs.sort.map do |spec|
-      platform = spec.original_platform
-      platform = Gem::Platform::RUBY if platform.nil?
+    latest_specs = Gem::Specification.latest_specs
+
+    specs = latest_specs.sort.map do |spec|
+      platform = spec.original_platform || Gem::Platform::RUBY
       [spec.name, spec.version, platform]
     end
 
@@ -546,21 +547,20 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
   end
 
   def quick(req, res)
-    @source_index.refresh!
+    Gem::Specification.reset
 
     res['content-type'] = 'text/plain'
     add_date res
 
     case req.request_uri.path
     when %r|^/quick/(Marshal.#{Regexp.escape Gem.marshal_version}/)?(.*?)-([0-9.]+)(-.*?)?\.gemspec\.rz$| then
-      dep = Gem::Dependency.new $2, $3
-      specs = @source_index.search dep
-      marshal_format = $1
+      marshal_format, name, version, platform = $1, $2, $3, $4
+      specs = Gem::Specification.find_all_by_name name, version
 
-      selector = [$2, $3, $4].map { |s| s.inspect }.join ' '
+      selector = [name, version, platform].map(&:inspect).join ' '
 
-      platform = if $4 then
-                   Gem::Platform.new $4.sub(/^-/, '')
+      platform = if platform then
+                   Gem::Platform.new platform.sub(/^-/, '')
                  else
                    Gem::Platform::RUBY
                  end
@@ -583,7 +583,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
   end
 
   def root(req, res)
-    @source_index.refresh!
+    Gem::Specification.reset
     add_date res
 
     raise WEBrick::HTTPStatus::NotFound, "`#{req.path}' not found." unless
@@ -592,13 +592,15 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
     specs = []
     total_file_count = 0
 
-    @source_index.each do |path, spec|
+    Gem::Specification.each do |spec|
       total_file_count += spec.files.size
-      deps = spec.dependencies.map do |dep|
-        { "name"    => dep.name,
+      deps = spec.dependencies.map { |dep|
+        {
+          "name"    => dep.name,
           "type"    => dep.type,
-          "version" => dep.requirement.to_s, }
-      end
+          "version" => dep.requirement.to_s,
+        }
+      }
 
       deps = deps.sort_by { |dep| [dep["name"].downcase, dep["version"]] }
       deps.last["is_last"] = true unless deps.empty?
@@ -792,13 +794,12 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
   end
 
   def specs(req, res)
-    @source_index.refresh!
+    Gem::Specification.reset
 
     add_date res
 
-    specs = @source_index.sort.map do |_, spec|
-      platform = spec.original_platform
-      platform = Gem::Platform::RUBY if platform.nil?
+    specs = Gem::Specification.sort_by(&:sort_obj).map do |spec|
+      platform = spec.original_platform || Gem::Platform::RUBY
       [spec.name, spec.version, platform]
     end
 
@@ -821,12 +822,11 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
   def launch
     listeners = @server.listeners.map{|l| l.addr[2] }
 
+    # TODO: 0.0.0.0 == any, not localhost.
     host = listeners.any?{|l| l == '0.0.0.0'} ? 'localhost' : listeners.first
 
     say "Launching browser to http://#{host}:#{@port}"
 
     system("#{@launch} http://#{host}:#{@port}")
   end
-
 end
-