pry 0.9.1 → 0.9.2

data/CHANGELOG

@@ -1,9 +1,15 @@
+21/6/2011 version 0.9.2
+* fixed string interpolation bug (caused valid ruby code not to execute, sorry!)
+* fixed `ls` command, so it can properly display members of Object and classes, and BasicObject, etc
+* added a few git related commands to experimental command set, blame and diff
+
 17/6/2011 version 0.9.0
 * plugin system
 * regex commands
 * show-method works on methods defined in REPL
 * new command system/API
 * rubinius core support
+* more backports to ruby 1.8
 * inp/out special locals
 * _ex_ backtrace navigation object (_ex_.line, _ex_.file)
 * readline history saving/loading
@@ -16,6 +22,8 @@
 * much more comprehensive test suite
 * support for new and old rubygems API
 * changed -s behaviour of ls (now excludes Object methods)
+* removed eval-file, lls, lcd, and a few other commands
+
 
 26/3/2011 version 0.7.6.1
 * added slightly better support for YARD

data/lib/pry/command_processor.rb

@@ -62,7 +62,7 @@ class Pry
           # so early exit.
           begin
             interp_val = interpolate_string(val, target)
-          rescue NameError
+          rescue Exception
             next
           end
 

data/lib/pry/default_commands/ls.rb

@@ -4,11 +4,19 @@ class Pry
     Ls = Pry::CommandSet.new do
 
       helpers do
-        def trim_methods(options, visibility)
-          if options[:e]
+        def should_trim?(target, options)
+          if target.eval('self').is_a? Module
+            options[:e] || target.eval('self') >= Object
+          else
+            options[:e]
+          end
+        end
+
+        def trim_methods(target, options, visibility)
+          if should_trim?(target, options)
             []
           else
-            Object.send("#{visibility}_methods")
+            Object.send("#{visibility}_instance_methods")
           end
         end
       end
@@ -73,7 +81,7 @@ Shows local and instance variables by default.
             options[:s] = true
           end
 
-          opts.on("-e", "--everything", "Include superclass entries including Object (relevant to constant and methods options).") do
+          opts.on("-e", "--everything", "Include superclass entries including Object (must be combined with -s switch).") do
             options[:e] = true
           end
 
@@ -140,19 +148,19 @@ Shows local and instance variables by default.
 
                               info["global variables"] = [Array(target.eval("global_variables")).sort, i += 1] if options[:g] || options[:a]
 
-                              info["public methods"] = [Array(target.eval("public_methods(#{options[:s]})")).uniq.sort - trim_methods(options, :public), i += 1] if (options[:m] && options[:P]) || options[:a]
+                              info["public methods"] = [Array(target.eval("public_methods(#{options[:s]})")).uniq.sort - trim_methods(target, options, :public), i += 1] if (options[:m] && options[:P]) || options[:a]
 
-                              info["protected methods"] = [Array(target.eval("protected_methods(#{options[:s]})")).sort - trim_methods(options, :protected), i += 1] if (options[:m] && options[:r]) || options[:a]
+                              info["protected methods"] = [Array(target.eval("protected_methods(#{options[:s]})")).sort - trim_methods(target, options, :protected), i += 1] if (options[:m] && options[:r]) || options[:a]
 
-                              info["private methods"] = [Array(target.eval("private_methods(#{options[:s]})")).sort - trim_methods(options, :private), i += 1] if (options[:m] && options[:p]) || options[:a]
+                              info["private methods"] = [Array(target.eval("private_methods(#{options[:s]})")).sort - trim_methods(target, options, :private), i += 1] if (options[:m] && options[:p]) || options[:a]
 
                               info["just singleton methods"] = [Array(target.eval("methods(#{options[:s]})")).sort, i += 1] if (options[:m] && options[:j]) || options[:a]
 
-                              info["public instance methods"] = [Array(target.eval("public_instance_methods(#{options[:s]})")).uniq.sort - trim_methods(options, :public), i += 1] if target_self.is_a?(Module) && ((options[:M] && options[:P]) || options[:a])
+                              info["public instance methods"] = [Array(target.eval("public_instance_methods(#{options[:s]})")).uniq.sort - trim_methods(target, options, :public), i += 1] if target_self.is_a?(Module) && ((options[:M] && options[:P]) || options[:a])
 
