pry 0.9.11.2-java → 0.9.11.3-java

data/CHANGELOG

@@ -1,3 +1,10 @@
+17/01/2012 version 0.9.11.3
+* fix Pry.run_command
+* improve `ls` output
+* add :requires_gem => "jist" to 'gist' command (so deps can be installed
+	via install-command)
+* improve help for 'edit' command
+
 16/01/2012 version 0.9.11.2
 * minor bug fix for gist on windows, rescuing Jist::ClipboardError
 rather than letting the scary error spill out to users and potentially
@@ -7,6 +14,7 @@ have them think the gist didnt post.
 * fixed minor bug in 'gist' command where i neglected to remove
   a call to a non-existent method (no_arg) which was called when
   `gist` is invoked with no parameters
+
 16/01/2013 version 0.9.11
 dependency changes:
 * upgrade the slop gem to version ~> 3.4
@@ -15,6 +23,9 @@ dependency changes:
 new features:
 * #738 basic Ruby 2.0 support
 * #732 JRuby 1.7.0+ support
+* new reload-code command, using it you can reload code for methods,
+	classes, commands, objects and so on. e.g reload-code MyCLass,
+	reload-code my_method, reload-code my_obj
 * added bond tabcompletion, much more powerful than standard tab
 	completion. However, it requires a real 'readline' to work,
 	so will not work on standard osx setup (since it uses Editline)
@@ -106,7 +117,7 @@ bug fixes &c.
 
 09/05/2012 version 0.9.9.6 fixes #558
 * #558 has been a thorn in our side for long enough, hopefully this properly fixes it
-(though im not to confident :P)
+(though im not too confident :P)
 
 09/05/2012 version 0.9.9.5 minor bugfix
 * fixed ZeroDivisionError in correct_indentation, bug #558

data/lib/pry/command.rb

@@ -570,8 +570,8 @@ class Pry
       slop.help
     end
 
-    # Return an instance of Slop::Commands that can parse either subcommands
-    # or the options that this command accepts.
+    # Return an instance of Slop that can parse either subcommands or the
+    # options that this command accepts.
     def slop
       Slop.parse do |opt|
         opt.banner(unindent(self.class.banner))

data/lib/pry/commands/edit.rb

@@ -11,11 +11,12 @@ class Pry
     banner <<-'BANNER'
       Usage: edit [--no-reload|--reload|--patch] [--line LINE] [--temp|--ex|FILE[:LINE]|OBJECT|--in N]
 
-      Open a text editor. When no FILE is given, edits the pry input buffer. Ensure
-      `Pry.config.editor` is set to your editor of choice.
+      Open a text editor. When no FILE is given, edits the pry input buffer.
+      When a method/module/command is given, the code is opened in an editor.
+      Ensure `Pry.config.editor` is set to your editor of choice.
 
       edit sample.rb                edit -p MyClass#my_method
-      edit sample.rb --line 105     edit YourClass
+      edit sample.rb --line 105     edit MyClass
       edit MyClass#my_method        edit --ex
       edit --method                 edit --ex -p
 

data/lib/pry/commands/gist.rb

@@ -3,6 +3,7 @@ class Pry
     match 'gist'
     group 'Misc'
     description 'Playback a string variable or a method or a file as input.'
+    command_options :requires_gem => "jist"
 
     banner <<-'BANNER'
       Usage: gist [OPTIONS] [--help]

data/lib/pry/commands/ls.rb

@@ -325,8 +325,8 @@ class Pry
     # Add a new section to the output. Outputs nothing if the section would be empty.
     def output_section(heading, body)
       return "" if body.compact.empty?
-      table = Pry::Helpers.tablify_to_screen_width(body)
-      "#{text.bold(color(:heading, heading))}: \n#{table}\n"
+      fancy_heading = text.bold(color(:heading, heading))
+      Pry::Helpers.tablify_or_one_line(fancy_heading, body)
     end
 
     # Color output based on config.ls.*_color

data/lib/pry/helpers/table.rb

@@ -1,14 +1,23 @@
 class Pry
   module Helpers
-    def self.tablify_to_screen_width(things)
-      things = things.compact
-
-      if TerminalInfo.screen_size.nil?
-        return things.join(Pry.config.ls.separator)
+    def self.tablify_or_one_line(heading, things)
+      plain_heading = Pry::Helpers::Text.strip_color(heading)
+      attempt = Table.new(things, :column_count => things.size)
+      if attempt.fits_on_line?(TerminalInfo.width! - plain_heading.size - 2)
+        "#{heading}: #{attempt}\n"
+      else
+        "#{heading}: \n#{tablify_to_screen_width(things, :indent => '  ')}\n"
       end
+    end
 
-      screen_width = (TerminalInfo.screen_size || [25, 80])[1]
-      tablify(things, screen_width)
+    def self.tablify_to_screen_width(things, options = {})
+      things = things.compact
+      if indent = options[:indent]
+        usable_width = TerminalInfo.width! - indent.size
+        tablify(things, usable_width).to_s.gsub(/^/, indent)
+      else
+        tablify(things, TerminalInfo.width!).to_s
+      end
     end
 
     def self.tablify(things, line_length)

data/lib/pry/pry_class.rb

@@ -239,7 +239,9 @@ class Pry
 
     output = options[:show_output] ? options[:output] : StringIO.new
 
-    Pry.new(:output => output, :input => StringIO.new(command_string), :commands => options[:commands], :prompt => proc {""}, :hooks => Pry::Hooks.new).rep(options[:context])
+    Pry.new(:output => output, :input => StringIO.new("#{command_string}\nexit-all\n"),
+            :commands => options[:commands],
+            :prompt => proc {""}, :hooks => Pry::Hooks.new).repl(options[:context])
   end
 
   def self.default_editor_for_platform
@@ -255,6 +257,14 @@ class Pry
     end
   end
 
+  def self.auto_resize!
+    trap :WINCH do
+      size = `stty size`.split(/\s+/).map &:to_i
+      Readline.set_screen_size *size
+      Readline.refresh_line
+    end
+  end
+
   def self.set_config_defaults
     config.input = Readline
     config.output = $stdout
@@ -313,11 +323,11 @@ class Pry
     config.extra_sticky_locals = {}
 
     config.ls ||= OpenStruct.new({
-      :heading_color            => :default,
+      :heading_color            => :bright_blue,
 
       :public_method_color      => :default,
-      :private_method_color     => :green,
-      :protected_method_color   => :yellow,
+      :private_method_color     => :blue,
+      :protected_method_color   => :blue,
       :method_missing_color     => :bright_red,
 
       :local_var_color          => :yellow,

data/lib/pry/terminal_info.rb

@@ -11,6 +11,11 @@ class Pry::TerminalInfo
     end
   end
 
+  # Return a screen width or a default if it fails.
+  def self.width! default = 80
+    (screen_size || [nil, default])[1]
+  end
+
   def self.actual_screen_size
     [
       # Some readlines also provides get_screen_size.

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.9.11.2"
+  VERSION = "0.9.11.3"
 end

data/spec/commands/gist_spec.rb

@@ -2,10 +2,14 @@
 # THey need to be updated for the new 'gist' API, but im too sleepy to
 # do that now.
 
+require 'helper'
 
-# require 'helper'
+describe 'gist' do
+  it 'has a dependency on the jist gem' do
+    Pry::Command::Gist.command_options[:requires_gem].should == "jist"
+  end
+end
 
-# describe 'gist' do
 #   before do
 #     Pad.jist_calls = {}
 #   end

data/spec/commands/ls_spec.rb

@@ -37,7 +37,7 @@ describe "ls" do
   describe "methods" do
     it "should show public methods by default" do
       output = pry_eval("ls Class.new{ def goo; end; public :goo }.new")
-      output.should =~ /methods: \ngoo/
+      output.should =~ /methods: goo/
     end
 
     it "should not show protected/private by default" do
@@ -46,12 +46,12 @@ describe "ls" do
     end
 
     it "should show public methods with -p" do
-      pry_eval("ls -p Class.new{ def goo; end }.new").should =~ /methods: \ngoo/
+      pry_eval("ls -p Class.new{ def goo; end }.new").should =~ /methods: goo/
     end
 
     it "should show protected/private methods with -p" do
-      pry_eval("ls -pM Class.new{ def goo; end; protected :goo }").should =~ /methods: \ngoo/
-      pry_eval("ls -p Class.new{ def goo; end; private :goo }.new").should =~ /methods: \ngoo/
+      pry_eval("ls -pM Class.new{ def goo; end; protected :goo }").should =~ /methods: goo/
+      pry_eval("ls -p Class.new{ def goo; end; private :goo }.new").should =~ /methods: goo/
     end
 
     it "should work for objects with an overridden method method" do

data/spec/helpers/table_spec.rb

@@ -80,4 +80,7 @@ asfadsssaaad    fasfaafdssd     s
     end
   end
 
+  describe 'decide between one-line or indented output' do
+    Pry::Helpers.tablify_or_one_line('head', %w(ing)).should == 'head:  ing'
+  end
 end

data/spec/run_command_spec.rb

@@ -0,0 +1,25 @@
+require 'helper'
+
+describe "Pry.run_command" do
+  before do
+    o = Object.new
+    def o.drum
+      "roken is dodelijk"
+    end
+    @context = Pry.binding_for(o)
+  end
+
+  it 'performs a simple ls' do
+    @context.eval("hokey_pokey = 10")
+    Pry.run_command "ls", :context => @context, :output => out = StringIO.new
+    out.string.should =~ /hokey_pokey/
+  end
+
+  if !PryTestHelpers.mri18_and_no_real_source_location?
+    # This is a regression test as 0.9.11 broke this behaviour
+    it 'can perform a show-source' do
+      Pry.run_command "show-source drum", :context => @context, :output => out = StringIO.new
+      out.string.should =~ /roken is dodelijk/
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry
 version: !ruby/object:Gem::Version
-  version: 0.9.11.2
+  version: 0.9.11.3
   prerelease: 
 platform: java
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
+date: 2013-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay
@@ -349,6 +349,7 @@ files:
 - spec/pry_history_spec.rb
 - spec/pry_output_spec.rb
 - spec/pry_spec.rb
+- spec/run_command_spec.rb
 - spec/sticky_locals_spec.rb
 - spec/syntax_checking_spec.rb
 - spec/wrapped_module_spec.rb
@@ -434,6 +435,7 @@ test_files:
 - spec/pry_history_spec.rb
 - spec/pry_output_spec.rb
 - spec/pry_spec.rb
+- spec/run_command_spec.rb
 - spec/sticky_locals_spec.rb
 - spec/syntax_checking_spec.rb
 - spec/wrapped_module_spec.rb