make whereami N work, fixes #537

pry · Apr 18, 2012 · 4d2ed09 · 4d2ed09
1 parent 14b7eb5
commit 4d2ed09
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/lib/pry.rb b/lib/pry.rb
@@ -15,7 +15,7 @@ class Pry
 
     # /unknown/ for rbx
     if file !~ /(\(.*\))|<.*>/ && file !~ /__unknown__/ && file != "" && file != "-e"  || file == Pry.eval_path
-      _pry_.run_command("whereami 5", "", target)
+      _pry_.run_command("whereami", "", target)
     end
   end
 

diff --git a/lib/pry/code.rb b/lib/pry/code.rb
@@ -135,7 +135,6 @@ def from_method(meth, start_line=nil)
       # @return [Code]
       def from_module(mod, start_line=nil)
         mod = Pry::WrappedModule(mod)
-
         start_line ||= mod.source_line || 1
         new(mod.source, start_line, :ruby)
       end

diff --git a/lib/pry/default_commands/context.rb b/lib/pry/default_commands/context.rb
@@ -28,13 +28,13 @@ def process
             marker = target.eval("__LINE__")
           else
             file   = target.eval("__FILE__")
-            start  = target.eval("__LINE__") 
+            start  = target.eval("__LINE__")
             finish = (args.first && args.first.to_i) || 5
             marker = start
           end
 
           if invalid_file?(file)
-            raise Pry::CommandError, 
+            raise Pry::CommandError,
             "Cannot find local context. Did you use binding.pry?"
           end
 
@@ -48,20 +48,20 @@ def process
           desc = (@method && @method.name_with_owner) || ""
 
           if !code.empty?
-            output.puts "\n#{text.bold('From:')} #{file} @ line #{start}#{desc}:\n\n"
+            output.puts "\n#{text.bold('From:')} #{file} @ line #{start} #{desc}:\n\n"
             output.puts code.with_line_numbers.with_marker(marker)
             output.puts
           end
         end
 
-        private 
+        private
 
         def show_method?
-          @method && !@method.instance_of?(Pry::Method::Disowned) && @method.source_range.count < 20
+          args.empty? && @method && !@method.instance_of?(Pry::Method::Disowned) && @method.source_range.count < 20
         end
 
         def invalid_file?(file)
-          file != Pry.eval_path && 
+          file != Pry.eval_path &&
           (file =~ /(\(.*\))|<.*>/ || file == "" || file == "-e")
         end
       end