Added [email protected]'s developer dependencies

git-svn-id: svn+ssh://rubyforge.org/var/svn/rubygems/trunk@1711 3d4018f9-ac1a-0410-99e9-8a154d859a19

Author: zenspider

lib/rubygems.rb

@@ -152,7 +152,7 @@ def self.activate(gem, *version_requirements)
     @loaded_specs[spec.name] = spec
 
     # Load dependent gems first
-    spec.dependencies.each do |dep_gem|
+    spec.runtime_dependencies.each do |dep_gem|
       activate dep_gem
     end
 

lib/rubygems/commands/install_command.rb

@@ -62,7 +62,8 @@ def execute
       :install_dir => options[:install_dir],
       :security_policy => options[:security_policy],
       :wrappers => options[:wrappers],
-      :bin_dir => options[:bin_dir]
+      :bin_dir => options[:bin_dir],
+      :development => options[:development],
     }
 
     exit_code = 0

lib/rubygems/commands/lock_command.rb

@@ -80,7 +80,7 @@ def execute
       say "gem '#{spec.name}', '= #{spec.version}'" unless locked[spec.name]
       locked[spec.name] = true
 
-      spec.dependencies.each do |dep|
+      spec.runtime_dependencies.each do |dep|
         next if locked[dep.name]
         candidates = Gem.source_index.search dep.name, dep.requirement_list
 

lib/rubygems/custom_require.rb

@@ -26,7 +26,7 @@ module Kernel
   def require(path) # :nodoc:
     gem_original_require path
   rescue LoadError => load_error
-    if load_error.message =~ /\A[Nn]o such file to load -- #{Regexp.escape path}\z/ and
+    if load_error.message =~ /#{Regexp.escape path}\z/ and
        spec = Gem.searcher.find(path) then
       Gem.activate(spec.name, "= #{spec.version}")
       gem_original_require path

lib/rubygems/dependency.rb

@@ -9,9 +9,15 @@
 ##
 # The Dependency class holds a Gem name and a Gem::Requirement
 class Gem::Dependency
+  TYPES = [
+    :runtime,
+    :development
+  ]
 
   attr_accessor :name
 
+  attr_reader :type
+
   attr_writer :version_requirements
 
   def <=>(other)
@@ -24,8 +30,15 @@ def <=>(other)
   # name:: [String] name of the Gem
   # version_requirements:: [String Array] version requirement (e.g. ["> 1.2"])
   #
-  def initialize(name, version_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
@@ -48,17 +61,18 @@ def normalize
   end
 
   def to_s # :nodoc:
-    "#{name} (#{version_requirements})"
+    "#{name} (#{version_requirements}#{", #{type}" if type != :runtime})"
   end
 
   def ==(other) # :nodoc:
     self.class === other &&
       self.name == other.name &&
+      self.type == other.type &&
       self.version_requirements == other.version_requirements
   end
 
   def hash
-    name.hash + version_requirements.hash
+    name.hash + type.hash + version_requirements.hash
   end
 
 end

lib/rubygems/dependency_installer.rb

@@ -44,6 +44,7 @@ def initialize(options = {})
     options = DEFAULT_OPTIONS.merge options
 
     @bin_dir = options[:bin_dir]
+    @development = options[:development]
     @domain = options[:domain]
     @env_shebang = options[:env_shebang]
     @force = options[:force]
@@ -120,7 +121,10 @@ def gather_dependencies
         next if spec.nil? or seen[spec.name]
         seen[spec.name] = true
 
-        spec.dependencies.each do |dep|
+        deps = spec.runtime_dependencies
+        deps |= spec.development_dependencies if @development
+
+        deps.each do |dep|
           results = find_gems_with_sources(dep).reverse # local gems first
 
           results.each do |dep_spec, source_uri|
@@ -222,7 +226,8 @@ def install dep_or_name, version = Gem::Requirement.default
                                 :install_dir => @install_dir,
                                 :security_policy => @security_policy,
                                 :wrappers => @wrappers,
-                                :bin_dir => @bin_dir
+                                :bin_dir => @bin_dir,
+                                :development => @development
 
       spec = inst.install
 

lib/rubygems/dependency_list.rb

@@ -69,7 +69,7 @@ def find_name(full_name)
   # Are all the dependencies in the list satisfied?
   def ok?
     @specs.all? do |spec|
-      spec.dependencies.all? do |dep|
+      spec.runtime_dependencies.all? do |dep|
         @specs.find { |s| s.satisfies_requirement? dep }
       end
     end

lib/rubygems/install_update_options.rb

@@ -89,6 +89,12 @@ def add_install_update_options
                'foo_exec18') do |value, options|
       options[:format_executable] = value
     end
+
+    add_option(:"Install/Update", "--development",
+                "Install any additional development",
+                "dependencies") do |value, options|
+      options[:development] = true
+    end
   end
 
   # Default options for the gem install command.

lib/rubygems/installer.rb

@@ -76,6 +76,7 @@ def initialize(gem, options={})
     @security_policy = options[:security_policy]
     @wrappers = options[:wrappers]
     @bin_dir = options[:bin_dir]
+    @development = options[:development]
 
     begin
       @format = Gem::Format.from_file_by_path @gem, @security_policy
@@ -119,7 +120,10 @@ def install
       end
 
       unless @ignore_dependencies then
-        @spec.dependencies.each do |dep_gem|
+        deps = @spec.runtime_dependencies
+        deps |= @spec.development_dependencies if @development
+
+        deps.each do |dep_gem|
           ensure_dependency @spec, dep_gem
         end
       end

lib/rubygems/server.rb

@@ -421,6 +421,7 @@ def run
         total_file_count += spec.files.size
         deps = spec.dependencies.collect { |dep|
           { "name"    => dep.name,
+            "type"    => dep.type,
             "version" => dep.version_requirements.to_s, }
         }
         deps = deps.sort_by { |dep| [dep["name"].downcase, dep["version"]] }