pry 0.9.4pre4 → 0.9.4pre5

data/lib/pry/pry_class.rb

@@ -101,9 +101,10 @@ class Pry
   # @param max_size The maximum number of chars before clipping occurs.
   # @return [String] The string representation of `obj`.
   def self.view_clip(obj, max_length = 60)
-    if obj.kind_of?(Module) && obj.name && obj.name != "" && obj.name.to_s.length <= max_length
+    if obj.kind_of?(Module) && obj.name.to_s != "" && obj.name.to_s.length <= max_length
       obj.name.to_s
-    elsif obj.inspect.length <= max_length
+    elsif TOPLEVEL_BINDING.eval('self') == obj
+      # special case for 'main' object :)
       obj.inspect
     else
       "#<#{obj.class}:%#x>" % (obj.object_id << 1)
@@ -160,7 +161,7 @@ class Pry
 
     output = options[:show_output] ? options[:output] : StringIO.new
 
-    Pry.new(:output => output, :input => StringIO.new(command_string), :commands => options[:commands]).rep(options[:context])
+    Pry.new(:output => output, :input => StringIO.new(command_string), :commands => options[:commands], :prompt => proc {""}, :hooks => {}).rep(options[:context])
   end
 
   def self.default_editor_for_platform
@@ -175,7 +176,7 @@ class Pry
     config.input = Readline
     config.output = $stdout
     config.commands = Pry::Commands
-    config.prompt = NAV_PROMPT
+    config.prompt = DEFAULT_PROMPT
     config.print = DEFAULT_PRINT
     config.exception_handler = DEFAULT_EXCEPTION_HANDLER
     config.hooks = DEFAULT_HOOKS

data/lib/pry/version.rb

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

data/test/test_pry.rb

@@ -1126,21 +1126,28 @@ describe Pry do
 
             VC_MAX_LENGTH = 60
 
-            describe "given an object with an #inspect string shorter than the maximum specified" do
-              it "returns the #inspect string" do
+            describe "given an object with an #inspect string" 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 == o.inspect
+                Pry.view_clip(o, VC_MAX_LENGTH).should =~ /Object:0x.*?/
               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 an object with an #inspect string as long as the maximum specified" do
-              it "returns the #inspect string" 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 == o.inspect
+                Pry.view_clip(o, VC_MAX_LENGTH).should =~ /Object:0x.*?/
               end
             end
 
@@ -1151,7 +1158,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\d+?/
+                  Pry.view_clip(o, VC_MAX_LENGTH).should =~ /Object:0x.*?/
                 end
               end
 

metadata

@@ -1,92 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pry
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.9.4pre5
   prerelease: 5
-  version: 0.9.4pre4
 platform: ruby
-authors: 
+authors:
 - John Mair (banisterfiend)
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-08 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ruby_parser
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70196682021800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    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 
+  version_requirements: *70196682021800
+- !ruby/object:Gem::Dependency
+  name: coderay
+  requirement: &70196682020120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.8
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: slop
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70196682020120
+- !ruby/object:Gem::Dependency
+  name: slop
+  requirement: &70196682019580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: method_source
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70196682019580
+- !ruby/object:Gem::Dependency
+  name: method_source
+  requirement: &70196682018860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.5
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: bacon
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70196682018860
+- !ruby/object:Gem::Dependency
+  name: bacon
+  requirement: &70196682033740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: open4
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70196682033740
+- !ruby/object:Gem::Dependency
+  name: open4
+  requirement: &70196682031180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.1
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *70196682031180
 description: An IRB alternative and runtime developer console
 email: jrmair@gmail.com
-executables: 
+executables:
 - pry
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gemtest
 - .gitignore
@@ -162,32 +159,29 @@ files:
 - wiki/Home.md
 homepage: http://pry.github.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: An IRB alternative and runtime developer console
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_command_helpers.rb
 - test/test_command_processor.rb