pry 0.9.12.4 → 0.9.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca2644d1fc36d71310d22774a431aab6abdfb9e8
-  data.tar.gz: 75bd27d5ce4e629c84e8e424a069494466c57453
+  metadata.gz: d30aa9c1c9bdb6ed408d5964a955485fb8f83e08
+  data.tar.gz: b21a5d3f751cd1ec64a22b6443848f1453e67dfe
 SHA512:
-  metadata.gz: 6d181cfb067a4a2b3acb346e90eca5aeae5758971a6bb5e29414353e46af0f48a2e374559a2c023ce13e3883d235151a3d067e60376e8661369ed6d37f371243
-  data.tar.gz: 5bec33d0ac7949ebffe7d886ea0798eba3b98a38316aab33fc1409ca3774b31e28a18e03a009eaf27379a97d6acf4a55dce9f0fd1fe8c04b4e09197c7a19f59a
+  metadata.gz: d6c7bfedcc2b28f4852e89799bece299cec2c33cbfc02b387491a224b8d80e48cec1f4056189d1db98987c0ccab5931a7d6967396d025187ba1777ac71c1b292
+  data.tar.gz: 3e007ae61bafb3c3ad94346a7fd6ebb752df0110a9a8cfcdf962646f536b6bc161bb48b8187249f9675270ac62a340a8191d9292d08bda3ab559a1798876e94e

data/.travis.yml

@@ -2,14 +2,19 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.0
   - ruby-head
   - ree
-  - rbx-18mode
-  - rbx-19mode
-  - jruby-18mode
+  - rbx
   - jruby-19mode
   - jruby-head
 
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+
 notifications:
   irc: "irc.freenode.org#pry"
   recipients:
@@ -17,5 +22,4 @@ notifications:
 
 branches:
   only:
-    - master
     - 0-9-12-stable

data/Gemfile

@@ -1,9 +1,12 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec
 
-# For Guard
 group :development do
   gem 'jist'
-  gem 'rb-inotify', :require => 'false'
-  gem 'rb-fsevent', :require => 'false'
+end
+
+if RbConfig::CONFIG['ruby_install_name'] == 'rbx'
+  gem 'rubysl-singleton'
+  gem 'rubysl-prettyprint'
+  gem 'rb-readline'
 end

data/Rakefile

@@ -87,17 +87,17 @@ namespace :ruby do
   end
 end
 
-namespace :jruby do
-  spec = modify_base_gemspec do |s|
-    s.add_dependency('spoon', '~> 0.0')
-    s.platform = 'java'
-  end
-
-  Gem::PackageTask.new(spec) do |pkg|
-    pkg.need_zip = false
-    pkg.need_tar = false
-  end
-end
+#namespace :jruby do
+#  spec = modify_base_gemspec do |s|
+#    s.add_dependency('spoon', '~> 0.0')
+#    s.platform = 'java'
+#  end
+#
+#  Gem::PackageTask.new(spec) do |pkg|
+#    pkg.need_zip = false
+#    pkg.need_tar = false
+#  end
+#end
 
 
 [:mingw32, :mswin32].each do |v|
@@ -115,7 +115,7 @@ 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']
 
 desc "remove all platform gems"
 task :rmgems => ['ruby:clobber_package']

data/lib/pry.rb

@@ -196,6 +196,16 @@ class Pry
   # IRB = Pry thing.
   module ExtendCommandBundle
   end
+
+  def self.require_readline
+    return false if @required_readline
+    require 'readline'
+    @required_readline = true
+  rescue LoadError
+    warn "Sorry, you can't use Pry without Readline or a compatible library."
+    warn "Please `gem install rb-readline` or recompile Ruby --with-readline."
+    raise
+  end
 end
 
 if Pry::Helpers::BaseHelpers.mri_18?
@@ -213,19 +223,11 @@ require 'slop'
 require 'rbconfig'
 require 'tempfile'
 
-begin
-  require 'readline'
-rescue LoadError
-  warn "You're running a version of ruby with no Readline support"
-  warn "Please `gem install rb-readline` or recompile ruby --with-readline."
-  exit!
-end
-
 if Pry::Helpers::BaseHelpers.jruby?
   begin
     require 'ffi'
   rescue LoadError
-    warn "Need to `gem install ffi`"
+    warn "For a better Pry experience on JRuby, please `gem install ffi`."
   end
 end
 
@@ -236,7 +238,8 @@ if Pry::Helpers::BaseHelpers.windows? && !Pry::Helpers::BaseHelpers.windows_ansi
   # only fail on jruby (where win32console doesn't work).
   # Instead we'll recommend ansicon, which does.
   rescue LoadError
-    warn "For a better pry experience, please use ansicon: http://adoxa.3eeweb.com/ansicon/"
+    warn "For a better Pry experience on Windows, please use ansicon:"
+    warn "   http://adoxa.3eeweb.com/ansicon/"
   end
 end
 

