pry 0.9.4pre5-i386-mingw32 → 0.9.4pre6-i386-mingw32

data/CHANGELOG

@@ -1,4 +1,20 @@
-*/8/2011 version 0.9.4
+8/9/2011 version 0.9.4
+
+MAJOR NEW FEATURES:
+- JRuby support, including show-method/edit-method and editor integration on both 1.8 and 1.9 versions
+- extended cd syntax: cd ../@x/y
+- play command now works much better with _in_ array (this is a very powerful feature, esp with Pry::NAV_PROMPT)
+- history saving/loading is now lightning fast
+- 'edit' (entered by itself) now opens current lines in input buffer in an editor, and evals on exit
+- 'edit' command is also, in general more intelligent
+- ls output no longer in array format, and colors can be configured, e.g: Pry.config.ls.ivar_color = :bright_blue
+- new switch-to command for moving around the binding stack without exiting out of sessions
+- more sophisticated prompts, Pry::NAV_PROMPT to ease deep spelunking of code
+- major bug fix for windows systems
+- much better support for huge objects, should no longer hang pry (see #245)
+- cat --ex and edit --ex now work better
+
+complete CHANGELOG:
 * tempfile should end in .rb (for edit -t)
 * ls output should not be in array format
 * fix history saving (should not save all of Readline::HISTORY, but only what changed)
@@ -9,8 +25,6 @@
 * got rid of warnings caused by stricter ruby 1.9.3 rules
 * remove interpolation of command names and fix interpolation error messag (update WIKI) (thanks ryanf!)
 * 'nested sessions' now use binding stacks (so each instance manages its own collection of bindings without spawning other instances)
-* changed `exit` command so that it now called Kernel#exit (after saving history)
-* 'quit' now behaves like 'exit-all' (and aliased to exit-all) - it breaks out of the repl loop and sets empties the binding_stack
 * 'cd ..' just pops a binding off the binding_stack with special behaviour when only one binding in stack - it breaks out of the repl loop
 * added switch-to command (like jump-to but doesnt unwind the stack)
 * show-method and show-doc now accept multiple method names
@@ -34,6 +48,8 @@
 * added Pry::NAV_PROMPT (great new navigation prompt, per robgleeson) and Pry::SIMPLE_PRINT for simple (IRB-style) print output (just using inspect)
 * _pry_ now passed as 3rd parameter to :before_session hook
 * ls colors now configurable via Pry.config.ls.local_var_color = :bright_red etc
+* ls separator configurable via, e.g Pry.config.ls.separator = "  "
+* Pry.view_clip() now only calls inspect on a few immediates, otherwise uses the #<> syntax, which has been truncated further to exclude teh mem address, again related to #245
 
 */7/2011 version 0.9.3
 * cat --ex (cats 5 lines above and below line in file where exception was raised)

data/CONTRIBUTORS

@@ -1,13 +1,16 @@
-   564	John Mair
+   616	John Mair
     76	Rob Gleeson
     50	Lee Jarvis
-    46	Mon ouïe
+    47	Mon ouïe
     18	David Palm
+    16	Conrad Irwin
+    14	Ryan Fitzgerald
     13	epitron
-     8	Conrad Irwin
-     6	Ryan Fitzgerald
      2	Darrick Wiebe
-     2	Xavier Shay
+     2	robgleeson
      2	Eric Christopherson
-     1	Josh Cheek
+     2	Xavier Shay
      1	Tim Pope
+     1	Gosha Arinich
+     1	Josh Cheek
+     1	Eero Saynatkari

data/TODO

@@ -19,7 +19,6 @@
 * whitelist exceptions
 * hooks system
 * jruby shell command support
-*
 
 0.9.3
 * hist command now excludes last line of input (the command invocation itself)

data/lib/pry.rb

@@ -17,7 +17,7 @@ class Pry
     end
   }
 
-  # The default prints
+  # The default print
   DEFAULT_PRINT = proc do |output, value|
     stringified = begin
                     value.pretty_inspect
@@ -45,6 +45,11 @@ class Pry
     end
   end
 
