1
0
Fork 0
mirror of https://github.com/pry/pry.git synced 2022-11-09 12:35:05 -05:00

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

This reverts commit e306ff5584.
This commit is contained in:
Conrad Irwin 2012-05-30 13:33:13 -07:00
parent 9847daac18
commit 4824314c8c
4 changed files with 3 additions and 1083 deletions

View file

@ -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 file

@ -172,6 +172,7 @@ require "readline"
require "stringio"
require "coderay"
require "optparse"
require "slop"
require "rbconfig"
if Pry::Helpers::BaseHelpers.jruby?
@ -190,7 +191,6 @@ if Pry::Helpers::BaseHelpers.windows?
end
end
require "pry/slop"
require "pry/version"
require "pry/rbx_method"
require "pry/rbx_path"

File diff suppressed because it is too large Load diff

View file

@ -3,7 +3,7 @@ unless Object.const_defined? 'Pry'
require 'pry'
end
puts "Ruby v#{RUBY_VERSION} (#{defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"}), Pry v#{Pry::VERSION}, method_source v#{MethodSource::VERSION}, CodeRay v#{CodeRay::VERSION}"
puts "Ruby v#{RUBY_VERSION} (#{defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"}), Pry v#{Pry::VERSION}, method_source v#{MethodSource::VERSION}, CodeRay v#{CodeRay::VERSION}, Slop v#{Slop::VERSION}"
require 'bacon'
require 'open4'