pry 0.9.9.3 → 0.9.9.4pre1

data/CHANGELOG

@@ -1,3 +1,8 @@
+26/4/2012 version 0.9.9.4 major bugfix
+* fixed `NoMethodError: undefined method `winsize' for #<IO:<STDOUT>>`, bug #549
+* fixes for jruby
+* heredoc content no longer auto-indented
+
 19/4/2012 version 0.9.9.3 major doc bugfix
 * show-doc would fail on some core classes, i.e `show-doc Bignum`. This is now fixed
 and show allow a wider range of core documentation to be viewed directly in Pry.

data/lib/pry/default_commands/introspection.rb

@@ -254,25 +254,29 @@ class Pry
 
           file_name, line = mod.source_location
           set_file_and_dir_locals(file_name)
-          code = ""
-          code << "\n#{Pry::Helpers::Text.bold('From:')} #{file_name} @ line #{line}:\n\n"
-          code << Code.from_module(mod, module_start_line(mod)).with_line_numbers(use_line_numbers?).to_s
+          code = Code.from_module(mod, module_start_line(mod)).with_line_numbers(use_line_numbers?).to_s
+          result = ""
+          result << "\n#{Pry::Helpers::Text.bold('From:')} #{file_name} @ line #{line}:\n"
+          result << "#{Pry::Helpers::Text.bold('Number of lines:')} #{code.lines.count}\n\n"
+          result << code
         end
 
         def all_modules
           mod = module_object
 
-          code = ""
-          code << "Found #{mod.number_of_candidates} candidates for `#{mod.name}` definition:\n"
+          result = ""
+          result << "Found #{mod.number_of_candidates} candidates for `#{mod.name}` definition:\n"
           mod.number_of_candidates.times do |v|
             begin
-              code << "\nCandidate #{v+1}/#{mod.number_of_candidates}: #{mod.source_file_for_candidate(v)} @ line #{mod.source_line_for_candidate(v)}:\n\n"
-              code << Code.new(mod.source_for_candidate(v), module_start_line(mod, v)).with_line_numbers(use_line_numbers?).to_s
+              code = Code.new(mod.source_for_candidate(v), module_start_line(mod, v)).with_line_numbers(use_line_numbers?).to_s
+              result << "\nCandidate #{v+1}/#{mod.number_of_candidates}: #{mod.source_file_for_candidate(v)} @ line #{mod.source_line_for_candidate(v)}:\n"
+              result << "Number of lines: #{code.lines.count}\n\n"
+              result << code
             rescue Pry::RescuableException
               next
             end
           end
-          code
+          result
         end
 
         def use_line_numbers?

data/lib/pry/indent.rb

@@ -1,12 +1,10 @@
 require 'coderay'
 
 class Pry
+  # Load io-console if possible, so that we can use $stdout.winsize.
   begin
     require 'io/console'
   rescue LoadError
-    IO_CONSOLE_AVAILABLE = false
-  else
-    IO_CONSOLE_AVAILABLE = true
   end
 
   ##
@@ -56,7 +54,7 @@ class Pry
     #
     # :pre_constant and :preserved_constant are the CodeRay 0.9.8 and 1.0.0
     # classifications of "true", "false", and "nil".
-    IGNORE_TOKENS = [:space, :content, :string, :delimiter, :method, :ident,
+    IGNORE_TOKENS = [:space, :content, :string, :method, :ident,
                      :constant, :pre_constant, :predefined_constant]
 
     # Tokens that indicate the end of a statement (i.e. that, if they appear
@@ -65,7 +63,8 @@ class Pry
     #
     # :reserved and :keywords are the CodeRay 0.9.8 and 1.0.0 respectively
     # classifications of "super", "next", "return", etc.
-    STATEMENT_END_TOKENS = IGNORE_TOKENS + [:regexp, :integer, :float, :keyword, :reserved]
+    STATEMENT_END_TOKENS = IGNORE_TOKENS + [:regexp, :integer, :float, :keyword,
+                                            :delimiter, :reserved]
 
     # Collection of tokens that should appear dedented even though they
     # don't affect the surrounding code.
@@ -79,6 +78,9 @@ class Pry
     def reset
       @stack = []
       @indent_level = ''
+      @heredoc_queue = []
+      @close_heredocs = {}
+      @string_start = nil
       self
     end
 
@@ -109,14 +111,27 @@ class Pry
       prefix = indent_level
 
       input.lines.each do |line|
-        tokens = CodeRay.scan(line, :ruby)
-        tokens = tokens.tokens.each_slice(2) if tokens.respond_to?(:tokens) # Coderay 1.0.0
+
+        if in_string?
+          tokens = tokenize("#{open_delimiters_line}\n#{line}")
+          tokens = tokens.drop_while{ |token, type| !(String === token && token.include?("\n")) }
+          previously_in_string = true
+        else
+          tokens = tokenize(line)
+          previously_in_string = false
+        end
 
         before, after = indentation_delta(tokens)
 
         before.times{ prefix.sub! SPACES, '' }
-        output += prefix + line.strip + "\n"
-        prefix += SPACES * after
+        new_prefix = prefix + SPACES * after
+
+        line = prefix + line.lstrip unless previously_in_string
+        line = line.rstrip + "\n"   unless in_string?
+
+        output += line
+
+        prefix = new_prefix
       end
 
       @indent_level = prefix
@@ -124,6 +139,16 @@ class Pry
       return output.gsub(/\s+$/, '')
     end
 
+    # Get the indentation for the start of the next line.
+    #
+    # This is what's used between the prompt and the cursor in pry.
+    #
+    # @return String  The correct number of spaces
+    #
+    def current_prefix
+      in_string? ? '' : indent_level
+    end
+
     # Get the change in indentation indicated by the line.
     #
     # By convention, you remove indent from the line containing end tokens,
@@ -167,7 +192,9 @@ class Pry
 
         seen_for_at << add_after if token == "for"
 
-        if OPEN_TOKENS.keys.include?(token) && !is_optional_do && !is_singleline_if
+        if kind == :delimiter
+          track_delimiter(token)
+        elsif OPEN_TOKENS.keys.include?(token) && !is_optional_do && !is_singleline_if
           @stack << token
           add_after += 1
         elsif token == OPEN_TOKENS[@stack.last]
@@ -194,6 +221,65 @@ class Pry
       (last_token =~ /^[)\]}\/]$/ || STATEMENT_END_TOKENS.include?(last_kind))
     end
 
+    # Are we currently in the middle of a string literal.
+    #
+    # This is used to determine whether to re-indent a given line, we mustn't re-indent
+    # within string literals because to do so would actually change the value of the
+    # String!
+    #
+    # @return Boolean
+    def in_string?
+      !open_delimiters.empty?
+    end
+
+    # Given a string of Ruby code, use CodeRay to export the tokens.
+    #
+    # @param String  The Ruby to lex.
+    # @return [Array]  An Array of pairs of [token_value, token_type]
+    def tokenize(string)
+      tokens = CodeRay.scan(string, :ruby)
+      tokens = tokens.tokens.each_slice(2) if tokens.respond_to?(:tokens) # Coderay 1.0.0
+      tokens.to_a
+    end
+
+    # Update the internal state about what kind of strings are open.
+    #
+    # Most of the complication here comes from the fact that HEREDOCs can be nested. For
+    # normal strings (which can't be nested) we assume that CodeRay correctly pairs
+    # open-and-close delimiters so we don't bother checking what they are.
+    #
+    # @param String  The token (of type :delimiter)
+    def track_delimiter(token)
+      case token
+      when /^<<-(["'`]?)(.*)\\1/
+        @heredoc_queue << token
+        @close_heredocs[token] = /^\s*$2/
+      when @close_heredocs[@heredoc_queue.first]
+        @heredoc_queue.shift
+      else
+        if @string_start
+          @string_start = nil
+        else
+          @string_start = token
+        end
+      end
+    end
+
+    # All the open delimiters, in the order that they first appeared.
+    #
+    # @return [String]
+    def open_delimiters
+      @heredoc_queue + [@string_start].compact
+    end
+
+    # Return a string which restores the CodeRay string status to the correct value by
+    # opening HEREDOCs and strings.
+    #
+    # @return String
+    def open_delimiters_line
+      "puts #{open_delimiters.join(", ")}"
+    end
+
     # Return a string which, when printed, will rewrite the previous line with
     # the correct indentation. Mostly useful for fixing 'end'.
     #
@@ -204,19 +290,18 @@ class Pry
     # @return [String]
     def correct_indentation(prompt, code, overhang=0)
       full_line = prompt + code
-      if IO_CONSOLE_AVAILABLE && $stdout.tty?
+      whitespace = ' ' * overhang
+
+      if $stdout.tty? && $stdout.respond_to?(:winsize)
         _, cols = $stdout.winsize
-        lines = full_line.length / cols + 1
       elsif Readline.respond_to?(:get_screen_size)
         _, cols = Readline.get_screen_size
-        lines = full_line.length / cols + 1
       elsif ENV['COLUMNS'] && ENV['COLUMNS'] != ''
         cols = ENV['COLUMNS'].to_i
-        lines = full_line.length / cols + 1
-      else
-        lines = 1
       end
 
+      lines = cols ? (full_line.length / cols + 1) : 1
+
       if defined?(Win32::Console)
         move_up   = "\e[#{lines}F"
         move_down = "\e[#{lines}E"
@@ -224,7 +309,6 @@ class Pry
         move_up   = "\e[#{lines}A\e[0G"
         move_down = "\e[#{lines}B\e[0G"
       end
-      whitespace = ' ' * overhang
 
       "#{move_up}#{prompt}#{colorize_code(code)}#{whitespace}#{move_down}"
     end

data/lib/pry/pry_instance.rb

@@ -338,7 +338,7 @@ class Pry
                                                         instance_eval(&custom_completions))
 
 
-    indentation = Pry.config.auto_indent ? @indent.indent_level : ''
+    indentation = Pry.config.auto_indent ? @indent.current_prefix : ''
 
     begin
       val = readline("#{current_prompt}#{indentation}", completion_proc)

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.9.9.3"
+  VERSION = "0.9.9.4pre1"
 end

data/pry.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "pry"
-  s.version = "0.9.9.3"
+  s.version = "0.9.9.4pre1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mair (banisterfiend)"]
-  s.date = "2012-04-20"
+  s.date = "2012-04-26"
   s.description = "An IRB alternative and runtime developer console"
   s.email = "jrmair@gmail.com"
   s.executables = ["pry"]