+  # useful when playing with truly enormous objects
+  CLIPPED_PRINT = proc do |output, value|
+    output.puts "=> #{Pry.view_clip(value)}"
+  end
+
   # Will only show the first line of the backtrace
   DEFAULT_EXCEPTION_HANDLER = proc do |output, exception|
     output.puts "#{exception.class}: #{exception.message}"
@@ -53,22 +58,23 @@ class Pry
 
   # The default prompt; includes the target and nesting level
   DEFAULT_PROMPT = [
-    proc { |target_self, nest_level, _|
-      if nest_level == 0
-        "pry(#{Pry.view_clip(target_self)})> "
-      else
-        "pry(#{Pry.view_clip(target_self)}):#{Pry.view_clip(nest_level)}> "
-      end
-    },
-
-    proc { |target_self, nest_level, _|
-      if nest_level == 0
-        "pry(#{Pry.view_clip(target_self)})* "
-      else
-        "pry(#{Pry.view_clip(target_self)}):#{Pry.view_clip(nest_level)}* "
-      end
-    }
+                    proc { |target_self, nest_level, _|
+                      if nest_level == 0
+                        "pry(#{Pry.view_clip(target_self)})> "
+                      else
+                        "pry(#{Pry.view_clip(target_self)}):#{nest_level}> "
+                      end
+                    },
+
+                    proc { |target_self, nest_level, _|
+                      if nest_level == 0
+                        "pry(#{Pry.view_clip(target_self)})* "
+                      else
+                        "pry(#{Pry.view_clip(target_self)}):#{nest_level}* "
+                      end
+                    }
                    ]
+
   # Deal with the ^D key being pressed, different behaviour in
   # different cases:
   # 1) In an expression     - behave like `!` command   (clear input buffer)
@@ -92,22 +98,22 @@ class Pry
   SIMPLE_PROMPT = [proc { ">> " }, proc { " | " }]
 
   SHELL_PROMPT = [
-    proc { |target_self, _, _| "pry #{Pry.view_clip(target_self)}:#{Dir.pwd} $ " },
-    proc { |target_self, _, _| "pry #{Pry.view_clip(target_self)}:#{Dir.pwd} * " }
+                  proc { |target_self, _, _| "pry #{Pry.view_clip(target_self)}:#{Dir.pwd} $ " },
+                  proc { |target_self, _, _| "pry #{Pry.view_clip(target_self)}:#{Dir.pwd} * " }
                  ]
 
   # A prompt that includes the full object path as well as
   # input/output (_in_ and _out_) information. Good for navigation.
   NAV_PROMPT = [
-                 proc do |_, level, pry|
-                   tree = pry.binding_stack.map { |b| Pry.view_clip(b.eval("self")) }.join " / "
-                   "[#{pry.input_array.size}] (pry) #{tree}: #{level}> "
-                 end,
-                 proc do |_, level, pry|
-                   tree = pry.binding_stack.map { |b| Pry.view_clip(b.eval("self")) }.join " / "
-                   "[#{pry.input_array.size}] (pry) #{tree}: #{level}* "
-                 end,
-                ]
+                proc do |_, level, pry|
+                  tree = pry.binding_stack.map { |b| Pry.view_clip(b.eval("self")) }.join " / "
+                  "[#{pry.input_array.size}] (pry) #{tree}: #{level}> "
+                end,
+                proc do |_, level, pry|
+                  tree = pry.binding_stack.map { |b| Pry.view_clip(b.eval("self")) }.join " / "
+                  "[#{pry.input_array.size}] (pry) #{tree}: #{level}* "
+                end,
+               ]
 
 
   # As a REPL, we often want to catch any unexpected exceptions that may have
@@ -116,15 +122,15 @@ class Pry
   module RescuableException
     def self.===(exception)
       case exception
-      # Catch when the user hits ^C (Interrupt < SignalException), and assume
-      # that they just wanted to stop the in-progress command (just like bash etc.)
+        # Catch when the user hits ^C (Interrupt < SignalException), and assume
+        # that they just wanted to stop the in-progress command (just like bash etc.)
       when Interrupt
         true
-      # Don't catch signals (particularly not SIGTERM) as these are unlikely to be
-      # intended for pry itself. We should also make sure that Kernel#exit works.
+        # Don't catch signals (particularly not SIGTERM) as these are unlikely to be
+        # intended for pry itself. We should also make sure that Kernel#exit works.
       when SystemExit, SignalException
         false
-      # All other exceptions will be caught.
+        # All other exceptions will be caught.
       else
         true
       end

data/lib/pry/default_commands/input.rb

@@ -12,7 +12,7 @@ class Pry
         render_output(false, 1, Pry.color ? CodeRay.scan(eval_string, :ruby).term : eval_string)
       end
 
-      command(/amend-line.?(-?\d+)?(?:\.\.(-?\d+))?/, "Amend a line of input in multi-line mode. Type `amend-line --help` for more information. Aliases %",
+      command(/amend-line(?: (-?\d+)(?:\.\.(-?\d+))?)?/, "Amend a line of input in multi-line mode. Type `amend-line --help` for more information. Aliases %",
               :interpolate => false, :listing => "amend-line")  do |*args|
         start_line_number, end_line_number, replacement_line = *args
 
@@ -52,7 +52,7 @@ e.g amend-line puts 'hello again'   # no line number modifies immediately preced
         run "show-input"
       end
 
-      alias_command(/%.?(-?\d+)?(?:\.\.(-?\d+))?/, /amend-line.?(-?\d+)?(?:\.\.(-?\d+))?/, "")
+      alias_command(/%.?(-?\d+)?(?:\.\.(-?\d+))?/, /amend-line(?: (-?\d+)(?:\.\.(-?\d+))?)?/, "")
 
       command "play", "Play back a string variable or a method or a file as input. Type `play --help` for more information." do |*args|
         opts = Slop.parse!(args) do |opt|

data/lib/pry/default_commands/introspection.rb

@@ -146,8 +146,9 @@ class Pry
           should_reload_at_top_level = opts[:n] ? false : true
 
         elsif opts.t? || args.first.nil?
-          file_name = Tempfile.new(["tmp", ".rb"]).tap(&:close).path
-          File.open(file_name, "w") { |f| f.puts eval_string } if !eval_string.empty?
+          file_name = temp_file do |f|
+            f.puts eval_string  if !eval_string.empty?
+          end
           line = eval_string.lines.count + 1
           should_reload_locally = opts[:n] ? false : true
         else

data/lib/pry/default_commands/ls.rb

@@ -198,7 +198,7 @@ Shows local and instance variables by default.
               if !v.first.empty?
                 text <<  "#{k}:\n--\n"
                 filtered_list = v.first.grep options[:grep]
-                text << text().send(ls_color_map[k], (filtered_list.join("   ")))
+                text << text().send(ls_color_map[k], (filtered_list.join(Pry.config.ls.separator)))
                 text << "\n\n"
               end
             end
@@ -212,7 +212,7 @@ Shows local and instance variables by default.
                                 # plain
                               else
                                 list = info.sort_by { |k, v| v.last }.map { |k, v| [k, [v.first.grep(options[:grep])], v.last] }
-                                list = list.each { |k, v| text << text().send(ls_color_map[k], v.first.join("  ")); text << "  " }
+                                list = list.each { |k, v| text << text().send(ls_color_map[k], v.first.join(Pry.config.ls.separator)); text << Pry.config.ls.separator }
 
                                 if !options[:f]
                                   stagger_output(text)

data/lib/pry/helpers/command_helpers.rb

@@ -39,6 +39,16 @@ class Pry
         end
       end
 
+      # Open a temp file and yield it to the block, closing it after
+      # @return [String] The path of the temp file
+      def temp_file
+        file = Tempfile.new(["tmp", ".rb"])
+        yield file
+        file.path
+      ensure
+        file.close
+      end
+
       ########### RBX HELPERS #############
       def is_core_rbx_path?(path)
         rbx? &&

data/lib/pry/pry_class.rb

@@ -106,11 +106,13 @@ class Pry
     elsif TOPLEVEL_BINDING.eval('self') == obj
       # special case for 'main' object :)
       obj.inspect
+    elsif [String, Numeric, Symbol, nil, true, false].any? { |v| v === obj } && obj.inspect.length <= max_length
+      obj.inspect
     else
-      "#<#{obj.class}:%#x>" % (obj.object_id << 1)
+      "#<#{obj.class}>"#:%x>"# % (obj.object_id << 1)
     end
 
-  rescue
+  rescue RescuableException
     "unknown"
   end
 
@@ -210,6 +212,8 @@ class Pry
     Pry.config.ls.method_color = :green
     Pry.config.ls.instance_method_color = :bright_green
     Pry.config.ls.constant_color = :yellow
+
+    Pry.config.ls.separator = "  "
   end
 
   # Set all the configurable options back to their default values

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.9.4pre5"
+  VERSION = "0.9.4pre6"
 end

data/pry.gemspec

@@ -2,20 +2,20 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pry}
-  s.version = "0.9.4pre1"
+  s.version = "0.9.4"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{John Mair (banisterfiend)}]
-  s.date = %q{2011-09-07}
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["John Mair (banisterfiend)"]
+  s.date = %q{2011-09-08}
   s.description = %q{An IRB alternative and runtime developer console}
   s.email = %q{jrmair@gmail.com}
