pry 0.9.0pre3 → 0.9.0

data/test/test_default_commands/test_input.rb

@@ -13,11 +13,118 @@ describe "Pry::DefaultCommands::Input" do
 
     it 'should correctly amend the specified line of input when line number given ' do
       str_output = StringIO.new
-      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", "amend-line-0 def goodbye", "show-input", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", "amend-line 1 def goodbye", "show-input", "exit-all"), str_output) do
         pry
       end
       str_output.string.should =~ /\A\d+: def goodbye\n\d+: puts :bing\n\d+: puts :bang/
     end
+
+    it 'should correctly amend the specified line of input when line number given, 0 should behave as 1 ' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", "amend-line 0 def goodbye", "show-input", "exit-all"), str_output) do
+        pry
+      end
+      str_output.string.should =~ /\A\d+: def goodbye\n\d+: puts :bing\n\d+: puts :bang/
+    end
+
+    it 'should correctly amend the specified line of input when line number given (negative number)' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", "amend-line -1 puts :bink", "show-input", "exit-all"), str_output) do
+        pry
+      end
+      str_output.string.should =~ /\A\d+: def hello\n\d+: puts :bing\n\d+: puts :bink/
+
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", "amend-line -2 puts :bink", "show-input", "exit-all"), str_output) do
+        pry
+      end
+      str_output.string.should =~ /\A\d+: def hello\n\d+: puts :bink\n\d+: puts :bang/
+    end
+
+    it 'should correctly amend the specified range of lines of input when range of negative numbers given (negative number)' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", "puts :boat", "amend-line -3..-2 puts :bink", "show-input", "exit-all"), str_output) do
+        pry
+      end
+      str_output.string.should =~ /\A\d+: def hello\n\d+: puts :bink\n\d+: puts :boat/
+    end
+
+    it 'should correctly amend the specified line with string interpolated text' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", 'amend-line puts "#{goodbye}"', "show-input", "exit-all"), str_output) do
+        pry
+      end
+
+      str_output.string.should =~ /\A\d+: def hello\n\d+: puts :bing\n\d+: puts \"\#{goodbye}\"/
+    end
+
+    it 'should display error if nothing to amend' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("amend-line", "exit-all"), str_output) do
+        pry
+      end
+      str_output.string.should =~ /No input to amend/
+    end
+
+
+    it 'should correctly amend the specified range of lines' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", "puts :heart", "amend-line 2..3 puts :bong", "show-input", "exit-all"), str_output) do
+        pry
+      end
+      str_output.string.should =~ /\A\d+: def hello\n\d+: puts :bong\n\d+: puts :heart/
+    end
+
+    it 'should correctly delete a specific line using the ! for content' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", "puts :boast", "puts :heart", "amend-line 3 !", "show-input", "exit-all"), str_output) do
+        pry
+      end
+
+      str_output.string.should =~ /\d+: def hello\n\d+: puts :bing\n\d+: puts :boast\n\d+: puts :heart/
+    end
+
+    it 'should correctly delete a range of lines using the ! for content' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", "puts :boast", "puts :heart", "amend-line 2..4 !", "show-input", "exit-all"), str_output) do
+        pry
+      end
+
+      str_output.string.should =~ /\d+: def hello\n\d+: puts :heart\n\Z/
+    end
+
+    it 'should correctly delete the previous line using the ! for content' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", "puts :boast", "puts :heart", "amend-line !", "show-input", "exit-all"), str_output) do
+        pry
+      end
+
+      str_output.string.should =~ /\d+: def hello\n\d+: puts :bing\n\d+: puts :bang\n\d+: puts :boast\n\Z/
+    end
+
+    it 'should correctly amend the specified range of lines, using negative numbers in range' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", "puts :boast", "puts :heart", "amend-line-2..-2 puts :bong", "show-input", "exit-all"), str_output) do
+        pry
+      end
+      str_output.string.should =~ /\d+: def hello\n\d+: puts :bong\n\d+: puts :heart/
+    end
+
+    it 'should correctly insert a new line of input before a specified line using the > syntax' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", "amend-line 2 >puts :inserted", "show-input", "exit-all"), str_output) do
+        pry
+      end
+      str_output.string.should =~ /\d+: def hello\n\d+: puts :inserted\n\d+: puts :bing\n\d+: puts :bang/
+    end
+
+    it 'should correctly insert a new line of input before a specified line using the > syntax (should ignore second value of range)' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", "amend-line 2..21 >puts :inserted", "show-input", "exit-all"), str_output) do
+        pry
+      end
+      str_output.string.should =~ /\d+: def hello\n\d+: puts :inserted\n\d+: puts :bing\n\d+: puts :bang/
+    end
   end
 
   describe "show-input" do
@@ -42,6 +149,53 @@ describe "Pry::DefaultCommands::Input" do
     end
   end
 
