bin/mongo_console in mongo-1.9.2 vs bin/mongo_console in mongo-1.10.0.rc0

- old
+ new

@@ -1,8 +1,8 @@ #!/usr/bin/env ruby -# Copyright (C) 2013 10gen Inc. +# Copyright (C) 2009-2013 MongoDB, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # @@ -15,22 +15,29 @@ # limitations under the License. org_argv = ARGV.dup ARGV.clear -require 'irb' - $LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib') -require 'mongo' +require 'mongo' include Mongo host = org_argv[0] || ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost' port = org_argv[1] || ENV['MONGO_RUBY_DRIVER_PORT'] || MongoClient::DEFAULT_PORT dbnm = org_argv[2] || ENV['MONGO_RUBY_DRIVER_DB'] || 'ruby-mongo-console' puts "Connecting to #{host}:#{port} (CLIENT) on with database #{dbnm} (DB)" CLIENT = MongoClient.new(host, port) DB = CLIENT.db(dbnm) -puts "Starting IRB session..." -IRB.start(__FILE__) +# try pry if available, fall back to irb +begin + require 'pry' + CONSOLE_CLASS = Pry +rescue LoadError + require 'irb' + CONSOLE_CLASS = IRB +end + +puts "Starting #{CONSOLE_CLASS.name} session..." +CONSOLE_CLASS.start(__FILE__)