-  s.executables = [%q{pry}]
-  s.files = [%q{.document}, %q{.gemtest}, %q{.gitignore}, %q{.yardopts}, %q{CHANGELOG}, %q{CONTRIBUTORS}, %q{LICENSE}, %q{README.markdown}, %q{Rakefile}, %q{TODO}, %q{bin/pry}, %q{examples/example_basic.rb}, %q{examples/example_command_override.rb}, %q{examples/example_commands.rb}, %q{examples/example_hooks.rb}, %q{examples/example_image_edit.rb}, %q{examples/example_input.rb}, %q{examples/example_input2.rb}, %q{examples/example_output.rb}, %q{examples/example_print.rb}, %q{examples/example_prompt.rb}, %q{examples/helper.rb}, %q{lib/pry.rb}, %q{lib/pry/command_context.rb}, %q{lib/pry/command_processor.rb}, %q{lib/pry/command_set.rb}, %q{lib/pry/commands.rb}, %q{lib/pry/completion.rb}, %q{lib/pry/config.rb}, %q{lib/pry/core_extensions.rb}, %q{lib/pry/custom_completions.rb}, %q{lib/pry/default_commands/basic.rb}, %q{lib/pry/default_commands/context.rb}, %q{lib/pry/default_commands/documentation.rb}, %q{lib/pry/default_commands/easter_eggs.rb}, %q{lib/pry/default_commands/gems.rb}, %q{lib/pry/default_commands/input.rb}, %q{lib/pry/default_commands/introspection.rb}, %q{lib/pry/default_commands/ls.rb}, %q{lib/pry/default_commands/shell.rb}, %q{lib/pry/extended_commands/experimental.rb}, %q{lib/pry/extended_commands/user_command_api.rb}, %q{lib/pry/helpers.rb}, %q{lib/pry/helpers/base_helpers.rb}, %q{lib/pry/helpers/command_helpers.rb}, %q{lib/pry/helpers/text.rb}, %q{lib/pry/history.rb}, %q{lib/pry/history_array.rb}, %q{lib/pry/plugins.rb}, %q{lib/pry/pry_class.rb}, %q{lib/pry/pry_instance.rb}, %q{lib/pry/version.rb}, %q{pry.gemspec}, %q{test/helper.rb}, %q{test/test_command_helpers.rb}, %q{test/test_command_processor.rb}, %q{test/test_command_set.rb}, %q{test/test_completion.rb}, %q{test/test_default_commands.rb}, %q{test/test_default_commands/test_context.rb}, %q{test/test_default_commands/test_documentation.rb}, %q{test/test_default_commands/test_gems.rb}, %q{test/test_default_commands/test_input.rb}, %q{test/test_default_commands/test_introspection.rb}, %q{test/test_default_commands/test_shell.rb}, %q{test/test_history_array.rb}, %q{test/test_pry.rb}, %q{test/test_pry_history.rb}, %q{test/test_pry_output.rb}, %q{test/test_special_locals.rb}, %q{test/testrc}, %q{wiki/Customizing-pry.md}, %q{wiki/Home.md}]
+  s.executables = ["pry"]
+  s.files = [".document", ".gemtest", ".gitignore", ".yardopts", "CHANGELOG", "CONTRIBUTORS", "LICENSE", "README.markdown", "Rakefile", "TODO", "bin/pry", "examples/example_basic.rb", "examples/example_command_override.rb", "examples/example_commands.rb", "examples/example_hooks.rb", "examples/example_image_edit.rb", "examples/example_input.rb", "examples/example_input2.rb", "examples/example_output.rb", "examples/example_print.rb", "examples/example_prompt.rb", "examples/helper.rb", "lib/pry.rb", "lib/pry/command_context.rb", "lib/pry/command_processor.rb", "lib/pry/command_set.rb", "lib/pry/commands.rb", "lib/pry/completion.rb", "lib/pry/config.rb", "lib/pry/core_extensions.rb", "lib/pry/custom_completions.rb", "lib/pry/default_commands/basic.rb", "lib/pry/default_commands/context.rb", "lib/pry/default_commands/documentation.rb", "lib/pry/default_commands/easter_eggs.rb", "lib/pry/default_commands/gems.rb", "lib/pry/default_commands/input.rb", "lib/pry/default_commands/introspection.rb", "lib/pry/default_commands/ls.rb", "lib/pry/default_commands/shell.rb", "lib/pry/extended_commands/experimental.rb", "lib/pry/extended_commands/user_command_api.rb", "lib/pry/helpers.rb", "lib/pry/helpers/base_helpers.rb", "lib/pry/helpers/command_helpers.rb", "lib/pry/helpers/text.rb", "lib/pry/history.rb", "lib/pry/history_array.rb", "lib/pry/plugins.rb", "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", "test/test_command_set.rb", "test/test_completion.rb", "test/test_default_commands.rb", "test/test_default_commands/test_context.rb", "test/test_default_commands/test_documentation.rb", "test/test_default_commands/test_gems.rb", "test/test_default_commands/test_input.rb", "test/test_default_commands/test_introspection.rb", "test/test_default_commands/test_shell.rb", "test/test_history_array.rb", "test/test_pry.rb", "test/test_pry_history.rb", "test/test_pry_output.rb", "test/test_special_locals.rb", "test/testrc", "wiki/Customizing-pry.md", "wiki/Home.md"]
   s.homepage = %q{http://pry.github.com}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.7.2}
   s.summary = %q{An IRB alternative and runtime developer console}
-  s.test_files = [%q{test/helper.rb}, %q{test/test_command_helpers.rb}, %q{test/test_command_processor.rb}, %q{test/test_command_set.rb}, %q{test/test_completion.rb}, %q{test/test_default_commands.rb}, %q{test/test_default_commands/test_context.rb}, %q{test/test_default_commands/test_documentation.rb}, %q{test/test_default_commands/test_gems.rb}, %q{test/test_default_commands/test_input.rb}, %q{test/test_default_commands/test_introspection.rb}, %q{test/test_default_commands/test_shell.rb}, %q{test/test_history_array.rb}, %q{test/test_pry.rb}, %q{test/test_pry_history.rb}, %q{test/test_pry_output.rb}, %q{test/test_special_locals.rb}, %q{test/testrc}]
+  s.test_files = ["test/helper.rb", "test/test_command_helpers.rb", "test/test_command_processor.rb", "test/test_command_set.rb", "test/test_completion.rb", "test/test_default_commands.rb", "test/test_default_commands/test_context.rb", "test/test_default_commands/test_documentation.rb", "test/test_default_commands/test_gems.rb", "test/test_default_commands/test_input.rb", "test/test_default_commands/test_introspection.rb", "test/test_default_commands/test_shell.rb", "test/test_history_array.rb", "test/test_pry.rb", "test/test_pry_history.rb", "test/test_pry_output.rb", "test/test_special_locals.rb", "test/testrc"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -24,14 +24,14 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<ruby_parser>, [">= 2.0.5"])
       s.add_runtime_dependency(%q<coderay>, [">= 0.9.8"])
       s.add_runtime_dependency(%q<slop>, ["~> 2.1.0"])
-      s.add_runtime_dependency(%q<method_source>, [">= 0.6.0"])
+      s.add_runtime_dependency(%q<method_source>, [">= 0.6.5"])
       s.add_development_dependency(%q<bacon>, [">= 1.1.0"])
       s.add_development_dependency(%q<open4>, ["~> 1.0.1"])
     else
       s.add_dependency(%q<ruby_parser>, [">= 2.0.5"])
       s.add_dependency(%q<coderay>, [">= 0.9.8"])
       s.add_dependency(%q<slop>, ["~> 2.1.0"])
-      s.add_dependency(%q<method_source>, [">= 0.6.0"])
+      s.add_dependency(%q<method_source>, [">= 0.6.5"])
       s.add_dependency(%q<bacon>, [">= 1.1.0"])
       s.add_dependency(%q<open4>, ["~> 1.0.1"])
     end
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<ruby_parser>, [">= 2.0.5"])
     s.add_dependency(%q<coderay>, [">= 0.9.8"])
     s.add_dependency(%q<slop>, ["~> 2.1.0"])
-    s.add_dependency(%q<method_source>, [">= 0.6.0"])
+    s.add_dependency(%q<method_source>, [">= 0.6.5"])
     s.add_dependency(%q<bacon>, [">= 1.1.0"])
     s.add_dependency(%q<open4>, ["~> 1.0.1"])
   end

data/test/test_default_commands/test_input.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 describe "Pry::DefaultCommands::Input" do
 
-  describe "amend-line-N" do
+  describe "amend-line" do
     it 'should correctly amend the last line of input when no line number specified ' do
       str_output = StringIO.new
       redirect_pry_io(InputTester.new("def hello", "puts :bing", "amend-line puts :blah", "show-input", "exit-all"), str_output) do
@@ -104,7 +104,7 @@ describe "Pry::DefaultCommands::Input" do
 
     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
+      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/

data/test/test_pry.rb

@@ -1131,23 +1131,37 @@ describe Pry do
                 o = Object.new
                 def o.inspect; "a" * VC_MAX_LENGTH; end
 
-                Pry.view_clip(o, VC_MAX_LENGTH).should =~ /Object:0x.*?/
+                Pry.view_clip(o, VC_MAX_LENGTH).should =~ /#<Object/
               end
             end
 
-            # describe "given the 'main' object" do
-            #   it "returns the #inspect of main (special case)" do
-            #     o = TOPLEVEL_BINDING.eval('self')
-            #     Pry.view_clip(o, VC_MAX_LENGTH).should == o.inspect
-            #   end
-            # end
+            describe "given the 'main' object" do
+              it "returns the #inspect of main (special case)" do
+                o = TOPLEVEL_BINDING.eval('self')
+                Pry.view_clip(o, VC_MAX_LENGTH).should == o.inspect
+              end
+            end
+
+            describe "given the a Numeric, String or Symbol object" do
+              [1, 2.0, -5, "hello", :test].each do |o|
+                it "returns the #inspect of the special-cased immediate object: #{o}" do
+                  Pry.view_clip(o, VC_MAX_LENGTH).should == o.inspect
+                end
+              end
+
+              # only testing with String here :)
+              it "returns #<> format of the special-cased immediate object if #inspect is longer than maximum" do
+                o = "o" * (VC_MAX_LENGTH + 1)
+                Pry.view_clip(o, VC_MAX_LENGTH).should =~ /#<String/
+              end
+            end
 
             describe "given an object with an #inspect string as long as the maximum specified" do
               it "returns the #<> format of the object (never use inspect)" do
                 o = Object.new
                 def o.inspect; "a" * VC_MAX_LENGTH; end
 