+  describe "play" do
+    it 'should play a string of code (with no args)' do
+      redirect_pry_io(InputTester.new("play :test_string", "exit-all"), str_output = StringIO.new) do
+        pry
+      end
+      str_output.string.should =~ /:test_string/
+    end
+
+    it 'should play an interpolated string of code (with no args)' do
+      $obj = ":test_string_interpolated"
+      redirect_pry_io(InputTester.new('play #{$obj}', "exit-all"), str_output = StringIO.new) do
+        pry
+      end
+      str_output.string.should =~ /:test_string_interpolated/
+    end
+
+    it 'should play a method with the -m switch (a single line)' do
+      $o = Object.new
+      def $o.test_method
+        :test_method_content
+      end
+
+      redirect_pry_io(InputTester.new('play -m $o.test_method --lines 2', "exit-all"), str_output = StringIO.new) do
+        pry
+      end
+
+      str_output.string.should =~ /:test_method_content/
+      $o = nil
+    end
+
+    it 'should play a method with the -m switch (multiple line)' do
+      $o = Object.new
+      def $o.test_method
+        1 + 102
+        5 * 6
+      end
+
+      redirect_pry_io(InputTester.new('play -m $o.test_method --lines 2..3', "exit-all"), str_output = StringIO.new) do
+        pry
+      end
+
+      str_output.string.should =~ /103\n.*30/
+      $o = nil
+    end
+
+  end
+
   describe "hist" do
     push_first_hist_line = lambda do |hist, line|
       hist.push line
@@ -94,13 +248,29 @@ describe "Pry::DefaultCommands::Input" do
       @hist.push "pepper"
       @hist.push "orange"
       @hist.push "grape"
+      @hist.push "def blah 1"
+      @hist.push "def boink 2"
+      @hist.push "place holder"
 
       str_output = StringIO.new
       redirect_pry_io(InputTester.new("hist --grep o", "exit-all"), str_output) do
         pry
       end
-
       str_output.string.should =~ /\d:.*?box\n\d:.*?button\n\d:.*?orange/
+
+      # test more than one word in a regex match (def blah)
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("hist --grep def blah", "exit-all"), str_output) do
+        pry
+      end
+      str_output.string.should =~ /def blah 1/
+
+      # test more than one word with leading white space in a regex match (def boink)
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("hist --grep      def boink", "exit-all"), str_output) do
+        pry
+      end
+      str_output.string.should =~ /def boink 2/
     end
 
     it 'should return last N lines in history with --tail switch' do

data/test/test_default_commands/test_introspection.rb

@@ -20,6 +20,15 @@ describe "Pry::DefaultCommands::Introspection" do
       str_output.string.should =~ /\d+: def sample/
     end
 
+    it 'should output a method\'s source with line numbers starting at 1' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("show-method -b sample_method", "exit-all"), str_output) do
+        pry
+      end
+
+      str_output.string.should =~ /1: def sample/
+    end
+
     it 'should output a method\'s source if inside method without needing to use method name' do
       $str_output = StringIO.new
 

data/test/test_pry.rb

@@ -40,6 +40,17 @@ describe Pry do
         @excep.is_a?(NameError).should == true
       end
 
+      if defined?(BasicObject)
+        it 'should be able to operate inside the BasicObject class' do
+          $obj = nil
+          redirect_pry_io(InputTester.new(":foo", "$obj = _", "exit-all"), StringIO.new) do
+            BasicObject.pry
+          end
+          $obj.should == :foo
+          $obj = nil
+        end
+      end
+
       it 'should set an ivar on an object' do
         input_string = "@x = 10"
         input = InputTester.new(input_string)
@@ -488,6 +499,21 @@ describe Pry do
             $test_interpolation = nil
           end
 
+          it 'should NOT try to interpolate pure ruby code (no commands) ' do
+            str_output = StringIO.new
+            Pry.new(:input => StringIO.new('puts \'#{aggy}\''), :output => str_output).rep
+            str_output.string.should.not =~ /NameError/
+
+            Pry.new(:input => StringIO.new('puts #{aggy}'), :output => str_output).rep
+            str_output.string.should.not =~ /NameError/
+
+            $test_interpolation = "blah"
+            Pry.new(:input => StringIO.new('puts \'#{$test_interpolation}\''), :output => str_output).rep
+
+            str_output.string.should.not =~ /blah/
+            $test_interpolation = nil
+          end
+
           it 'should create a command with a space in its name' do
             set = Pry::CommandSet.new do
               command "hello baby", "" do

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: pry
 version: !ruby/object:Gem::Version 
-  prerelease: 5
-  version: 0.9.0pre3
+  prerelease: 
+  version: 0.9.0
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-09 00:00:00 Z
+date: 2011-06-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ruby_parser
@@ -42,7 +42,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.6.0
+        version: 1.9.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -53,7 +53,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.0
+        version: 0.6.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -137,6 +137,7 @@ files:
 - lib/pry/pry_class.rb
 - lib/pry/pry_instance.rb
 - lib/pry/version.rb
+- pry.gemspec
 - test/helper.rb
 - test/test_command_helpers.rb
 - test/test_command_processor.rb
@@ -169,9 +170,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
+      version: "0"
 requirements: []
 
 rubyforge_project: