pry 0.9.6-java → 0.9.6.2-java

data/.travis.yml

@@ -0,0 +1,16 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ree
+  - rbx-2.0
+  - jruby
+
+notifications:
+  irc: "irc.freenode.org#pry"
+  recipients:
+    - jrmair@gmail.com
+
+branches:
+  only:
+    - master

data/CHANGELOG

@@ -1,3 +1,8 @@
+27/9/2011 version 0.9.6.2 HOTFIX release
+* downgrading to CodeRay 0.9.8 due to problems with 1.0 and rails (autoloading problem) see #280 on pry and #6 on CodeRay
+* also added (as a minor feature) cirwin's implementation of edit --in
+* added early break/exit for objectpath errors (the 'cd 34/@hello/bad_path/23')
+
 19/9/2011 version 0.9.6
 * restored previous behavior of command-line switches (allowing "-rfilename")
 * removed -p option (--play) from edit command

data/README.markdown

@@ -1,7 +1,8 @@
+[![Build Status](https://secure.travis-ci.org/pry/pry.png)](http://travis-ci.org/pry/pry)
 <center>
 ![Alt text](http://dl.dropbox.com/u/26521875/pry_logo_350.png)
 
-(C) John Mair (banisterfiend) 2011
+(C) John Mair (banisterfiend) 2011<br>
 
 
 **Please** [DONATE](http://www.pledgie.com/campaigns/15899) to the Pry project - Pry was a **huge** amount of work and every donation received is encouraging and supports Pry's continued development!

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rake/clean'
-require 'rake/gempackagetask'
+require "rubygems"
+require "rubygems/package_task"
 
 $:.unshift 'lib'
 require 'pry/version'
@@ -20,14 +21,18 @@ def apply_spec_defaults(s)
   s.executables = ["pry"]
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- test/*`.split("\n")
-  s.add_dependency("ruby_parser",">=2.0.5")
-  s.add_dependency("coderay",">=0.9.8")
+  s.add_dependency("ruby_parser","~>2.0.5")
+  s.add_dependency("coderay","~>0.9.8")
   s.add_dependency("slop","~>2.1.0")
-  s.add_dependency("method_source",">=0.6.5")
-  s.add_development_dependency("bacon",">=1.1.0")
+  s.add_dependency("method_source","~>0.6.5")
+  s.add_development_dependency("bacon","~>1.1.0")
   s.add_development_dependency("open4", "~>1.0.1")
+  s.add_development_dependency("rake", "~>0.9")
 end
 
+desc "Set up and run tests"
+task :default => [:test]
+
 desc "Run tests"
 task :test do
   sh "bacon -Itest -rubygems -a -q"
@@ -49,7 +54,7 @@ namespace :ruby do
     s.platform = Gem::Platform::RUBY
   end
 
-  Rake::GemPackageTask.new(spec) do |pkg|
+  Gem::PackageTask.new(spec) do |pkg|
     pkg.need_zip = false
     pkg.need_tar = false
   end
@@ -65,11 +70,11 @@ end
 namespace :jruby do
   spec = Gem::Specification.new do |s|
     apply_spec_defaults(s)
-    s.add_dependency("spoon", ">=0.0.1")
+    s.add_dependency("spoon", "~>0.0.1")
     s.platform = "java"
   end
 
-  Rake::GemPackageTask.new(spec) do |pkg|
+  Gem::PackageTask.new(spec) do |pkg|
     pkg.need_zip = false
     pkg.need_tar = false
   end
@@ -80,11 +85,11 @@ end
   namespace v do
     spec = Gem::Specification.new do |s|
       apply_spec_defaults(s)
-      s.add_dependency("win32console", ">=1.3.0")
+      s.add_dependency("win32console", "~>1.3.0")
       s.platform = "i386-#{v}"
     end
 
-    Rake::GemPackageTask.new(spec) do |pkg|
+    Gem::PackageTask.new(spec) do |pkg|
       pkg.need_zip = false
       pkg.need_tar = false
     end

data/lib/pry/default_commands/context.rb

@@ -37,6 +37,7 @@ class Pry
           rescue RescuableException
             output.puts "Bad object path: #{arg_string}. Failed trying to resolve: #{context}"
             resolve_failure = true
+            break
           end
         end
 

data/lib/pry/default_commands/introspection.rb

@@ -115,13 +115,14 @@ class Pry
       command "edit", "Invoke the default editor on a file. Type `edit --help` for more info" do |*args|
         opts = Slop.parse!(args) do |opt|
           opt.banner unindent <<-USAGE
-            Usage: edit [--no-reload|--reload] [--line LINE] [--temp|--ex|FILE[:LINE]]
+            Usage: edit [--no-reload|--reload] [--line LINE] [--temp|--ex|FILE[:LINE]|--in N]
             Open a text editor. When no FILE is given, edits the pry input buffer.
             Ensure #{text.bold("Pry.config.editor")} is set to your editor of choice.
             e.g: edit sample.rb
           USAGE
 
           opt.on :e, :ex, "Open the file that raised the most recent exception (_ex_.file)", :optional => true, :as => Integer
+          opt.on :i, :in, "Open a temporary file containing the Nth line of _in_. N may be a range.", :optional => true, :as => Range, :default => -1..-1
           opt.on :t, :temp, "Open an empty temporary file"
           opt.on :l, :line, "Jump to this line in the opened file", true, :as => Integer
           opt.on :n, :"no-reload", "Don't automatically reload the edited code"
@@ -132,8 +133,8 @@ class Pry
         end
         next if opts.h?
 
-        if [opts.ex? || nil, opts.t? || nil, !args.empty? || nil].compact.size > 1
-          next output.puts "Only one of --ex, --temp, and FILE may be specified"
+        if [opts.ex?, opts.t?, opts.in?, !args.empty?].count(true) > 1
+          next output.puts "Only one of --ex, --temp, --in and FILE may be specified"
         end
 
         # edit of local code, eval'd within pry.
@@ -141,6 +142,15 @@ class Pry
 
           content = if opts.t?
                       ""
+                    elsif opts.i?
+                      case opts[:i]
+                      when Range
+                        (_pry_.input_array[opts[:i]] || []).join
+                      when Fixnum
+                        _pry_.input_array[opts[:i]] || ""
+                      else
+                        next output.puts "Not a valid range: #{opts[:i]}"
+                      end
                     elsif eval_string.strip != ""
                       eval_string
                     else

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.9.6"
+  VERSION = "0.9.6.2"
 end

data/pry.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pry}
-  s.version = "0.9.6"
+  s.version = "0.9.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{John Mair (banisterfiend)}]
-  s.date = %q{2011-09-19}
+  s.date = %q{2011-09-27}
   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{.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/command_context.rb}, %q{lib/pry/command_processor.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/extended_commands/user_command_api.rb}, %q{lib/pry/helpers.rb}, %q{lib/pry/helpers/base_helpers.rb}, %q{lib/pry/helpers/command_helpers.rb}, %q{lib/pry/helpers/text.rb}, %q{lib/pry/history.rb}, %q{lib/pry/history_array.rb}, %q{lib/pry/plugins.rb}, %q{lib/pry/pry_class.rb}, %q{lib/pry/pry_instance.rb}, %q{lib/pry/version.rb}, %q{pry.gemspec}, %q{test/helper.rb}, %q{test/test_command_helpers.rb}, %q{test/test_command_processor.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_shell.rb}, %q{test/test_exception_whitelist.rb}, %q{test/test_history_array.rb}, %q{test/test_input_stack.rb}, %q{test/test_pry.rb}, %q{test/test_pry_history.rb}, %q{test/test_pry_output.rb}, %q{test/test_special_locals.rb}, %q{test/testrc}, %q{wiki/Customizing-pry.md}, %q{wiki/Home.md}]
+  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/command_context.rb}, %q{lib/pry/command_processor.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/extended_commands/user_command_api.rb}, %q{lib/pry/helpers.rb}, %q{lib/pry/helpers/base_helpers.rb}, %q{lib/pry/helpers/command_helpers.rb}, %q{lib/pry/helpers/text.rb}, %q{lib/pry/history.rb}, %q{lib/pry/history_array.rb}, %q{lib/pry/plugins.rb}, %q{lib/pry/pry_class.rb}, %q{lib/pry/pry_instance.rb}, %q{lib/pry/version.rb}, %q{pry.gemspec}, %q{test/helper.rb}, %q{test/test_command_helpers.rb}, %q{test/test_command_processor.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_shell.rb}, %q{test/test_exception_whitelist.rb}, %q{test/test_history_array.rb}, %q{test/test_input_stack.rb}, %q{test/test_pry.rb}, %q{test/test_pry_history.rb}, %q{test/test_pry_output.rb}, %q{test/test_special_locals.rb}, %q{test/testrc}, %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}
@@ -21,26 +21,29 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ruby_parser>, [">= 2.0.5"])
-      s.add_runtime_dependency(%q<coderay>, [">= 0.9.8"])
+      s.add_runtime_dependency(%q<ruby_parser>, ["~> 2.0.5"])
+      s.add_runtime_dependency(%q<coderay>, ["~> 0.9.8"])
       s.add_runtime_dependency(%q<slop>, ["~> 2.1.0"])
-      s.add_runtime_dependency(%q<method_source>, [">= 0.6.5"])
-      s.add_development_dependency(%q<bacon>, [">= 1.1.0"])
+      s.add_runtime_dependency(%q<method_source>, ["~> 0.6.5"])
+      s.add_development_dependency(%q<bacon>, ["~> 1.1.0"])
       s.add_development_dependency(%q<open4>, ["~> 1.0.1"])
+      s.add_development_dependency(%q<rake>, ["~> 0.9"])
     else
-      s.add_dependency(%q<ruby_parser>, [">= 2.0.5"])
-      s.add_dependency(%q<coderay>, [">= 0.9.8"])
+      s.add_dependency(%q<ruby_parser>, ["~> 2.0.5"])
+      s.add_dependency(%q<coderay>, ["~> 0.9.8"])
       s.add_dependency(%q<slop>, ["~> 2.1.0"])
-      s.add_dependency(%q<method_source>, [">= 0.6.5"])
-      s.add_dependency(%q<bacon>, [">= 1.1.0"])
+      s.add_dependency(%q<method_source>, ["~> 0.6.5"])
+      s.add_dependency(%q<bacon>, ["~> 1.1.0"])
       s.add_dependency(%q<open4>, ["~> 1.0.1"])
+      s.add_dependency(%q<rake>, ["~> 0.9"])
     end
   else
-    s.add_dependency(%q<ruby_parser>, [">= 2.0.5"])
-    s.add_dependency(%q<coderay>, [">= 0.9.8"])
+    s.add_dependency(%q<ruby_parser>, ["~> 2.0.5"])
+    s.add_dependency(%q<coderay>, ["~> 0.9.8"])
     s.add_dependency(%q<slop>, ["~> 2.1.0"])
-    s.add_dependency(%q<method_source>, [">= 0.6.5"])
-    s.add_dependency(%q<bacon>, [">= 1.1.0"])
+    s.add_dependency(%q<method_source>, ["~> 0.6.5"])
+    s.add_dependency(%q<bacon>, ["~> 1.1.0"])
     s.add_dependency(%q<open4>, ["~> 1.0.1"])
+    s.add_dependency(%q<rake>, ["~> 0.9"])
   end
 end

data/test/helper.rb

@@ -24,6 +24,7 @@ class << Pry
     Pry.config.plugins.enabled = false
     Pry.config.history.should_load = false
     Pry.config.history.should_save = false
+    Pry.config.hooks = { }
   end
 end
 

data/test/test_default_commands/test_introspection.rb

@@ -212,6 +212,36 @@ describe "Pry::DefaultCommands::Introspection" do
         mock_pry("edit -n").should.not =~ /FOO/
       end
     end
+
+    describe "with --in" do
+      it "should edit the nth line of _in_" do
+        mock_pry("10", "11", "edit --in -2")
+        @contents.should == "10\n"
+      end
+
+      it "should edit the last line if no argument is given" do
+        mock_pry("10", "11", "edit --in")
+        @contents.should == "11\n"
+      end
+
+      it "should edit a range of lines if a range is given" do
+        mock_pry("10", "11", "edit -i 1,2")
+        @contents.should == "10\n11\n"
+      end
+
+      it "should edit a multi-line expression as it occupies one line of _in_" do
+        mock_pry("class Fixnum", "  def invert; -self; end", "end", "edit -i 1")
+        @contents.should == "class Fixnum\n  def invert; -self; end\nend\n"
+      end
+
+      it "should not work with a filename" do
+        mock_pry("edit ruby.rb -i").should =~ /Only one of --ex, --temp, --in and FILE may be specified/
+      end
+
+      it "should not work with nonsense" do
+        mock_pry("edit --in three").should =~ /Not a valid range: three/
+      end
+    end
   end
 
   describe "show-method" do

data/test/test_pry.rb

@@ -2,15 +2,15 @@ require 'helper'
 
 describe Pry do
 
-  if RUBY_PLATFORM !~ /mingw/ && RUBY_PLATFORM !~ /mswin/ && RUBY_PLATFORM != 'java'
-    describe 'warning emissions' do
-      it 'should emit no warnings' do
-        Open4.popen4 'ruby -I lib -rubygems -r"pry" -W -e "exit"' do |pid, stdin, stdout, stderr|
-          stderr.read.empty?.should == true
-        end
-      end
-    end
-  end
+  # if RUBY_PLATFORM !~ /mingw/ && RUBY_PLATFORM !~ /mswin/ && RUBY_PLATFORM != 'java'
+  #   describe 'warning emissions' do
+  #     it 'should emit no warnings' do
+  #       Open4.popen4 'ruby -I lib -rubygems -r"pry" -W -e "exit"' do |pid, stdin, stdout, stderr|
+  #         stderr.read.empty?.should == true
+  #       end
+  #     end
+  #   end
+  # end
 
   if RUBY_VERSION =~ /1.9/
     describe "Exotic object support" do

data/test/test_pry_output.rb

@@ -1,3 +1,4 @@
+require 'helper'
 
 describe Pry do
   describe "output failsafe" do
@@ -34,7 +35,7 @@ describe Pry do
     end
 
     it "should not be phased by un-inspectable things" do
-      mock_pry("class NastyClass; undef pretty_inspect; end", "NastyClass.new").should =~ /#<NastyClass:0x[0-9a-f]+>/
+      mock_pry("class NastyClass; undef pretty_inspect; end", "NastyClass.new").should =~ /#<NastyClass:0x.*?>/
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.6.2
   prerelease: 
 platform: java
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-19 00:00:00.000000000 Z
+date: 2011-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_parser
-  requirement: &70165026964420 !ruby/object:Gem::Requirement
+  requirement: &70249512913620 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70165026964420
+  version_requirements: *70249512913620
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &70165026961800 !ruby/object:Gem::Requirement
+  requirement: &70249512912320 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.8
   type: :runtime
   prerelease: false
-  version_requirements: *70165026961800
+  version_requirements: *70249512912320
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &70165026957860 !ruby/object:Gem::Requirement
+  requirement: &70249509217380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,32 +43,32 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70165026957860
+  version_requirements: *70249509217380
 - !ruby/object:Gem::Dependency
   name: method_source
-  requirement: &70165026956400 !ruby/object:Gem::Requirement
+  requirement: &70249509215340 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *70165026956400
+  version_requirements: *70249509215340
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &70165026955560 !ruby/object:Gem::Requirement
+  requirement: &70249509214560 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70165026955560
+  version_requirements: *70249509214560
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70165026955040 !ruby/object:Gem::Requirement
+  requirement: &70249509213480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,18 +76,29 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *70165026955040
+  version_requirements: *70249509213480
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70249509211340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: *70249509211340
 - !ruby/object:Gem::Dependency
   name: spoon
-  requirement: &70165026954200 !ruby/object:Gem::Requirement
+  requirement: &70249509202020 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70165026954200
+  version_requirements: *70249509202020
 description: An IRB alternative and runtime developer console
 email: jrmair@gmail.com
 executables:
@@ -98,6 +109,7 @@ files:
 - .document
 - .gemtest
 - .gitignore
+- .travis.yml
 - .yardopts
 - CHANGELOG
 - CONTRIBUTORS