data/lib/pry/completion.rb

@@ -5,6 +5,14 @@ class Pry
   module BondCompleter
 
     def self.build_completion_proc(target, pry=nil, commands=[""])
+      Pry.require_readline
+
+      # If we're using libedit, don't use Bond.
+      if Readline::VERSION =~ /editline/i
+        Pry.config.completer = InputCompleter
+        return InputCompleter.build_completion_proc(target, pry, commands)
+      end
+
       if !@started
         @started = true
         start
@@ -28,13 +36,6 @@ class Pry
 
   # Implements tab completion for Readline in Pry
   module InputCompleter
-
-    if Readline.respond_to?("basic_word_break_characters=")
-      Readline.basic_word_break_characters = " \t\n\"\\'`><=;|&{("
-    end
-
-    Readline.completion_append_character = nil
-
     ReservedWords = [
       "BEGIN", "END",
       "alias", "and",
@@ -60,10 +61,26 @@ class Pry
       "[]", "[]=", "^", "!", "!=", "!~"
     ]
 
+    # If we haven't configured Readline for completion yet, do it now.
+    # @private
+    def self.initialize_readline
+      Pry.require_readline
+      return if @initialized_readline
+
+      if Readline.respond_to?("basic_word_break_characters=")
+        Readline.basic_word_break_characters = " \t\n\"\\'`><=;|&{("
+      end
+
+      Readline.completion_append_character = nil
+
+      @initialized_readline = true
+    end
+
     # Return a new completion proc for use by Readline.
     # @param [Binding] target The current binding context.
     # @param [Array<String>] commands The array of Pry commands.
     def self.build_completion_proc(target, pry=nil, commands=[""])
+      initialize_readline
 
       proc do |input|
 

data/lib/pry/config.rb

@@ -5,13 +5,27 @@ class Pry
 
     # Get/Set the object to use for input by default by all Pry instances.
     # Pry.config.input is an option determining the input object - the object from
-    # which Pry retrieves its lines of input. Pry accepts any object that implements the readline method.
-    # This includes IO objects, StringIO, Readline, File and custom objects.
+    # which Pry retrieves its lines of input. Pry accepts any object that
+    # implements the readline method.  This includes IO objects, StringIO,
+    # Readline, File and custom objects. It can also be a Proc which returns an
+    # object implementing the readline method.
     # @return [#readline] The object to use for input by default by all
     #   Pry instances.
     # @example
     #   Pry.config.input = StringIO.new("@x = 10\nexit")
-    attr_accessor :input
+    def input
+      @reified_input ||=
+        if @input.respond_to?(:call)
+          @input.call
+        else
+          @input
+        end
+    end
+
+    def input=(input)
+      @reified_input = nil
+      @input = input
+    end
 
     # Get/Set the object to use for output by default by all Pry instances.
     # Pry.config.output is an option determining the output object - the object to which

data/lib/pry/history.rb

@@ -1,6 +1,6 @@
 class Pry
-  # The History class is responsible for maintaining the user's input history, both
-  # internally and within Readline.
+  # The History class is responsible for maintaining the user's input history,
+  # both internally and within Readline.
   class History
     attr_accessor :loader, :saver, :pusher, :clearer
 
@@ -111,11 +111,13 @@ class Pry
     # The default pusher. Appends the given line to Readline::HISTORY.
     # @param [String] line
     def push_to_readline(line)
+      Pry.require_readline
       Readline::HISTORY << line
     end
 
     # The default clearer. Clears Readline::HISTORY.
     def clear_readline
+      Pry.require_readline
       Readline::HISTORY.shift until Readline::HISTORY.empty?
     end
   end

data/lib/pry/pry_class.rb

@@ -107,8 +107,7 @@ class Pry
   # Including: loading .pryrc, loading plugins, loading requires, and
   # loading history.
   def self.initial_session_setup
-
-    return if !initial_session?
+    return unless initial_session?
 
     # note these have to be loaded here rather than in pry_instance as
     # we only want them loaded once per entire Pry lifetime.
@@ -262,6 +261,7 @@ class Pry
   end
 
   def self.auto_resize!
+    Pry.require_readline
     ver = Readline::VERSION
     if ver[/edit/i]
       warn <<-EOT
@@ -286,7 +286,7 @@ Readline version #{ver} detected - will not auto_resize! correctly.
   end
 
   def self.set_config_defaults
-    config.input = Readline
+    config.input = proc { Pry.require_readline; Readline }
     config.output = $stdout
     config.commands = Pry::Commands
     config.prompt_name = DEFAULT_PROMPT_NAME
@@ -310,12 +310,7 @@ Readline version #{ver} detected - will not auto_resize! correctly.
     config.correct_indent = true
     config.collision_warning = false
     config.output_prefix = "=> "
