Do initial_session_setup eagerly if -c is passed [Fixes #860]

1 files changed, 6 insertions, 1 deletions

diff --git a/lib/pry/cli.rb b/lib/pry/cli.rb
index e0bcaa0b..66ae3e3e 100644
--- a/lib/pry/cli.rb
+++ b/lib/pry/cli.rb
@@ -196,7 +196,12 @@ end.process_options do |opts|
   Pry.cli = true
 
   # create the actual context
-  context = Pry.binding_for(eval(opts[:context]))
+  if opts[:context]
+    Pry.initial_session_setup
+    context = Pry.binding_for(eval(opts[:context]))
+  else
+    context = Pry.top_level_binding
+  end
 
   if Pry::CLI.input_args.any? && Pry::CLI.input_args != ["pry"]
     full_name = File.expand_path(Pry::CLI.input_args.first)