pry 0.9.7.1 → 0.9.7.2

data/CHANGELOG

@@ -1,3 +1,11 @@
+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)
+* changed ^D so it no longer resets indent level automatically
+
+26/10/2011 version 0.9.7.1 hotfix
+* fixed gem dependecy issues
+
 25/10/2011 version 0.9.7
 
 MAJOR NEW FEATURES:
@@ -8,6 +16,9 @@ MAJOR NEW FEATURES:
 complete CHANGELOG:
 * fixed syntax highlighting for object literals
 * fixed ActiveSupport method-naming conflict with "in?"
+* added --super option to edit-method, show-method, and friends -  making it easier to operate on superclass methods
+* officially added edit --in to open previous expressions in an editor
+* whereami now works for REPL-defined code
 * started using JRuby parser for input validation in JRuby (thanks pangloss!)
 * fixed bug where ~/.pryrc could be loaded more than once (thanks kelseyjudson!)
 * added parse_options! helper to pull option parsing out of commands

data/lib/pry/indent.rb

@@ -48,11 +48,11 @@ 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]
+    STATEMENT_END_TOKENS = IGNORE_TOKENS + [:regexp, :integer, :float, :keyword]
 
     # Collection of tokens that should appear dedented even though they
     # don't affect the surrounding code.
-    MIDWAY_TOKENS = %w(when else elsif rescue)
+    MIDWAY_TOKENS = %w(when else elsif ensure rescue)
 
     def initialize
       reset

data/lib/pry/pry_instance.rb

@@ -254,6 +254,8 @@ class Pry
     val = ""
     loop do
       val = retrieve_line(eval_string, target)
+
+      # eval_string may be mutated by this method
       process_line(val, eval_string, target)
 
       break if valid_expression?(eval_string)
@@ -302,12 +304,10 @@ class Pry
 
     val = readline(current_prompt + indentation)
 
-    # exit session if we receive EOF character (^D)
+    # invoke handler if we receive EOF character (^D)
     if !val
       output.puts ""
       Pry.config.control_d_handler.call(eval_string, self)
-
-      @indent.reset if Pry.config.auto_indent
       ""
     else
       # Change the eval_string into the input encoding (Issue 284)
@@ -359,12 +359,14 @@ class Pry
   end
 
   # Run the specified command.
-  # @param [String] The command (and its params) to execute.
-  # @param [Binding] The binding to use..
+  # @param [String] val The command (and its params) to execute.
+  # @param [String] eval_string The current input buffer.
+  # @param [Binding] target The binding to use..
+  # @return [Pry::CommandContext::VOID_VALUE]
   # @example
   #   pry_instance.run_command("ls -m")
-  def run_command(val, target = binding_stack.last)
-    process_line(val, "", target)
+  def run_command(val, eval_string = "", target = binding_stack.last)
+    process_line(val, eval_string, target)
     Pry::CommandContext::VOID_VALUE
   end
 

data/lib/pry/version.rb

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

data/test/test_pry.rb

@@ -184,10 +184,19 @@ describe Pry do
       it 'should run a command in a specified context' do
         b = Pry.binding_for(7)
         p = Pry.new(:output => StringIO.new)
-        p.run_command("ls -m", b)
+        p.run_command("ls -m", "", b)
         p.output.string.should =~ /divmod/
       end
 
+      it 'should run a command that modifies the passed in eval_string' do
+        b = Pry.binding_for(7)
+        p = Pry.new(:output => StringIO.new)
+        eval_string = "def hello\npeter pan\n"
+        p.run_command("amend-line !", eval_string, b)
+        eval_string.should =~ /def hello/
+        eval_string.should.not =~ /peter pan/
+      end
+
       it 'should run a command in the context of a session' do
         mock_pry("@session_ivar = 10", "_pry_.run_command('ls')").should =~ /@session_ivar/
       end

metadata

@@ -1,8 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: pry
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: 
-  version: 0.9.7.1
+  segments: 
+  - 0
+  - 9
+  - 7
+  - 2
+  version: 0.9.7.2
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -10,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-26 00:00:00 Z
+date: 2011-10-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ruby_parser
@@ -20,6 +26,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 2
+        - 3
+        - 1
         version: 2.3.1
   type: :runtime
   version_requirements: *id001
@@ -31,6 +42,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 0
+        - 9
+        - 8
         version: 0.9.8
   type: :runtime
   version_requirements: *id002
@@ -42,6 +58,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 1
+        - 0
         version: 2.1.0
   type: :runtime
   version_requirements: *id003
@@ -53,6 +74,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 6
+        - 7
         version: 0.6.7
   type: :runtime
   version_requirements: *id004
@@ -64,6 +90,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
   type: :development
   version_requirements: *id005
@@ -75,6 +106,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
         version: 1.0.1
   type: :development
   version_requirements: *id006
@@ -86,6 +122,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
         version: "0.9"
   type: :development
   version_requirements: *id007
@@ -196,17 +236,23 @@ 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.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: An IRB alternative and runtime developer console