-                Pry.view_clip(o, VC_MAX_LENGTH).should =~ /Object:0x.*?/
+                Pry.view_clip(o, VC_MAX_LENGTH).should =~ /#<Object/
               end
             end
 
@@ -1158,7 +1172,7 @@ describe Pry do
                   o = Object.new
                   def o.inspect; "a" * (VC_MAX_LENGTH + 1); end
 
-                  Pry.view_clip(o, VC_MAX_LENGTH).should =~ /Object:0x.*?/
+                  Pry.view_clip(o, VC_MAX_LENGTH).should =~ /#<Object/
                 end
               end
 
@@ -1167,8 +1181,8 @@ describe Pry do
                   it "returns a string of the #<class name:object idish> format" do
                     c, m = Class.new, Module.new
 
-                    Pry.view_clip(c, VC_MAX_LENGTH).should =~ /Class:0x.*?/
-                    Pry.view_clip(m, VC_MAX_LENGTH).should =~ /Module:0x.*?/
+                    Pry.view_clip(c, VC_MAX_LENGTH).should =~ /#<Class/
+                    Pry.view_clip(m, VC_MAX_LENGTH).should =~ /#<Module/
                   end
                 end
 
@@ -1180,8 +1194,8 @@ describe Pry do
                     def c.name; "a" * (VC_MAX_LENGTH + 1); end
                     def m.name; "a" * (VC_MAX_LENGTH + 1); end
 
