pry 0.9.7.4 → 0.9.8pre2

data/.gitignore

@@ -9,8 +9,6 @@ coverage/
 .yardoc/
 /tags
 *.gem
-
-# Not sure if Pry devs use RVM or want the Gemfile.lock in the repo, thus I'm
-# ignoring them for now.
+.rbx/
 .rvmrc
 Gemfile.lock

data/README.markdown

@@ -9,7 +9,9 @@
 
 **Sponsors**
 
-[Atomic Object](http://www.atomicobject.com/)
+[Atomic Object](http://www.atomicobject.com/)<br/>
+[Bendyworks](http://bendyworks.com/)<br/>
+[Intridea](http://intridea.com/)<br/>
 
 **Other Resources**
 

data/Rakefile

@@ -1,32 +1,41 @@
 require 'rake/clean'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 
 $:.unshift 'lib'
 require 'pry/version'
 
-CLOBBER.include("**/*~", "**/*#*", "**/*.log")
-CLEAN.include("**/*#*", "**/*#*.*", "**/*_flymake*.*", "**/*_flymake",
-              "**/*.rbc", "**/.#*.*")
+CLOBBER.include('**/*~', '**/*#*', '**/*.log')
+CLEAN.include('**/*#*', '**/*#*.*', '**/*_flymake*.*', '**/*_flymake', '**/*.rbc', '**/.#*.*')
 
 def apply_spec_defaults(s)
-  s.name = "pry"
+  s.name = 'pry'
   s.summary = "An IRB alternative and runtime developer console"
   s.version = Pry::VERSION
   s.date = Time.now.strftime '%Y-%m-%d'
   s.author = "John Mair (banisterfiend)"
   s.email = 'jrmair@gmail.com'
   s.description = s.summary
-  s.homepage = "http://pry.github.com"
-  s.executables = ["pry"]
+  s.homepage = 'http://pry.github.com'
+  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.3.1")
-  s.add_dependency("coderay","~>0.9.8")
-  s.add_dependency("slop","~>2.1.0")
-  s.add_dependency("method_source","~>0.6.7")
-  s.add_development_dependency("bacon","~>1.1.0")
-  s.add_development_dependency("open4", "~>1.0.1")
-  s.add_development_dependency("rake", "~>0.9")
+  s.add_dependency('coderay', '~> 0.9')
+  s.add_dependency('slop', ['>= 2.4.1', '< 3'])
+  s.add_dependency('method_source','~> 0.6')
+  s.add_development_dependency('bacon', '~> 1.1')
+  s.add_development_dependency('open4', '~> 1.3')
+  s.add_development_dependency('rake', '~> 0.9')
+end
+
+def check_dependencies
+  require 'bundler'
+
+  ENV["BUNDLE_GEMFILE"] = File.expand_path("../Gemfile", __FILE__)
+  Bundler.definition.missing_specs
+rescue LoadError
+  # if Bundler isn't installed, we'll just assume your setup is ok.
+rescue Bundler::GemNotFound
+  raise RuntimeError, "You're missing one or more required gems. Run `bundle install` first."
 end
 
 desc "Set up and run tests"
@@ -34,33 +43,35 @@ task :default => [:test]
 
 desc "Run tests"
 task :test do
+  check_dependencies unless ENV['SKIP_DEP_CHECK']
   sh "bacon -Itest -rubygems -a -q"
 end
 
-desc "profile pry's startup time"
-task :profile do
-  require 'profile'
-  require 'pry'
-  Pry.start(TOPLEVEL_BINDING, :input => StringIO.new('exit'))
-end
-
-desc "run pry"
+desc "Run pry"
 task :pry do
+  check_dependencies unless ENV['SKIP_DEP_CHECK']
   load 'bin/pry'
 end
 
-desc "show pry version"
+desc "Show pry version"
 task :version do
   puts "Pry version: #{Pry::VERSION}"
 end
 
+desc "Profile pry's startup time"
+task :profile do
+  require 'profile'
+  require 'pry'
+  Pry.start(TOPLEVEL_BINDING, :input => StringIO.new('exit'))
+end
+
 namespace :ruby do
   spec = Gem::Specification.new do |s|
     apply_spec_defaults(s)
     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
@@ -76,11 +87,11 @@ end
 namespace :jruby do
   spec = Gem::Specification.new do |s|
     apply_spec_defaults(s)
-    s.add_dependency("spoon", "~>0.0.1")
-    s.platform = "java"
+    s.add_dependency('spoon', '~> 0.0')
+    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
@@ -91,11 +102,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')
       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
@@ -103,10 +114,16 @@ end
 end
 
 desc "build all platform gems at once"
-task :gems => [:clean, :rmgems, "ruby:gem", "mswin32:gem", "mingw32:gem", "jruby:gem"]
+task :gems => [:clean, :rmgems, 'ruby:gem', 'mswin32:gem', 'mingw32:gem', 'jruby:gem']
 
 desc "remove all platform gems"
-task :rmgems => ["ruby:clobber_package"]
+task :rmgems => ['ruby:clobber_package']
+
+desc "reinstall gem"
+task :reinstall => :gems do
+  sh "gem uninstall pry" rescue nil
+  sh "gem install #{File.dirname(__FILE__)}/pkg/pry-#{Pry::VERSION}.gem"
+end
 
 desc "build and push latest gems"
 task :pushgems => :gems do

data/bin/pry

@@ -12,83 +12,5 @@ rescue LoadError
   require 'pry'
 end
 
-opts = Slop.parse(:help => true, :multiple_switches => false) do
-  banner %{Usage: pry [OPTIONS]
-Start a Pry session.
-See: `https://github.com/pry` for more information.
-Copyright (c) 2011 John Mair (banisterfiend)
---
-}
-
-  on :e, :exec, "A line of code to execute in context before the session starts", true
-
-  on "no-pager", "Disable pager for long output" do
-    Pry.config.pager = false
-  end
-
-  on "no-history", "Disable history loading" do
-    Pry.config.history.should_load = false
-  end
-
-  on "no-color", "Disable syntax highlighting for session" do
-    Pry.color = false
-  end
-
-  on :f, "Suppress loading of ~/.pryrc" do
-    # load ~/.pryrc, if not suppressed with -f option
-    Pry.config.should_load_rc = false
-  end
-
-  on "no-plugins", "Suppress loading of plugins." do
-    # suppress plugins if given --no-plugins optino
-    Pry.config.plugins.enabled = false
-  end
-
-  on "installed-plugins", "List installed plugins." do
-    puts "Installed Plugins:"
-    puts "--"
-    Pry.locate_plugins.each do |plugin|
-      puts "#{plugin.name}".ljust(18) + plugin.spec.summary
-    end
-    exit
-  end
-
-  on "simple-prompt", "Enable simple prompt mode" do
-    Pry.prompt = Pry::SIMPLE_PROMPT
-  end
-
-  on :r, :require, "`require` a Ruby script at startup", true do |file|
-    Pry.config.requires << file
-  end
-
-  on :I, "Add a path to the $LOAD_PATH", true do |path|
-    $LOAD_PATH << path
-  end
-
-  on :v, :version, "Display the Pry version" do
-    puts "Pry version #{Pry::VERSION} on Ruby #{RUBY_VERSION}"
-    exit
-  end
-
-  on(:c, :context,
-    "Start the session in the specified context. Equivalent to `context.pry` in a session.",
-    true,
-    :default => "TOPLEVEL_BINDING"
-    )
-end
-
-# invoked via cli
-Pry.cli = true
-
-# create the actual context
-context = Pry.binding_for(eval(opts[:context]))
-
-if opts[:exec]
-  exec_string = opts[:exec] + "\n"
-else
-  exec_string = ""
-end
-
-# Start the session (running any code passed with -e, if there is any)
-Pry.start(context, :input => StringIO.new(exec_string))
-
+# Process command line options and run Pry
+Pry::CLI.parse_options

data/lib/pry.rb

@@ -4,19 +4,19 @@
 
 require 'pp'
 require 'pry/helpers/base_helpers'
+require 'pry/hooks'
+
 class Pry
   # The default hooks - display messages when beginning and ending Pry sessions.
-  DEFAULT_HOOKS = {
-    :before_session => proc do |out, target, _pry_|
-      # ensure we're actually in a method
-      file = target.eval('__FILE__')
-
-      # /unknown/ for rbx
-      if file == Pry.eval_path  || (file !~ /(\(.*\))|<.*>/ && file !~ /__unknown__/ && file != "" && file != "-e")
-        _pry_.process_line("whereami 5", "", target)
-      end
+  DEFAULT_HOOKS = Pry::Hooks.new.add_hook(:before_session, :default) do |out, target, _pry_|
+    # ensure we're actually in a method
+    file = target.eval('__FILE__')
+
+    # /unknown/ for rbx
+    if file !~ /(\(.*\))|<.*>/ && file !~ /__unknown__/ && file != "" && file != "-e"
+      _pry_.run_command("whereami 5", "", target)
     end
-  }
+  end
 
   # The default print
   DEFAULT_PRINT = proc do |output, value|
@@ -36,6 +36,9 @@ class Pry
 
     colorized = Helpers::BaseHelpers.colorize_code(stringified.gsub(/#</, "%<#{nonce}"))
 
+    # avoid colour-leak from CodeRay and any of the users' previous output
+    colorized = colorized.sub(/(\n*)$/, "\e[0m\\1") if Pry.color
+
     Helpers::BaseHelpers.stagger_output("=> #{colorized.gsub(/%<(.*?)#{nonce}/, '#<\1')}", output)
   end
 
@@ -66,19 +69,11 @@ class Pry
   # The default prompt; includes the target and nesting level
   DEFAULT_PROMPT = [
                     proc { |target_self, nest_level, pry|
-                      if nest_level == 0
-                        "[#{pry.input_array.size}] pry(#{Pry.view_clip(target_self)})> "
-                      else
-                        "[#{pry.input_array.size}] pry(#{Pry.view_clip(target_self)}):#{nest_level}> "
-                      end
+                      "[#{pry.input_array.size}] pry(#{Pry.view_clip(target_self)})#{":#{nest_level}" unless nest_level.zero?}> "
                     },
 
                     proc { |target_self, nest_level, pry|
-                      if nest_level == 0
-                        "[#{pry.input_array.size}] pry(#{Pry.view_clip(target_self)})* "
-                      else
-                        "[#{pry.input_array.size}] pry(#{Pry.view_clip(target_self)}):#{nest_level}* "
-                      end
+                      "[#{pry.input_array.size}] pry(#{Pry.view_clip(target_self)})#{":#{nest_level}" unless nest_level.zero?}* "
                     }
                    ]
 
@@ -184,6 +179,7 @@ require "pry/version"
 require "pry/rbx_method"
 require "pry/rbx_path"
 require "pry/method"
+require "pry/wrapped_module"
 require "pry/history_array"
 require "pry/helpers"
 require "pry/history"
@@ -196,3 +192,4 @@ require "pry/plugins"
 require "pry/core_extensions"
 require "pry/pry_class"
 require "pry/pry_instance"
+require "pry/cli"

data/lib/pry/cli.rb

@@ -0,0 +1,152 @@
+
+class Pry
+
+  # Manage the processing of command line options
+  class CLI
+
+    NoOptionsError = Class.new(StandardError)
+
+    class << self
+
+      # @return [Proc] The Proc defining the valid command line options.
+      attr_accessor :options
+
+      # @return [Array] The Procs that process the parsed options.
+      attr_accessor :option_processors
+
+      # Add another set of CLI options
+      def add_options(&block)
+        if options
+          old_options = options
+          self.options = proc do
+            instance_exec(&old_options)
+            instance_exec(&block)
+          end
+        else
+          self.options = block
+        end
+
+        self
+      end
+
+      # Bring in options defined in plugins
+      def add_plugin_options
+        Pry.plugins.values.each do |plugin|
+          plugin.load_cli_options
+        end
+
+        self
+      end
+
+      # Add a block responsible for processing parsed options.
+      def process_options(&block)
+        self.option_processors ||= []
+        option_processors << block
+
+        self
+      end
+
+      # Clear `options` and `option_processors`
+      def reset
+        self.options           = nil
+        self.option_processors = nil
+      end
+
+      def parse_options(args=ARGV)
+        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)
+        option_processors.each { |processor| processor.call(opts) } if option_processors # option processors are optional
+
+        self
+      end
+
+    end
+
+    reset
+  end
+end
+
+# Bring in options defined by plugins
+Pry::CLI.add_plugin_options
+
+# The default Pry command line options (before plugin options are included)
+Pry::CLI.add_options do
+  banner %{Usage: pry [OPTIONS]
+Start a Pry session.
+See: `https://github.com/pry` for more information.
+Copyright (c) 2011 John Mair (banisterfiend)
+--
+}
+  on :e, :exec, "A line of code to execute in context before the session starts", true
+
+  on "no-pager", "Disable pager for long output" do
+    Pry.config.pager = false
+  end
+
+  on "no-history", "Disable history loading" do
+    Pry.config.history.should_load = false
+  end
+
+  on "no-color", "Disable syntax highlighting for session" do
+    Pry.color = false
+  end
+
+  on :f, "Suppress loading of ~/.pryrc" do
+    # load ~/.pryrc, if not suppressed with -f option
+    Pry.config.should_load_rc = false
+  end
+
+  on "no-plugins", "Suppress loading of plugins." do
+    # suppress plugins if given --no-plugins optino
+    Pry.config.plugins.enabled = false
+  end
+
+  on "installed-plugins", "List installed plugins." do
+    puts "Installed Plugins:"
+    puts "--"
+    Pry.locate_plugins.each do |plugin|
+      puts "#{plugin.name}".ljust(18) + plugin.spec.summary
+    end
+    exit
+  end
+
+  on "simple-prompt", "Enable simple prompt mode" do
+    Pry.config.prompt = Pry::SIMPLE_PROMPT
+  end
+
+  on :r, :require, "`require` a Ruby script at startup", true do |file|
+    Pry.config.requires << file
+  end
+
+  on :I, "Add a path to the $LOAD_PATH", true do |path|
+    $LOAD_PATH << path
+  end
+
+  on :v, :version, "Display the Pry version" do
+    puts "Pry version #{Pry::VERSION} on Ruby #{RUBY_VERSION}"
+    exit
+  end
+
+  on(:c, :context,
+     "Start the session in the specified context. Equivalent to `context.pry` in a session.",
+     true,
+     :default => "TOPLEVEL_BINDING"
+     )
+end.process_options do |opts|
+  # invoked via cli
+  Pry.cli = true
+
+  # create the actual context
+  context = Pry.binding_for(eval(opts[:context]))
+
+  if opts[:exec]
+    exec_string = opts[:exec] + "\n"
+  else
+    exec_string = ""
+  end
+
+  # Start the session (running any code passed with -e, if there is any)
+  Pry.start(context, :input => StringIO.new(exec_string))
+end
+