shoesgem 0.1430.0 → 0.1469.0

data/shoes/ruby/lib/rubygems/defaults.rb

@@ -1,89 +1,88 @@
-module Gem
-
-  @post_install_hooks   ||= []
-  @post_uninstall_hooks ||= []
-  @pre_uninstall_hooks  ||= []
-  @pre_install_hooks    ||= []
-
-  ##
-  # An Array of the default sources that come with RubyGems
-
-  def self.default_sources
-    %w[http://gems.rubyforge.org/]
-  end
-
-  ##
-  # Default home directory path to be used if an alternate value is not
-  # specified in the environment
-
-  def self.default_dir
-    if defined? RUBY_FRAMEWORK_VERSION then
-      File.join File.dirname(ConfigMap[:sitedir]), 'Gems',
-                ConfigMap[:ruby_version]
-    else
-      File.join(ConfigMap[:libdir], ruby_engine, 'gems',
-                ConfigMap[:ruby_version])
-    end
-  end
-
-  ##
-  # Path for gems in the user's home directory
-
-  def self.user_dir
-    File.join(Gem.user_home, '.gem', ruby_engine,
-              ConfigMap[:ruby_version])
-  end
-
-  ##
-  # Default gem load path
-
-  def self.default_path
-    [user_dir, default_dir]
-  end
-
-  ##
-  # Deduce Ruby's --program-prefix and --program-suffix from its install name
-
-  def self.default_exec_format
-    baseruby = ConfigMap[:BASERUBY] || 'ruby'
-    ConfigMap[:RUBY_INSTALL_NAME].sub(baseruby, '%s') rescue '%s'
-  end
-
-  ##
-  # The default directory for binaries
-
-  def self.default_bindir
-    if defined? RUBY_FRAMEWORK_VERSION then # mac framework support
-      '/usr/bin'
-    else # generic install
-      ConfigMap[:bindir]
-    end
-  end
-
-  ##
-  # The default system-wide source info cache directory
-
-  def self.default_system_source_cache_dir
-    File.join Gem.dir, 'source_cache'
-  end
-
-  ##
-  # The default user-specific source info cache directory
-
-  def self.default_user_source_cache_dir
-    File.join Gem.user_home, '.gem', 'source_cache'
-  end
-
-  ##
-  # A wrapper around RUBY_ENGINE const that may not be defined
-
-  def self.ruby_engine
-    if defined? RUBY_ENGINE then
-      RUBY_ENGINE
-    else
-      'ruby'
-    end
-  end
-
-end
-
+module Gem
+
+  @post_install_hooks   ||= []
+  @post_uninstall_hooks ||= []
+  @pre_uninstall_hooks  ||= []
+  @pre_install_hooks    ||= []
+
+  ##
+  # An Array of the default sources that come with RubyGems
+
+  def self.default_sources
+    %w[http://gems.rubyforge.org/]
+  end
+
+  ##
+  # Default home directory path to be used if an alternate value is not
+  # specified in the environment
+
+  def self.default_dir
+    if defined? RUBY_FRAMEWORK_VERSION then
+      File.join File.dirname(ConfigMap[:sitedir]), 'Gems',
+                ConfigMap[:ruby_version]
+    else
+      ConfigMap[:sitelibdir].sub(%r'/site_ruby/(?=[^/]+)', '/gems/')
+    end
+  end
+
+  ##
+  # Path for gems in the user's home directory
+
+  def self.user_dir
+    File.join(Gem.user_home, '.gem', ruby_engine,
+              ConfigMap[:ruby_version])
+  end
+
+  ##
+  # Default gem load path
+
+  def self.default_path
+    [user_dir, default_dir]
+  end
+
+  ##
+  # Deduce Ruby's --program-prefix and --program-suffix from its install name
+
+  def self.default_exec_format
+    baseruby = ConfigMap[:BASERUBY] || 'ruby'
+    ConfigMap[:RUBY_INSTALL_NAME].sub(baseruby, '%s') rescue '%s'
+  end
+
+  ##
+  # The default directory for binaries
+
+  def self.default_bindir
+    if defined? RUBY_FRAMEWORK_VERSION then # mac framework support
+      '/usr/bin'
+    else # generic install
+      ConfigMap[:bindir]
+    end
+  end
+
+  ##
+  # The default system-wide source info cache directory
+
+  def self.default_system_source_cache_dir
+    File.join Gem.dir, 'source_cache'
+  end
+
+  ##
+  # The default user-specific source info cache directory
+
+  def self.default_user_source_cache_dir
+    File.join Gem.user_home, '.gem', 'source_cache'
+  end
+
+  ##
+  # A wrapper around RUBY_ENGINE const that may not be defined
+
+  def self.ruby_engine
+    if defined? RUBY_ENGINE then
+      RUBY_ENGINE
+    else
+      'ruby'
+    end
+  end
+
+end
+

data/shoes/ruby/lib/rubygems/dependency.rb

@@ -1,119 +1,119 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'rubygems'
-
-##
-# The Dependency class holds a Gem name and a Gem::Requirement
-
-class Gem::Dependency
-
-  ##
-  # Valid dependency types.
-  #--
-  # When this list is updated, be sure to change
-  # Gem::Specification::CURRENT_SPECIFICATION_VERSION as well.
-
-  TYPES = [
-    :development,
-    :runtime,
-  ]
-
-  ##
-  # Dependency name or regular expression.
-
-  attr_accessor :name
-
-  ##
-  # Dependency type.
-
-  attr_reader :type
-
-  ##
-  # Dependent versions.
-
-  attr_writer :version_requirements
-
-  ##
-  # Orders dependencies by name only.
-
-  def <=>(other)
-    [@name] <=> [other.name]
-  end
-
-  ##
-  # Constructs a dependency with +name+ and +requirements+.
-
-  def initialize(name, version_requirements, type=:runtime)
-    @name = name
-
-    unless TYPES.include? type
-      raise ArgumentError, "Valid types are #{TYPES.inspect}, not #{@type.inspect}"
-    end
-
-    @type = type
-
-    @version_requirements = Gem::Requirement.create version_requirements
-    @version_requirement = nil   # Avoid warnings.
-  end
-
-  def version_requirements
-    normalize if defined? @version_requirement and @version_requirement
-    @version_requirements
-  end
-
-  def requirement_list
-    version_requirements.as_list
-  end
-
-  alias requirements_list requirement_list
-
-  def normalize
-    ver = @version_requirement.instance_eval { @version }
-    @version_requirements = Gem::Requirement.new([ver])
-    @version_requirement = nil
-  end
-
-  def to_s # :nodoc:
-    "#{name} (#{version_requirements}, #{@type || :runtime})"
-  end
-
-  def ==(other) # :nodoc:
-    self.class === other &&
-      self.name == other.name &&
-      self.type == other.type &&
-      self.version_requirements == other.version_requirements
-  end
-
-  ##
-  # Uses this dependency as a pattern to compare to the dependency +other+.
-  # This dependency will match if the name matches the other's name, and other
-  # has only an equal version requirement that satisfies this dependency.
-
-  def =~(other)
-    return false unless self.class === other
-
-    pattern = @name
-    pattern = /\A#{@name}\Z/ unless Regexp === pattern
-
-    return false unless pattern =~ other.name
-
-    reqs = other.version_requirements.requirements
-
-    return false unless reqs.length == 1
-    return false unless reqs.first.first == '='
-
-    version = reqs.first.last
-
-    version_requirements.satisfied_by? version
-  end
-
-  def hash # :nodoc:
-    name.hash + type.hash + version_requirements.hash
-  end
-
-end
-
+#--
+# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#++
+
+require 'rubygems'
+
+##
+# The Dependency class holds a Gem name and a Gem::Requirement
+
+class Gem::Dependency
+
+  ##
+  # Valid dependency types.
+  #--
+  # When this list is updated, be sure to change
+  # Gem::Specification::CURRENT_SPECIFICATION_VERSION as well.
+
+  TYPES = [
+    :development,
+    :runtime,
+  ]
+
+  ##
+  # Dependency name or regular expression.
+
+  attr_accessor :name
+
+  ##
+  # Dependency type.
+
+  attr_reader :type
+
+  ##
+  # Dependent versions.
+
+  attr_writer :version_requirements
+
+  ##
+  # Orders dependencies by name only.
+
+  def <=>(other)
+    [@name] <=> [other.name]
+  end
+
+  ##
+  # Constructs a dependency with +name+ and +requirements+.
+
+  def initialize(name, version_requirements, type=:runtime)
+    @name = name
+
+    unless TYPES.include? type
+      raise ArgumentError, "Valid types are #{TYPES.inspect}, not #{@type.inspect}"
+    end
+
+    @type = type
+
+    @version_requirements = Gem::Requirement.create version_requirements
+    @version_requirement = nil   # Avoid warnings.
+  end
+
+  def version_requirements
+    normalize if defined? @version_requirement and @version_requirement
+    @version_requirements
+  end
+
+  def requirement_list
+    version_requirements.as_list
+  end
+
+  alias requirements_list requirement_list
+
+  def normalize
+    ver = @version_requirement.instance_eval { @version }
+    @version_requirements = Gem::Requirement.new([ver])
+    @version_requirement = nil
+  end
+
+  def to_s # :nodoc:
+    "#{name} (#{version_requirements}, #{@type || :runtime})"
+  end
+
+  def ==(other) # :nodoc:
+    self.class === other &&
+      self.name == other.name &&
+      self.type == other.type &&
+      self.version_requirements == other.version_requirements
+  end
+
+  ##
+  # Uses this dependency as a pattern to compare to the dependency +other+.
+  # This dependency will match if the name matches the other's name, and other
+  # has only an equal version requirement that satisfies this dependency.
+
+  def =~(other)
+    return false unless self.class === other
+
+    pattern = @name
+    pattern = /\A#{@name}\Z/ unless Regexp === pattern
+
+    return false unless pattern =~ other.name
+
+    reqs = other.version_requirements.requirements
+
+    return false unless reqs.length == 1
+    return false unless reqs.first.first == '='
+
+    version = reqs.first.last
+
+    version_requirements.satisfied_by? version
+  end
+
+  def hash # :nodoc:
+    name.hash + type.hash + version_requirements.hash
+  end
+
+end
+