-                    Pry.view_clip(c, VC_MAX_LENGTH).should =~ /Class:0x.*?/
-                    Pry.view_clip(m, VC_MAX_LENGTH).should =~ /Module:0x.*?/
+                    Pry.view_clip(c, VC_MAX_LENGTH).should =~ /#<Class/
+                    Pry.view_clip(m, VC_MAX_LENGTH).should =~ /#<Module/
                   end
                 end
 

data/test/test_pry_history.rb

@@ -5,7 +5,8 @@ describe Pry do
 
   before do
     Pry.history.clear
-    @hist = Tempfile.new(["tmp", ".pry_history"]).tap(&:close).path
+    @file = Tempfile.new(["tmp", ".pry_history"])
+    @hist = @file.path
     File.open(@hist, 'w') {|f| f << "1\n2\n3\n" }
     @old_hist = Pry.config.history.file
     Pry.config.history.file = @hist
@@ -13,7 +14,8 @@ describe Pry do
   end
 
   after do
-    File.unlink @hist
+    @file.close
+    File.unlink(@hist)
     Pry.config.history.file = @old_hist
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry
 version: !ruby/object:Gem::Version
-  version: 0.9.4pre5
+  version: 0.9.4pre6
   prerelease: 5
 platform: i386-mingw32
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_parser
-  requirement: &70196681527040 !ruby/object:Gem::Requirement
+  requirement: &70110119614600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70196681527040
+  version_requirements: *70110119614600
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &70196681526120 !ruby/object:Gem::Requirement
+  requirement: &70110119613180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.8
   type: :runtime
   prerelease: false
-  version_requirements: *70196681526120
+  version_requirements: *70110119613180
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &70196681525480 !ruby/object:Gem::Requirement
+  requirement: &70110119612300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70196681525480
+  version_requirements: *70110119612300
 - !ruby/object:Gem::Dependency
   name: method_source
-  requirement: &70196681524600 !ruby/object:Gem::Requirement
+  requirement: &70110119611220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *70196681524600
+  version_requirements: *70110119611220
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &70196681523700 !ruby/object:Gem::Requirement
+  requirement: &70110119610420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70196681523700
+  version_requirements: *70110119610420
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70196681522820 !ruby/object:Gem::Requirement
+  requirement: &70110119609460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *70196681522820
+  version_requirements: *70110119609460
 - !ruby/object:Gem::Dependency
   name: win32console
-  requirement: &70196681521480 !ruby/object:Gem::Requirement
+  requirement: &70110123458240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70196681521480
+  version_requirements: *70110123458240
 description: An IRB alternative and runtime developer console
 email: jrmair@gmail.com
 executables: