pry 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cbb3b43af90a5a4254181530c9f5138dd977b1a
-  data.tar.gz: b35030de76cf1c5ea335c765eda2fa82c266a4bd
+  metadata.gz: c4b5511a43b1aac132c835425bc30425073db90f
+  data.tar.gz: 9ef96f53b4d97a16d58ee063a6281d94e804ed4b
 SHA512:
-  metadata.gz: 9ad850b5ea04cd13a3842865024e9e57cb788826cd55cc7fbf77ef5acd0f57c0e2fd17f87441ca6a8e0be68a082f4e6ad7dc733f4d88c511b5b76f2baf1dd93c
-  data.tar.gz: 940a6953bd599289c8f1a706bdc132652d630f8a6e54a45a70feef1657f6e96f1c8d182af6c961daa0ef0f5eab12da69318a072e61ffeb37c9f41c7bf568b26b
+  metadata.gz: 73fc5d3c0d448db136892e2bf0ac917995ca78f4961fa4b5b069a87bac1cdc0c50ba730127e7029f94731dd53cb43bd8bdc7b3c57f3d20c064bba9756bdd22a8
+  data.tar.gz: e94499c0d75d985a4fa22ce04410c5e2972e3b52edb4d567557666536d17bec5378e8d62250bdab7d571699846a9117805633f6f1e37cc93e354f923a897174c

data/CHANGELOG.md

@@ -1,4 +1,11 @@
-### 0.10.0.pre2 (2014/??/??)
+### 0.10.1
+
+* Fix bugs with jruby
+* Move to rspec for testing (from bacon)
+* Clean up ruby warnings
+
+
+### 0.10.0
 
 #### Features
 * Added a `watch` command that lets you see how values change over time.
@@ -16,7 +23,7 @@
   * See `Pry.config.prompt_safe_objects`
 * `whereami` is now aliased to `@`
 * Added  arguments to `whereami`:
