pry 0.8.0pre8-java → 0.8.0pre9-java

data/lib/pry/commands.rb

@@ -23,9 +23,34 @@ class Pry
       Pry.start(target)
     end
 
+    # this cannot be accessed, it's just for help purposed.
     command ".<shell command>", "All text following a '.' is forwarded to the shell." do
     end
 
+    command "hist", "Show and replay Readline history" do |*args|
+      require 'slop'
+      if args.empty?
+        text = add_line_numbers(Readline::HISTORY.to_a.join("\n"), 0)
+        stagger_output(text)
+        next
+      end
+
+      opts = Slop.parse(args) do
+        banner "Usage: hist [-rSTART..END]"
+        on :r, :replay, 'The line (or range of lines) to replay.', true, :as => Range do |r|
+          options[:r].argument_value = r.to_i if r.is_a?(String)
+        end
+        on :h, :help, 'Show this message.', :tail => true do
+          output.puts help
+        end        
+      end
+
+      next if opts.h?
+
+      actions = Array(Readline::HISTORY.to_a[opts[:r]]).join("\n") + "\n"
+      Pry.active_instance.input = StringIO.new(actions)
+    end
+
     command "exit-program", "End the current program. Aliases: quit-program, !!!" do
       exit
     end

data/lib/pry/pry_instance.rb

@@ -193,10 +193,7 @@ class Pry
     loop do
       val = retrieve_line(eval_string, target)
       process_line(val, eval_string, target)
-      if valid_expression?(eval_string)
-        redo if null_input?(val)
-        break 
-      end
+      break if valid_expression?(eval_string) && !null_input?(val)
     end
 
     @suppress_output = true if eval_string =~ /;\Z/
@@ -276,10 +273,22 @@ class Pry
       # as it has a second parameter.
       input.readline(current_prompt, true)
     else
-      if input.method(:readline).arity == 1
-        input.readline(current_prompt)
-      else
-        input.readline
+      begin
+        if input.method(:readline).arity == 1
+          input.readline(current_prompt)
+        else
+          input.readline
+        end
+      rescue Exception => ex
+        self.input = Readline
+        ""
+
+        # FIX ME!!!
+        # failing test is due to null_input?() being true for a
+        # command that doesn't return a value. This causes a EOFError
+        # exception for a 'rep' (as in test) as it makes the read loop
+        # redo and so it tries to read from a non-existent string
+        # binding.pry
       end
     end
   end

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.8.0pre8" 
+  VERSION = "0.8.0pre9" 
 end

data/test/test.rb

@@ -380,7 +380,7 @@ describe Pry do
               end
             end
             str_output = StringIO.new
-            Pry.new(:input => StringIO.new("hello"), :output => str_output, :commands => Command68).rep
+            Pry.new(:input => StringIO.new("hello\n"), :output => str_output, :commands => Command68).rep
             str_output.string.should =~ /:kept_hello/
 
             Object.remove_const(:Command68)
@@ -393,7 +393,7 @@ describe Pry do
               end
             end
             str_output = StringIO.new
-            Pry.new(:input => StringIO.new("hello"), :output => str_output, :commands => Command68).rep
+            Pry.new(:input => StringIO.new("hello\n"), :output => str_output, :commands => Command68).rep
             (str_output.string =~ /:kept_hello/).should == nil
 
             Object.remove_const(:Command68)

metadata

@@ -1,127 +1,107 @@
 --- !ruby/object:Gem::Specification 
 name: pry
 version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 0
-  - 8
-  - 0pre8
-  version: 0.8.0pre8
+  prerelease: 5
+  version: 0.8.0pre9
 platform: java
 authors: 
-- John Mair (banisterfiend)
+  - John Mair (banisterfiend)
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 +12:00
+date: 2011-04-15 00:00:00 +12:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: ruby_parser
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 5
-        version: 2.0.5
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: coderay
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 7
-        version: 0.9.7
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bacon
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 0
-        version: 1.1.0
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: method_source
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 0
-        version: 0.2.0
-  type: :runtime
-  version_requirements: *id004
+  - !ruby/object:Gem::Dependency 
+    name: ruby_parser
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 2.0.5
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: coderay
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.9.7
+    type: :runtime
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: bacon
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.1.0
+    type: :development
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: method_source
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            version: 0.2.0
+    type: :runtime
+    version_requirements: *id004
 description: attach an irb-like session to any object at runtime
 email: jrmair@gmail.com
 executables: 
-- pry
+  - pry
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
-- lib/pry/commands.rb
-- lib/pry/version.rb
-- lib/pry/TAGS
-- lib/pry/command_base.rb
-- lib/pry/prompts.rb
-- lib/pry/hooks.rb
-- lib/pry/custom_completions.rb
-- lib/pry/core_extensions.rb
-- lib/pry/command_helpers.rb
-- lib/pry/command_processor.rb
-- lib/pry/completion.rb
-- lib/pry/print.rb
-- lib/pry/pry_class.rb
-- lib/pry/command_base_helpers.rb
-- lib/pry/pry_instance.rb
-- lib/pry.rb
-- examples/example_commands.rb
-- examples/example_image_edit.rb
-- examples/example_input2.rb
-- examples/example_prompt.rb
-- examples/example_command_override.rb
-- examples/example_output.rb
-- examples/example_hooks.rb
-- examples/example_print.rb
-- examples/example_basic.rb
-- examples/example_input.rb
-- test/test.rb
-- test/test_helper.rb
-- test/testrc
-- CHANGELOG
-- LICENSE
-- README.markdown
-- Rakefile
-- .gemtest
-- bin/pry
-has_rdoc: yard
+  - lib/pry.rb
+  - lib/pry/commands.rb
+  - lib/pry/version.rb
+  - lib/pry/TAGS
+  - lib/pry/command_base.rb
+  - lib/pry/prompts.rb
+  - lib/pry/hooks.rb
+  - lib/pry/custom_completions.rb
+  - lib/pry/core_extensions.rb
+  - lib/pry/command_helpers.rb
+  - lib/pry/command_processor.rb
+  - lib/pry/completion.rb
+  - lib/pry/print.rb
+  - lib/pry/pry_class.rb
+  - lib/pry/command_base_helpers.rb
+  - lib/pry/pry_instance.rb
+  - examples/example_commands.rb
+  - examples/example_image_edit.rb
+  - examples/example_input2.rb
+  - examples/example_prompt.rb
+  - examples/example_command_override.rb
+  - examples/example_output.rb
+  - examples/example_hooks.rb
+  - examples/example_print.rb
+  - examples/example_basic.rb
+  - examples/example_input.rb
+  - test/test.rb
+  - test/test_helper.rb
+  - test/testrc
+  - CHANGELOG
+  - LICENSE
+  - README.markdown
+  - Rakefile
+  - .gemtest
+  - bin/pry
+has_rdoc: true
 homepage: http://banisterfiend.wordpress.com
 licenses: []
 
@@ -129,29 +109,23 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: attach an irb-like session to any object at runtime