diff --git a/README.markdown b/README.markdown index 58a507bb..b4f02480 100644 --- a/README.markdown +++ b/README.markdown @@ -566,4 +566,4 @@ Problems or questions contact me at [github](http://github.com/banister) -] + diff --git a/lib/pry.rb b/lib/pry.rb index 6d48c106..64ec9a20 100644 --- a/lib/pry.rb +++ b/lib/pry.rb @@ -6,8 +6,6 @@ direc = File.dirname(__FILE__) require "method_source" require "readline" require "#{direc}/pry/version" -require "#{direc}/pry/input" -require "#{direc}/pry/output" require "#{direc}/pry/hooks" require "#{direc}/pry/print" require "#{direc}/pry/command_base" diff --git a/lib/pry/input.rb b/lib/pry/input.rb deleted file mode 100644 index d8c84700..00000000 --- a/lib/pry/input.rb +++ /dev/null @@ -1,20 +0,0 @@ -require 'readline' - -class Pry - - # preset input class - class PresetInput - def initialize(*actions) - @orig_actions = actions.dup - @actions = actions - end - - def readline(*) - @actions.shift - end - - def rewind - @actions = @orig_actions.dup - end - end -end diff --git a/lib/pry/output.rb b/lib/pry/output.rb deleted file mode 100644 index da181ae8..00000000 --- a/lib/pry/output.rb +++ /dev/null @@ -1,7 +0,0 @@ -class Pry - - # null output class - doesn't write anywwhere. - class NullOutput - def self.puts(*) end - end -end diff --git a/lib/pry/pry_instance.rb b/lib/pry/pry_instance.rb index 172e9425..842b2460 100644 --- a/lib/pry/pry_instance.rb +++ b/lib/pry/pry_instance.rb @@ -10,8 +10,8 @@ class Pry # Create a new `Pry` object. # @param [Hash] options The optional configuration parameters. - # @option options [#readline] :input The object to use for input. (see input.rb) - # @option options [#puts] :output The object to use for output. (see output.rb) + # @option options [#readline] :input The object to use for input. + # @option options [#puts] :output The object to use for output. # @option options [Pry::CommandBase] :commands The object to use for # commands. (see commands.rb) # @option options [Hash] :hooks The defined hook Procs (see hooks.rb) diff --git a/test/test_helper.rb b/test/test_helper.rb index 4b1a2166..dfbc40be 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -17,6 +17,15 @@ class InputTester end end +class Pry + + # null output class - doesn't write anywwhere. + class NullOutput + def self.puts(*) end + end +end + + class CommandTester < Pry::CommandBase command "command1", "command 1 test" do