Permalink
Browse files

Revert "Set Pry::Slop equal to Slop (v2.4.4)"

This reverts commit e306ff5.
  • Loading branch information...
1 parent 9847daa commit 4824314c8c4f66d397f0dc726de521b57b9ffa7e @ConradIrwin ConradIrwin committed May 30, 2012
Showing with 3 additions and 1,083 deletions.
  1. +1 −0 Rakefile
  2. +1 −1 lib/pry.rb
  3. +0 −1,081 lib/pry/slop.rb
  4. +1 −1 test/helper.rb
View
@@ -20,6 +20,7 @@ def apply_spec_defaults(s)
s.files = `git ls-files`.split("\n")
s.test_files = `git ls-files -- test/*`.split("\n")
s.add_dependency('coderay', '~> 1.0.5')
+ s.add_dependency('slop', ['>= 2.4.4', '< 3'])
s.add_dependency('method_source','~> 0.7.1')
s.add_development_dependency('bacon', '~> 1.1')
s.add_development_dependency('open4', '~> 1.3')
View
@@ -172,6 +172,7 @@ module ExtendCommandBundle
require "stringio"
require "coderay"
require "optparse"
+require "slop"
require "rbconfig"
if Pry::Helpers::BaseHelpers.jruby?
@@ -190,7 +191,6 @@ module ExtendCommandBundle
end
end
-require "pry/slop"
require "pry/version"
require "pry/rbx_method"
require "pry/rbx_path"
Oops, something went wrong.

0 comments on commit 4824314

Please sign in to comment.