pry 0.9.8 → 0.9.8.1

data/.travis.yml

@@ -3,7 +3,8 @@ rvm:
   - 1.9.2
   - 1.9.3
   - ree
-  - rbx-2.0
+  - rbx-18mode
+  - rbx-19mode
   - jruby
 
 notifications:
@@ -13,4 +14,4 @@ notifications:
 
 branches:
   only:
-    - master
+    - master

data/CHANGELOG

@@ -1,4 +1,12 @@
-X/X/2012 version 0.9.8
+30/1/2012 version 0.9.8.1 bugfix
+* fixed broken --no-plugins option
+* Ensure ARGV is not mutated during option parsing.
+* Use a more rbx-friendly test for unicodeness
+* Use rbx-{18,19}mode as indicated  http://about.travis-ci.org/docs/user/languages/ruby/
+* Don't explode in gem-list [Fixes #453, #454]
+* Check for command-name collision on assignment [Fixes #450]
+
+25/1/2012 version 0.9.8
 
 MAJOR NEW FEATURES
 - upgraded command api, https://github.com/pry/pry/wiki/Custom-commands
@@ -7,7 +15,6 @@ MAJOR NEW FEATURES
 - added save-file command
 - added gist command (removed gist-method, new gist command is more general)
 
-
 complete CHANGELOG:
 * CommandError's no longer cause the current input to be disgarded
 * Better syntax highlighting for rbx code code
@@ -39,7 +46,6 @@ complete CHANGELOG:
 * changed edit-command to no-longer need a command set argument
 * fixed empty lines so that they don't replace _ by nil
 * fixed SyntaxErrors at the REPL level so they don't replace _ex_.
-<TODO: everything that happened after f3262e32700709a6998579a9f71cdc6b8f4a695e>
 
 5/11/2011 version 0.9.7.4 hotfix
 * ls -M now works in modules (bugfix)

data/CONTRIBUTORS

@@ -1,22 +1,29 @@
-   687	John Mair <jrmair@gmail.com>
-    82	Conrad Irwin <conrad.irwin@gmail.com>
-    76	Rob Gleeson <rob@flowof.info>
-    70	Ryan Fitzgerald <rwfitzge@gmail.com>
-    50	Lee Jarvis <lee@jarvis.co>
-    47	Mon ouïe <mon.ouie@gmail.com>
-    18	David Palm <dpalm@elctech.com>
-    13	epitron <chris@ill-logic.com>
-     8	Eero Saynatkari <projects@kittensoft.org>
-     6	Yorick Peterse <yorickpeterse@gmail.com>
-     3	Darrick Wiebe <darrick@innatesoftware.com>
-     2	robgleeson <rob@flowof.info>
-     2	Eric Christopherson <echristopherson@gmail.com>
-     2	Kelsey Judson <kelseyjudson@gmail.com>
-     2	Xavier Shay <xavier@rhnh.net>
-     1	Josh Cheek <josh.cheek@gmail.com>
-     1	Tim Pope <code@tpope.net>
-     1	Gosha Arinich <me@goshakkk.name>
-     1	Shawn Anderson <shawn42@gmail.com>
-     1	Jordan Running <jrunning@gmail.com>
-     1	fowlmouth <phowl.mouth@gmail.com>
-     1	Lars Haugseth <git@larshaugseth.com>
+   804	John Mair
+   168	Conrad Irwin
+   129	Ryan Fitzgerald
+    84	Rob Gleeson
+    51	Lee Jarvis
+    48	Mon ouïe
+    18	David Palm
+    13	epitron
+    13	Jordon Bedwell
+     9	Yorick Peterse
+     8	Eero Saynatkari
+     3	fowlmouth
+     3	Darrick Wiebe
+     2	Bram Swenson
+     2	Eric Christopherson
+     2	Erik Michaels-Ober
+     2	Kelsey Judson
+     2	Xavier Shay
+     2	robgleeson
+     1	Kirill Lashuk
+     1	Josh Cheek
+     1	Shawn Anderson
+     1	Sherin C
+     1	Tim Pope
+     1	Gosha Arinich
+     1	Jordan Running
+     1	Jonathan Jackson
+     1	Lars Haugseth
+     1	Robert Gleeson

data/lib/pry/cli.rb

@@ -52,7 +52,7 @@ class Pry
         self.option_processors = nil
       end
 
-      def parse_options(args=ARGV)
+      def parse_options(args=ARGV.dup)
         raise NoOptionsError, "No command line options defined! Use Pry::CLI.add_options to add command line options." if !options
 
         opts = Slop.parse(args, :help => true, :multiple_switches => false, &options)
@@ -99,7 +99,7 @@ Copyright (c) 2011 John Mair (banisterfiend)
 
   on "no-plugins", "Suppress loading of plugins." do
     # suppress plugins if given --no-plugins optino
-    Pry.config.plugins.enabled = false
+    Pry.config.should_load_plugins = false
   end
 
   on "installed-plugins", "List installed plugins." do

data/lib/pry/command.rb

@@ -182,9 +182,13 @@ class Pry
     # the current scope.
     # @param [String] command_name_match The name of the colliding command.
     # @param [Binding] target The current binding context.
-    def check_for_command_name_collision(command_name_match)
-      if collision_type = target.eval("defined?(#{command_name_match})")
-        output.puts "#{Pry::Helpers::Text.bold('WARNING:')} Command name collision with a #{collision_type}: '#{command_name_match}'\n\n"
+    def check_for_command_name_collision(command_name_match, arg_string)
+      collision_type = target.eval("defined?(#{command_name_match})")
+      collision_type ||= 'local-variable' if arg_string.match(%r{\A\s*[-+*/%&|^]*=})
+
+      if collision_type
+        output.puts "#{Pry::Helpers::Text.bold('WARNING:')} Calling Pry command '#{command_name_match}'," +
+                                                          "which conflicts with a #{collision_type}.\n\n"
       end
     rescue Pry::RescuableException
     end
@@ -229,7 +233,7 @@ class Pry
     def process_line(line)
       command_name, arg_string, captures, args = tokenize(line)
 
-      check_for_command_name_collision(command_name) if Pry.config.collision_warning
+      check_for_command_name_collision(command_name, arg_string) if Pry.config.collision_warning
 
       self.arg_string = arg_string
       self.captures = captures

data/lib/pry/config.rb

@@ -129,7 +129,6 @@ class Pry
 
     # Config option for plugins:
     # sub-options include:
-    # `plugins.enabled` (Boolean) to toggle the loading of plugins on and off wholesale. (defaults to true)
     # `plugins.strict_loading` (Boolean) which toggles whether referring to a non-existent plugin should raise an exception (defaults to `false`)
     # @return [OpenStruct]
     attr_accessor :plugins

data/lib/pry/default_commands/gems.rb

@@ -59,6 +59,7 @@ class Pry
         BANNER
 
         def process(pattern=nil)
+          pattern = Regexp.compile(pattern || '')
           gems    = if Gem::Specification.respond_to?(:each)
                       Gem::Specification.select{|spec| spec.name =~ pattern }.group_by(&:name)
                     else

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.9.8"
+  VERSION = "0.9.8.1"
 end

data/pry.gemspec

@@ -1,21 +1,21 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{pry}
-  s.version = "0.9.8pre7"
+  s.name = "pry"
+  s.version = "0.9.8.1"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{John Mair (banisterfiend)}]
-  s.date = %q{2012-01-20}
-  s.description = %q{An IRB alternative and runtime developer console}
-  s.email = %q{jrmair@gmail.com}
-  s.executables = [%q{pry}]
-  s.files = [%q{.document}, %q{.gemtest}, %q{.gitignore}, %q{.travis.yml}, %q{.yardopts}, %q{CHANGELOG}, %q{CONTRIBUTORS}, %q{Gemfile}, %q{LICENSE}, %q{README.markdown}, %q{Rakefile}, %q{TODO}, %q{bin/pry}, %q{examples/example_basic.rb}, %q{examples/example_command_override.rb}, %q{examples/example_commands.rb}, %q{examples/example_hooks.rb}, %q{examples/example_image_edit.rb}, %q{examples/example_input.rb}, %q{examples/example_input2.rb}, %q{examples/example_output.rb}, %q{examples/example_print.rb}, %q{examples/example_prompt.rb}, %q{examples/helper.rb}, %q{lib/pry.rb}, %q{lib/pry/cli.rb}, %q{lib/pry/code.rb}, %q{lib/pry/command.rb}, %q{lib/pry/command_set.rb}, %q{lib/pry/commands.rb}, %q{lib/pry/completion.rb}, %q{lib/pry/config.rb}, %q{lib/pry/core_extensions.rb}, %q{lib/pry/custom_completions.rb}, %q{lib/pry/default_commands/basic.rb}, %q{lib/pry/default_commands/context.rb}, %q{lib/pry/default_commands/documentation.rb}, %q{lib/pry/default_commands/easter_eggs.rb}, %q{lib/pry/default_commands/gems.rb}, %q{lib/pry/default_commands/input.rb}, %q{lib/pry/default_commands/introspection.rb}, %q{lib/pry/default_commands/ls.rb}, %q{lib/pry/default_commands/shell.rb}, %q{lib/pry/extended_commands/experimental.rb}, %q{lib/pry/helpers.rb}, %q{lib/pry/helpers/base_helpers.rb}, %q{lib/pry/helpers/command_helpers.rb}, %q{lib/pry/helpers/options_helpers.rb}, %q{lib/pry/helpers/text.rb}, %q{lib/pry/history.rb}, %q{lib/pry/history_array.rb}, %q{lib/pry/hooks.rb}, %q{lib/pry/indent.rb}, %q{lib/pry/method.rb}, %q{lib/pry/plugins.rb}, %q{lib/pry/pry_class.rb}, %q{lib/pry/pry_instance.rb}, %q{lib/pry/rbx_method.rb}, %q{lib/pry/rbx_path.rb}, %q{lib/pry/version.rb}, %q{lib/pry/wrapped_module.rb}, %q{man/pry.1}, %q{man/pry.1.html}, %q{man/pry.1.ronn}, %q{pry.gemspec}, %q{test/helper.rb}, %q{test/test_cli.rb}, %q{test/test_code.rb}, %q{test/test_command.rb}, %q{test/test_command_helpers.rb}, %q{test/test_command_integration.rb}, %q{test/test_command_set.rb}, %q{test/test_completion.rb}, %q{test/test_default_commands.rb}, %q{test/test_default_commands/test_context.rb}, %q{test/test_default_commands/test_documentation.rb}, %q{test/test_default_commands/test_gems.rb}, %q{test/test_default_commands/test_input.rb}, %q{test/test_default_commands/test_introspection.rb}, %q{test/test_default_commands/test_ls.rb}, %q{test/test_default_commands/test_shell.rb}, %q{test/test_exception_whitelist.rb}, %q{test/test_history_array.rb}, %q{test/test_hooks.rb}, %q{test/test_indent.rb}, %q{test/test_input_stack.rb}, %q{test/test_method.rb}, %q{test/test_pry.rb}, %q{test/test_pry_defaults.rb}, %q{test/test_pry_history.rb}, %q{test/test_pry_output.rb}, %q{test/test_special_locals.rb}, %q{test/test_syntax_checking.rb}, %q{test/test_wrapped_module.rb}, %q{test/testrc}, %q{test/testrcbad}, %q{wiki/Customizing-pry.md}, %q{wiki/Home.md}]
-  s.homepage = %q{http://pry.github.com}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{An IRB alternative and runtime developer console}
-  s.test_files = [%q{test/helper.rb}, %q{test/test_cli.rb}, %q{test/test_code.rb}, %q{test/test_command.rb}, %q{test/test_command_helpers.rb}, %q{test/test_command_integration.rb}, %q{test/test_command_set.rb}, %q{test/test_completion.rb}, %q{test/test_default_commands.rb}, %q{test/test_default_commands/test_context.rb}, %q{test/test_default_commands/test_documentation.rb}, %q{test/test_default_commands/test_gems.rb}, %q{test/test_default_commands/test_input.rb}, %q{test/test_default_commands/test_introspection.rb}, %q{test/test_default_commands/test_ls.rb}, %q{test/test_default_commands/test_shell.rb}, %q{test/test_exception_whitelist.rb}, %q{test/test_history_array.rb}, %q{test/test_hooks.rb}, %q{test/test_indent.rb}, %q{test/test_input_stack.rb}, %q{test/test_method.rb}, %q{test/test_pry.rb}, %q{test/test_pry_defaults.rb}, %q{test/test_pry_history.rb}, %q{test/test_pry_output.rb}, %q{test/test_special_locals.rb}, %q{test/test_syntax_checking.rb}, %q{test/test_wrapped_module.rb}, %q{test/testrc}, %q{test/testrcbad}]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["John Mair (banisterfiend)"]
+  s.date = "2012-01-30"
+  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/basic.rb", "lib/pry/default_commands/context.rb", "lib/pry/default_commands/documentation.rb", "lib/pry/default_commands/easter_eggs.rb", "lib/pry/default_commands/gems.rb", "lib/pry/default_commands/input.rb", "lib/pry/default_commands/introspection.rb", "lib/pry/default_commands/ls.rb", "lib/pry/default_commands/shell.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/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.rb", "test/test_default_commands/test_context.rb", "test/test_default_commands/test_documentation.rb", "test/test_default_commands/test_gems.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_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_special_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.15"
+  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.rb", "test/test_default_commands/test_context.rb", "test/test_default_commands/test_documentation.rb", "test/test_default_commands/test_gems.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_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_special_locals.rb", "test/test_syntax_checking.rb", "test/test_wrapped_module.rb", "test/testrc", "test/testrcbad"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/test_command.rb

@@ -300,7 +300,23 @@ describe "Pry::Command" do
       output = StringIO.new
       cmd.new(:target => binding, :output => output).process_line %(frankie mouse)
 
-      output.string.should =~ /Command name collision/
+      output.string.should =~ /command .* conflicts/
+
+      Pry.config.collision_warning = old
+    end
+
+    it 'should spot collision warnings on assignment if configured' do
+      old = Pry.config.collision_warning
+      Pry.config.collision_warning = true
+
+      cmd = @set.command 'frankie' do
+
+      end
+
+      output = StringIO.new
+      cmd.new(:target => binding, :output => output).process_line %(frankie = mouse)
+
+      output.string.should =~ /command .* conflicts/
 
       Pry.config.collision_warning = old
     end

data/test/test_default_commands/test_gems.rb

@@ -7,7 +7,11 @@ describe "Pry::DefaultCommands::Gems" do
     it 'should not raise when invoked' do
       str_output = StringIO.new
       Pry.start self, :input => InputTester.new("gem-list", "exit-all"), :output => str_output
-      str_output.string.should.not =~ /NoMethodError/
+      str_output.string.should.not =~ /Error/
+    end
+
+    it 'should not raise when invoked with an argument' do
+      mock_pry('gem-list pry').should.not =~ /Error/
     end
   end
 end

data/test/test_input_stack.rb

@@ -77,7 +77,7 @@ describe "Pry#input_stack" do
     end
 
     it "should be able to use unicode regexes on a UTF-8 terminal" do
-      mock_pry('":-Þ" =~ /\p{Upper}/').should == %{=> 2\n\n}
+      mock_pry('":-Þ" =~ /þ/i').should == %{=> 2\n\n}
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000 Z
+date: 2012-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &70335751790200 !ruby/object:Gem::Requirement
+  requirement: &70340902709120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70335751790200
+  version_requirements: *70340902709120
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &70335751787080 !ruby/object:Gem::Requirement
+  requirement: &70340902788280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70335751787080
+  version_requirements: *70340902788280
 - !ruby/object:Gem::Dependency
   name: method_source
-  requirement: &70335751784160 !ruby/object:Gem::Requirement
+  requirement: &70340902786160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -46,10 +46,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70335751784160
+  version_requirements: *70340902786160
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &70335751782400 !ruby/object:Gem::Requirement
+  requirement: &70340902784780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -57,10 +57,10 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70335751782400
+  version_requirements: *70340902784780
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70335748077440 !ruby/object:Gem::Requirement
+  requirement: &70340902783480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -68,10 +68,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70335748077440
+  version_requirements: *70340902783480
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70335748075880 !ruby/object:Gem::Requirement
+  requirement: &70340902782740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -79,7 +79,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70335748075880
+  version_requirements: *70340902782740
 description: An IRB alternative and runtime developer console
 email: jrmair@gmail.com
 executables:
@@ -205,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: An IRB alternative and runtime developer console