pry 0.9.9.4 → 0.9.9.5

data/CHANGELOG

@@ -1,3 +1,8 @@
+09/05/2012 version 0.9.9.5 minor bugfix
+* fixed ZeroDivisionError in correct_indentation, bug #558
+* fix double highlighting in rdoc, bug #562
+* autocreate configuration for plugins, bug #548
+
 26/4/2012 version 0.9.9.4 major bugfix
 * fixed `NoMethodError: undefined method `winsize' for #<IO:<STDOUT>>`, bug #549
 * fixes for jruby

data/lib/pry/helpers/documentation_helpers.rb

@@ -11,7 +11,7 @@ class Pry
           gsub(/<i>(?:\s*\n)?(.*?)\s*<\/i>/m) { Pry.color ? "\e[1m#{$1}\e[0m" : $1 }.
           gsub(/\B\+(\w*?)\+\B/)  { Pry.color ? "\e[32m#{$1}\e[0m": $1 }.
           gsub(/((?:^[ \t]+.+(?:\n+|\Z))+)/)  { Pry.color ? CodeRay.scan($1, code_type).term : $1 }.
-          gsub(/`(?:\s*\n)?(.*?)\s*`/) { Pry.color ? CodeRay.scan($1, code_type).term : $1 }
+          gsub(/`(?:\s*\n)?([^\e]*?)\s*`/) { "`#{Pry.color ? CodeRay.scan($1, code_type).term : $1}`" }
       end
 
       def process_yardoc_tag(comment, tag)

data/lib/pry/indent.rb

@@ -292,15 +292,8 @@ class Pry
       full_line = prompt + code
       whitespace = ' ' * overhang
 
-      if $stdout.tty? && $stdout.respond_to?(:winsize)
-        _, cols = $stdout.winsize
-      elsif Readline.respond_to?(:get_screen_size)
-        _, cols = Readline.get_screen_size
-      elsif ENV['COLUMNS'] && ENV['COLUMNS'] != ''
-        cols = ENV['COLUMNS'].to_i
-      end
-
-      lines = cols ? (full_line.length / cols + 1) : 1
+      _, cols = screen_size
+      lines = cols && cols != 0 ? (full_line.length / cols + 1) : 1
 
       if defined?(Win32::Console)
         move_up   = "\e[#{lines}F"
@@ -312,5 +305,24 @@ class Pry
 
       "#{move_up}#{prompt}#{colorize_code(code)}#{whitespace}#{move_down}"
     end
+
+    # Return a pair of [rows, columns] which gives the size of the window.
+    #
+    # If the window size cannot be determined, return nil.
+    def screen_size
+      [
+         # io/console adds a winsize method to IO streams.
+         $stdout.tty? && $stdout.respond_to?(:winsize) && $stdout.winsize,
+
+         # Some readlines also provides get_screen_size.
+         Readline.respond_to?(:get_screen_size) && Readline.get_screen_size,
+
+         # Otherwise try to use the environment (this may be out of date due
+         # to window resizing, but it better than nothing).
+         [ENV["ROWS"], ENV["COLUMNS"]]
+      ].detect do |(rows, cols)|
+        cols.to_i > 0
+      end
+    end
   end
 end

data/lib/pry/plugins.rb

@@ -42,12 +42,16 @@ class Pry
       # disabled)
       # Does not reload plugin if it's already active.
       def activate!
+        # Create the configuration object for the plugin.
+        Pry.config.send("#{gem_name.gsub('-', '_')}=", OpenStruct.new)
+
         begin
           require gem_name if !active?
         rescue LoadError => e
           warn "Warning: The plugin '#{gem_name}' was not found! (gem found but could not be loaded)"
           warn e
         end
+
         self.active = true
         self.enabled = true
       end

data/lib/pry/version.rb

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

data/pry.gemspec

@@ -2,18 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = "pry"
-  s.version = "0.9.9.4"
+  s.version = "0.9.9.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mair (banisterfiend)"]
-  s.date = "2012-04-26"
+  s.date = "2012-05-09"
   s.description = "An IRB alternative and runtime developer console"
   s.email = "jrmair@gmail.com"
   s.executables = ["pry"]
   s.files = [".document", ".gemtest", ".gitignore", ".travis.yml", ".yardopts", "CHANGELOG", "CONTRIBUTORS", "Gemfile", "LICENSE", "README.markdown", "Rakefile", "TODO", "bin/pry", "examples/example_basic.rb", "examples/example_command_override.rb", "examples/example_commands.rb", "examples/example_hooks.rb", "examples/example_image_edit.rb", "examples/example_input.rb", "examples/example_input2.rb", "examples/example_output.rb", "examples/example_print.rb", "examples/example_prompt.rb", "examples/helper.rb", "lib/pry.rb", "lib/pry/cli.rb", "lib/pry/code.rb", "lib/pry/command.rb", "lib/pry/command_set.rb", "lib/pry/commands.rb", "lib/pry/completion.rb", "lib/pry/config.rb", "lib/pry/core_extensions.rb", "lib/pry/custom_completions.rb", "lib/pry/default_commands/cd.rb", "lib/pry/default_commands/commands.rb", "lib/pry/default_commands/context.rb", "lib/pry/default_commands/easter_eggs.rb", "lib/pry/default_commands/editing.rb", "lib/pry/default_commands/find_method.rb", "lib/pry/default_commands/gems.rb", "lib/pry/default_commands/help.rb", "lib/pry/default_commands/hist.rb", "lib/pry/default_commands/input_and_output.rb", "lib/pry/default_commands/introspection.rb", "lib/pry/default_commands/ls.rb", "lib/pry/default_commands/misc.rb", "lib/pry/default_commands/navigating_pry.rb", "lib/pry/extended_commands/experimental.rb", "lib/pry/helpers.rb", "lib/pry/helpers/base_helpers.rb", "lib/pry/helpers/command_helpers.rb", "lib/pry/helpers/documentation_helpers.rb", "lib/pry/helpers/options_helpers.rb", "lib/pry/helpers/text.rb", "lib/pry/history.rb", "lib/pry/history_array.rb", "lib/pry/hooks.rb", "lib/pry/indent.rb", "lib/pry/method.rb", "lib/pry/plugins.rb", "lib/pry/pry_class.rb", "lib/pry/pry_instance.rb", "lib/pry/rbx_method.rb", "lib/pry/rbx_path.rb", "lib/pry/version.rb", "lib/pry/wrapped_module.rb", "man/pry.1", "man/pry.1.html", "man/pry.1.ronn", "pry.gemspec", "test/helper.rb", "test/test_cli.rb", "test/test_code.rb", "test/test_command.rb", "test/test_command_helpers.rb", "test/test_command_integration.rb", "test/test_command_set.rb", "test/test_completion.rb", "test/test_default_commands/test_cd.rb", "test/test_default_commands/test_context.rb", "test/test_default_commands/test_documentation.rb", "test/test_default_commands/test_find_method.rb", "test/test_default_commands/test_gems.rb", "test/test_default_commands/test_help.rb", "test/test_default_commands/test_input.rb", "test/test_default_commands/test_introspection.rb", "test/test_default_commands/test_ls.rb", "test/test_default_commands/test_shell.rb", "test/test_default_commands/test_show_source.rb", "test/test_exception_whitelist.rb", "test/test_history_array.rb", "test/test_hooks.rb", "test/test_indent.rb", "test/test_input_stack.rb", "test/test_method.rb", "test/test_pry.rb", "test/test_pry_defaults.rb", "test/test_pry_history.rb", "test/test_pry_output.rb", "test/test_sticky_locals.rb", "test/test_syntax_checking.rb", "test/test_wrapped_module.rb", "test/testrc", "test/testrcbad", "wiki/Customizing-pry.md", "wiki/Home.md"]
   s.homepage = "http://pry.github.com"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.16"
