version 0.6.8pre4, changed Pry::Commands.dup to Pry::Commands.clone due to rubinius bug. Made .pryrc run on ordinary pry sessions (not just command line), still need to complete whereami command

1 files changed, 3 insertions, 2 deletions

diff --git a/bin/pry b/bin/pry
index cfba91c6..c177a71d 100644
--- a/bin/pry
+++ b/bin/pry
@@ -65,10 +65,11 @@ See: `https://github.com/banister` for more information.
   end
 end.parse!
 
-rcpath = File.expand_path("~/.pryrc")
+# invoked via cli
+Pry.cli = true
 
 # load ~/.pryrc, if not suppressed with -f option
-load rcpath if File.exists?(rcpath) && options[:loadrc]
+Pry.should_load_rc = false if !options[:loadrc]
 
 # create the actual context
 context = Pry.binding_for(eval(options[:context_string]))