pry 0.9.6.1-i386-mswin32 → 0.9.6.2-i386-mswin32

data/test/test_command_set.rb

@@ -3,7 +3,6 @@ require 'helper'
 describe Pry::CommandSet do
   before do
     @set = Pry::CommandSet.new
-    @ctx = Pry::CommandContext.new
   end
 
   it 'should call the block used for the command when it is called' do
@@ -12,7 +11,7 @@ describe Pry::CommandSet do
       run = true
     end
 
-    @set.run_command @ctx, 'foo'
+    @set.run_command nil, 'foo'
     run.should == true
   end
 
@@ -21,23 +20,21 @@ describe Pry::CommandSet do
       args.should == [1, 2, 3]
     end
 
-    @set.run_command @ctx, 'foo', 1, 2, 3
+    @set.run_command nil, 'foo', 1, 2, 3
   end
 
   it 'should use the first argument as self' do
-    ctx = @ctx
-
     @set.command 'foo' do
-      self.should == ctx
+      self.should == true
     end
 
-    @set.run_command @ctx, 'foo'
+    @set.run_command true, 'foo'
   end
 
   it 'should raise an error when calling an undefined command' do
     @set.command('foo') {}
     lambda {
-      @set.run_command @ctx, 'bar'
+      @set.run_command nil, 'bar'
     }.should.raise(Pry::NoCommandError)
   end
 
@@ -46,7 +43,7 @@ describe Pry::CommandSet do
     @set.delete 'foo'
 
     lambda {
-      @set.run_command @ctx, 'foo'
+      @set.run_command nil, 'foo'
     }.should.raise(Pry::NoCommandError)
   end
 
@@ -60,11 +57,11 @@ describe Pry::CommandSet do
 
     @set.import_from(other_set, 'foo')
 
-    @set.run_command @ctx, 'foo'
+    @set.run_command nil, 'foo'
     run.should == true
 
     lambda {
-      @set.run_command @ctx, 'bar'
+      @set.run_command nil, 'bar'
     }.should.raise(Pry::NoCommandError)
   end
 
@@ -78,8 +75,8 @@ describe Pry::CommandSet do
 
     @set.import other_set
 
-    @set.run_command @ctx, 'foo'
-    @set.run_command @ctx, 'bar'
+    @set.run_command nil, 'foo'
+    @set.run_command nil, 'bar'
     run.should == [true, true]
   end
 
@@ -87,7 +84,7 @@ describe Pry::CommandSet do
     run = false
     @set.command('foo') { run = true }
 
-    Pry::CommandSet.new(@set).run_command @ctx, 'foo'
+    Pry::CommandSet.new(@set).run_command nil, 'foo'
     run.should == true
   end
 
@@ -104,7 +101,7 @@ describe Pry::CommandSet do
     @set.commands['bar'].name.should == 'bar'
     @set.commands['bar'].description.should == ''
 
-    @set.run_command @ctx, 'bar'
+    @set.run_command nil, 'bar'
     run.should == true
   end
 
@@ -117,17 +114,17 @@ describe Pry::CommandSet do
 
   it 'should return Pry::CommandContext::VOID_VALUE for commands by default' do
     @set.command('foo') { 3 }
-    @set.run_command(@ctx, 'foo').should == Pry::CommandContext::VOID_VALUE
+    @set.run_command(nil, 'foo').should == Pry::CommandContext::VOID_VALUE
   end
 
   it 'should be able to keep return values' do
     @set.command('foo', '', :keep_retval => true) { 3 }
-    @set.run_command(@ctx, 'foo').should == 3
+    @set.run_command(nil, 'foo').should == 3
   end
 
   it 'should be able to keep return values, even if return value is nil' do
     @set.command('foo', '', :keep_retval => true) { nil }
-    @set.run_command(@ctx, 'foo').should == nil
+    @set.run_command(nil, 'foo').should == nil
   end
 
   it 'should be able to have its own helpers' do