+  s.rubygems_version = "1.8.23"
   s.summary = "An IRB alternative and runtime developer console"
   s.test_files = ["test/helper.rb", "test/test_cli.rb", "test/test_code.rb", "test/test_command.rb", "test/test_command_helpers.rb", "test/test_command_integration.rb", "test/test_command_set.rb", "test/test_completion.rb", "test/test_default_commands/test_cd.rb", "test/test_default_commands/test_context.rb", "test/test_default_commands/test_documentation.rb", "test/test_default_commands/test_find_method.rb", "test/test_default_commands/test_gems.rb", "test/test_default_commands/test_help.rb", "test/test_default_commands/test_input.rb", "test/test_default_commands/test_introspection.rb", "test/test_default_commands/test_ls.rb", "test/test_default_commands/test_shell.rb", "test/test_default_commands/test_show_source.rb", "test/test_exception_whitelist.rb", "test/test_history_array.rb", "test/test_hooks.rb", "test/test_indent.rb", "test/test_input_stack.rb", "test/test_method.rb", "test/test_pry.rb", "test/test_pry_defaults.rb", "test/test_pry_history.rb", "test/test_pry_output.rb", "test/test_sticky_locals.rb", "test/test_syntax_checking.rb", "test/test_wrapped_module.rb", "test/testrc", "test/testrcbad"]
 

data/test/test_default_commands/test_documentation.rb

@@ -65,6 +65,68 @@ if !mri18_and_no_real_source_location?
       end
     end
 
+    describe "rdoc highlighting" do
+      it "should syntax highlight code in rdoc" do
+        c = Class.new{
+          # This can initialize your class:
+          #
+          #   a = c.new :foo
+          #
+          # @param foo
+          def initialize(foo); end
+        }
+
+        begin
+          mock_pry(binding, "show-doc c#initialize").should =~ /c.new :foo/
+          Pry.config.color = true
+          # I don't want the test to rely on which colour codes are there, just to
+          # assert that "something" is being colourized.
+          mock_pry(binding, "show-doc c#initialize").should.not =~ /c.new :foo/
+        ensure
+          Pry.config.color = false
+        end
+      end
+
+      it "should syntax highlight `code` in rdoc" do
+        c = Class.new{
+          # After initializing your class with `c.new(:foo)`, go have fun!
+          #
+          # @param foo
+          def initialize(foo); end
+        }
+
+        begin
+          mock_pry(binding, "show-doc c#initialize").should =~ /c.new\(:foo\)/
+          Pry.config.color = true
+          # I don't want the test to rely on which colour codes are there, just to
+          # assert that "something" is being colourized.
+          mock_pry(binding, "show-doc c#initialize").should.not =~ /c.new\(:foo\)/
+        ensure
+          Pry.config.color = false
+        end
+
+      end
+
+      it "should not syntax highlight `` inside code" do
+        c = Class.new{
+          # Convert aligned output (from many shell commands) into nested arrays:
+          #
+          #   a = decolumnize `ls -l $HOME`
+          #
+          # @param output
+          def decolumnize(output); end
+        }
+
+        begin
+          Pry.config.color = true
+          mock_pry(binding, "show-doc c#decolumnize").should =~ /ls -l \$HOME/
+          mock_pry(binding, "show-doc c#decolumnize").should.not =~ /`ls -l \$HOME`/
+        ensure
+          Pry.config.color = false
+        end
+      end
+    end
+
     describe "on modules" do
       before do
         # god this is boring1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry
 version: !ruby/object:Gem::Version
-  version: 0.9.9.4
+  version: 0.9.9.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-26 00:00:00.000000000 Z
+date: 2012-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &70146509151200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 1.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70146509151200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &70146509149520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +40,18 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70146509149520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.4
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: method_source
-  requirement: &70146509146680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -46,10 +59,15 @@ dependencies:
         version: 0.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *70146509146680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &70146509157160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -57,10 +75,15 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70146509157160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70146509154460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -68,10 +91,15 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70146509154460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70146509169040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -79,7 +107,12 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70146509169040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: An IRB alternative and runtime developer console
 email: jrmair@gmail.com
 executables:
@@ -214,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: An IRB alternative and runtime developer console