-
-    if defined?(Bond) && Readline::VERSION !~ /editline/i
-      config.completer = Pry::BondCompleter
-    else
-      config.completer = Pry::InputCompleter
-    end
+    config.completer = Pry::BondCompleter
 
     config.gist ||= OpenStruct.new
     config.gist.inspecter = proc(&:pretty_inspect)

data/lib/pry/pry_instance.rb

@@ -619,7 +619,7 @@ class Pry
         input.completion_proc = completion_proc
       end
 
-      if input == Readline
+      if defined?(Readline) && input == Readline
         if !$stdout.tty? && $stdin.tty? && !Pry::Helpers::BaseHelpers.windows?
           Readline.output = File.open('/dev/tty', 'w')
         end

data/lib/pry/terminal.rb

@@ -53,7 +53,7 @@ class Pry::Terminal
     end
 
     def screen_size_according_to_readline
-      if Readline.respond_to?(:get_screen_size)
+      if defined?(Readline) && Readline.respond_to?(:get_screen_size)
         size = Readline.get_screen_size
         size if nonzero_column?(size)
       end

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.9.12.4"
+  VERSION = "0.9.12.5"
 end

data/lib/pry/wrapped_module.rb

@@ -120,7 +120,11 @@ class Pry
     # Is this a singleton class?
     # @return [Boolean]
     def singleton_class?
-      wrapped != wrapped.ancestors.first
+      if wrapped.respond_to?(:singleton_class?)
+        wrapped.singleton_class?
+      else
+        wrapped != wrapped.ancestors.first
+      end
     end
 
     # Is this strictly a module? (does not match classes)

data/pry.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'bacon', '~> 1.2'
   s.add_development_dependency 'open4', '~> 1.3'
   s.add_development_dependency 'rake',  '~> 0.9'
-  s.add_development_dependency 'guard', '~> 1.3.2'
   s.add_development_dependency 'mocha', '~> 0.13.1'
   # TODO: make this a plain dependency:
   s.add_development_dependency 'bond',  '~> 0.4.2'

data/spec/commands/cd_spec.rb

@@ -45,7 +45,7 @@ describe 'cd' do
     describe 'when an error was raised' do
       it 'should not toggle and should keep correct stacks' do
         proc {
-          @t.eval 'cd @'
+          @t.eval 'cd %'
         }.should.raise(Pry::CommandError)
 
         @t.old_stack.should == []

data/spec/completion_spec.rb

@@ -10,6 +10,8 @@ def completer_test(bind, pry=nil, assert_flag=true)
   return proc {|*symbols| symbols.each(&test) }
 end
 
+Pry.require_readline
+
 if defined?(Bond) && Readline::VERSION !~ /editline/i
   describe 'bond-based completion' do
     it 'should pull in Bond by default' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry
 version: !ruby/object:Gem::Version
-  version: 0.9.12.4
+  version: 0.9.12.5
 platform: ruby
 authors:
 - John Mair (banisterfiend)
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-24 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay
@@ -96,20 +96,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -155,7 +141,6 @@ files:
 - CHANGELOG
 - CONTRIBUTORS
 - Gemfile
-- Guardfile
 - LICENSE
 - README.markdown
 - Rakefile
@@ -343,7 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: An IRB alternative and runtime developer console

data/Guardfile

@@ -1,62 +0,0 @@
-require 'guard/guard'
-
-module ::Guard
-  class Bacon < Guard
-    def run_all
-      system "rake spec"
-      puts
-      true
-    end
-
-    def run_on_changes(paths)
-      paths.delete('some_lib')
-      puts "Running: #{paths.join ' '}"
-      if paths.size.zero?
-        warn 'Running all tests'
-        system 'rake recspec'
-      else
-        paths.each do |path|
-          warn "Running #{path}"
-          system "rake spec run=#{path}" or return
-          warn "\e[32;1mNice!!\e[0m  Now running all specs, just to be sure."
-          run_all
-        end
-      end
-    end
-  end
-end
-
-guard 'bacon' do
-  def deduce_spec_from(token)
-    %W(
-      spec/#{token}_spec.rb
-      spec/pry_#{token}_spec.rb
-      spec/commands/#{token}_spec.rb
-    ).each do |e|
-      return e if File.exists? e
-    end
-    nil
-  end
-
-  Dir['lib/pry/**/*.rb'].each do |rb|
-    rb[%r(lib/pry/(.+)\.rb$)]
-    spec_rb = deduce_spec_from($1)
-    if spec_rb
-      # run as 'bundle exec guard -d' to see these.
-      ::Guard::UI.debug "'#{rb}' maps to '#{spec_rb}'"
-    else
-      ::Guard::UI.debug "No map, so run all for: '#{rb}'"
-    end
-    next unless spec_rb
-    watch(rb) do |m| spec_rb end
-  end
-
-  watch(%r{^lib/.+\.rb$}) do |m|
-    return if deduce_spec_from(m[0])
-    'some_lib'
-  end
-
-  watch(%r{^spec/.+\.rb$}) do |m| m end
-end
-
-# vim:ft=ruby