pry 0.9.11.3-java → 0.9.11.4-java

data/CHANGELOG

@@ -1,3 +1,7 @@
+20/01/2012 version 0.9.11.4
+* fixed pager bug (wouldn't render color codes in some circumstances)
+* added Pry.last_internal_error, useful for devs debugging commands
+
 17/01/2012 version 0.9.11.3
 * fix Pry.run_command
 * improve `ls` output

data/lib/pry/pager.rb

@@ -24,7 +24,12 @@ class Pry::Pager
   end
 
   def self.page_size
-    27
+    @page_size ||= begin
+      require 'io/console'
+      $stdout.winsize.first
+    rescue LoadError
+      27
+    end
   end
 
   def initialize(text)
@@ -47,13 +52,27 @@ class Pry::Pager
 
   class SystemPager < Pry::Pager
     def self.default_pager
-      ENV["PAGER"] || "less -R -S -F -X"
+      pager = ENV["PAGER"] || ""
+
+      # Default to less, and make sure less is being passed the correct options
+      if pager.strip.empty? or pager =~ /^less\s*/
+        pager = "less -R -S -F -X"
+      end
+
+      pager
     end
 
     def self.available?
-      pager_executable = default_pager.split(' ').first
-      `which #{ pager_executable }`
-    rescue
+      if @system_pager.nil?
+        @system_pager = begin
+          pager_executable = default_pager.split(' ').first
+          `which #{ pager_executable }`
+        rescue
+          false
+        end
+      else
+        @system_pager
+      end
     end
 
     def initialize(*)

data/lib/pry/pry_class.rb

@@ -55,6 +55,10 @@ class Pry
     # @return [Binding] A top level binding with no local variables
     attr_accessor :toplevel_binding
 
+    # @return [Exception, nil] The last pry internal error.
+    #   (a CommandError in most cases)
+    attr_accessor :last_internal_error
+
     # plugin forwardables
     def_delegators :@plugin_manager, :plugins, :load_plugins, :locate_plugins
 

data/lib/pry/pry_instance.rb

@@ -300,6 +300,7 @@ class Pry
         # eval_string will probably be mutated by this method
         retrieve_line(eval_string, target)
       rescue CommandError, Slop::InvalidOptionError, MethodSource::SourceNotFoundError => e
+        Pry.last_internal_error = e
         output.puts "Error: #{e.message}"
       end
 

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.9.11.3"
+  VERSION = "0.9.11.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry
 version: !ruby/object:Gem::Version
-  version: 0.9.11.3
+  version: 0.9.11.4
   prerelease: 
 platform: java
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-18 00:00:00.000000000 Z
+date: 2013-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay