summaryrefslogtreecommitdiff
path: root/lib/rubygems/gem_runner.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/rubygems/gem_runner.rb')
-rw-r--r--lib/rubygems/gem_runner.rb19
1 files changed, 3 insertions, 16 deletions
diff --git a/lib/rubygems/gem_runner.rb b/lib/rubygems/gem_runner.rb
index 6197036f81..8060e15312 100644
--- a/lib/rubygems/gem_runner.rb
+++ b/lib/rubygems/gem_runner.rb
@@ -4,10 +4,9 @@
# See LICENSE.txt for permissions.
#++
-require "rubygems"
+require 'rubygems'
require 'rubygems/command_manager'
require 'rubygems/config_file'
-require 'rubygems/doc_manager'
##
# Load additional plugins from $LOAD_PATH
@@ -29,25 +28,21 @@ class Gem::GemRunner
# TODO: nuke these options
@command_manager_class = options[:command_manager] || Gem::CommandManager
@config_file_class = options[:config_file] || Gem::ConfigFile
- @doc_manager_class = options[:doc_manager] || Gem::DocManager
end
##
# Run the gem command with the following arguments.
def run(args)
- start_time = Time.now
-
if args.include?('--')
# We need to preserve the original ARGV to use for passing gem options
# to source gems. If there is a -- in the line, strip all options after
# it...its for the source building process.
+ # TODO use slice!
build_args = args[args.index("--") + 1...args.length]
args = args[0...args.index("--")]
end
- Gem::Command.build_args = build_args if build_args
-
do_configuration args
cmd = @command_manager_class.instance
@@ -62,14 +57,7 @@ class Gem::GemRunner
Gem::Command.add_specific_extra_args command_name, config_args
end
- cmd.run Gem.configuration.args
- end_time = Time.now
-
- if Gem.configuration.benchmark then
- printf "\nExecution time: %0.2f seconds.\n", end_time - start_time
- puts "Press Enter to finish"
- STDIN.gets
- end
+ cmd.run Gem.configuration.args, build_args
end
private
@@ -78,7 +66,6 @@ class Gem::GemRunner
Gem.configuration = @config_file_class.new(args)
Gem.use_paths Gem.configuration[:gemhome], Gem.configuration[:gempath]
Gem::Command.extra_args = Gem.configuration[:gem]
- @doc_manager_class.configured_args = Gem.configuration[:rdoc]
end
end