rubygems-update 1.8.30 → 2.0.0.preview2

data/lib/rubygems/package/digest_io.rb

@@ -0,0 +1,64 @@
+##
+# IO wrapper that creates digests of contents written to the IO it wraps.
+
+class Gem::Package::DigestIO
+
+  ##
+  # Collected digests for wrapped writes.
+  #
+  #   {
+  #     'SHA1'   => #<OpenSSL::Digest: [...]>,
+  #     'SHA512' => #<OpenSSL::Digest: [...]>,
+  #   }
+
+  attr_reader :digests
+
+  ##
+  # Wraps +io+ and updates digest for each of the digest algorithms in
+  # the +digests+ Hash.  Returns the digests hash.  Example:
+  #
+  #   io = StringIO.new
+  #   digests = {
+  #     'SHA1'   => OpenSSL::Digest.new('SHA1'),
+  #     'SHA512' => OpenSSL::Digest.new('SHA512'),
+  #   }
+  #
+  #   Gem::Package::DigestIO.wrap io, digests do |digest_io|
+  #     digest_io.write "hello"
+  #   end
+  #
+  #   digests['SHA1'].hexdigest   #=> "aaf4c61d[...]"
+  #   digests['SHA512'].hexdigest #=> "9b71d224[...]"
+
+  def self.wrap io, digests
+    digest_io = new io, digests
+
+    yield digest_io
+
+    return digests
+  end
+
+  ##
+  # Creates a new DigestIO instance.  Using ::wrap is recommended, see the
+  # ::wrap documentation for documentation of +io+ and +digests+.
+
+  def initialize io, digests
+    @io = io
+    @digests = digests
+  end
+
+  ##
+  # Writes +data+ to the underlying IO and updates the digests
+
+  def write data
+    result = @io.write data
+
+    @digests.each do |_, digest|
+      digest << data
+    end
+
+    result
+  end
+
+end
+

data/lib/rubygems/package/old.rb

@@ -0,0 +1,147 @@
+#--
+# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#++
+
+##
+# The format class knows the guts of the ancient .gem file format and provides
+# the capability to read such ancient gems.
+#
+# Please pretend this doesn't exist.
+
+class Gem::Package::Old < Gem::Package
+
+  undef_method :spec=
+
+  ##
+  # Creates a new old-format package reader for +gem+.  Old-format packages
+  # cannot be written.
+
+  def initialize gem
+    require 'fileutils'
+    require 'zlib'
+    Gem.load_yaml
+
+    @gem      = gem
+    @contents = nil
+    @spec     = nil
+  end
+
+  ##
+  # A list of file names contained in this gem
+
+  def contents
+    return @contents if @contents
+
+    open @gem, 'rb' do |io|
+      read_until_dashes io # spec
+      header = file_list io
+
+      @contents = header.map { |file| file['path'] }
+    end
+  end
+
+  ##
+  # Extracts the files in this package into +destination_dir+
+
+  def extract_files destination_dir
+    errstr = "Error reading files from gem"
+
+    open @gem, 'rb' do |io|
+      read_until_dashes io # spec
+      header = file_list io
+      raise Gem::Exception, errstr unless header
+
+      header.each do |entry|
+        full_name = entry['path']
+
+        destination = install_location full_name, destination_dir
+
+        file_data = ''
+
+        read_until_dashes io do |line|
+          file_data << line
+        end
+
+        file_data = file_data.strip.unpack("m")[0]
+        file_data = Zlib::Inflate.inflate file_data
+
+        raise Gem::Package::FormatError, "#{full_name} in #{@gem} is corrupt" if
+          file_data.length != entry['size'].to_i
+
+        FileUtils.rm_rf destination
+
+        FileUtils.mkdir_p File.dirname destination
+
+        open destination, 'wb', entry['mode'] do |out|
+          out.write file_data
+        end
+
+        say destination if Gem.configuration.really_verbose
+      end
+    end
+  rescue Zlib::DataError
+    raise Gem::Exception, errstr
+  end
+
+  ##
+  # Reads the file list section from the old-format gem +io+
+
+  def file_list io # :nodoc:
+    header = ''
+
+    read_until_dashes io do |line|
+      header << line
+    end
+
+    YAML.load header
+  end
+
+  ##
+  # Reads lines until a "---" separator is found
+
+  def read_until_dashes io # :nodoc:
+    while (line = io.gets) && line.chomp.strip != "---" do
+      yield line if block_given?
+    end
+  end
+
+  ##
+  # Skips the Ruby self-install header in +io+.
+
+  def skip_ruby io # :nodoc:
+    loop do
+      line = io.gets
+
+      return if line.chomp == '__END__'
+      break unless line
+    end
+
+    raise Gem::Exception, "Failed to find end of ruby script while reading gem"
+  end
+
+  ##
+  # The specification for this gem
+
+  def spec
+    return @spec if @spec
+
+    yaml = ''
+
+    open @gem, 'rb' do |io|
+      skip_ruby io
+      read_until_dashes io do |line|
+        yaml << line
+      end
+    end
+
+    @spec = Gem::Specification.from_yaml yaml
+  rescue YAML::SyntaxError => e
+    raise Gem::Exception, "Failed to parse gem specification out of gem file"
+  rescue ArgumentError => e
+    raise Gem::Exception, "Failed to parse gem specification out of gem file"
+  end
+
+end
+

