pry 0.9.7.2-i386-mingw32 → 0.9.7.3-i386-mingw32

data/CHANGELOG

@@ -1,3 +1,9 @@
+28/10/2011 version 0.9.7.3 hotfix-hotfix ;)
+* really fixed indentation for 'super if' and friends
+* Fixed indentation for tmux
+* added Pry.config.correct_indent option (to toggle whether indentation
+* corrected optional param behaviour for method signatures: e.g Signature meth(param1=?, param2=?)
+
 27/10/2011 version 0.9.7.2 hotfix
 * fixed indentation for 'super if' and 'ensure', 'next if', etc
 * refactored Pry#run_command so it can accept an eval_string parameter (so amend-line and so on can work with it)

data/lib/pry/config.rb

@@ -134,6 +134,10 @@ class Pry
     # @return [Boolean] Whether or not code should be indented
     #  using Pry::Indent.
     attr_accessor :auto_indent
+
+    # @return [Boolean] Whether or not indentation should be corrected
+    #   after hitting enter. This feature is not supported by all terminals.
+    attr_accessor :correct_indent
   end
 end
 

data/lib/pry/indent.rb

@@ -48,7 +48,10 @@ class Pry
     # Tokens that indicate the end of a statement (i.e. that, if they appear
     # directly before an "if" indicates that that if applies to the same line,
     # not the next line)
-    STATEMENT_END_TOKENS = IGNORE_TOKENS + [:regexp, :integer, :float, :keyword]
+    #
+    # :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]
 
     # Collection of tokens that should appear dedented even though they
     # don't affect the surrounding code.
@@ -195,9 +198,14 @@ class Pry
         lines = 1
       end
 
-      move_up    = "\e[#{lines}F"
+      if defined?(Win32::Console)
+        move_up    = "\e[#{lines}F"
+        move_down  = "\e[#{lines}E"
+      else
+        move_up    = "\e[#{lines}A\e[0G"
+        move_down  = "\e[#{lines}B\e[0G"
+      end
       whitespace = ' ' * overhang
-      move_down  = "\e[#{lines}E"
 
       "#{move_up}#{full_line}#{whitespace}#{move_down}"
     end

data/lib/pry/method.rb

@@ -259,9 +259,10 @@ class Pry
         args = parameters.inject([]) do |arr, (type, name)|
           name ||= (type == :block ? 'block' : "arg#{arr.size + 1}")
           arr << case type
-                 when :req        then name.to_s
-                 when :opt, :rest then "*#{name}"
-                 when :block      then "&#{name}"
+                 when :req   then name.to_s
+                 when :opt   then "#{name}=?"
+                 when :rest  then "*#{name}"
+                 when :block then "&#{name}"
                  else '?'
                  end
         end

data/lib/pry/pry_class.rb

@@ -191,6 +191,7 @@ class Pry
     config.disable_auto_reload = false
     config.command_prefix = ""
     config.auto_indent = true
+    config.correct_indent = true
 
     config.plugins ||= OpenStruct.new
     config.plugins.enabled = true

data/lib/pry/pry_instance.rb

@@ -321,7 +321,7 @@ class Pry
         orig_val = "#{indentation}#{val}"
         val = @indent.indent(val)
 
-        if orig_val != val && output.tty? && Pry::Helpers::BaseHelpers.use_ansi_codes?
+        if orig_val != val && output.tty? && Pry::Helpers::BaseHelpers.use_ansi_codes? && Pry.config.correct_indent
           output.print @indent.correct_indentation(current_prompt + val, orig_val.length - val.length)
         end
       end

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.9.7.2"
+  VERSION = "0.9.7.3"
 end

data/test/test_indent.rb

@@ -195,6 +195,7 @@ TXT
     @indent.reset.indent("foo() if bar\n#").should == "foo() if bar\n#"
     @indent.reset.indent("foo 'hi' if bar\n#").should == "foo 'hi' if bar\n#"
     @indent.reset.indent("foo 1 while bar\n#").should == "foo 1 while bar\n#"
+    @indent.reset.indent("super if true\n#").should == "super if true\n#"
   end
 
   it "should indent cunningly disguised ifs" do

metadata

@@ -1,14 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: pry
 version: !ruby/object:Gem::Version 
-  hash: 31
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 7
-  - 2
-  version: 0.9.7.2
+  version: 0.9.7.3
 platform: i386-mingw32
 authors: 
 - John Mair (banisterfiend)
@@ -26,11 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 2
-        - 3
-        - 1
         version: 2.3.1
   type: :runtime
   version_requirements: *id001
@@ -42,11 +31,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
         version: 0.9.8
   type: :runtime
   version_requirements: *id002
@@ -58,11 +42,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
         version: 2.1.0
   type: :runtime
   version_requirements: *id003
@@ -74,11 +53,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 6
-        - 7
         version: 0.6.7
   type: :runtime
   version_requirements: *id004
@@ -90,11 +64,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
         version: 1.1.0
   type: :development
   version_requirements: *id005
@@ -106,11 +75,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 0
-        - 1
         version: 1.0.1
   type: :development
   version_requirements: *id006
@@ -122,10 +86,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
         version: "0.9"
   type: :development
   version_requirements: *id007
@@ -137,11 +97,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
         version: 1.3.0
   type: :runtime
   version_requirements: *id008
@@ -252,23 +207,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: An IRB alternative and runtime developer console