refactored example initialization code (still need to update examples for new API)

examples/example_basic.rb

@@ -1,7 +1,4 @@
-direc = File.dirname(__FILE__)
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-
-require 'rubygems'
-require "#{direc}/../lib/pry"
 
 # define a local.
 a = "a local variable"
@@ -14,4 +11,5 @@ end
 # Start pry session at top-level.
 # The local variable `a` and the `hello` method will
 # be accessible.
+puts __LINE__
 binding.pry

examples/example_command_override.rb

@@ -1,7 +1,4 @@
-direc = File.dirname(__FILE__)
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-
-require 'rubygems'
-require "#{direc}/../lib/pry"
 
 # Inherit standard command set, but tweak them by importing some and
 # overriding others.
@@ -18,7 +15,7 @@ class MyCommands < Pry::CommandBase
 
   # analogy to Ruby's native alias_method idiom for decorating a method
   alias_command "old_status", "status", ""
-  
+
   # Invoke one command from within another using `run`
   command "status", "Modified status."  do |x|
     output.puts "About to show status, are you ready?"

examples/example_commands.rb

@@ -1,7 +1,4 @@
-direc = File.dirname(__FILE__)
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-
-require 'rubygems'
-require "#{direc}/../lib/pry"
 
 class MathCommands < Pry::CommandBase
   command "greet", "Greet a person, e.g: greet john" do |name|

examples/example_hooks.rb

@@ -1,12 +1,9 @@
-direc = File.dirname(__FILE__)
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-
-require 'rubygems'
-require "#{direc}/../lib/pry"
 
 my_hooks = {
   :before_session => proc { |out, target| out.puts "Opening #{target.eval('self')}." },
   :after_session => proc { |out, target| out.puts "Closing #{target.eval('self')}." }
 }
-           
+
 # Start a Pry session using the hooks hash defined in my_hooks
 Pry.start(TOPLEVEL_BINDING, :hooks => my_hooks)

examples/example_image_edit.rb

@@ -1,7 +1,7 @@
 # Note: this requires you to have Gosu and TexPlay installed.
 # `gem install gosu`
 # `gem install texplay`
-# 
+#
 # Extra instructions for installing Gosu on Linux can be found here:
 # http://code.google.com/p/gosu/wiki/GettingStartedOnLinux
 #
@@ -10,11 +10,7 @@
 #
 # Have fun! :)
 
-direc = File.dirname(__FILE__)
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-
-require 'rubygems'
-require "texplay"
-require "#{direc}/../lib/pry"
 
 WIDTH = 640
 HEIGHT = 480
@@ -42,12 +38,12 @@ class WinClass < Gosu::Window
     @img.rect 0, 0, @img.width - 1, @img.height - 1
 
     @binding = Pry.binding_for(@img)
-    
+
     @pry_instance = Pry.new(:commands => ImageCommands, :prompt => IMAGE_PROMPT)
   end
 
   def draw
-    @img.draw_rot(WIDTH / 2, HEIGHT / 2, 1, 0, 0.5, 0.5) 
+    @img.draw_rot(WIDTH / 2, HEIGHT / 2, 1, 0, 0.5, 0.5)
   end
 
   def update

examples/example_input.rb

@@ -1,7 +1,4 @@
-direc = File.dirname(__FILE__)
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-
-require 'rubygems'
-require "#{direc}/../lib/pry"
 
 # Create a StringIO that contains the input data
 str_input = StringIO.new("puts 'hello world!'\nputs \"I am in \#{self}\"\nexit")

examples/example_input2.rb

@@ -1,7 +1,4 @@
-direc = File.dirname(__FILE__)
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-
-require 'rubygems'
-require "#{direc}/../lib/pry"
 
 # Create a StringIO that contains the input data for all the Pry objects
 cmds = <<-CMDS

examples/example_output.rb

@@ -1,7 +1,4 @@
-direc = File.dirname(__FILE__)
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-
-require 'rubygems'
-require "#{direc}/../lib/pry"
 
 # Create a StringIO to contain the output data
 str_output = StringIO.new

examples/example_print.rb

@@ -1,9 +1,6 @@
-direc = File.dirname(__FILE__)
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-
-require 'rubygems'
-require "#{direc}/../lib/pry"
 
 my_print = proc { |out, value| out.puts "Output is: #{value.inspect}" }
-           
+
 # Start a Pry session using the print object defined in my_print
 Pry.start(TOPLEVEL_BINDING, :print => my_print)

examples/example_prompt.rb

@@ -1,12 +1,9 @@
-direc = File.dirname(__FILE__)
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-
-require 'rubygems'
-require "#{direc}/../lib/pry"
 
 # Remember, first prompt in array is the main prompt, second is the wait
 # prompt (used for multiline input when more input is required)
 my_prompt = [ proc { |obj, *| "inside #{obj}> " },
            proc { |obj, *| "inside #{obj}* "} ]
-           
+
 # Start a Pry session using the prompt defined in my_prompt
 Pry.start(TOPLEVEL_BINDING, :prompt => my_prompt)

examples/helper.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+unless Object.const_defined? 'Pry'
+  $:.unshift File.expand_path '../../lib', __FILE__
+  require 'pry'
+end
+