data/lib/rubygems/package/tar_header.rb

@@ -102,61 +102,24 @@ class Gem::Package::TarHeader
 
     fields = header.unpack UNPACK_FORMAT
 
-    name     = fields.shift
-    mode     = fields.shift.oct
-    uid      = fields.shift.oct
-    gid      = fields.shift.oct
-    size     = fields.shift.oct
-    mtime    = fields.shift.oct
-    checksum = fields.shift.oct
-    typeflag = fields.shift
-    linkname = fields.shift
-    magic    = fields.shift
-    version  = fields.shift.oct
-    uname    = fields.shift
-    gname    = fields.shift
-    devmajor = fields.shift.oct
-    devminor = fields.shift.oct
-    prefix   = fields.shift
-
-    new :name     => name,
-        :mode     => mode,
-        :uid      => uid,
-        :gid      => gid,
-        :size     => size,
-        :mtime    => mtime,
-        :checksum => checksum,
-        :typeflag => typeflag,
-        :linkname => linkname,
-        :magic    => magic,
-        :version  => version,
-        :uname    => uname,
-        :gname    => gname,
-        :devmajor => devmajor,
-        :devminor => devminor,
-        :prefix   => prefix,
-
-        :empty    => empty
-
-    # HACK unfactor for Rubinius
-    #new :name     => fields.shift,
-    #    :mode     => fields.shift.oct,
-    #    :uid      => fields.shift.oct,
-    #    :gid      => fields.shift.oct,
-    #    :size     => fields.shift.oct,
-    #    :mtime    => fields.shift.oct,
-    #    :checksum => fields.shift.oct,
-    #    :typeflag => fields.shift,
-    #    :linkname => fields.shift,
-    #    :magic    => fields.shift,
-    #    :version  => fields.shift.oct,
-    #    :uname    => fields.shift,
-    #    :gname    => fields.shift,
-    #    :devmajor => fields.shift.oct,
-    #    :devminor => fields.shift.oct,
-    #    :prefix   => fields.shift,
-
-    #    :empty => empty
+    new :name     => fields.shift,
+        :mode     => fields.shift.oct,
+        :uid      => fields.shift.oct,
+        :gid      => fields.shift.oct,
+        :size     => fields.shift.oct,
+        :mtime    => fields.shift.oct,
+        :checksum => fields.shift.oct,
+        :typeflag => fields.shift,
+        :linkname => fields.shift,
+        :magic    => fields.shift,
+        :version  => fields.shift.oct,
+        :uname    => fields.shift,
+        :gname    => fields.shift,
+        :devmajor => fields.shift.oct,
+        :devminor => fields.shift.oct,
+        :prefix   => fields.shift,
+
+        :empty => empty
   end
 
   ##

data/lib/rubygems/package/tar_reader.rb

@@ -9,7 +9,7 @@
 
 class Gem::Package::TarReader
 
-  include Gem::Package
+  include Enumerable
 
   ##
   # Raised if the tar IO is not seekable
@@ -52,9 +52,9 @@ class Gem::Package::TarReader
   # Iterates over files in the tarball yielding each entry
 
   def each
-    loop do
-      return if @io.eof?
+    return enum_for __method__ unless block_given?
 
+    until @io.eof? do
       header = Gem::Package::TarHeader.from @io
       return if header.empty?
 
@@ -100,6 +100,23 @@ class Gem::Package::TarReader
     end
   end
 
+  ##
+  # Seeks through the tar file until it finds the +entry+ with +name+ and
+  # yields it.  Rewinds the tar file to the beginning when the block
+  # terminates.
+
+  def seek name # :yields: entry
+    found = find do |entry|
+      entry.full_name == name
+    end
+
+    return unless found
+
+    return yield found
+  ensure
+    rewind
+  end
+
 end
 
 require 'rubygems/package/tar_reader/entry'

data/lib/rubygems/package/tar_writer.rb

@@ -40,12 +40,12 @@ class Gem::Package::TarWriter
     # number of bytes will be more than #limit
 
     def write(data)
-      if data.size + @written > @limit
+      if data.bytesize + @written > @limit
         raise FileOverflow, "You tried to feed more data than fits in the file."
       end
       @io.write data
-      @written += data.size
-      data.size
+      @written += data.bytesize
+      data.bytesize
     end
 
   end
@@ -129,6 +129,62 @@ class Gem::Package::TarWriter
     self
   end
 
+  ##
+  # Adds +name+ with permissions +mode+ to the tar, yielding +io+ for writing
+  # the file.  The +digest_algorithm+ is written to a read-only +name+.sum
+  # file following the given file contents containing the digest name and
+  # hexdigest separated by a tab.
+  #
+  # The created digest object is returned.
+
+  def add_file_digest name, mode, digest_algorithms # :yields: io
+    digests = digest_algorithms.map do |digest_algorithm|
+      digest = digest_algorithm.new
+      [digest.name, digest]
+    end
+
+    digests = Hash[*digests.flatten]
+
+    add_file name, mode do |io|
+      Gem::Package::DigestIO.wrap io, digests do |digest_io|
+        yield digest_io
+      end
+    end
+
+    digests
+  end
+
+  ##
+  # Adds +name+ with permissions +mode+ to the tar, yielding +io+ for writing
+  # the file.  The +signer+ is used to add a digest file using its
+  # digest_algorithm per add_file_digest and a cryptographic signature in
+  # +name+.sig.  If the signer has no key only the checksum file is added.
+  #
+  # Returns the digest.
+
+  def add_file_signed name, mode, signer
+    digest_algorithms = [
+      signer.digest_algorithm,
+      OpenSSL::Digest::SHA512,
+    ].uniq
+
+    digests = add_file_digest name, mode, digest_algorithms do |io|
+      yield io
+    end
+
+    signature_digest = digests.values.find do |digest|
+      digest.name == signer.digest_name
+    end
+
+    signature = signer.sign signature_digest.digest
+
+    add_file_simple "#{name}.sig", 0444, signature.length do |io|
+      io.write signature
+    end if signature
+
+    digests
+  end
+
   ##
   # Add file +name+ with permissions +mode+ +size+ bytes long.  Yields an IO
   # to write the file to.
@@ -211,9 +267,9 @@ class Gem::Package::TarWriter
   # Splits +name+ into a name and prefix that can fit in the TarHeader
 
   def split_name(name) # :nodoc:
-    raise Gem::Package::TooLongFileName if name.size > 256
+    raise Gem::Package::TooLongFileName if name.bytesize > 256
 
-    if name.size <= 100 then
+    if name.bytesize <= 100 then
       prefix = ""
     else
       parts = name.split(/\//)
@@ -222,14 +278,14 @@ class Gem::Package::TarWriter
 
       loop do
         nxt = parts.pop
-        break if newname.size + 1 + nxt.size > 100
+        break if newname.bytesize + 1 + nxt.bytesize > 100
         newname = nxt + "/" + newname
       end
 
       prefix = (parts + [nxt]).join "/"
       name = newname
 
-      if name.size > 100 or prefix.size > 155 then
+      if name.bytesize > 100 or prefix.bytesize > 155 then
         raise Gem::Package::TooLongFileName
       end
     end

data/lib/rubygems/package_task.rb

@@ -20,6 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'rubygems'
+require 'rubygems/package'
 begin
   gem 'rake'
 rescue Gem::LoadError
@@ -43,13 +44,10 @@ require 'rake/packagetask'
 #   require 'rubygems/package_task'
 #
 #   spec = Gem::Specification.new do |s|
-#     s.platform = Gem::Platform::RUBY
 #     s.summary = "Ruby based make-like utility."
 #     s.name = 'rake'
 #     s.version = PKG_VERSION
 #     s.requirements << 'none'
-#     s.require_path = 'lib'
-#     s.autorequire = 'rake'
 #     s.files = PKG_FILES
 #     s.description = <<-EOF
 #   Rake is a Make-like program implemented in Ruby. Tasks
@@ -113,7 +111,8 @@ class Gem::PackageTask < Rake::PackageTask
     file gem_path => [package_dir, gem_dir] + @gem_spec.files do
       chdir(gem_dir) do
         when_writing "Creating #{gem_spec.file_name}" do
-          Gem::Builder.new(gem_spec).build
+          Gem::Package.build gem_spec
+
           verbose trace do
             mv gem_file, '..'
           end