-                              info["protected instance methods"] = [Array(target.eval("protected_instance_methods(#{options[:s]})")).uniq.sort - trim_methods(options, :protected), i += 1] if target_self.is_a?(Module) && ((options[:M] && options[:r]) || options[:a])
+                              info["protected instance methods"] = [Array(target.eval("protected_instance_methods(#{options[:s]})")).uniq.sort - trim_methods(target, options, :protected), i += 1] if target_self.is_a?(Module) && ((options[:M] && options[:r]) || options[:a])
 
-                              info["private instance methods"] = [Array(target.eval("private_instance_methods(#{options[:s]})")).uniq.sort - trim_methods(options, :private), i += 1] if target_self.is_a?(Module) && ((options[:M] && options[:p]) || options[:a])
+                              info["private instance methods"] = [Array(target.eval("private_instance_methods(#{options[:s]})")).uniq.sort - trim_methods(target, options, :private), i += 1] if target_self.is_a?(Module) && ((options[:M] && options[:p]) || options[:a])
 
                               # dealing with 1.8/1.9 compatibility issues :/
                               csuper = options[:s]

data/lib/pry/extended_commands/experimental.rb

@@ -12,6 +12,66 @@ class Pry
         meth.reload
       end
 
+      command "blame", "Show blame for a method", :requires_gem => "grit" do |meth_name|
+        require 'grit'
+        if (meth = get_method_object(meth_name, target, {})).nil?
+          output.puts "Invalid method name: #{meth_name}."
+          next
+        end
+
+        repo ||= Grit::Repo.new(".")
+        start_line = meth.source_location.last
+        num_lines = meth.source.lines.count
+        authors = repo.blame(meth.source_location.first).lines.select do |v|
+          v.lineno >= start_line && v.lineno <= start_line + num_lines
+        end.map do |v|
+          v.commit.author.output(Time.new).split(/</).first.strip
+        end
+
+        lines_with_blame = []
+        meth.source.lines.zip(authors) { |line, author| lines_with_blame << ("#{author}".ljust(10) + colorize_code(line)) }
+        output.puts        lines_with_blame.join
+      end
+
+      command "diff", "Show the diff for a method", :requires_gem => ["grit", "diffy"] do |meth_name|
+        require 'grit'
+        require 'diffy'
+
+        if (meth = get_method_object(meth_name, target, {})).nil?
+          output.puts "Invalid method name: #{meth_name}."
+          next
+        end
+
+        output.puts colorize_code(Diffy::Diff.new(method_code_from_head(meth), meth.source))
+      end
+
+      helpers do
+        def get_file_from_commit(path)
+          repo = Grit::Repo.new('.')
+          head = repo.commits.first
+          tree_names = path.split("/")
+          start_tree = head.tree
+          blob_name = tree_names.last
+          tree = tree_names[0..-2].inject(start_tree)  { |a, v|  a.trees.find { |t| t.basename == v } }
+          blob = tree.blobs.find { |v| v.basename == blob_name }
+          blob.data
+        end
+
+        def method_code_from_head(meth)
+          rel_path = relative_path(meth.source_location.first)
+          code = get_file_from_commit(rel_path)
+          start_line = meth.source_location.last
+          code_length = meth.source.lines.count
+          code.lines.to_a[(start_line - 1)...((start_line - 1) + code_length)].join
+        end
+
+        def relative_path(path)
+          path =~ /#{Regexp.escape(File.expand_path("."))}\/(.*)/
+          $1
+        end
+
+      end
+
     end
   end
 end

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/test/test_pry.rb

@@ -487,6 +487,15 @@ describe Pry do
             $test_interpolation = nil
           end
 
+          # bug fix for https://github.com/banister/pry/issues/170
+          it 'should not choke on complex string interpolation when checking if ruby code is a command' do
+            redirect_pry_io(InputTester.new('/#{Regexp.escape(File.expand_path("."))}/'), str_output = StringIO.new) do
+              pry
+            end
+
+            str_output.string.should.not =~ /SyntaxError/
+          end
+
           it 'should NOT interpolate ruby code into commands if :interpolate => false' do
             klass = Pry::CommandSet.new do
               command "hello", "", :keep_retval => true, :interpolate => false do |arg|

metadata

@@ -2,7 +2,7 @@
 name: pry
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-17 00:00:00 Z
+date: 2011-06-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ruby_parser