@@ -139,7 +136,7 @@ describe Pry::CommandSet do
       def my_helper; end
     end
 
-    @set.run_command(@ctx, 'foo')
+    @set.run_command(Pry::CommandContext.new, 'foo')
     Pry::CommandContext.new.should.not.respond_to :my_helper
   end
 
@@ -157,7 +154,7 @@ describe Pry::CommandSet do
       def my_other_helper; end
     end
 
-    @set.run_command(@ctx, 'foo')
+    @set.run_command(Pry::CommandContext.new, 'foo')
   end
 
   it 'should import helpers from imported sets' do
@@ -169,7 +166,7 @@ describe Pry::CommandSet do
 
     @set.import imported_set
     @set.command('foo') { should.respond_to :imported_helper_method }
-    @set.run_command(@ctx, 'foo')
+    @set.run_command(Pry::CommandContext.new, 'foo')
   end
 
   it 'should import helpers even if only some commands are imported' do
@@ -183,7 +180,7 @@ describe Pry::CommandSet do
 
     @set.import_from imported_set, 'bar'
     @set.command('foo') { should.respond_to :imported_helper_method }
-    @set.run_command(@ctx, 'foo')
+    @set.run_command(Pry::CommandContext.new, 'foo')
   end
 
   it 'should provide a :listing for a command that defaults to its name' do
@@ -197,11 +194,12 @@ describe Pry::CommandSet do
   end
 
   it "should provide a 'help' command" do
-    @ctx.command_set = @set
-    @ctx.output = StringIO.new
+    context = Pry::CommandContext.new
+    context.command_set = @set
+    context.output = StringIO.new
 
     lambda {
-      @set.run_command(@ctx, 'help')
+      @set.run_command(context, 'help')
     }.should.not.raise
   end
 
@@ -211,12 +209,13 @@ describe Pry::CommandSet do
     @set.command 'moo', "Mooerizes" do; end
     @set.command 'boo', "Booerizes" do; end
 
-    @ctx.command_set = @set
-    @ctx.output = StringIO.new
+    context = Pry::CommandContext.new
+    context.command_set = @set
+    context.output = StringIO.new
 
-    @set.run_command(@ctx, 'help')
+    @set.run_command(context, 'help')
 
-    doc = @ctx.output.string
+    doc = context.output.string
 
     order = [doc.index("boo"),
              doc.index("foo"),

data/test/test_default_commands/test_introspection.rb

@@ -211,11 +211,36 @@ describe "Pry::DefaultCommands::Introspection" do
         }
         mock_pry("edit -n").should.not =~ /FOO/
       end
+    end
 
+    describe "with --in" do
       it "should edit the nth line of _in_" do
         mock_pry("10", "11", "edit --in -2")
         @contents.should == "10\n"
       end
+
+      it "should edit the last line if no argument is given" do
+        mock_pry("10", "11", "edit --in")
+        @contents.should == "11\n"
+      end
+
+      it "should edit a range of lines if a range is given" do
+        mock_pry("10", "11", "edit -i 1,2")
+        @contents.should == "10\n11\n"
+      end
+
+      it "should edit a multi-line expression as it occupies one line of _in_" do
+        mock_pry("class Fixnum", "  def invert; -self; end", "end", "edit -i 1")
+        @contents.should == "class Fixnum\n  def invert; -self; end\nend\n"
+      end
+
+      it "should not work with a filename" do
+        mock_pry("edit ruby.rb -i").should =~ /Only one of --ex, --temp, --in and FILE may be specified/
+      end
+
+      it "should not work with nonsense" do
+        mock_pry("edit --in three").should =~ /Not a valid range: three/
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry
 version: !ruby/object:Gem::Version
-  version: 0.9.6.1
+  version: 0.9.6.2
   prerelease: 
 platform: i386-mswin32
 authors:
@@ -13,29 +13,29 @@ date: 2011-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_parser
-  requirement: &70236410186820 !ruby/object:Gem::Requirement
+  requirement: &70249509038380 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70236410186820
+  version_requirements: *70249509038380
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &70236413936320 !ruby/object:Gem::Requirement
+  requirement: &70249509034780 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.8
   type: :runtime
   prerelease: false
-  version_requirements: *70236413936320
+  version_requirements: *70249509034780
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &70236413933460 !ruby/object:Gem::Requirement
+  requirement: &70249509033220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,32 +43,32 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70236413933460
+  version_requirements: *70249509033220
 - !ruby/object:Gem::Dependency
   name: method_source
-  requirement: &70236410291220 !ruby/object:Gem::Requirement
+  requirement: &70249509173580 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *70236410291220
+  version_requirements: *70249509173580
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &70236410288640 !ruby/object:Gem::Requirement
+  requirement: &70249509171580 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70236410288640
+  version_requirements: *70249509171580
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70236410287480 !ruby/object:Gem::Requirement
+  requirement: &70249509100360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *70236410287480
+  version_requirements: *70249509100360
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70236410285060 !ruby/object:Gem::Requirement
+  requirement: &70249512745240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,18 +87,18 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70236410285060
+  version_requirements: *70249512745240
 - !ruby/object:Gem::Dependency
   name: win32console
-  requirement: &70236410257780 !ruby/object:Gem::Requirement
+  requirement: &70249512743620 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70236410257780
+  version_requirements: *70249512743620
 description: An IRB alternative and runtime developer console
 email: jrmair@gmail.com
 executables:
@@ -156,12 +156,9 @@ files:
 - lib/pry/helpers/text.rb
 - lib/pry/history.rb
 - lib/pry/history_array.rb
-- lib/pry/method.rb
 - lib/pry/plugins.rb
 - lib/pry/pry_class.rb
 - lib/pry/pry_instance.rb
-- lib/pry/rbx_method.rb
-- lib/pry/rbx_path.rb
 - lib/pry/version.rb
 - pry.gemspec
 - test/helper.rb
@@ -179,7 +176,6 @@ files:
 - test/test_exception_whitelist.rb
 - test/test_history_array.rb
 - test/test_input_stack.rb
-- test/test_method.rb
 - test/test_pry.rb
 - test/test_pry_history.rb
 - test/test_pry_output.rb
@@ -227,7 +223,6 @@ test_files:
 - test/test_exception_whitelist.rb
 - test/test_history_array.rb
 - test/test_input_stack.rb
-- test/test_method.rb
 - test/test_pry.rb
 - test/test_pry_history.rb
 - test/test_pry_output.rb

data/lib/pry/method.rb

@@ -1,184 +0,0 @@
-class Pry
-  class Method
-    include RbxMethod if defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /rbx/
-
-    class << self
-      def from_str(str, target=TOPLEVEL_BINDING, options={})
-        if str.nil?
-          from_binding(target)
-        elsif str.to_s =~ /(\S+)\#(\S+)\Z/
-          context, meth_name = $1, $2
-          from_module(target.eval(context), meth_name)
-        elsif str.to_s =~ /(\S+)\.(\S+)\Z/
-          context, meth_name = $1, $2
-          from_obj(target.eval(context), meth_name)
-        elsif options[:instance]
-          new(target.eval("instance_method(:#{str})")) rescue nil
-        elsif options[:methods]
-          new(target.eval("method(:#{str})")) rescue nil
-        else
-          from_str(str, target, :instance => true) ||
-            from_str(str, target, :methods => true)
-        end
-      end
-
-      def from_binding(b)
-        meth_name = b.eval('__method__')
-        if [:__script__, nil, :__binding__, :__binding_impl__].include?(meth_name)
-          nil
-        else
-          new(b.eval("method(:#{meth_name})"))
-        end
-      end
-
-      def from_module(nodule, name)
-        new(nodule.instance_method(name)) rescue nil
-      end
-      alias from_class from_module
-
-      def from_obj(obj, name)
-        new(obj.method(name)) rescue nil
-      end
-    end
-
-    def initialize(method)
-      @method = method
-    end
-
-    def source
-      @source ||= case source_type
-        when :c
-          info = pry_doc_info
-          if info and info.source
-            code = strip_comments_from_c_code(info.source)
-          end
-        when :rbx
-          strip_leading_whitespace(core_code)
-        when :ruby
-          if pry_method?
-            code = Pry.new(:input => StringIO.new(Pry.line_buffer[source_line..-1].join), :prompt => proc {""}, :hooks => {}).r
-          else
-            code = @method.source
-          end
-          strip_leading_whitespace(code)
-        end
-    end
-
-    def doc
-      @doc ||= case source_type
-        when :c
-          info = pry_doc_info
-          info.docstring if info
-        when :rbx
-          strip_leading_hash_and_whitespace_from_ruby_comments(core_doc)
-        when :ruby
-          if pry_method?
-            raise "Error: Can't view doc for a REPL-defined method."
-          else
-            strip_leading_hash_and_whitespace_from_ruby_comments(@method.comment)
-          end
-        end
-    end
-
-    def source_type
-      if defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /rbx/
-        if core? then :rbx else :ruby end
-      else
-        if source_location.nil? then :c else :ruby end
-      end
-    end
-
-    def source_file
-      source_location.nil? ? nil : source_location.first
-    end
-
-    def source_line
-      source_location.nil? ? nil : source_location.last
-    end
-
-    def visibility
-      if owner.public_instance_methods.include?(name)
-        :public
-      elsif owner.protected_instance_methods.include?(name)
-        :protected
-      elsif owner.private_instance_methods.include?(name)
-        :private
-      else
-        :none
-      end
-    end
-
-    # paraphrased from awesome_print gem
-    def signature
-      if respond_to?(:parameters)
-        args = parameters.inject([]) do |arr, (type, name)|
-          name ||= (type == :block ? 'block' : "arg#{arr.size + 1}")
-          arr << case type
-                 when :req        then name.to_s
-                 when :opt, :rest then "*#{name}"
-                 when :block      then "&#{name}"
-                 else '?'
-                 end
-        end
-      else
-        args = (1..arity.abs).map { |i| "arg#{i}" }
-        args[-1] = "*#{args[-1]}" if arity < 0
-      end
-
-      "#{name}(#{args.join(', ')})"
-    end
-
-    def dynamically_defined?
-      source_file ? !!(source_file =~ /(\(.*\))|<.*>/) : nil
-    end
-
-    def pry_method?
-      source_file == Pry.eval_path
-    end
-
-    def ==(obj)
-      if obj.is_a? Pry::Method
-        super
-      else
-        @method == obj
-      end
-    end
-
-    def is_a?(klass)
-      klass == Pry::Method or @method.is_a?(klass)
-    end
-    alias kind_of? is_a?
-
-    def respond_to?(method_name)
-      super or @method.respond_to?(method_name)
-    end
-
-    def method_missing(method_name, *args, &block)
-      @method.send(method_name, *args, &block)
-    end
-
-    private
-      def pry_doc_info
-        if Pry.config.has_pry_doc
-          Pry::MethodInfo.info_for(@method) or output.puts "Cannot find C method: #{name}"
-        else
-          output.puts "Cannot locate this method: #{name}. Try `gem install pry-doc` to get access to Ruby Core documentation."
-        end
-      end
-
-      def strip_comments_from_c_code(code)
-        code.sub(/\A\s*\/\*.*?\*\/\s*/m, '')
-      end
-
-      def strip_leading_hash_and_whitespace_from_ruby_comments(comment)
-        comment = comment.dup
-        comment.gsub!(/\A\#+?$/, '')
-        comment.gsub!(/^\s*#/, '')
-        strip_leading_whitespace(comment)
-      end
-
-      def strip_leading_whitespace(text)
-        Pry::Helpers::CommandHelpers.unindent(text)
-      end
-  end
-end