data/test/test_indent.rb

@@ -230,6 +230,46 @@ begin
 rescue => e
   doit :right
 end
+OUTPUT
+
+    @indent.indent(input).should == output
+  end
+
+  it "should not indent inside strings" do
+    @indent.indent(%(def a\n"foo\nbar"\n  end)).should == %(def a\n  "foo\nbar"\nend)
+    @indent.indent(%(def a\nputs %w(foo\nbar), 'foo\nbar'\n  end)).should == %(def a\n  puts %w(foo\nbar), 'foo\nbar'\nend)
+  end
+
+  it "should not indent inside HEREDOCs" do
+    @indent.indent(%(def a\nputs <<FOO\n bar\nFOO\nbaz\nend)).should == %(def a\n  puts <<FOO\n bar\nFOO\n  baz\nend)
+    @indent.indent(%(def a\nputs <<-'^^'\n bar\n\t^^\nbaz\nend)).should == %(def a\n  puts <<-'^^'\n bar\n\t^^\n  baz\nend)
+  end
+
+  it "should not indent nested HEREDOCs" do
+    input = <<INPUT.strip
+def a
+puts <<FOO, <<-BAR, "baz", <<-':p'
+foo
+FOO
+bar
+BAR
+tongue
+:p
+puts :p
+end
+INPUT
+
+    output = <<OUTPUT.strip
+def a
+  puts <<FOO, <<-BAR, "baz", <<-':p'
+foo
+FOO
+bar
+BAR
+tongue
+:p
+  puts :p
+end
 OUTPUT
 
     @indent.indent(input).should == output

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: pry
 version: !ruby/object:Gem::Version
-  version: 0.9.9.3
-  prerelease: 
+  version: 0.9.9.4pre1
+  prerelease: 7
 platform: ruby
 authors:
 - John Mair (banisterfiend)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000 Z
+date: 2012-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &70353477044540 !ruby/object:Gem::Requirement
+  requirement: &70094357173940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70353477044540
+  version_requirements: *70094357173940
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &70353477043560 !ruby/object:Gem::Requirement
+  requirement: &70094357171380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70353477043560
+  version_requirements: *70094357171380
 - !ruby/object:Gem::Dependency
   name: method_source
-  requirement: &70353477057660 !ruby/object:Gem::Requirement
+  requirement: &70094357179560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -46,10 +46,10 @@ dependencies:
         version: 0.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *70353477057660
+  version_requirements: *70094357179560
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &70353477055900 !ruby/object:Gem::Requirement
+  requirement: &70094357193160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -57,10 +57,10 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70353477055900
+  version_requirements: *70094357193160
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70353477052460 !ruby/object:Gem::Requirement
+  requirement: &70094357188820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -68,10 +68,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70353477052460
+  version_requirements: *70094357188820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70353477064300 !ruby/object:Gem::Requirement
+  requirement: &70094357202040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -79,7 +79,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70353477064300
+  version_requirements: *70094357202040
 description: An IRB alternative and runtime developer console
 email: jrmair@gmail.com
 executables:
@@ -209,9 +209,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.16