rubygems-update 0.9.4 → 0.9.5

data/lib/rubygems/local_remote_options.rb

@@ -0,0 +1,106 @@
+#--
+# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#++
+
+require 'rubygems'
+
+# Mixin methods for local and remote Gem::Command options.
+module Gem::LocalRemoteOptions
+
+  # Allows OptionParser to handle HTTP URIs.
+  def accept_uri_http
+    OptionParser.accept URI::HTTP do |value|
+      begin
+        value = URI.parse value
+      rescue URI::InvalidURIError
+        raise OptionParser::InvalidArgument, value
+      end
+
+      raise OptionParser::InvalidArgument, value unless value.scheme == 'http'
+
+      value
+    end
+  end
+
+  # Add local/remote options to the command line parser.
+  def add_local_remote_options
+    add_option(:"Local/Remote", '-l', '--local',
+               'Restrict operations to the LOCAL domain') do |value, options|
+      options[:domain] = :local
+    end
+
+    add_option(:"Local/Remote", '-r', '--remote',
+      'Restrict operations to the REMOTE domain') do |value, options|
+      options[:domain] = :remote
+    end
+
+    add_option(:"Local/Remote", '-b', '--both',
+               'Allow LOCAL and REMOTE operations') do |value, options|
+      options[:domain] = :both
+    end
+
+    add_bulk_threshold_option
+    add_source_option
+    add_proxy_option
+    add_update_sources_option
+  end
+
+  # Add the --bulk-threshold option
+  def add_bulk_threshold_option
+    add_option(:"Local/Remote", '-B', '--bulk-threshold COUNT',
+               "Threshold for switching to bulk",
+               "synchronization (default #{Gem.configuration.bulk_threshold})") do
+      |value, options|
+      Gem.configuration.bulk_threshold = value.to_i
+    end
+  end
+
+  # Add the --http-proxy option
+  def add_proxy_option
+    accept_uri_http
+
+    add_option(:"Local/Remote", '-p', '--[no-]http-proxy [URL]', URI::HTTP,
+               'Use HTTP proxy for remote operations') do |value, options|
+      options[:http_proxy] = (value == false) ? :no_proxy : value
+      Gem.configuration[:http_proxy] = options[:http_proxy]
+    end
+  end
+
+  # Add the --source option
+  def add_source_option
+    accept_uri_http
+
+    add_option(:"Local/Remote", '--source URL', URI::HTTP,
+               'Use URL as the remote source for gems') do |value, options|
+      if options[:added_source] then
+        Gem.sources << value
+      else
+        options[:added_source] = true
+        Gem.sources.replace [value]
+      end
+    end
+  end
+
+  # Add the --source option
+  def add_update_sources_option
+
+    add_option(:"Local/Remote", '-u', '--[no-]update-sources',
+               'Update local source cache') do |value, options|
+      Gem.configuration.update_sources = value
+    end
+  end
+
+  # Is local fetching enabled?
+  def local?
+    options[:domain] == :local || options[:domain] == :both
+  end
+
+  # Is remote fetching enabled?
+  def remote?
+    options[:domain] == :remote || options[:domain] == :both
+  end
+
+end
+

data/lib/rubygems/old_format.rb

@@ -4,15 +4,11 @@
 # See LICENSE.txt for permissions.
 #++
 
-module Gem
+require 'fileutils'
+require 'yaml'
+require 'zlib'
 
-  ##
-  # Used to raise parsing and loading errors
-  #
-  class FormatException < Gem::Exception
-    attr_accessor :file_path
-    #I go back and forth on whether or not to create custom exception classes
-  end
+module Gem
 
   ##
   # The format class knows the guts of the RubyGem .gem file format
@@ -41,8 +37,7 @@ module Gem
       unless File.exist?(file_path)
         raise Gem::Exception, "Cannot load gem file [#{file_path}]"
       end
-      require 'fileutils'
-      File.open(file_path, 'r') do |file|
+      File.open(file_path, 'rb') do |file|
         from_io(file, file_path)
       end
     end
@@ -93,7 +88,6 @@ module Gem
     # file:: [IO] The IO to process
     #
     def self.read_spec(file)
-      require 'yaml'
       yaml = ''
       begin
         read_until_dashes(file) do |line|
@@ -131,8 +125,6 @@ module Gem
     # gem_file:: [IO] The IO to process
     #
     def self.read_files_from_gem(gem_file)
-      require 'zlib'
-      require 'yaml'
       errstr = "Error reading files from gem"
       header_yaml = ''
       begin

data/lib/rubygems/open-uri.rb

@@ -2,6 +2,7 @@ require 'uri'
 require 'stringio'
 require 'time'
 
+# :stopdoc:
 module Kernel
   private
   alias rubygems_open_uri_original_open open # :nodoc:
@@ -769,3 +770,4 @@ module URI
     include OpenURI::OpenRead
   end
 end
+# :startdoc:

data/lib/rubygems/package.rb

@@ -1,26 +1,22 @@
-#
+#++
 # Copyright (C) 2004 Mauricio Julio Fern�ndez Pradier
 # See LICENSE.txt for additional licensing information.
-#
+#--
 
-require 'yaml'
-require 'yaml/syck'
-require 'fileutils'
-require 'zlib'
-require 'digest/md5'
 require 'fileutils'
 require 'find'
 require 'stringio'
+require 'yaml'
+require 'zlib'
 
-require 'rubygems/specification'
+require 'rubygems/digest/md5'
 require 'rubygems/security'
+require 'rubygems/specification'
 
 # Wrapper for FileUtils meant to provide logging and additional operations if
 # needed.
 class Gem::FileOperations
 
-  extend FileUtils
-
   def initialize(logger = nil)
     @logger = logger
   end
@@ -488,14 +484,13 @@ module Gem::Package
       @tarreader.each do |entry|
         case entry.full_name
         when "metadata"
-          # (GS) Changed to line below: @metadata = YAML.load(entry.read) rescue nil
           @metadata = load_gemspec(entry.read)
           has_meta = true
           break
         when "metadata.gz"
           begin
-            # if we have a security_policy, then pre-read the
-            # metadata file and calculate it's digest
+            # if we have a security_policy, then pre-read the metadata file
+            # and calculate it's digest
             sio = nil
             if security_policy
               Gem.ensure_ssl_available
@@ -506,7 +501,6 @@ module Gem::Package
 
             gzis = Zlib::GzipReader.new(sio || entry)
             # YAML wants an instance of IO
-            # (GS) Changed to line below: @metadata = YAML.load(gzis) rescue nil
             @metadata = load_gemspec(gzis)
             has_meta = true
           ensure
@@ -524,23 +518,24 @@ module Gem::Package
         end
       end
 
-      if security_policy
+      if security_policy then
         Gem.ensure_ssl_available
-        # map trust policy from string to actual class (or a
-        # serialized YAML file, if that exists)
-        if (security_policy.is_a?(String))
-          if Gem::Security.constants.index(security_policy)
+
+        # map trust policy from string to actual class (or a serialized YAML
+        # file, if that exists)
+        if String === security_policy then
+          if Gem::Security::Policy.key? security_policy then
             # load one of the pre-defined security policies
-            security_policy = Gem::Security.const_get(security_policy)
-          elsif File.exist?(security_policy)
+            security_policy = Gem::Security::Policy[security_policy]
+          elsif File.exist? security_policy then
             # FIXME: this doesn't work yet
-            security_policy = YAML::load(File.read(security_policy))
+            security_policy = YAML.load File.read(security_policy)
           else
             raise Gem::Exception, "Unknown trust policy '#{security_policy}'"
           end
         end
 
-        if data_sig && data_dgst && meta_sig && meta_dgst
+        if data_sig && data_dgst && meta_sig && meta_dgst then
           # the user has a trust policy, and we have a signed gem
           # file, so use the trust policy to verify the gem signature
 
@@ -618,9 +613,14 @@ module Gem::Package
     # this method would use the String IO approach on all platforms at all
     # times.  And that's the way it is.
     def zipped_stream(entry)
-      zis = Zlib::GzipReader.new entry
-      dis = zis.read
-      is = StringIO.new(dis)
+      # This is Jamis Buck's ZLib workaround.  The original code is
+      # commented out while we evaluate this patch.
+      entry.read(10) # skip the gzip header
+      zis = Zlib::Inflate.new(-Zlib::MAX_WBITS)
+      is = StringIO.new(zis.inflate(entry.read))
+      # zis = Zlib::GzipReader.new entry
+      # dis = zis.read
+      # is = StringIO.new(dis)
     ensure
       zis.finish if zis
     end
@@ -706,11 +706,7 @@ module Gem::Package
 
             TarWriter.new(os) do |inner_tar_stream|
               klass = class << inner_tar_stream; self end
-              if RUBY_VERSION >= "1.9" then
-                klass.funcall(:define_method, :metadata=, &set_meta)
-              else
-                klass.send(:define_method, :metadata=, &set_meta)
-              end
+              klass.send(:define_method, :metadata=, &set_meta)
               block.call inner_tar_stream
             end
           ensure
@@ -846,7 +842,7 @@ module Gem::Package
       Dir
     end
 
-    def find_class
+    def find_class # HACK kill me
       Find
     end
   end

data/lib/rubygems/platform.rb

@@ -0,0 +1,187 @@
+require 'rubygems'
+
+# Available list of platforms for targeting Gem installations.
+#
+class Gem::Platform
+
+  @local = nil
+
+  attr_accessor :cpu
+
+  attr_accessor :os
+
+  attr_accessor :version
+
+  def self.local
+    arch = Config::CONFIG['arch']
+    arch = "#{arch}_60" if arch =~ /mswin32$/
+    @local ||= new(arch)
+  end
+
+  def self.match(platform)
+    Gem.platforms.any? do |local_platform|
+      platform.nil? or local_platform == platform or
+        (local_platform != Gem::Platform::RUBY and local_platform =~ platform)
+    end
+  end
+
+  def self.new(arch) # :nodoc:
+    case arch
+    when Gem::Platform::RUBY, nil, '' then
+      Gem::Platform::RUBY
+    else
+      super
+    end
+  end
+
+  def initialize(arch)
+    case arch
+    when Array then
+      @cpu, @os, @version = arch
+    when String then
+      arch = arch.split '-'
+
+      if arch.length > 2 and arch.last !~ /\d/ then # reassemble x86-linux-gnu
+        extra = arch.pop
+        arch.last << "-#{extra}"
+      end
+
+      cpu = arch.shift
+
+      @cpu = case cpu
+             when /i\d86/ then 'x86'
+             else cpu
+             end
+
+      if arch.length == 2 and arch.last =~ /^\d+$/ then # for command-line
+        @os, @version = arch
+        return
+      end
+
+      os, = arch
+      @cpu, os = nil, cpu if os.nil? # legacy jruby
+
+      @os, @version = case os
+                      when /aix(\d+)/ then             [ 'aix',       $1  ]
+                      when /cygwin/ then               [ 'cygwin',    nil ]
+                      when /darwin(\d+)?/ then         [ 'darwin',    $1  ]
+                      when /freebsd(\d+)/ then         [ 'freebsd',   $1  ]
+                      when /hpux(\d+)/ then            [ 'hpux',      $1  ]
+                      when /^java$/, /^jruby$/ then    [ 'java',      nil ]
+                      when /^java([\d.]*)/ then        [ 'java',      $1  ]
+                      when /linux/ then                [ 'linux',     $1  ]
+                      when /mingw32/ then              [ 'mingw32',   nil ]
+                      when /(mswin\d+)(\_(\d+))?/ then [ $1,          $3  ]
+                      when /netbsdelf/ then            [ 'netbsdelf', nil ]
+                      when /openbsd(\d+\.\d+)/ then    [ 'openbsd',   $1  ]
+                      when /solaris(\d+\.\d+)/ then    [ 'solaris',   $1  ]
+                      # test
+                      when /^(\w+_platform)(\d+)/ then [ $1,          $2  ]
+                      else                             [ 'unknown',   nil ]
+                      end
+    when Gem::Platform then
+      @cpu = arch.cpu
+      @os = arch.os
+      @version = arch.version
+    else
+      raise ArgumentError, "invalid argument #{arch.inspect}"
+    end
+  end
+
+  def inspect
+    "#<%s:0x%x @cpu=%p, @os=%p, @version=%p>" % [self.class, object_id, *to_a]
+  end
+
+  def to_a
+    [@cpu, @os, @version]
+  end
+
+  def to_s
+    to_a.compact.join '-'
+  end
+
+  def ==(other)
+    self.class === other and
+      @cpu == other.cpu and @os == other.os and @version == other.version
+  end
+
+  def ===(other)
+    return nil unless Gem::Platform === other
+
+    # cpu
+    (@cpu == 'universal' or other.cpu == 'universal' or @cpu == other.cpu) and
+
+    # os
+    @os == other.os and
+
+    # version
+    (@version.nil? or other.version.nil? or @version == other.version)
+  end
+
+  def =~(other)
+    case other
+    when Gem::Platform then # nop
+    when String then
+      # This data is from http://gems.rubyforge.org/gems/yaml on 19 Aug 2007
+      other = case other
+              when /^i686-darwin(\d)/ then     ['x86',       'darwin',  $1]
+              when /^i\d86-linux/ then         ['x86',       'linux',   nil]
+              when 'java', 'jruby' then        [nil,         'java',    nil]
+              when /mswin32(\_(\d+))?/ then    ['x86',       'mswin32', $2]
+              when 'powerpc-darwin' then       ['powerpc',   'darwin',  nil]
+              when /powerpc-darwin(\d)/ then   ['powerpc',   'darwin',  $1]
+              when /sparc-solaris2.8/ then     ['sparc',     'solaris', '2.8']
+              when /universal-darwin(\d)/ then ['universal', 'darwin',  $1]
+              else                             other
+              end
+
+      other = Gem::Platform.new other
+    else
+      return nil
+    end
+
+    self === other
+  end
+
+  ##
+  # A pure-ruby gem that may use Gem::Specification#extensions to build
+  # binary files.
+
+  RUBY = 'ruby'
+
+  ##
+  # A platform-specific gem that is built for the packaging ruby's platform.
+  # This will be replaced with Gem::Platform::local.
+
+  CURRENT = 'current'
+
+  ##
+  # A One Click Installer-compatible gem, built with VC6 for 32 bit Windows.
+  #
+  # CURRENT is preferred over this constant, avoid its use at all costs.
+
+  MSWIN32 = new ['x86', 'mswin32', '60']
+
+  ##
+  # An x86 Linux-compatible gem
+  #
+  # CURRENT is preferred over this constant, avoid its use at all costs.
+
+  X86_LINUX = new ['x86', 'linux', nil]
+
+  ##
+  # A PowerPC Darwin-compatible gem
+  #
+  # CURRENT is preferred over this constant, avoid its use at all costs.
+
+  PPC_DARWIN = new ['ppc', 'darwin', nil]
+
+  # :stopdoc:
+  # Here lie legacy constants.  These are deprecated.
+  WIN32 = 'mswin32'
+  LINUX_586 = 'i586-linux'
+  DARWIN = 'powerpc-darwin'
+  # :startdoc:
+
+end
+