-  * `-m` shows the surroungind method
+  * `-m` shows the surrounding method
   * `-c` shows the surrounding class
   * `-f` shows the entire file
 * Lazy load configuration values (Pry.config). (#1096)

data/README.md

@@ -1,6 +1,6 @@
 [![Build Status](https://img.shields.io/travis/pry/pry.svg)](https://travis-ci.org/pry/pry)
 [![Code Climate](https://img.shields.io/codeclimate/github/pry/pry.svg)](https://codeclimate.com/github/pry/pry)
-[![Inline docs](http://inch-pages.github.io/github/pry/pry.svg)](http://inch-pages.github.io/github/pry/pry)
+[![Inline docs](http://inch-ci.org/github/pry/pry.svg)](http://inch-ci.org/github/pry/pry)
 
 <center>
 ![The Pry Logo](https://dl.dropbox.com/u/26521875/pry%20stuff/logo/pry_logo_350.png)

data/lib/pry/code.rb

@@ -253,7 +253,12 @@ class Pry
     # @return [String] a formatted representation (based on the configuration of
     #   the object).
     def to_s
-      print_to_output("")
+      print_to_output("", false)
+    end
+
+    # @return [String] a (possibly highlighted) copy of the source code.
+    def highlighted
+      print_to_output("", true)
     end
 
     # Writes a formatted representation (based on the configuration of the
@@ -261,7 +266,7 @@ class Pry
     def print_to_output(output, color=false)
       @lines.each do |loc|
         loc = loc.dup
-        loc.colorize(@code_type)
+        loc.colorize(@code_type)              if color
         loc.add_line_number(max_lineno_width, color) if @with_line_numbers
         loc.add_marker(@marker_lineno)        if @with_marker
         loc.indent(@indentation_num)          if @with_indentation

data/lib/pry/commands/bang.rb

@@ -1,6 +1,6 @@
 class Pry
   class Command::Bang < Pry::ClassCommand
-    match /^\s*!\s*$/
+    match(/^\s*!\s*$/)
     group 'Editing'
     description 'Clear the input buffer.'
     command_options :use_prefix => false

data/lib/pry/commands/cat/abstract_formatter.rb

@@ -8,7 +8,7 @@ class Pry
       def decorate(content)
         content.code_type = code_type
         content.between(*between_lines).
-          with_line_numbers(use_line_numbers?)
+          with_line_numbers(use_line_numbers?).highlighted
       end
 
       def code_type

data/lib/pry/commands/cat/file_formatter.rb

@@ -51,7 +51,7 @@ class Pry
         code_type = @code_from_file.code_type
 
         if code_type == :unknown
-          name, ext = File.basename(file_name).split('.', 2)
+          name = File.basename(file_name).split('.', 2).first
           case name
           when "Rakefile", "Gemfile"
             :ruby

data/lib/pry/commands/ls/formatter.rb

@@ -1,7 +1,7 @@
 class Pry
   class Command::Ls < Pry::ClassCommand
     class Formatter
-      attr_accessor :grep
+      attr_writer :grep
       attr_reader :_pry_
 
       def initialize(_pry_)

data/lib/pry/commands/show_source.rb

@@ -40,7 +40,7 @@ class Pry
     # The source for code_object prepared for display.
     def content_for(code_object)
       Code.new(code_object.source, start_line_for(code_object)).
-        with_line_numbers(use_line_numbers?)
+        with_line_numbers(use_line_numbers?).highlighted
     end
   end
 

data/lib/pry/commands/watch_expression.rb

@@ -88,7 +88,7 @@ class Pry
 
     def add_expression(arguments)
       expressions << Expression.new(_pry_, target, arg_string)
-      output.puts "Watching #{Code.new(arg_string)}"
+      output.puts "Watching #{Code.new(arg_string).highlighted}"
     end
 
     def add_hook

data/lib/pry/commands/watch_expression/expression.rb

@@ -6,7 +6,7 @@ class Pry
       def initialize(_pry_, target, source)
         @_pry_ = _pry_
         @target = target
-        @source = source.strip
+        @source = Code.new(source).strip
       end
 
       def eval!
@@ -15,7 +15,7 @@ class Pry
       end
 
       def to_s
-        "#{Code.new(source).strip} => #{value}"
+        "#{Code.new(source).highlighted.strip} => #{value}"
       end
 
       # Has the value of the expression changed?

data/lib/pry/commands/whereami.rb

@@ -89,7 +89,7 @@ class Pry
       set_file_and_dir_locals(@file)
 
       out = "\n#{text.bold('From:')} #{location}:\n\n" <<
-        code.with_line_numbers(use_line_numbers?).with_marker(marker) << "\n"
+        code.with_line_numbers(use_line_numbers?).with_marker(marker).highlighted << "\n"
 
       _pry_.pager.page out
     end

data/lib/pry/config/behavior.rb

@@ -54,7 +54,7 @@ module Pry::Config::Behavior
       value = @default.public_send(name, *args, &block)
       # FIXME: refactor Pry::Hook so that it stores config on the config object,
       # so that we can use the normal strategy.
-      self[key] = value.dup if key == 'hooks'
+      self[key] = value = value.dup if key == 'hooks'
       value
     else
       nil

data/lib/pry/config/convenience.rb

@@ -5,7 +5,6 @@ module Pry::Config::Convenience
                :commands,
                :print,
                :exception_handler,
-               :quiet?,
                :hooks,
                :color,
                :pager,

data/lib/pry/config/default.rb

@@ -119,10 +119,6 @@ class Pry::Config::Default
     configure_history
   end
 
-  def quiet?
-    quiet
-  end
-
   default.each do |key, value|
     define_method(key) do
       if default[key].equal?(value)

data/lib/pry/editor.rb

@@ -84,7 +84,7 @@ class Pry
         '--nofork' if blocking
       when /^jedit/
         '-wait' if blocking
-      when /^mate/, /^subl/
+      when /^mate/, /^subl/, /^redcar/
         '-w' if blocking
       end
     end
@@ -106,6 +106,8 @@ class Pry
         "#{file_name}/#{line_number}"
       when /^jedit/
         "#{file_name} +line:#{line_number}"
+      when /^redcar/
+        "-l#{line_number} #{file_name}"
       else
         if windows?
           "#{file_name}"

data/lib/pry/history.rb

@@ -81,10 +81,10 @@ class Pry
 
     # The default loader. Yields lines from `Pry.history.config.file`.
     def read_from_file
-      filename = File.expand_path(Pry.config.history.file)
+      path = history_file_path
 
-      if File.exists?(filename)
-        File.foreach(filename) { |line| yield(line) }
+      if File.exists?(path)
+        File.foreach(path) { |line| yield(line) }
       end
     rescue => error
       warn "History file not loaded: #{error.message}"
@@ -111,15 +111,17 @@ class Pry
       if defined?(@history_file)
         @history_file
       else
-        @history_file = File.open(file_path, 'a', 0600).tap { |f| f.sync = true }
+        @history_file = File.open(history_file_path, 'a', 0600).tap do |file|
+          file.sync = true
+        end
       end
     rescue Errno::EACCES
       warn 'History not saved; unable to open your history file for writing.'
       @history_file = false
     end
 
-    def file_path
-      @file_path || Pry.config.history.file
+    def history_file_path
+      File.expand_path(@file_path || Pry.config.history.file)
     end
   end
 end

data/lib/pry/method/weird_method_locator.rb

@@ -164,7 +164,7 @@ class Pry
       end
 
       def valid_file?(file)
-        (File.exists?(file) && !File.directory?(file)) || Pry.eval_path == file
+        (File.exist?(file) && !File.directory?(file)) || Pry.eval_path == file
       end
 
       def lines_for_file(file)

data/lib/pry/pager.rb

@@ -38,9 +38,10 @@ class Pry::Pager
 
   private
 
-  attr_reader :output
   def enabled?; !!@enabled; end
 
+  def output; @output; end
+
   # Return an instance of the "best" available pager class -- `SystemPager` if
   # possible, `SimplePager` if `SystemPager` isn't available, and `NullPager`
   # if the user has disabled paging. All pagers accept output with `#puts`,

data/lib/pry/plugins.rb

@@ -35,7 +35,7 @@ class Pry
       # Load the Command line options defined by this plugin (if they exist)
       def load_cli_options
         cli_options_file = File.join(spec.full_gem_path, "lib/#{spec.name}/cli.rb")
-        require cli_options_file if File.exists?(cli_options_file)
+        require cli_options_file if File.exist?(cli_options_file)
       end
       # Activate the plugin (require the gem - enables/loads the
       # plugin immediately at point of call, even if plugin is

data/lib/pry/pry_class.rb

@@ -19,7 +19,7 @@ class Pry
     def_delegators :@plugin_manager, :plugins, :load_plugins, :locate_plugins
 
     extend Pry::Config::Convenience
-    config_shortcut *Pry::Config.shortcuts
+    config_shortcut(*Pry::Config.shortcuts)
 
     def prompt=(value)
       config.prompt = value

data/lib/pry/pry_instance.rb

@@ -39,7 +39,7 @@ class Pry
   attr_reader :config
 
   extend Pry::Config::Convenience
-  config_shortcut *Pry::Config.shortcuts
+  config_shortcut(*Pry::Config.shortcuts)
   EMPTY_COMPLETIONS = [].freeze
 
   # Create a new {Pry} instance.
@@ -167,12 +167,14 @@ class Pry
     end
   end
 
+  undef :memory_size if method_defined? :memory_size
   # @return [Integer] The maximum amount of objects remembered by the inp and
   #   out arrays. Defaults to 100.
   def memory_size
     @output_array.max_size
   end
 
+  undef :memory_size= if method_defined? :memory_size=
   def memory_size=(size)
     @input_array  = Pry::HistoryArray.new(size)
     @output_array = Pry::HistoryArray.new(size)
@@ -503,7 +505,7 @@ class Pry
     @input_array << code
     if code
       Pry.line_buffer.push(*code.each_line)
-      Pry.current_line += code.each_line.count
+      Pry.current_line += code.lines.count
     end
   end
 
@@ -596,6 +598,7 @@ class Pry
     prompt_stack.size > 1 ? prompt_stack.pop : prompt
   end
 
+  undef :pager if method_defined? :pager
   # Returns the currently configured pager
   # @example
   #   _pry_.pager.page text
@@ -603,6 +606,7 @@ class Pry
     Pry::Pager.new(self)
   end
 
+  undef :output if method_defined? :output
   # Returns an output device
   # @example
   #   _pry_.output.puts "ohai!"
@@ -651,4 +655,10 @@ class Pry
   end
   def raise_up(*args); raise_up_common(false, *args); end
   def raise_up!(*args); raise_up_common(true, *args); end
+
+  # Convenience accessor for the `quiet` config key.
+  # @return [Boolean]
+  def quiet?
+    config.quiet
+  end
 end

data/lib/pry/terminal.rb

@@ -5,7 +5,7 @@ class Pry::Terminal
     # If the window size cannot be determined, return nil.
     def screen_size
       rows, cols = actual_screen_size
-      if rows && cols
+      if rows.to_i != 0 && cols.to_i != 0
         [rows.to_i, cols.to_i]
       else
         nil

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

data/lib/pry/wrapped_module.rb

@@ -107,6 +107,10 @@ class Pry
     def singleton_class?
       if Pry::Method.safe_send(wrapped, :respond_to?, :singleton_class?)
         Pry::Method.safe_send(wrapped, :singleton_class?)
+      elsif defined?(Rubinius)
+        # https://github.com/rubinius/rubinius/commit/2e71722dba53d1a92c54d5e3968d64d1042486fe singleton_class? added 30 Jul 2014
+        # https://github.com/rubinius/rubinius/commit/4310f6b2ef3c8fc88135affe697db4e29e4621c4 has been around since 2011
+        !!Rubinius::Type.singleton_class_object(wrapped)
       else
         wrapped != Pry::Method.safe_send(wrapped, :ancestors).first
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - John Mair (banisterfiend)
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay